|
|
|
|
@ -1,5 +1,9 @@
|
|
|
|
|
# set to zero to avoid running test suite
|
|
|
|
|
%bcond_without tests
|
|
|
|
|
# Disable to avoid all the test suites
|
|
|
|
|
|
|
|
|
|
%bcond_with tests
|
|
|
|
|
|
|
|
|
|
# Disable automatic .la file removal
|
|
|
|
|
%global __brp_remove_la_files %nil
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} || 0%{?eln}
|
|
|
|
|
%bcond_with kwallet
|
|
|
|
|
@ -23,14 +27,11 @@
|
|
|
|
|
%bcond_with python2
|
|
|
|
|
%bcond_without python3
|
|
|
|
|
%bcond_without pyswig
|
|
|
|
|
%bcond_without ruby
|
|
|
|
|
%bcond_with ruby
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%ifarch %{power64} s390x
|
|
|
|
|
%global with_java 0
|
|
|
|
|
%else
|
|
|
|
|
%global with_java 1
|
|
|
|
|
%endif
|
|
|
|
|
# do not build java package on RHEL 10
|
|
|
|
|
%bcond_with java
|
|
|
|
|
|
|
|
|
|
%if %{with python2} == %{with python3}
|
|
|
|
|
%error Pick exactly one Python version
|
|
|
|
|
@ -55,9 +56,9 @@
|
|
|
|
|
|
|
|
|
|
Summary: A Modern Concurrent Version Control System
|
|
|
|
|
Name: subversion
|
|
|
|
|
Version: 1.14.1
|
|
|
|
|
Release: 5%{?dist}
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
Version: 1.14.3
|
|
|
|
|
Release: 7%{?dist}
|
|
|
|
|
License: Apache-2.0
|
|
|
|
|
URL: https://subversion.apache.org/
|
|
|
|
|
Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
|
|
|
|
|
Source1: subversion.conf
|
|
|
|
|
@ -69,14 +70,14 @@ Source7: svnserve.tmpfiles
|
|
|
|
|
Source8: svnserve.sysconf
|
|
|
|
|
Patch1: subversion-1.12.0-linking.patch
|
|
|
|
|
Patch2: subversion-1.14.0-testwarn.patch
|
|
|
|
|
Patch3: subversion-1.14.0-soversion.patch
|
|
|
|
|
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-testnoautoprops.patch
|
|
|
|
|
Patch7: subversion-1.14.1-fixjavatests.patch
|
|
|
|
|
Patch8: subversion-1.14.1-CVE-2022-24070.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Patch6: subversion-1.14.1-testnomagic.patch
|
|
|
|
|
Patch7: subversion-ruby-c99.patch
|
|
|
|
|
Patch8: subversion-1.14.2-modsyms.patch
|
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2255746
|
|
|
|
|
Patch9: subversion-1.14.3-zlib-ng.patch
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++
|
|
|
|
|
BuildRequires: swig >= 1.3.24, gettext
|
|
|
|
|
@ -140,6 +141,7 @@ Subversion libraries.
|
|
|
|
|
%{?python_provide:%python_provide python3-subversion}
|
|
|
|
|
Summary: Python bindings for Subversion Version Control system
|
|
|
|
|
BuildRequires: python3-devel py3c-devel
|
|
|
|
|
BuildRequires: (python3-setuptools if python3-devel >= 3.12)
|
|
|
|
|
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description -n python3-subversion
|
|
|
|
|
@ -191,17 +193,16 @@ using HTTP, via the Apache httpd server.
|
|
|
|
|
Summary: Perl bindings to the Subversion libraries
|
|
|
|
|
BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker)
|
|
|
|
|
BuildRequires: perl(Test::More), perl(ExtUtils::Embed)
|
|
|
|
|
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
|
|
|
|
|
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description perl
|
|
|
|
|
This package includes the Perl bindings to the Subversion libraries.
|
|
|
|
|
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%if %{with java}
|
|
|
|
|
%package javahl
|
|
|
|
|
Summary: JNI bindings to the Subversion libraries
|
|
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
|
|
BuildRequires: java-11-openjdk-devel
|
|
|
|
|
BuildRequires: java-17-openjdk-devel
|
|
|
|
|
# JAR repacking requires both zip and unzip in the buildroot
|
|
|
|
|
BuildRequires: zip, unzip
|
|
|
|
|
# For the tests
|
|
|
|
|
@ -233,19 +234,20 @@ This package includes supplementary tools for use with Subversion.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q
|
|
|
|
|
%patch1 -p1 -b .linking
|
|
|
|
|
%patch2 -p1 -b .testwarn
|
|
|
|
|
%patch3 -p1 -b .soversion
|
|
|
|
|
%patch4 -p1 -b .rubybind
|
|
|
|
|
%patch5 -p1 -b .swigplWall
|
|
|
|
|
%patch6 -p1 -b .testnoautoprops
|
|
|
|
|
%patch7 -p1 -b .fixjavatests
|
|
|
|
|
%patch8 -p1 -b .cve24070
|
|
|
|
|
%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
|
|
|
|
|
|
|
|
|
|
:
|
|
|
|
|
: === Building:
|
|
|
|
|
: === Python3=%{with python3} Python2=%{with python2} PySwig=%{with pyswig}
|
|
|
|
|
: === Java=%{with_java} Ruby=%{with ruby}
|
|
|
|
|
: === Java=%{with java} Ruby=%{with ruby}
|
|
|
|
|
: === BDB=%{with bdb} Tests=%{with tests} KWallet=%{with kwallet}
|
|
|
|
|
:
|
|
|
|
|
|
|
|
|
|
@ -284,18 +286,22 @@ export svn_cv_ruby_includes="-I%{_includedir}"
|
|
|
|
|
export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
|
|
|
|
|
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
|
|
|
|
|
|
|
|
|
export CFLAGS="%{build_cflags} -Wno-error=incompatible-pointer-types"
|
|
|
|
|
# neccessary for libtool compilation of bindings
|
|
|
|
|
export LT_CFLAGS="$CFLAGS"
|
|
|
|
|
|
|
|
|
|
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
|
|
|
|
--disable-debug \
|
|
|
|
|
--enable-plaintext-password-storage \
|
|
|
|
|
--with-swig --with-serf=%{_prefix} \
|
|
|
|
|
--with-ruby-sitedir=%{ruby_vendorarchdir} \
|
|
|
|
|
--with-ruby-test-verbose=verbose \
|
|
|
|
|
--with-apxs=%{_httpd_apxs} --disable-mod-activation \
|
|
|
|
|
--enable-plaintext-password-storage \
|
|
|
|
|
--with-apache-libexecdir=%{_httpd_moddir} \
|
|
|
|
|
--disable-static --with-sasl=%{_prefix} \
|
|
|
|
|
--with-libmagic=%{_prefix} \
|
|
|
|
|
--with-gnome-keyring \
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%if %{with java}
|
|
|
|
|
--enable-javahl \
|
|
|
|
|
--with-junit=%{_prefix}/share/java/junit.jar \
|
|
|
|
|
%endif
|
|
|
|
|
@ -316,7 +322,7 @@ make swig-pl swig-pl-lib
|
|
|
|
|
%if %{with ruby}
|
|
|
|
|
make swig-rb swig-rb-lib
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%if %{with java}
|
|
|
|
|
# javahl-javah does not parallel-make with javahl
|
|
|
|
|
#make javahl-java javahl-javah
|
|
|
|
|
make javahl
|
|
|
|
|
@ -327,10 +333,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
%if %{with pyswig}
|
|
|
|
|
make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
%endif
|
|
|
|
|
make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
make install-swig-pl-lib DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
%if %{with ruby}
|
|
|
|
|
make install-swig-rb DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
make pure_vendor_install -C subversion/bindings/swig/perl/native \
|
|
|
|
|
PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
|
|
|
|
|
%if %{with java}
|
|
|
|
|
make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@ -468,14 +480,10 @@ if ! make check-swig-py; then
|
|
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
# check-swig-rb omitted: it runs svnserve
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%ifnarch aarch64
|
|
|
|
|
# Breaks reliably on aarch64, timing issue?
|
|
|
|
|
# Upstream discussion: https://lists.apache.org/x/thread.html/rff2b0ab98a30c5fc83ca5ab21bf3862036d3a5ac2fc768d027bb6fe4@%3Cdev.subversion.apache.org%3E
|
|
|
|
|
%if %{with java}
|
|
|
|
|
make check-javahl
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%post
|
|
|
|
|
%systemd_post svnserve.service
|
|
|
|
|
@ -492,7 +500,7 @@ make check-javahl
|
|
|
|
|
|
|
|
|
|
%ldconfig_scriptlets ruby
|
|
|
|
|
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%if %{with java}
|
|
|
|
|
%ldconfig_scriptlets javahl
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@ -525,7 +533,7 @@ make check-javahl
|
|
|
|
|
%{_libdir}/libsvn*.so.*
|
|
|
|
|
%exclude %{_libdir}/libsvn_swig_perl*
|
|
|
|
|
%exclude %{_libdir}/libsvn_swig_ruby*
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%if %{with java}
|
|
|
|
|
%{_libdir}/libsvnjavahl-*.so
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with kwallet}
|
|
|
|
|
@ -580,28 +588,137 @@ make check-javahl
|
|
|
|
|
%{ruby_vendorarchdir}/svn
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_java}
|
|
|
|
|
%if %{with java}
|
|
|
|
|
%files javahl
|
|
|
|
|
%{_javadir}/svn-javahl.jar
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Apr 26 2022 Richard Lescak <rlescak@redhat.com> - 1.14.1-5
|
|
|
|
|
- Fix for CVE-2022-24070 (#2076565)
|
|
|
|
|
* Thu Aug 08 2024 Troy Dawson <tdawson@redhat.com> - 1.14.3-7
|
|
|
|
|
- Bump release for Aug 2024 java mass rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Aug 07 2024 Tomas Korbar <tkorbar@redhat.com> - 1.14.3-6
|
|
|
|
|
- Fix debuginfo building and stop building ruby and java subpackages
|
|
|
|
|
- Resolves: RHEL-52974
|
|
|
|
|
|
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.14.3-5
|
|
|
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
|
|
|
|
|
|
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.3-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sun Jan 21 2024 Tomas Korbar <tkorbar@redhat.com> - 1.14.3-3
|
|
|
|
|
- Fix building with gcc 14
|
|
|
|
|
- incompatible-pointer-types warnings became errors, but they've
|
|
|
|
|
been present for a long time and posed no threat, thus revert
|
|
|
|
|
the behaviour
|
|
|
|
|
- Resolves: rhbz#2259155
|
|
|
|
|
|
|
|
|
|
* Fri Jan 12 2024 Tomas Korbar <tkorbar@redhat.com> - 1.14.3-2
|
|
|
|
|
- Fix testing of binary patch
|
|
|
|
|
- Resolves: rhbz#2255746
|
|
|
|
|
|
|
|
|
|
* Fri Jan 05 2024 Richard Lescak <rlescak@redhat.com> - 1.14.3-1
|
|
|
|
|
- rebase to version 1.14.3 (#2256062)
|
|
|
|
|
|
|
|
|
|
* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.2-23
|
|
|
|
|
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
|
|
|
|
|
|
|
|
|
|
* Mon Nov 20 2023 Joe Orton <jorton@redhat.com> - 1.14.2-22
|
|
|
|
|
- fix mod_authz_svn, mod_dontdothat (#2250182)
|
|
|
|
|
|
|
|
|
|
* Wed Nov 8 2023 Joe Orton <jorton@redhat.com> - 1.14.2-21
|
|
|
|
|
- restore plaintext password storage by default (per upstream)
|
|
|
|
|
- restrict symbols exposed by DSOs built for httpd
|
|
|
|
|
|
|
|
|
|
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-20
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.2-19
|
|
|
|
|
- Perl 5.38 rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 1.14.2-18
|
|
|
|
|
- Rebuilt for Python 3.12
|
|
|
|
|
|
|
|
|
|
* Fri Jun 30 2023 Richard Lescak <rlescak@redhat.com> - 1.14.2-17
|
|
|
|
|
- temporary disable tests for eln to prevent FTBFS
|
|
|
|
|
|
|
|
|
|
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.14.2-16
|
|
|
|
|
- Rebuilt for Python 3.12
|
|
|
|
|
|
|
|
|
|
* Mon May 08 2023 Florian Weimer <fweimer@redhat.com> - 1.14.2-15
|
|
|
|
|
- Port to C99
|
|
|
|
|
|
|
|
|
|
* Thu Feb 16 2023 Richard Lescak <rlescak@redhat.com> - 1.14.2-14
|
|
|
|
|
- SPDX migration
|
|
|
|
|
|
|
|
|
|
* Fri Jan 27 2023 Richard Lescak <rlescak@redhat.com> - 1.14.2-13
|
|
|
|
|
- add requirement for python3-setuptools with new Python 3.12 (#2155420)
|
|
|
|
|
|
|
|
|
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-12
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.2-11
|
|
|
|
|
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
|
|
|
|
|
|
|
|
|
|
* Sun Oct 09 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.2-10
|
|
|
|
|
- Backport upstream fix for ruby3.2 support
|
|
|
|
|
|
|
|
|
|
* Wed Oct 05 2022 Richard Lescak <rlescak@redhat.com> - 1.14.2-8
|
|
|
|
|
- fix segfault in Python swig test (#2128024)
|
|
|
|
|
|
|
|
|
|
* Fri Jul 29 2022 Joe Orton <jorton@redhat.com> - 1.14.2-7
|
|
|
|
|
- improve library versioning so filenames are unique across releases
|
|
|
|
|
|
|
|
|
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-6
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 5 2022 Joe Orton <jorton@redhat.com> - 1.14.2-5
|
|
|
|
|
- disable libmagic during test runs
|
|
|
|
|
|
|
|
|
|
* Tue Jul 5 2022 Joe Orton <jorton@redhat.com> - 1.14.2-4
|
|
|
|
|
- update for new Java arches and bump to JDK 17 (#2103909)
|
|
|
|
|
|
|
|
|
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.14.2-3
|
|
|
|
|
- Rebuilt for Python 3.11
|
|
|
|
|
|
|
|
|
|
* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.2-2
|
|
|
|
|
- Perl 5.36 rebuild
|
|
|
|
|
|
|
|
|
|
* Wed May 4 2022 Joe Orton <jorton@redhat.com> - 1.14.2-1
|
|
|
|
|
- update to 1.14.2 (#2073852, CVE-2021-28544, CVE-2022-24070)
|
|
|
|
|
|
|
|
|
|
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.14.1-11
|
|
|
|
|
- Rebuilt for java-17-openjdk as system jdk
|
|
|
|
|
|
|
|
|
|
* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.1-10
|
|
|
|
|
- F-36: rebuild against ruby31
|
|
|
|
|
|
|
|
|
|
* Mon Jan 24 2022 Timm Bäder <tbaeder@redhat.com> - 1.14.1-9
|
|
|
|
|
- Disable automatic .la file removal
|
|
|
|
|
- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
|
|
|
|
|
|
|
|
|
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-8
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Dec 16 2021 Richard Lescak <rlescak@redhat.com> - 1.14.1-7
|
|
|
|
|
- Replaced deprecated method readfp() in gen_base.py to build with Python 3.11 (#2019019)
|
|
|
|
|
|
|
|
|
|
* Thu Jul 29 2021 Joe Orton <jorton@redhat.com> - 1.14.1-6
|
|
|
|
|
- fix intermittent FTBFS in tests (#1956806)
|
|
|
|
|
|
|
|
|
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-4.1
|
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-5
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-3.1
|
|
|
|
|
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
|
|
|
|
Related: rhbz#1971065
|
|
|
|
|
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.14.1-4
|
|
|
|
|
- Rebuilt for Python 3.10
|
|
|
|
|
|
|
|
|
|
* Wed Apr 28 2021 Joe Orton <jorton@redhat.com> - 1.14.1-2.1
|
|
|
|
|
- enable plaintext password storage (#1951484)
|
|
|
|
|
* Sat May 22 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.1-3
|
|
|
|
|
- Perl 5.34 rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-2
|
|
|
|
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
|
|
|
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.14.1-2
|
|
|
|
|
- Rebuilt for updated systemd-rpm-macros
|
|
|
|
|
See https://pagure.io/fesco/issue/2583.
|
|
|
|
|
|
|
|
|
|
* Wed Feb 10 2021 Joe Orton <jorton@redhat.com> - 1.14.1-1
|
|
|
|
|
- update to 1.14.1 (#1927265, #1768698)
|
|
|
|
|
|
