Open Build Service

_service:tar_scm:subversion.spec Added

@@ -0,0 +1,369 @@
+%define jdk_path /usr/lib/jvm/java
+
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+%global svn_python_sitearch %{python3_sitearch}
+%global svn_python %{__python3}
+
+%bcond_with java
+
+Summary: Subversion, a version control system.
+Name: subversion
+Version: 1.14.2
+Release: 4
+License: ASL 2.0
+URL: https://subversion.apache.org/
+
+Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
+
+Patch0: subversion-1.12.0-linking.patch
+Patch1: subversion-1.14.0-testwarn.patch
+Patch2: subversion-1.14.0-soversion.patch
+Patch3: subversion-1.8.0-rubybind.patch
+Patch4: subversion-1.8.5-swigplWall.patch
+Patch5: backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch
+Patch6: backport-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
+
+BuildRequires: autoconf libtool texinfo which swig gettext apr-devel apr-util-devel libserf-devel cyrus-sasl-devel sqlite-devel file-devel utf8proc-devel lz4-devel apr-util-openssl dbus-devel, libsecret-devel httpd-devel 
+Requires: httpd
+
+Provides: svn
+Provides: %{name}-libs
+Provides: %{name}-gnome
+Provides: mod_dav_svn
+Provides: %{name}-tools
+
+Obsoletes: svn
+Obsoletes: %{name}-libs
+Obsoletes: %{name}-gnome
+Obsoletes: mod_dav_svn
+Obsoletes: %{name}-tools
+
+%define swigdirs swig_pydir=%{svn_python_sitearch}/libsvn swig_pydir_extra=%{svn_python_sitearch}/svn
+
+%description
+Subversion exists to be universally recognized and adopted as an open-source, centralized version control system characterized by its reliability as a safe haven for valuable data; the simplicity of its model and usage; and its ability to support the needs of a wide variety of users and projects, from individuals to large-scale enterprise operations.
+
+%package devel
+Summary:  Development package for subversion
+Requires: subversion%{?_isa} = %{version}-%{release}
+Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa}
+
+%description devel
+Development package for subversion.
+%package_help
+Requires: subversion = %{version}-%{release}
+
+%package -n python3-%{name}
+%{?python_provide:%python_provide python3-subversion}
+Provides: %{name}-python = %{version}-%{release}
+Provides: python3-%{name} = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+BuildRequires: python3-devel py3c-devel
+Summary:  python3 bindings to the subversion libraries
+
+%description -n python3-%{name}
+python3 bindings to the subversion libraries
+
+%package -n perl-%{name}
+Summary:  perl bindings to the subversion libraries
+Provides: %{name}-perl = %{version}-%{release}
+Obsoletes: %{name}-perl
+BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker) perl(Test::More), perl(ExtUtils::Embed)
+Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
+Requires: subversion%{?_isa} = %{version}-%{release}
+
+%description -n perl-%{name}
+perl bindings to the subversion libraries
+
+%if %{with java}
+%package -n java-%{name}
+Summary:  java bindings to the subversion libraries
+Provides: %{name}-java = %{version}-%{release}
+Obsoletes: %{name}-java
+Provides: %{name}-javahl = %{version}-%{release}
+Obsoletes: %{name}-javahl
+Requires: subversion = %{version}-%{release}
+BuildRequires: java-devel-openjdk zip, unzip junit
+BuildArch: noarch
+
+%description -n java-%{name}
+java bindings to the subversion libraries
+%endif
+
+%package -n ruby-%{name}
+Summary: Ruby bindings to the Subversion libraries
+Provides: %{name}-ruby = %{version}-%{release}
+Obsoletes: %{name}-ruby
+BuildRequires: ruby-devel ruby rubygem(test-unit)
+Requires: subversion%{?_isa} = %{version}-%{release}
+
+%description -n ruby-%{name}
+This package includes the Ruby bindings to the Subversion libraries.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+mv build-outputs.mk build-outputs.mk.old
+export PYTHON=%{svn_python}
+touch build/generator/swig/*.py
+PATH=/usr/bin:$PATH ./autogen.sh --release
+
+perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
+perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/svneditor.py
+
+export svn_cv_ruby_link="%{__cc} -shared"
+export svn_cv_ruby_sitedir_libsuffix=""
+export svn_cv_ruby_sitedir_archsuffix=""
+
+export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
+export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
+
+%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
+        --disable-debug \
+        --with-swig --with-serf=%{_prefix} \
+        --with-ruby-sitedir=%{ruby_vendorarchdir} \
+        --with-ruby-test-verbose=verbose \
+        --with-apxs=%{_httpd_apxs} --disable-mod-activation \
+        --with-apache-libexecdir=%{_httpd_moddir} \
+        --disable-static --with-sasl=%{_prefix} \
+        --with-libmagic=%{_prefix} \
+        --with-gnome-keyring \
+%if %{with java}
+        --enable-javahl \
+        --with-junit=%{_prefix}/share/java/junit.jar \
+%endif
+        --without-berkeley-db \
+        || (cat config.log; exit 1)
+make %{?_smp_mflags} all tools
+make %{?_smp_mflags} swig-py swig-py-lib %{swigdirs}
+make %{?_smp_mflags} swig-pl swig-pl-lib swig-rb swig-rb-lib
+%if %{with java}
+make %{?_smp_mflags} javahl
+%endif
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
+make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
+make pure_vendor_install -C subversion/bindings/swig/perl/native \
+        PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+%if %{with java}
+make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir}
+%endif
+DESTDIR=$RPM_BUILD_ROOT
+
+install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/subversion
+
+mkdir -p ${RPM_BUILD_ROOT}{%{_httpd_modconfdir},%{_httpd_confdir}}
+
+rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
+       ${RPM_BUILD_ROOT}%{svn_python_sitearch}/*/*.{a,la}
+
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_auth_*.so
+
+find $RPM_BUILD_ROOT -type f \
+    -a $ -name .packlist -o \( -name '*.bs' -a -empty $ \) \
+    -print0 | xargs -0 rm -f
+
+find $RPM_BUILD_ROOT%{_libdir}/perl5 -type f -perm 555 -print0 |
+        xargs -0 chmod 755
+
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a}
+
+rm -f ${RPM_BUILD_ROOT}%{ruby_vendorarchdir}/svn/ext/*.*a
+
+rm -rvf tools/*/*.in tools/hook-scripts/mailer/tests
+
+ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
+
+sed -i "/^dependency_libs/{
+     s, -l[^ ']*, ,g;
+     s, -L[^ ']*, ,g;
+     s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
+     }"  $RPM_BUILD_ROOT%{_libdir}/*.la
+
+install -Dpm 644 tools/client-side/bash_completion \
+        $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn
+for comp in svnadmin svndumpfilter svnlook svnsync svnversion; do
+    ln -s svn \
+        $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/${comp}
+done
+
+make install-tools DESTDIR=$RPM_BUILD_ROOT toolsdir=%{_bindir}
+rm -f $RPM_BUILD_ROOT%{_bindir}/diff* $RPM_BUILD_ROOT%{_bindir}/x509-parser
+
+sed -i "/^Requires.private/s, serf-1, ," \
+    $RPM_BUILD_ROOT%{_datadir}/pkgconfig/libsvn_ra_serf.pc
+

_service:tar_scm_kernel_repo:subversion.spec Deleted

@@ -1,365 +0,0 @@
-%define jdk_path /usr/lib/jvm/java
-
-%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
-
-%global svn_python_sitearch %{python3_sitearch}
-%global svn_python %{__python3}
-
-%bcond_with java
-
-Summary: Subversion, a version control system.
-Name: subversion
-Version: 1.14.2
-Release: 3
-License: ASL 2.0
-URL: https://subversion.apache.org/
-
-Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
-
-Patch0: subversion-1.12.0-linking.patch
-Patch1: subversion-1.14.0-testwarn.patch
-Patch2: subversion-1.14.0-soversion.patch
-Patch3: subversion-1.8.0-rubybind.patch
-Patch4: subversion-1.8.5-swigplWall.patch
-Patch5: backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch
-
-BuildRequires: autoconf libtool texinfo which swig gettext apr-devel apr-util-devel libserf-devel cyrus-sasl-devel sqlite-devel file-devel utf8proc-devel lz4-devel apr-util-openssl dbus-devel, libsecret-devel httpd-devel 
-Requires: httpd
-
-Provides: svn
-Provides: %{name}-libs
-Provides: %{name}-gnome
-Provides: mod_dav_svn
-Provides: %{name}-tools
-
-Obsoletes: svn
-Obsoletes: %{name}-libs
-Obsoletes: %{name}-gnome
-Obsoletes: mod_dav_svn
-Obsoletes: %{name}-tools
-
-%define swigdirs swig_pydir=%{svn_python_sitearch}/libsvn swig_pydir_extra=%{svn_python_sitearch}/svn
-
-%description
-Subversion exists to be universally recognized and adopted as an open-source, centralized version control system characterized by its reliability as a safe haven for valuable data; the simplicity of its model and usage; and its ability to support the needs of a wide variety of users and projects, from individuals to large-scale enterprise operations.
-
-%package devel
-Summary:  Development package for subversion
-Requires: subversion%{?_isa} = %{version}-%{release}
-Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa}
-
-%description devel
-Development package for subversion.
-%package_help
-Requires: subversion = %{version}-%{release}
-
-%package -n python3-%{name}
-%{?python_provide:%python_provide python3-subversion}
-Provides: %{name}-python = %{version}-%{release}
-Provides: python3-%{name} = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
-BuildRequires: python3-devel py3c-devel
-Summary:  python3 bindings to the subversion libraries
-
-%description -n python3-%{name}
-python3 bindings to the subversion libraries
-
-%package -n perl-%{name}
-Summary:  perl bindings to the subversion libraries
-Provides: %{name}-perl = %{version}-%{release}
-Obsoletes: %{name}-perl
-BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker) perl(Test::More), perl(ExtUtils::Embed)
-Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
-Requires: subversion%{?_isa} = %{version}-%{release}
-
-%description -n perl-%{name}
-perl bindings to the subversion libraries
-
-%if %{with java}
-%package -n java-%{name}
-Summary:  java bindings to the subversion libraries
-Provides: %{name}-java = %{version}-%{release}
-Obsoletes: %{name}-java
-Provides: %{name}-javahl = %{version}-%{release}
-Obsoletes: %{name}-javahl
-Requires: subversion = %{version}-%{release}
-BuildRequires: java-devel-openjdk zip, unzip junit
-BuildArch: noarch
-
-%description -n java-%{name}
-java bindings to the subversion libraries
-%endif
-
-%package -n ruby-%{name}
-Summary: Ruby bindings to the Subversion libraries
-Provides: %{name}-ruby = %{version}-%{release}
-Obsoletes: %{name}-ruby
-BuildRequires: ruby-devel ruby rubygem(test-unit)
-Requires: subversion%{?_isa} = %{version}-%{release}
-
-%description -n ruby-%{name}
-This package includes the Ruby bindings to the Subversion libraries.
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-mv build-outputs.mk build-outputs.mk.old
-export PYTHON=%{svn_python}
-touch build/generator/swig/*.py
-PATH=/usr/bin:$PATH ./autogen.sh --release
-
-perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
-perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/svneditor.py
-
-export svn_cv_ruby_link="%{__cc} -shared"
-export svn_cv_ruby_sitedir_libsuffix=""
-export svn_cv_ruby_sitedir_archsuffix=""
-
-export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
-export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
-
-%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
-        --disable-debug \
-        --with-swig --with-serf=%{_prefix} \
-        --with-ruby-sitedir=%{ruby_vendorarchdir} \
-        --with-ruby-test-verbose=verbose \
-        --with-apxs=%{_httpd_apxs} --disable-mod-activation \
-        --with-apache-libexecdir=%{_httpd_moddir} \
-        --disable-static --with-sasl=%{_prefix} \
-        --with-libmagic=%{_prefix} \
-        --with-gnome-keyring \
-%if %{with java}
-        --enable-javahl \
-        --with-junit=%{_prefix}/share/java/junit.jar \
-%endif
-        --without-berkeley-db \
-        || (cat config.log; exit 1)
-make %{?_smp_mflags} all tools
-make %{?_smp_mflags} swig-py swig-py-lib %{swigdirs}
-make %{?_smp_mflags} swig-pl swig-pl-lib swig-rb swig-rb-lib
-%if %{with java}
-make %{?_smp_mflags} javahl
-%endif
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
-make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
-make pure_vendor_install -C subversion/bindings/swig/perl/native \
-        PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%if %{with java}
-make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir}
-%endif
-DESTDIR=$RPM_BUILD_ROOT
-
-install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/subversion
-
-mkdir -p ${RPM_BUILD_ROOT}{%{_httpd_modconfdir},%{_httpd_confdir}}
-
-rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
-       ${RPM_BUILD_ROOT}%{svn_python_sitearch}/*/*.{a,la}
-
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_auth_*.so
-
-find $RPM_BUILD_ROOT -type f \
-    -a $ -name .packlist -o \( -name '*.bs' -a -empty $ \) \
-    -print0 | xargs -0 rm -f
-
-find $RPM_BUILD_ROOT%{_libdir}/perl5 -type f -perm 555 -print0 |
-        xargs -0 chmod 755
-
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a}
-
-rm -f ${RPM_BUILD_ROOT}%{ruby_vendorarchdir}/svn/ext/*.*a
-
-rm -rvf tools/*/*.in tools/hook-scripts/mailer/tests
-
-ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
-
-sed -i "/^dependency_libs/{
-     s, -l[^ ']*, ,g;
-     s, -L[^ ']*, ,g;
-     s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
-     }"  $RPM_BUILD_ROOT%{_libdir}/*.la
-
-install -Dpm 644 tools/client-side/bash_completion \
-        $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn
-for comp in svnadmin svndumpfilter svnlook svnsync svnversion; do
-    ln -s svn \
-        $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/${comp}
-done
-
-make install-tools DESTDIR=$RPM_BUILD_ROOT toolsdir=%{_bindir}
-rm -f $RPM_BUILD_ROOT%{_bindir}/diff* $RPM_BUILD_ROOT%{_bindir}/x509-parser
-
-sed -i "/^Requires.private/s, serf-1, ," \
-    $RPM_BUILD_ROOT%{_datadir}/pkgconfig/libsvn_ra_serf.pc
-
-rm $RPM_BUILD_ROOT%{_bindir}/svnauthz-validate

_service:tar_scm:backport-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch Added

@@ -0,0 +1,64 @@
+From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001
+From: Yasuhito Futatsuki <futatuki@apache.org>
+Date: Tue, 20 Sep 2022 12:57:06 +0000
+Subject: [PATCH] swig-py: Fix conditionals by SWIG version and by Python
+ version for proxy code.
+
+We are using different code for proxy object, by Python version and by SWIG
+version.  The distinguish between Python 2 and Python 3 was done by SWIG
+macro "SWIGPYTHON_PY3".  However, the macro was dropped since SWIG commit
+a343b7e[1], between SWIG 4.0.2 release and upcoming SWIG 4.1.0 release.
+
+As we already dropped support for the combination of SWIG >= 4.0 and Python 2,
+we should detect Python 2 only in SWIG < 4.0 case. So we can rely on the macro
+only in the case.
+
+* subversion/bindings/swig/include/proxy.swg ():
+  Reorder the conditionals distinguish SWIG versions and Python versions,
+  as described above.
+
+Found by: Jitka Plesnikova (jplesnik {_AT_} redhat.com)
+
+Suggested by: Julien Schueller (schueller {_AT_} phimeca.com) [2]
+
+[1] https://github.com/swig/swig/commit/a343b7e254567a64761bc1be7dc55b7b7424ec52
+[2] https://github.com/swig/swig/issues/2373#issuecomment-1250997124
+
+
+git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904167 13f79535-47bb-0310-9956-ffa450edef68
+---
+ subversion/bindings/swig/include/proxy.swg | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg
+index ac67d434ca..7d2d0dd033 100644
+--- a/subversion/bindings/swig/include/proxy.swg
++++ b/subversion/bindings/swig/include/proxy.swg
+@@ -66,7 +66,6 @@
+         fn()
+ 
+ %}
+-#if defined(SWIGPYTHON_PY3)
+ #if SWIG_VERSION >= 0x040000
+ %pythoncode %{
+   # -classic and -modern options have been dropped and this variable
+@@ -76,7 +75,7 @@
+   _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__)
+ 
+ %}
+-#else
++#elif defined(SWIGPYTHON_PY3)
+ %pythoncode %{
+   # SWIG classes generated with -modern do not define this variable
+   try:
+@@ -90,7 +89,6 @@
+   _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+ 
+ %}
+-#endif
+ #else
+ %pythoncode %{
+   # SWIG classes generated with -classic do not define this variable,
+-- 
+2.27.0
+

_service:tar_scm:backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch Added

@@ -0,0 +1,141 @@
+From 36e916ddaec4a5b1e64adee34337582f152805c5 Mon Sep 17 00:00:00 2001
+From: Nathan Hartman <hartmannathan@apache.org>
+Date: Sun, 9 Oct 2022 12:50:28 +0000
+Subject: [PATCH] swig-rb: Use Ruby API 'File.exist?' instead of deprecated
+ 'File.exists?'
+
+The Ruby API 'File.exists?' has been deprecated since Ruby 2.1 and is removed
+as of Ruby 3.2. Use 'File.exist?' instead, which exists at least as far back
+as Ruby 1.8. (According to our configure.ac, we support Ruby 1.8.x and newer,
+except between 1.9 and 1.9.3.)
+
+* subversion/bindings/swig/ruby/svn/util.rb
+  (): As above.
+
+* subversion/bindings/swig/ruby/test/test_wc.rb
+  (SvnWcTest::test_adm_ensure,
+   SvnWcTest::test_delete,
+   SvnWcTest::test_update_editor,
+   SvnWcTest::test_update_editor_options,
+   SvnWcTest::test_switch_editor): As above.
+
+* subversion/bindings/swig/ruby/test/windows_util.rb
+  (SvnTestUtil::Windows::SetupEnvironment::gen_make_opts): As above.
+
+Found by: Mamoru TASAKA (mtasaka {_AT_} fedoraproject (dot) org)
+
+
+git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904472 13f79535-47bb-0310-9956-ffa450edef68
+---
+ subversion/bindings/swig/ruby/svn/util.rb     |  2 +-
+ subversion/bindings/swig/ruby/test/test_wc.rb | 26 +++++++++----------
+ .../bindings/swig/ruby/test/windows_util.rb   |  2 +-
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/subversion/bindings/swig/ruby/svn/util.rb b/subversion/bindings/swig/ruby/svn/util.rb
+index d409b984c2761..f73554f5f7283 100644
+--- a/subversion/bindings/swig/ruby/svn/util.rb
++++ b/subversion/bindings/swig/ruby/svn/util.rb
+@@ -20,7 +20,7 @@
+ if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
+   $LOAD_PATH.each do |load_path|
+     svn_ext_path = File.join(load_path, "svn", "ext")
+-    if File.exists?(svn_ext_path)
++    if File.exist?(svn_ext_path)
+       svn_ext_path_win = File.expand_path(svn_ext_path)
+       svn_ext_path_win = svn_ext_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+       unless ENV["PATH"].split(";").find {|path| path == svn_ext_path_win}
+diff --git a/subversion/bindings/swig/ruby/test/test_wc.rb b/subversion/bindings/swig/ruby/test/test_wc.rb
+index 763cbf6611c1b..6548d83ee978b 100644
+--- a/subversion/bindings/swig/ruby/test/test_wc.rb
++++ b/subversion/bindings/swig/ruby/test/test_wc.rb
+@@ -342,11 +342,11 @@ def callbacks.handle_error(path, err)
+ 
+   def test_adm_ensure
+     adm_dir = Dir.glob(File.join(@wc_path, "{.,_}svn")).first
+-    assert(File.exists?(adm_dir))
++    assert(File.exist?(adm_dir))
+     FileUtils.rm_rf(adm_dir)
+-    assert(!File.exists?(adm_dir))
++    assert(!File.exist?(adm_dir))
+     Svn::Wc.ensure_adm(@wc_path, @fs.uuid, @repos_uri, @repos_uri, 0)
+-    assert(File.exists?(adm_dir))
++    assert(File.exist?(adm_dir))
+   end
+ 
+   def test_merge
+@@ -474,19 +474,19 @@ def test_delete
+       ctx.add(path)
+       ctx.ci(@wc_path).revision
+ 
+-      assert(File.exists?(path))
++      assert(File.exist?(path))
+       Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
+         access.delete(path)
+       end
+-      assert(!File.exists?(path))
++      assert(!File.exist?(path))
+ 
+       ctx.revert(path)
+ 
+-      assert(File.exists?(path))
++      assert(File.exist?(path))
+       Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
+         access.delete(path, nil, nil, true)
+       end
+-      assert(File.exists?(path))
++      assert(File.exist?(path))
+     end
+   end
+ 
+@@ -808,9 +808,9 @@ def test_update_editor
+         ctx.add(path2)
+         rev2 = ctx.commit(@wc_path).revision
+ 
+-        assert(File.exists?(path2))
++        assert(File.exist?(path2))
+         assert_equal(0, ctx.up(@wc_path, 0))
+-        assert(!File.exists?(path2))
++        assert(!File.exist?(path2))
+         Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
+           editor = access.update_editor('', 0)
+           assert_equal(0, editor.target_revision)
+@@ -848,9 +848,9 @@ def test_update_editor_options
+         ctx.add(path2)
+         rev2 = ctx.commit(@wc_path).revision
+ 
+-        assert(File.exists?(path2))
++        assert(File.exist?(path2))
+         assert_equal(0, ctx.up(@wc_path, 0))
+-        assert(!File.exists?(path2))
++        assert(!File.exist?(path2))
+         notification_count = 0
+         Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
+           notify_func = Proc.new {|n| notification_count += 1}
+@@ -946,9 +946,9 @@ def test_switch_editor
+         ctx.add(dir2_path)
+         rev2 = ctx.commit(@wc_path).revision
+ 
+-        assert(File.exists?(path1))
++        assert(File.exist?(path1))
+         assert_equal(rev2, ctx.switch(@wc_path, dir2_uri))
+-        assert(File.exists?(File.join(@wc_path, file2)))
++        assert(File.exist?(File.join(@wc_path, file2)))
+         Svn::Wc::AdmAccess.open_anchor(@wc_path) do |access, dir_access, target|
+           editor = dir_access.switch_editor('', dir1_uri, rev2)
+           assert_equal(rev2, editor.target_revision)
+diff --git a/subversion/bindings/swig/ruby/test/windows_util.rb b/subversion/bindings/swig/ruby/test/windows_util.rb
+index 726527a983805..338bf8fc31c27 100644
+--- a/subversion/bindings/swig/ruby/test/windows_util.rb
++++ b/subversion/bindings/swig/ruby/test/windows_util.rb
+@@ -115,7 +115,7 @@ def gen_make_opts
+           lines = []
+           gen_make_opts = File.join(@@top_dir, "gen-make.opts")
+           lines =
+-            File.read(gen_make_opts).lines.to_a if File.exists?(gen_make_opts)
++            File.read(gen_make_opts).lines.to_a if File.exist?(gen_make_opts)
+           config = Hash.new do |hash, key|
+             if /^--with-(.*)$/ =~ key
+               hash[key] = File.join(@@top_dir, $1)
+--
+2.23.0

_service:tar_scm:subversion-1.12.0-linking.patch Added

@@ -0,0 +1,84 @@
+
+Fix the way libtool is used to match standard practice:
+
+a) link ONLY libraries using -rpath $(libdir), not executables
+   .. this avoids adding an RPATH for $libdir to executables
+b) link non-installable test binaries using -no-install
+   .. only for convenience but should speed up builds slightly(?)
+
+--- subversion-1.12.0/build.conf.linking
++++ subversion-1.12.0/build.conf
+@@ -572,7 +572,7 @@
+ path = subversion/bindings/swig/python/libsvn_swig_py
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
+        apriconv apr python swig
+-link-cmd = $(LINK)
++link-cmd = $(LINK_LIB)
+ install = swig-py-lib
+ # need special build rule to include -DSWIGPYTHON
+ compile-cmd = $(COMPILE_SWIG_PY)
+@@ -598,7 +598,7 @@
+ lang = ruby
+ path = subversion/bindings/swig/ruby/libsvn_swig_ruby
+ libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
+-link-cmd = $(LINK) $(SWIG_RB_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
+ install = swig-rb-lib
+ # need special build rule to include
+ compile-cmd = $(COMPILE_SWIG_RB)
+@@ -769,6 +769,7 @@
+ libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
+ msvc-static = yes
+ undefined-lib-symbols = yes
++link-cmd = $(LINK_TEST_LIB)
+ 
+ # ----------------------------------------------------------------------------
+ # Tests for libsvn_fs_base
+--- subversion-1.12.0/build/generator/gen_base.py.linking
++++ subversion-1.12.0/build/generator/gen_base.py
+@@ -599,7 +599,7 @@
+     self.install = options.get('install')
+     self.compile_cmd = options.get('compile-cmd')
+     self.sources = options.get('sources', '*.c *.cpp')
+-    self.link_cmd = options.get('link-cmd', '$(LINK)')
++    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
+ 
+     self.external_lib = options.get('external-lib')
+     self.external_project = options.get('external-project')
+@@ -659,6 +659,14 @@
+ 
+     self.msvc_force_static = options.get('msvc-force-static') == 'yes'
+ 
++    if self.install in ['test', 'bdb-test', 'sub-test', ]:
++      self.link_cmd = '$(LINK_TEST)'
++    elif self.install in ['bin', 'tools']:
++      self.link_cmd = '$(LINK_EXE)'
++    elif self.link_cmd == '$(LINK_LIB)':
++      raise GenError('ERROR: Unknown executable link type for ' + self.name + \
++                     ': ' + self.link_cmd + ' (' + self.install + ')')
++    
+   def add_dependencies(self):
+     TargetLinked.add_dependencies(self)
+ 
+--- subversion-1.12.0/Makefile.in.linking
++++ subversion-1.12.0/Makefile.in
+@@ -268,11 +268,14 @@
+ COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c
+ COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c
+ 
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_LIB = $(LINK) $(LT_SO_VERSION)
+-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
+-LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
++LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
++LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
++LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
++LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) -no-install
++LINK_TEST = $(LINK) -no-install
++LINK_TEST_LIB = $(LINK_TEST) -avoid-version
++LINK_EXE = $(LINK)
+ 
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared

_service:tar_scm:subversion-1.14.0-soversion.patch Added

_service:tar_scm:subversion-1.14.0-testwarn.patch Added

_service:tar_scm:subversion-1.8.0-rubybind.patch Added

_service:tar_scm:subversion-1.8.5-swigplWall.patch Added

_service:tar_scm_kernel_repo:backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch Deleted

@@ -1,141 +0,0 @@
-From 36e916ddaec4a5b1e64adee34337582f152805c5 Mon Sep 17 00:00:00 2001
-From: Nathan Hartman <hartmannathan@apache.org>
-Date: Sun, 9 Oct 2022 12:50:28 +0000
-Subject: [PATCH] swig-rb: Use Ruby API 'File.exist?' instead of deprecated
- 'File.exists?'
-
-The Ruby API 'File.exists?' has been deprecated since Ruby 2.1 and is removed
-as of Ruby 3.2. Use 'File.exist?' instead, which exists at least as far back
-as Ruby 1.8. (According to our configure.ac, we support Ruby 1.8.x and newer,
-except between 1.9 and 1.9.3.)
-
-* subversion/bindings/swig/ruby/svn/util.rb
-  (): As above.
-
-* subversion/bindings/swig/ruby/test/test_wc.rb
-  (SvnWcTest::test_adm_ensure,
-   SvnWcTest::test_delete,
-   SvnWcTest::test_update_editor,
-   SvnWcTest::test_update_editor_options,
-   SvnWcTest::test_switch_editor): As above.
-
-* subversion/bindings/swig/ruby/test/windows_util.rb
-  (SvnTestUtil::Windows::SetupEnvironment::gen_make_opts): As above.
-
-Found by: Mamoru TASAKA (mtasaka {_AT_} fedoraproject (dot) org)
-
-
-git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904472 13f79535-47bb-0310-9956-ffa450edef68
----
- subversion/bindings/swig/ruby/svn/util.rb     |  2 +-
- subversion/bindings/swig/ruby/test/test_wc.rb | 26 +++++++++----------
- .../bindings/swig/ruby/test/windows_util.rb   |  2 +-
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/subversion/bindings/swig/ruby/svn/util.rb b/subversion/bindings/swig/ruby/svn/util.rb
-index d409b984c2761..f73554f5f7283 100644
---- a/subversion/bindings/swig/ruby/svn/util.rb
-+++ b/subversion/bindings/swig/ruby/svn/util.rb
-@@ -20,7 +20,7 @@
- if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
-   $LOAD_PATH.each do |load_path|
-     svn_ext_path = File.join(load_path, "svn", "ext")
--    if File.exists?(svn_ext_path)
-+    if File.exist?(svn_ext_path)
-       svn_ext_path_win = File.expand_path(svn_ext_path)
-       svn_ext_path_win = svn_ext_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
-       unless ENV["PATH"].split(";").find {|path| path == svn_ext_path_win}
-diff --git a/subversion/bindings/swig/ruby/test/test_wc.rb b/subversion/bindings/swig/ruby/test/test_wc.rb
-index 763cbf6611c1b..6548d83ee978b 100644
---- a/subversion/bindings/swig/ruby/test/test_wc.rb
-+++ b/subversion/bindings/swig/ruby/test/test_wc.rb
-@@ -342,11 +342,11 @@ def callbacks.handle_error(path, err)
- 
-   def test_adm_ensure
-     adm_dir = Dir.glob(File.join(@wc_path, "{.,_}svn")).first
--    assert(File.exists?(adm_dir))
-+    assert(File.exist?(adm_dir))
-     FileUtils.rm_rf(adm_dir)
--    assert(!File.exists?(adm_dir))
-+    assert(!File.exist?(adm_dir))
-     Svn::Wc.ensure_adm(@wc_path, @fs.uuid, @repos_uri, @repos_uri, 0)
--    assert(File.exists?(adm_dir))
-+    assert(File.exist?(adm_dir))
-   end
- 
-   def test_merge
-@@ -474,19 +474,19 @@ def test_delete
-       ctx.add(path)
-       ctx.ci(@wc_path).revision
- 
--      assert(File.exists?(path))
-+      assert(File.exist?(path))
-       Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
-         access.delete(path)
-       end
--      assert(!File.exists?(path))
-+      assert(!File.exist?(path))
- 
-       ctx.revert(path)
- 
--      assert(File.exists?(path))
-+      assert(File.exist?(path))
-       Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
-         access.delete(path, nil, nil, true)
-       end
--      assert(File.exists?(path))
-+      assert(File.exist?(path))
-     end
-   end
- 
-@@ -808,9 +808,9 @@ def test_update_editor
-         ctx.add(path2)
-         rev2 = ctx.commit(@wc_path).revision
- 
--        assert(File.exists?(path2))
-+        assert(File.exist?(path2))
-         assert_equal(0, ctx.up(@wc_path, 0))
--        assert(!File.exists?(path2))
-+        assert(!File.exist?(path2))
-         Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
-           editor = access.update_editor('', 0)
-           assert_equal(0, editor.target_revision)
-@@ -848,9 +848,9 @@ def test_update_editor_options
-         ctx.add(path2)
-         rev2 = ctx.commit(@wc_path).revision
- 
--        assert(File.exists?(path2))
-+        assert(File.exist?(path2))
-         assert_equal(0, ctx.up(@wc_path, 0))
--        assert(!File.exists?(path2))
-+        assert(!File.exist?(path2))
-         notification_count = 0
-         Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
-           notify_func = Proc.new {|n| notification_count += 1}
-@@ -946,9 +946,9 @@ def test_switch_editor
-         ctx.add(dir2_path)
-         rev2 = ctx.commit(@wc_path).revision
- 
--        assert(File.exists?(path1))
-+        assert(File.exist?(path1))
-         assert_equal(rev2, ctx.switch(@wc_path, dir2_uri))
--        assert(File.exists?(File.join(@wc_path, file2)))
-+        assert(File.exist?(File.join(@wc_path, file2)))
-         Svn::Wc::AdmAccess.open_anchor(@wc_path) do |access, dir_access, target|
-           editor = dir_access.switch_editor('', dir1_uri, rev2)
-           assert_equal(rev2, editor.target_revision)
-diff --git a/subversion/bindings/swig/ruby/test/windows_util.rb b/subversion/bindings/swig/ruby/test/windows_util.rb
-index 726527a983805..338bf8fc31c27 100644
---- a/subversion/bindings/swig/ruby/test/windows_util.rb
-+++ b/subversion/bindings/swig/ruby/test/windows_util.rb
-@@ -115,7 +115,7 @@ def gen_make_opts
-           lines = []
-           gen_make_opts = File.join(@@top_dir, "gen-make.opts")
-           lines =
--            File.read(gen_make_opts).lines.to_a if File.exists?(gen_make_opts)
-+            File.read(gen_make_opts).lines.to_a if File.exist?(gen_make_opts)
-           config = Hash.new do |hash, key|
-             if /^--with-(.*)$/ =~ key
-               hash[key] = File.join(@@top_dir, $1)
---
-2.23.0

