Compare commits

..

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

2 changed files with 72 additions and 46 deletions

View File

@ -16,26 +16,29 @@
Summary: Apache Portable Runtime Utility library Summary: Apache Portable Runtime Utility library
Name: apr-util Name: apr-util
Version: 1.6.1 Version: 1.6.1
Release: 9%{?dist} Release: 23%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: System Environment/Libraries URL: https://apr.apache.org/
URL: http://apr.apache.org/ Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
Patch1: apr-util-1.2.7-pkgconf.patch Patch1: apr-util-1.2.7-pkgconf.patch
Patch4: apr-util-1.4.1-private.patch Patch4: apr-util-1.4.1-private.patch
Patch5: apr-util-mariadb-upstream.patch Patch5: apr-util-mariadb-upstream.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2063562 # https://bugzilla.redhat.com/show_bug.cgi?id=2168760
Patch6: apr-util-1.6.1-r1907242+.patch Patch6: apr-util-1.6.3-r1907242+.patch
# Security patches: # Security patches:
# https://bugzilla.redhat.com/show_bug.cgi?id=2169652 # https://bugzilla.redhat.com/show_bug.cgi?id=2169652
Patch100: apr-util-1.6.1-CVE-2022-25147.patch Patch100: apr-util-1.6.1-CVE-2022-25147.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gcc
BuildRequires: autoconf, apr-devel >= 1.3.0 BuildRequires: autoconf, apr-devel >= 1.3.0
BuildRequires: %{dbdep}, expat-devel, libuuid-devel BuildRequires: %{dbdep}, expat-devel, libuuid-devel
Recommends: apr-util-bdb%{?_isa} = %{version}-%{release}
Recommends: apr-util-openssl%{_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 %description
The mission of the Apache Portable Runtime (APR) is to provide a The mission of the Apache Portable Runtime (APR) is to provide a
@ -44,7 +47,6 @@ contains additional utility interfaces for APR; including support
for XML, LDAP, database interfaces, URI parsing and more. for XML, LDAP, database interfaces, URI parsing and more.
%package devel %package devel
Group: Development/Libraries
Summary: APR utility library development kit Summary: APR utility library development kit
Requires: apr-util%{?_isa} = %{version}-%{release}, apr-devel%{?_isa}, pkgconfig Requires: apr-util%{?_isa} = %{version}-%{release}, apr-devel%{?_isa}, pkgconfig
Requires: %{dbdep}%{?_isa}, expat-devel%{?_isa}, openldap-devel%{?_isa} Requires: %{dbdep}%{?_isa}, expat-devel%{?_isa}, openldap-devel%{?_isa}
@ -56,9 +58,8 @@ of the Apache Portable Runtime (APR) is to provide a free
library of C data structures and routines. library of C data structures and routines.
%package pgsql %package pgsql
Group: Development/Libraries
Summary: APR utility library PostgreSQL DBD driver Summary: APR utility library PostgreSQL DBD driver
BuildRequires: postgresql-devel BuildRequires: libpq-devel
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
%description pgsql %description pgsql
@ -66,9 +67,7 @@ This package provides the PostgreSQL driver for the apr-util
DBD (database abstraction) interface. DBD (database abstraction) interface.
%package bdb %package bdb
Group: Development/Libraries
Summary: APR utility library Berkeley DB driver Summary: APR utility library Berkeley DB driver
BuildRequires: postgresql-devel
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
%description bdb %description bdb
@ -76,7 +75,6 @@ This package provides the Berkeley DB driver for the apr-util
DBM (database abstraction) interface. DBM (database abstraction) interface.
%package mysql %package mysql
Group: Development/Libraries
Summary: APR utility library MySQL DBD driver Summary: APR utility library MySQL DBD driver
BuildRequires: mariadb-connector-c-devel BuildRequires: mariadb-connector-c-devel
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
@ -86,7 +84,6 @@ This package provides the MySQL driver for the apr-util DBD
(database abstraction) interface. (database abstraction) interface.
%package sqlite %package sqlite
Group: Development/Libraries
Summary: APR utility library SQLite DBD driver Summary: APR utility library SQLite DBD driver
BuildRequires: sqlite-devel >= 3.0.0 BuildRequires: sqlite-devel >= 3.0.0
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
@ -96,7 +93,6 @@ This package provides the SQLite driver for the apr-util DBD
(database abstraction) interface. (database abstraction) interface.
%package odbc %package odbc
Group: Development/Libraries
Summary: APR utility library ODBC DBD driver Summary: APR utility library ODBC DBD driver
BuildRequires: unixODBC-devel BuildRequires: unixODBC-devel
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
@ -106,7 +102,6 @@ This package provides the ODBC driver for the apr-util DBD
(database abstraction) interface. (database abstraction) interface.
%package ldap %package ldap
Group: Development/Libraries
Summary: APR utility library LDAP support Summary: APR utility library LDAP support
BuildRequires: openldap-devel BuildRequires: openldap-devel
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
@ -115,7 +110,6 @@ Requires: apr-util%{?_isa} = %{version}-%{release}
This package provides the LDAP support for the apr-util. This package provides the LDAP support for the apr-util.
%package openssl %package openssl
Group: Development/Libraries
Summary: APR utility library OpenSSL crypto support Summary: APR utility library OpenSSL crypto support
BuildRequires: openssl-devel BuildRequires: openssl-devel
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
@ -125,9 +119,9 @@ This package provides the OpenSSL crypto support for the apr-util.
%if %{with_nss} %if %{with_nss}
%package nss %package nss
Group: Development/Libraries
Summary: APR utility library NSS crypto support Summary: APR utility library NSS crypto support
BuildRequires: nss-devel BuildRequires: nss-devel
BuildRequires: make
Requires: apr-util%{?_isa} = %{version}-%{release} Requires: apr-util%{?_isa} = %{version}-%{release}
%description nss %description nss
@ -160,11 +154,11 @@ export ac_cv_ldap_set_rebind_proc_style=three
%else %else
--without-nss --without-nss
%endif %endif
make %{?_smp_mflags} %{make_build}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT %{make_install}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/aclocal mkdir -p $RPM_BUILD_ROOT/%{_datadir}/aclocal
install -m 644 build/find_apu.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal install -m 644 build/find_apu.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
@ -189,60 +183,45 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/apr-util-%{apuver}/*.*a
# Run the less verbose test suites # Run the less verbose test suites
export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
cd test cd test
make %{?_smp_mflags} testall %{make_build} testall
# testall breaks with DBD DSO; ignore # testall breaks with DBD DSO; ignore
export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver} export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
./testall -v -q ./testall -v -q
%clean %ldconfig_scriptlets
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-)
%doc CHANGES LICENSE NOTICE %doc CHANGES LICENSE NOTICE
%{_libdir}/libaprutil-%{apuver}.so.* %{_libdir}/libaprutil-%{apuver}.so.*
%dir %{_libdir}/apr-util-%{apuver} %dir %{_libdir}/apr-util-%{apuver}
%files bdb %files bdb
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbm_db* %{_libdir}/apr-util-%{apuver}/apr_dbm_db*
%files pgsql %files pgsql
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql* %{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
%files mysql %files mysql
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbd_mysql* %{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
%files sqlite %files sqlite
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite* %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
%files odbc %files odbc
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbd_odbc* %{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
%files ldap %files ldap
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_ldap* %{_libdir}/apr-util-%{apuver}/apr_ldap*
%files openssl %files openssl
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_crypto_openssl* %{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
%if %{with_nss} %if %{with_nss}
%files nss %files nss
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_crypto_nss* %{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
%endif %endif
%files devel %files devel
%defattr(-,root,root,-)
%{_bindir}/apu-%{apuver}-config %{_bindir}/apu-%{apuver}-config
%{_libdir}/libaprutil-%{apuver}.*a %{_libdir}/libaprutil-%{apuver}.*a
%{_libdir}/libaprutil-%{apuver}.so %{_libdir}/libaprutil-%{apuver}.so
@ -251,17 +230,64 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%changelog %changelog
* Tue Jun 27 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-9 * Tue Jun 27 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-23
- Related: #2063562 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers - Related: #2168760 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers
* Mon Jun 12 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-8 * Mon Jun 12 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-22
- Resolves: #2063562 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers - Resolves: #2168760 - mod_auth_openidc fails with IPv6 OIDCMemCacheServers
* Wed May 31 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-7 * Wed May 31 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-21
- Resolves: #2196573 - CVE-2022-25147 apr-util: out-of-bounds writes in the apr_base64 - Resolves: #2196576 - CVE-2022-25147 apr-util: out-of-bounds writes in the
apr_base64
* Mon Oct 1 2018 Joe Orton <jorton@redhat.com> - 1.6.1-6 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-20
- Recommends: apr-util-openssl, apr-util-bdb (#1633973) - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
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 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild