SPECS/apr-util.spec

@@ -16,29 +16,26 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.6.1
-Release: 23%{?dist}
+Release: 9%{?dist}
 License: ASL 2.0
-URL: https://apr.apache.org/
+Group: System Environment/Libraries
-Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+URL: http://apr.apache.org/
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
 Patch4: apr-util-1.4.1-private.patch
 Patch5: apr-util-mariadb-upstream.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=2168760
+# https://bugzilla.redhat.com/show_bug.cgi?id=2063562
-Patch6: apr-util-1.6.3-r1907242+.patch
+Patch6: apr-util-1.6.1-r1907242+.patch
 
 # Security patches:
 # https://bugzilla.redhat.com/show_bug.cgi?id=2169652
 Patch100: apr-util-1.6.1-CVE-2022-25147.patch
 
-BuildRequires: gcc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: %{dbdep}, expat-devel, libuuid-devel
+Recommends: apr-util-bdb%{?_isa} = %{version}-%{release}
 Recommends: apr-util-openssl%{_isa} = %{version}-%{release}
-%if 0%{?fedora} < 27
-Requires: apr-util-bdb%{?_isa} = %{version}-%{release}
-%else
-Recommends: apr-util-bdb%{_isa} = %{version}-%{release}
-%endif
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -47,6 +44,7 @@ contains additional utility interfaces for APR; including support
 for XML, LDAP, database interfaces, URI parsing and more.
 
 %package devel
+Group: Development/Libraries
 Summary: APR utility library development kit
 Requires: apr-util%{?_isa} = %{version}-%{release}, apr-devel%{?_isa}, pkgconfig
 Requires: %{dbdep}%{?_isa}, expat-devel%{?_isa}, openldap-devel%{?_isa}
@@ -58,8 +56,9 @@ of the Apache Portable Runtime (APR) is to provide a free
 library of C data structures and routines.
 
 %package pgsql
+Group: Development/Libraries
 Summary: APR utility library PostgreSQL DBD driver
-BuildRequires: libpq-devel
+BuildRequires: postgresql-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
 
 %description pgsql
@@ -67,7 +66,9 @@ This package provides the PostgreSQL driver for the apr-util
 DBD (database abstraction) interface.
 
 %package bdb
+Group: Development/Libraries
 Summary: APR utility library Berkeley DB driver
+BuildRequires: postgresql-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
 
 %description bdb
@@ -75,6 +76,7 @@ This package provides the Berkeley DB driver for the apr-util
 DBM (database abstraction) interface.
 
 %package mysql
+Group: Development/Libraries
 Summary: APR utility library MySQL DBD driver
 BuildRequires: mariadb-connector-c-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
@@ -84,6 +86,7 @@ This package provides the MySQL driver for the apr-util DBD
 (database abstraction) interface.
 
 %package sqlite
+Group: Development/Libraries
 Summary: APR utility library SQLite DBD driver
 BuildRequires: sqlite-devel >= 3.0.0
 Requires: apr-util%{?_isa} = %{version}-%{release}
@@ -93,6 +96,7 @@ This package provides the SQLite driver for the apr-util DBD
 (database abstraction) interface.
 
 %package odbc
+Group: Development/Libraries
 Summary: APR utility library ODBC DBD driver
 BuildRequires: unixODBC-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
@@ -102,6 +106,7 @@ This package provides the ODBC driver for the apr-util DBD
 (database abstraction) interface.
 
 %package ldap
+Group: Development/Libraries
 Summary: APR utility library LDAP support
 BuildRequires: openldap-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
@@ -110,6 +115,7 @@ Requires: apr-util%{?_isa} = %{version}-%{release}
 This package provides the LDAP support for the apr-util.
 
 %package openssl
+Group: Development/Libraries
 Summary: APR utility library OpenSSL crypto support
 BuildRequires: openssl-devel
 Requires: apr-util%{?_isa} = %{version}-%{release}
@@ -119,9 +125,9 @@ This package provides the OpenSSL crypto support for the apr-util.
 
 %if %{with_nss}
 %package nss
+Group: Development/Libraries
 Summary: APR utility library NSS crypto support
 BuildRequires: nss-devel
-BuildRequires: make
 Requires: apr-util%{?_isa} = %{version}-%{release}
 
 %description nss
@@ -154,11 +160,11 @@ export ac_cv_ldap_set_rebind_proc_style=three
 %else
         --without-nss
 %endif
-%{make_build}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{make_install}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/aclocal
 install -m 644 build/find_apu.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
@@ -183,45 +189,60 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/apr-util-%{apuver}/*.*a
 # Run the less verbose test suites
 export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 cd test
-%{make_build} testall
+make %{?_smp_mflags} testall
 # testall breaks with DBD DSO; ignore
 export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
 ./testall -v -q
 
-%ldconfig_scriptlets
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
+%defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
 
 %files bdb
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbm_db*
 
 %files pgsql
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
 
 %files mysql
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
 
 %files sqlite
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
 
 %files odbc
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
 
 %files ldap
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_ldap*
 
 %files openssl
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
 
 %if %{with_nss}
 %files nss
+%defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
 %endif
 
 %files devel
+%defattr(-,root,root,-)
 %{_bindir}/apu-%{apuver}-config
 %{_libdir}/libaprutil-%{apuver}.*a
 %{_libdir}/libaprutil-%{apuver}.so
@@ -230,64 +251,17 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Tue Jun 27 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-23
+* Tue Jun 27 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-9
-- Related: #2168760 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers
+- Related: #2063562 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers
 
-* Mon Jun 12 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-22
+* Mon Jun 12 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-8
-- Resolves: #2168760 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers
+- Resolves: #2063562 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers
 
-* Wed May 31 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-21
+* Wed May 31 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-7
-- Resolves: #2196576 - CVE-2022-25147 apr-util: out-of-bounds writes in the
+- Resolves: #2196573 - CVE-2022-25147 apr-util: out-of-bounds writes in the apr_base64
-  apr_base64
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-20
+* Mon Oct  1 2018 Joe Orton <jorton@redhat.com> - 1.6.1-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Recommends: apr-util-openssl, apr-util-bdb (#1633973)
-  Related: rhbz#1991688
-
-* Wed Jul 28 2021 Florian Weimer <fweimer@redhat.com> - 1.6.1-19
-- Rebuild to pick up OpenSSL 3.0 Beta ABI (#1984097)
-
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-18
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-17
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 1.6.1-16
-- rebuild for libpq ABI fix rhbz#1908268
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 04 2020 Tom Stellard <tstellar@redhat.com> - 1.6.1-13
-- Use make_build and make_install macros
-- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1.6.1-9
-- Rebuilt for libcrypt.so.2 (#1666033)
-
-* Wed Sep 26 2018 Joe Orton <jorton@redhat.com> - 1.6.1-8
-- Recommends: -openssl and -bdb so default crypto, dbm drivers are
-  always available (#1491151, #1633152)
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Mar  9 2018 Bojan Smojver <bojan@rexursive.com> - 1.6.1-6
-- add gcc build requirement
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild