diff --git a/SPECS/subversion.spec b/SPECS/subversion.spec index 0fc0b41..856d87f 100644 --- a/SPECS/subversion.spec +++ b/SPECS/subversion.spec @@ -1,6 +1,8 @@ # set to zero to avoid running test suite %define make_check 1 +%global _hardened_build 1 + %define with_java 1 %define with_kwallet 1 @@ -20,7 +22,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.7.14 -Release: 7%{?dist}.1 +Release: 10%{?dist} License: ASL 2.0 Group: Development/Tools URL: http://subversion.apache.org/ @@ -126,9 +128,9 @@ passwords in the KDE Wallet. %package -n mod_dav_svn Group: System Environment/Daemons Summary: Apache httpd module for Subversion server -Requires: httpd-mmn = %{_httpd_mmn}, httpd >= 2.4.6-31%{?dist}.1 +Requires: httpd-mmn = %{_httpd_mmn}, httpd >= 2.4.6-37 Requires: subversion-libs%{?_isa} = %{version}-%{release} -BuildRequires: httpd-devel >= 2.4.6-31%{?dist}.1 +BuildRequires: httpd-devel >= 2.4.6-37 %description -n mod_dav_svn The mod_dav_svn package allows access to a Subversion repository @@ -221,6 +223,7 @@ sed -i 's/-fpie/-fPIE/' Makefile.in %endif export APACHE_LDFLAGS="-Wl,-z,relro,-z,now" +export LDFLAGS="-Wl,-z,relro,-z,now" export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS" %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-swig --with-neon=%{_prefix} \ @@ -367,7 +370,11 @@ if ! make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes; then fi # check-swig-rb omitted: it runs svnserve %if %{with_java} -make check-javahl +if test `id -u` -eq 0; then + : Omitting javahl tests as root +else + make check-javahl +fi %endif %endif @@ -490,10 +497,14 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog -* Wed Aug 12 2015 Joe Orton - 1.7.14-7.1 +* Wed Aug 12 2015 Joe Orton - 1.7.14-10 - add security fixes for CVE-2015-0248, CVE-2015-0251, CVE-2015-3184, CVE-2015-3187 +* Tue Jul 7 2015 Joe Orton - 1.7.14-8 +- build with full RELRO (#1092533) +- fix rebuild under root user (#1035340) + * Fri Jan 9 2015 Joe Orton - 1.7.14-7 - add security fixes for CVE-2014-3528, CVE-2014-3580, CVE-2014-8108