diff --git a/sources b/sources index a8b145e..f50165c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subversion-1.14.3.tar.bz2) = 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41 +SHA512 (subversion-1.14.5.tar.bz2) = e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321 diff --git a/subversion-1.14.5-progenv.patch b/subversion-1.14.5-progenv.patch new file mode 100644 index 0000000..e7c5c46 --- /dev/null +++ b/subversion-1.14.5-progenv.patch @@ -0,0 +1,21 @@ + +ra-test execution of svnserve (a libtool wrapper script) fails +with package notes enabled since LDFLAGS depend on $RPM_ARCH etc +being set in the environment, which is empty. + +This switches the execution of svnserve to inheriting the +build environment. + +https://github.com/apache/subversion/pull/25 + +--- subversion-1.14.5/subversion/tests/libsvn_ra/ra-test.c.progenv 2020-03-25 09:54:07.000000000 +0000 ++++ subversion-1.14.5/subversion/tests/libsvn_ra/ra-test.c 2024-12-13 08:53:20.268424556 +0000 +@@ -242,7 +242,7 @@ open_tunnel(svn_stream_t **request, svn_ + if (status == APR_SUCCESS) + status = apr_procattr_io_set(attr, 1, 1, 0); + if (status == APR_SUCCESS) +- status = apr_procattr_cmdtype_set(attr, APR_PROGRAM); ++ status = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); + proc = apr_palloc(pool, sizeof(*proc)); + if (status == APR_SUCCESS) + status = apr_proc_create(proc, diff --git a/subversion-ruby-c99.patch b/subversion-ruby-c99.patch deleted file mode 100644 index bab7ed8..0000000 --- a/subversion-ruby-c99.patch +++ /dev/null @@ -1,27 +0,0 @@ -The Ruby bindings apply the Ruby NIL_P macro to an apr_hash_t * value, -which some compilers flag as a type error. - -Submitted upstream: - -diff --git a/subversion/bindings/swig/include/svn_containers.swg b/subversion/bindings/swig/include/svn_containers.swg -index d3c6305a412b6505..47bc50a92bb8b433 100644 ---- a/subversion/bindings/swig/include/svn_containers.swg -+++ b/subversion/bindings/swig/include/svn_containers.swg -@@ -299,7 +299,7 @@ - $1 = svn_swig_rb_hash_to_apr_hash_svn_string($input, _global_pool); - _global_pool = NULL; - if (!NIL_P(rb_pool)) { -- if (NIL_P($1)) { -+ if ($1 == NULL) { - svn_swig_rb_destroy_pool(rb_pool); - } else { - svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool); -@@ -373,7 +373,7 @@ - svn_swig_rb_hash_to_apr_hash_string($input, _global_pool); - _global_pool = NULL; - if (!NIL_P(rb_pool)) { -- if (NIL_P($1)) { -+ if ($1 == NULL) { - svn_swig_rb_destroy_pool(rb_pool); - } else { - svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool); diff --git a/subversion.spec b/subversion.spec index 3b74d8e..af9e244 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,6 +1,6 @@ # Disable to avoid all the test suites -%bcond_with tests +%bcond_without tests # Disable automatic .la file removal %global __brp_remove_la_files %nil @@ -56,8 +56,8 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.14.3 -Release: 8%{?dist} +Version: 1.14.5 +Release: 2%{?dist} License: Apache-2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -74,10 +74,10 @@ Patch3: subversion-1.14.2-soversion.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch Patch6: subversion-1.14.1-testnomagic.patch -Patch7: subversion-ruby-c99.patch -Patch8: subversion-1.14.2-modsyms.patch +Patch7: subversion-1.14.2-modsyms.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2255746 -Patch9: subversion-1.14.3-zlib-ng.patch +Patch8: subversion-1.14.3-zlib-ng.patch +Patch9: subversion-1.14.5-progenv.patch BuildRequires: make BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++ BuildRequires: swig >= 1.3.24, gettext @@ -233,16 +233,7 @@ Requires: subversion-libs%{?_isa} = %{version}-%{release} This package includes supplementary tools for use with Subversion. %prep -%setup -q -%patch -P1 -p1 -b .linking -%patch -P2 -p1 -b .testwarn -%patch -P3 -p1 -b .soversion -%patch -P4 -p1 -b .rubybind -%patch -P5 -p1 -b .swigplWall -%patch -P6 -p1 -b .testnomagic -%patch -P7 -p1 -%patch -P8 -p1 -b .modsyms -%patch -P9 -p1 -b .zlib +%autosetup -p1 -S gendiff : : === Building: @@ -464,12 +455,17 @@ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} export MALLOC_PERTURB_=171 MALLOC_CHECK_=3 export LIBC_FATAL_STDERR_=1 export PYTHON=%{svn_python} -if ! make check CLEANUP=yes; then + +: Run svnauthz to avoid regeneration during test suite. +tools/server-side/svnauthz --version || exit 1 + +if ! make check CLEANUP=yes PARALLEL=${RPM_BUILD_NCPUS}; then : Test suite failure. cat fails.log + cat tests.log exit 1 fi -if ! make check-swig-pl check-swig-rb; then +if ! make check-swig-pl; then : Swig test failure. exit 1 fi @@ -479,7 +475,12 @@ if ! make check-swig-py; then exit 1 fi %endif -# check-swig-rb omitted: it runs svnserve +%if %{with ruby} +if ! make check-swig-rb; then + : Ruby swig test failure. + exit 1 +fi +%endif %if %{with java} make check-javahl %endif @@ -594,6 +595,16 @@ make check-javahl %endif %changelog +* Wed Jul 09 2025 Joe Orton - 1.14.5-2 +- update to 1.14.5 (#2331047) +- use %%autosetup +- enable tests by default again +- conditionalize Ruby tests (Yaakov Selkowitz) + +* Fri Nov 01 2024 Tomas Korbar - 1.14.4-1 +- Rebase to version 1.14.4 +- Resolves: rhbz#2317222 + * Tue Oct 29 2024 Troy Dawson - 1.14.3-8 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018