From d72418d996bc9aa85a52e82f07e021de58b41b05 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 11 2022 18:08:18 +0000 Subject: import apr-1.7.0-11.el9 --- diff --git a/SOURCES/apr-1.7.0-r1894167.patch b/SOURCES/apr-1.7.0-r1894167.patch new file mode 100644 index 0000000..02a73de --- /dev/null +++ b/SOURCES/apr-1.7.0-r1894167.patch @@ -0,0 +1,37 @@ +# ./pullrev.sh 1894167 +http://svn.apache.org/viewvc?view=revision&revision=1894167 + +--- apr-1.7.0/build/apr_network.m4 ++++ apr-1.7.0/build/apr_network.m4 +@@ -906,8 +906,16 @@ + dnl + AC_DEFUN([APR_CHECK_SCTP], + [ +- AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [ +- AC_TRY_RUN([ ++AC_ARG_ENABLE([sctp], ++ APR_HELP_STRING([--disable-sctp], [disable SCTP protocol support]), ++ [apr_wants_sctp=$enableval], ++ [apr_wants_sctp=any]) ++ ++if test "$apr_wants_sctp" = no; then ++ apr_cv_sctp=no ++else ++ AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [ ++ AC_TRY_RUN([ + #ifdef HAVE_SYS_TYPES_H + #include + #endif +@@ -932,7 +940,12 @@ + exit(2); + exit(0); + }], [apr_cv_sctp=yes], [apr_cv_sctp=no], [apr_cv_sctp=no])]) ++fi + ++if test "${apr_wants_sctp}X${apr_cv_sctp}" = yesXno; then ++ AC_MSG_ERROR([SCTP support requested but not available]) ++fi ++ + if test "$apr_cv_sctp" = "yes"; then + have_sctp=1 + else diff --git a/SPECS/apr.spec b/SPECS/apr.spec index dea74fb..99c7503 100644 --- a/SPECS/apr.spec +++ b/SPECS/apr.spec @@ -6,7 +6,7 @@ Summary: Apache Portable Runtime library Name: apr Version: 1.7.0 -Release: 10.5%{?dist} +Release: 11%{?dist} # ASL 2.0: everything # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c # BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c, @@ -21,9 +21,8 @@ Patch1: apr-1.2.2-libdir.patch Patch2: apr-1.2.7-pkgconf.patch Patch3: apr-1.7.0-deepbind.patch Patch4: apr-1.7.0-r1891269+.patch +Patch5: apr-1.7.0-r1894167.patch BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3 -# To enable SCTP support -BuildRequires: lksctp-tools-devel BuildRequires: make %description @@ -49,6 +48,7 @@ C data structures and routines. %patch2 -p1 -b .pkgconf %patch3 -p1 -b .deepbind %patch4 -p1 -b .r1891269+ +%patch5 -p1 -b .r1894167 %build # regenerate configure script etc. @@ -62,7 +62,8 @@ export ac_cv_search_shm_open=no --includedir=%{_includedir}/apr-%{aprver} \ --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \ --with-devrandom=/dev/urandom \ - --disable-static + --disable-static \ + --disable-sctp %{make_build} %install @@ -135,6 +136,9 @@ popd %{_datadir}/aclocal/*.m4 %changelog +* Mon Dec 6 2021 Joe Orton - 1.7.0-11 +- always disable SCTP support at build time (#1997107) + * Mon Aug 09 2021 Mohan Boddu - 1.7.0-10.5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688