diff --git a/backport-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch b/backport-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch deleted file mode 100644 index 4c6693c4faae70ba7c5e67647a3c4742aeab993a..0000000000000000000000000000000000000000 --- a/backport-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001 -From: Yasuhito Futatsuki -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 - diff --git a/backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch b/backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch deleted file mode 100644 index 0e1f7aa917de4a346aab5607bf87bec2842a3440..0000000000000000000000000000000000000000 --- a/backport-swig-rb-Use-Ruby-API-File.exist-instead-of-deprecate.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 36e916ddaec4a5b1e64adee34337582f152805c5 Mon Sep 17 00:00:00 2001 -From: Nathan Hartman -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 diff --git a/subversion-1.14.2.tar.bz2 b/subversion-1.14.3.tar.bz2 similarity index 52% rename from subversion-1.14.2.tar.bz2 rename to subversion-1.14.3.tar.bz2 index da611620c4aa0224f06922a69cad59367056fd8b..8c10b5f41181aa241a5470d81d1f7073365ea7d8 100644 Binary files a/subversion-1.14.2.tar.bz2 and b/subversion-1.14.3.tar.bz2 differ diff --git a/subversion.spec b/subversion.spec index 68ee9617579f7cfb3366e902cf88051aab2cb63a..633d900c0f8b99ad65b5335666f9ca1649abf294 100644 --- a/subversion.spec +++ b/subversion.spec @@ -9,8 +9,8 @@ Summary: Subversion, a version control system. Name: subversion -Version: 1.14.2 -Release: 4 +Version: 1.14.3 +Release: 1 License: ASL 2.0 URL: https://subversion.apache.org/ @@ -21,8 +21,6 @@ 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 @@ -316,6 +314,9 @@ make check-javahl %endif %changelog +* Wed Jan 03 2024 fuanan - 1.14.3-1 +- update version to 1.14.3 + * Thu Aug 24 2023 fuanan - 1.14.2-4 - Fix segfault in Python swig test