fix integer bounds checking in apr_encode_*

Resolves: rhbz#1997107

.apr.metadata

@@ -0,0 +1 @@
+58ebc7b35efaebb211c0b9df594ab16c4d874234 apr-1.7.0.tar.bz2

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 <sys/types.h>
+ #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

apr.spec

@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.0
-Release: 10.5%{?dist}
+Release: 12%{?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,9 @@ 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
+Patch6: apr-1.7.0-encoding.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
-# To enable SCTP support
-BuildRequires: lksctp-tools-devel
 BuildRequires: make
 
 %description
@@ -49,6 +49,8 @@ C data structures and routines.
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .deepbind
 %patch4 -p1 -b .r1891269+
+%patch5 -p1 -b .r1894167
+%patch6 -p1 -b .encoding
 
 %build
 # regenerate configure script etc.
@@ -62,7 +64,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 +138,13 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Dec  7 2023 Joe Orton <jorton@redhat.com> - 1.7.0-12
+- fix integer bounds checking in apr_encode_*
+  Resolves: RHEL-17123
+
+* Mon Dec  6 2021 Joe Orton <jorton@redhat.com> - 1.7.0-11
+- always disable SCTP support at build time (#1997107)
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.0-10.5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688