_service:tar_scm_kernel_repo:subversion-1.12.0-linking.patch Deleted

@@ -1,84 +0,0 @@
-
-Fix the way libtool is used to match standard practice:
-
-a) link ONLY libraries using -rpath $(libdir), not executables
-   .. this avoids adding an RPATH for $libdir to executables
-b) link non-installable test binaries using -no-install
-   .. only for convenience but should speed up builds slightly(?)
-
---- subversion-1.12.0/build.conf.linking
-+++ subversion-1.12.0/build.conf
-@@ -572,7 +572,7 @@
- path = subversion/bindings/swig/python/libsvn_swig_py
- libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
-        apriconv apr python swig
--link-cmd = $(LINK)
-+link-cmd = $(LINK_LIB)
- install = swig-py-lib
- # need special build rule to include -DSWIGPYTHON
- compile-cmd = $(COMPILE_SWIG_PY)
-@@ -598,7 +598,7 @@
- lang = ruby
- path = subversion/bindings/swig/ruby/libsvn_swig_ruby
- libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
--link-cmd = $(LINK) $(SWIG_RB_LIBS)
-+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
- install = swig-rb-lib
- # need special build rule to include
- compile-cmd = $(COMPILE_SWIG_RB)
-@@ -769,6 +769,7 @@
- libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
- msvc-static = yes
- undefined-lib-symbols = yes
-+link-cmd = $(LINK_TEST_LIB)
- 
- # ----------------------------------------------------------------------------
- # Tests for libsvn_fs_base
---- subversion-1.12.0/build/generator/gen_base.py.linking
-+++ subversion-1.12.0/build/generator/gen_base.py
-@@ -599,7 +599,7 @@
-     self.install = options.get('install')
-     self.compile_cmd = options.get('compile-cmd')
-     self.sources = options.get('sources', '*.c *.cpp')
--    self.link_cmd = options.get('link-cmd', '$(LINK)')
-+    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
- 
-     self.external_lib = options.get('external-lib')
-     self.external_project = options.get('external-project')
-@@ -659,6 +659,14 @@
- 
-     self.msvc_force_static = options.get('msvc-force-static') == 'yes'
- 
-+    if self.install in ['test', 'bdb-test', 'sub-test', ]:
-+      self.link_cmd = '$(LINK_TEST)'
-+    elif self.install in ['bin', 'tools']:
-+      self.link_cmd = '$(LINK_EXE)'
-+    elif self.link_cmd == '$(LINK_LIB)':
-+      raise GenError('ERROR: Unknown executable link type for ' + self.name + \
-+                     ': ' + self.link_cmd + ' (' + self.install + ')')
-+    
-   def add_dependencies(self):
-     TargetLinked.add_dependencies(self)
- 
---- subversion-1.12.0/Makefile.in.linking
-+++ subversion-1.12.0/Makefile.in
-@@ -268,11 +268,14 @@
- COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c
- COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c
- 
--LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_LIB = $(LINK) $(LT_SO_VERSION)
--LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
--LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
-+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) -no-install
-+LINK_TEST = $(LINK) -no-install
-+LINK_TEST_LIB = $(LINK_TEST) -avoid-version
-+LINK_EXE = $(LINK)
- 
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared

_service:tar_scm_kernel_repo:subversion-1.14.0-soversion.patch Deleted

_service:tar_scm_kernel_repo:subversion-1.14.0-testwarn.patch Deleted

_service:tar_scm_kernel_repo:subversion-1.8.0-rubybind.patch Deleted

_service:tar_scm_kernel_repo:subversion-1.8.5-swigplWall.patch Deleted

_service Changed

_service:tar_scm:subversion-1.14.2.tar.bz2 Added

_service:tar_scm:subversion-1692934839.05d5bf1.tar Added

_service:tar_scm:subversion.yaml Added

_service:tar_scm_kernel_repo:subversion-1.14.2.tar.bz2 Deleted

_service:tar_scm_kernel_repo:subversion.yaml Deleted

Changes of Revision 3