package/apr: security bump version to 1.7.2
- remove 0001-cross-compile.patch
(superseded by upstream commit [1])
- rename 0002-sys-param-h.patch to 0001-sys-param-h.patch
- remove 0003-Merge-r1887279-from-trunk.patch
(from upstream [2])
- remove 0004-apr-1.7.0-CVE-2021-35940.patch
(superseded by upstream commit [3], remove APR_IGNORE_CVES accordingly)
- set new configure option '--disable-sctp' (no libsctp provided by buildroot)
- set new 'ac_cv_strerror_r_rc_int' explicitly to no (default for
cross compile)
- set new 'ac_cv_mmap__dev_zero' explicitly to yes
- revert two upstream commits ([4], [5]) to fix apr-util build, fails
otherwise because of some path mismatch where to find apr_rules.mk copied
to apr-util-1.6.3/build/rules.mk, fixes:
Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory
For details see [6].
[1] 866e1df66b
[2] 0a763c5e50
[3] e0be630b68
[4] f82374627b
[5] b6dbbc77da
[6] https://downloads.apache.org/apr/CHANGES-APR-1.7
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Seiderer
Peter Korsgaard
parent
f67c896fec
commit
783cd8d90d
@ -1,58 +0,0 @@
|
||||
Fix cross-compilation
|
||||
|
||||
Patch was backported from Apache httpd:
|
||||
http://svn.apache.org/viewvc?view=revision&revision=1327907
|
||||
http://svn.apache.org/viewvc?view=revision&revision=1328390
|
||||
http://svn.apache.org/viewvc?view=revision&revision=1328714
|
||||
|
||||
Patch submitted upstream:
|
||||
https://issues.apache.org/bugzilla/show_bug.cgi?id=57058
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in
|
||||
--- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100
|
||||
+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200
|
||||
@@ -118,6 +118,16 @@
|
||||
echo "Configuring APR library"
|
||||
echo "Platform: $host"
|
||||
|
||||
+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless
|
||||
+dnl we got already CC_FOR_BUILD from environment.
|
||||
+if test "x${build_alias}" != "x${host_alias}"; then
|
||||
+ if test "x${CC_FOR_BUILD}" = "x"; then
|
||||
+ CC_FOR_BUILD=cc
|
||||
+ fi
|
||||
+fi
|
||||
+AC_SUBST(CC_FOR_BUILD)
|
||||
+AC_SUBST(CFLAGS_FOR_BUILD)
|
||||
+
|
||||
dnl Some initial steps for configuration. We setup the default directory
|
||||
dnl and which files are to be configured.
|
||||
|
||||
diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in
|
||||
--- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100
|
||||
+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200
|
||||
@@ -8,6 +8,8 @@
|
||||
# APR (Apache Portable Runtime) library Makefile.
|
||||
#
|
||||
CPP = @CPP@
|
||||
+CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
|
||||
# get substituted into some targets
|
||||
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
|
||||
@@ -134,8 +134,13 @@
|
||||
$(APR_MKDIR) tools
|
||||
$(LT_COMPILE)
|
||||
|
||||
+ifdef CC_FOR_BUILD
|
||||
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS)
|
||||
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $<
|
||||
+else
|
||||
tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
|
||||
$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
|
||||
+endif
|
||||
|
||||
include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
|
||||
$(APR_MKDIR) include/private
|
||||
@ -0,0 +1,30 @@
|
||||
From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001
|
||||
From: Graham Leggett <minfrin@apache.org>
|
||||
Date: Wed, 1 Jan 2020 10:43:39 +0000
|
||||
Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when
|
||||
cross compiling.
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68
|
||||
|
||||
[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
apr-config.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/apr-config.in b/apr-config.in
|
||||
index bed47ca..4873fc0 100644
|
||||
--- a/apr-config.in
|
||||
+++ b/apr-config.in
|
||||
@@ -246,7 +246,7 @@ while test $# -gt 0; do
|
||||
if test "$location" = "installed"; then
|
||||
echo "${installbuilddir}/libtool"
|
||||
elif test "$location" = "crosscompile"; then
|
||||
- echo "$APR_TARGET_DIR/${installbuilddir}/libtool"
|
||||
+ echo "$APR_TARGET_DIR/${installbuilddir}/build"
|
||||
else
|
||||
echo "$APR_BUILD_DIR/libtool"
|
||||
fi
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
From a15958a37a06f71c42c690278f9c958b93b7ee20 Mon Sep 17 00:00:00 2001
|
||||
From: Yann Ylavic <ylavic@apache.org>
|
||||
Date: Thu, 11 Mar 2021 14:10:21 +0000
|
||||
Subject: [PATCH] Merge r1887279 from trunk:
|
||||
|
||||
build/apr_common.m4: avoid explicit inclusion of "confdefs.h"
|
||||
|
||||
The failure is observed on `autoconf-2.69d` (soon to be released
|
||||
as `autoconf-2.70`). There `int64_t` detection fails as:
|
||||
|
||||
$ autoreconf && ./configure
|
||||
checking whether int64_t and int use fmt %d... no
|
||||
checking whether int64_t and long use fmt %ld... no
|
||||
checking whether int64_t and long long use fmt %lld... no
|
||||
configure: error: could not determine the string function for int64_t
|
||||
```
|
||||
|
||||
This happens because `./configure` always stumbles on warning:
|
||||
|
||||
configure:3350: gcc -c -g -O2 -Werror conftest.c >&5
|
||||
In file included from conftest.c:31:
|
||||
confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror]
|
||||
22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
|
||||
|
|
||||
|
||||
It's triggered by double inclusion of `"confdefs.h"` contents:
|
||||
explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly
|
||||
via `AC_LANG_SOURCE` use.
|
||||
|
||||
To fix it and avoid having to define `main()` declaration the change
|
||||
uses `AC_LANG_PROGRAM` instead.
|
||||
|
||||
Tested on both `autoconf-2.69` and `autoconf-2.69d`.
|
||||
|
||||
|
||||
Github: closes #25
|
||||
Submitted by: Sergei Trofimovich <slyfox gentoo.org>
|
||||
Reviewed by: ylavic
|
||||
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1887485 13f79535-47bb-0310-9956-ffa450edef68
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
build/apr_common.m4 | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/build/apr_common.m4 b/build/apr_common.m4
|
||||
index 297dd32cf75..b67a8608abe 100644
|
||||
--- a/build/apr_common.m4
|
||||
+++ b/build/apr_common.m4
|
||||
@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
|
||||
CFLAGS="$CFLAGS -Werror"
|
||||
fi
|
||||
AC_COMPILE_IFELSE(
|
||||
- [AC_LANG_SOURCE(
|
||||
- [#include "confdefs.h"
|
||||
- ]
|
||||
- [[$1]]
|
||||
- [int main(int argc, const char *const *argv) {]
|
||||
+ [AC_LANG_PROGRAM(
|
||||
+ [[$1]],
|
||||
[[$2]]
|
||||
- [ return 0; }]
|
||||
)], [CFLAGS=$apr_save_CFLAGS
|
||||
$3], [CFLAGS=$apr_save_CFLAGS
|
||||
$4])
|
||||
@ -0,0 +1,112 @@
|
||||
From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001
|
||||
From: Graham Leggett <minfrin@apache.org>
|
||||
Date: Tue, 31 Dec 2019 21:26:02 +0000
|
||||
Subject: [PATCH] Revert: Add the ability to cross compile APR.
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68
|
||||
|
||||
[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
CHANGES | 2 --
|
||||
apr-config.in | 22 ----------------------
|
||||
2 files changed, 24 deletions(-)
|
||||
|
||||
diff --git a/CHANGES b/CHANGES
|
||||
index 71b2f0e..e751c90 100644
|
||||
--- a/CHANGES
|
||||
+++ b/CHANGES
|
||||
@@ -56,8 +56,6 @@ Changes for APR 1.7.1
|
||||
*) Don't try to use PROC_PTHREAD by default when cross compiling.
|
||||
[Yann Ylavic]
|
||||
|
||||
- *) Add the ability to cross compile APR. [Graham Leggett]
|
||||
-
|
||||
*) While cross-compiling, the tools/gen_test_char could not
|
||||
be executed at build time, use AX_PROG_CC_FOR_BUILD to
|
||||
build native tools/gen_test_char
|
||||
diff --git a/apr-config.in b/apr-config.in
|
||||
index 4873fc0..84b4073 100644
|
||||
--- a/apr-config.in
|
||||
+++ b/apr-config.in
|
||||
@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@"
|
||||
# NOTE: the following line is modified during 'make install': alter with care!
|
||||
location=@APR_CONFIG_LOCATION@
|
||||
|
||||
-# absolute path, but not installed path - we're cross compiling
|
||||
-case "$0" in
|
||||
- "${bindir}/"*) ;;
|
||||
- "/"*) location=crosscompile;
|
||||
- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
|
||||
- *) ;;
|
||||
-esac
|
||||
-
|
||||
show_usage()
|
||||
{
|
||||
cat << EOF
|
||||
@@ -101,8 +93,6 @@ fi
|
||||
|
||||
if test "$location" = "installed"; then
|
||||
LA_FILE="$libdir/lib${APR_LIBNAME}.la"
|
||||
-elif test "$location" = "crosscompile"; then
|
||||
- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la"
|
||||
else
|
||||
LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
|
||||
fi
|
||||
@@ -132,8 +122,6 @@ while test $# -gt 0; do
|
||||
--includedir)
|
||||
if test "$location" = "installed"; then
|
||||
flags="$includedir"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$APR_TARGET_DIR/$includedir"
|
||||
elif test "$location" = "source"; then
|
||||
flags="$APR_SOURCE_DIR/include"
|
||||
else
|
||||
@@ -166,8 +154,6 @@ while test $# -gt 0; do
|
||||
--includes)
|
||||
if test "$location" = "installed"; then
|
||||
flags="$flags -I$includedir $EXTRA_INCLUDES"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES"
|
||||
elif test "$location" = "source"; then
|
||||
flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
|
||||
else
|
||||
@@ -182,8 +168,6 @@ while test $# -gt 0; do
|
||||
--installbuilddir)
|
||||
if test "$location" = "installed"; then
|
||||
echo "${installbuilddir}"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- echo "$APR_TARGET_DIR/${installbuilddir}"
|
||||
elif test "$location" = "source"; then
|
||||
echo "$APR_SOURCE_DIR/build"
|
||||
else
|
||||
@@ -200,8 +184,6 @@ while test $# -gt 0; do
|
||||
if test "$location" = "installed"; then
|
||||
### avoid using -L if libdir is a "standard" location like /usr/lib
|
||||
flags="$flags -L$libdir -l${APR_LIBNAME}"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
|
||||
else
|
||||
### this surely can't work since the library is in .libs?
|
||||
flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
|
||||
@@ -219,8 +201,6 @@ while test $# -gt 0; do
|
||||
# Since the user is specifying they are linking with libtool, we
|
||||
# *know* that -R will be recognized by libtool.
|
||||
flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}"
|
||||
else
|
||||
flags="$flags $LA_FILE"
|
||||
fi
|
||||
@@ -245,8 +225,6 @@ while test $# -gt 0; do
|
||||
--apr-libtool)
|
||||
if test "$location" = "installed"; then
|
||||
echo "${installbuilddir}/libtool"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- echo "$APR_TARGET_DIR/${installbuilddir}/build"
|
||||
else
|
||||
echo "$APR_BUILD_DIR/libtool"
|
||||
fi
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
|
||||
SECURITY: CVE-2021-35940 (cve.mitre.org)
|
||||
|
||||
Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
|
||||
was addressed in 1.6.x in 1.6.3 and later via r1807976.
|
||||
|
||||
The fix was merged back to 1.7.x in r1891198.
|
||||
|
||||
Since this was a regression in 1.7.0, a new CVE name has been assigned
|
||||
to track this, CVE-2021-35940.
|
||||
|
||||
Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue.
|
||||
|
||||
https://svn.apache.org/viewvc?view=revision&revision=1891198
|
||||
|
||||
[Retrieved from:
|
||||
https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
Index: ./time/unix/time.c
|
||||
===================================================================
|
||||
--- ./time/unix/time.c (revision 1891197)
|
||||
+++ ./time/unix/time.c (revision 1891198)
|
||||
@@ -142,6 +142,9 @@
|
||||
static const int dayoffset[12] =
|
||||
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
|
||||
|
||||
+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
|
||||
+ return APR_EBADDATE;
|
||||
+
|
||||
/* shift new year to 1st March in order to make leap year calc easy */
|
||||
|
||||
if (xt->tm_mon < 2)
|
||||
Index: ./time/win32/time.c
|
||||
===================================================================
|
||||
--- ./time/win32/time.c (revision 1891197)
|
||||
+++ ./time/win32/time.c (revision 1891198)
|
||||
@@ -54,6 +54,9 @@
|
||||
static const int dayoffset[12] =
|
||||
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
|
||||
|
||||
+ if (tm->wMonth < 1 || tm->wMonth > 12)
|
||||
+ return APR_EBADDATE;
|
||||
+
|
||||
/* Note; the caller is responsible for filling in detailed tm_usec,
|
||||
* tm_gmtoff and tm_isdst data when applicable.
|
||||
*/
|
||||
@@ -228,6 +231,9 @@
|
||||
static const int dayoffset[12] =
|
||||
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
|
||||
|
||||
+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
|
||||
+ return APR_EBADDATE;
|
||||
+
|
||||
/* shift new year to 1st March in order to make leap year calc easy */
|
||||
|
||||
if (xt->tm_mon < 2)
|
||||
@ -1,4 +1,4 @@
|
||||
# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256
|
||||
sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2
|
||||
# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256
|
||||
sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APR_VERSION = 1.7.0
|
||||
APR_VERSION = 1.7.2
|
||||
APR_SOURCE = apr-$(APR_VERSION).tar.bz2
|
||||
APR_SITE = https://archive.apache.org/dist/apr
|
||||
APR_LICENSE = Apache-2.0
|
||||
@ -16,8 +16,7 @@ APR_INSTALL_STAGING = YES
|
||||
# so we need to autoreconf:
|
||||
APR_AUTORECONF = YES
|
||||
|
||||
# 0004-apr-1.7.0-CVE-2021-35940.patch
|
||||
APR_IGNORE_CVES += CVE-2021-35940
|
||||
APR_CONF_OPTS = --disable-sctp
|
||||
|
||||
# avoid apr_hints.m4 by setting apr_preload_done=yes and set
|
||||
# the needed CFLAGS on our own (avoids '-D_REENTRANT' in case
|
||||
@ -32,6 +31,7 @@ APR_CONF_ENV = \
|
||||
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
|
||||
CFLAGS="$(APR_CFLAGS)" \
|
||||
ac_cv_file__dev_zero=yes \
|
||||
ac_cv_mmap__dev_zero=yes \
|
||||
ac_cv_func_setpgrp_void=yes \
|
||||
apr_cv_process_shared_works=yes \
|
||||
apr_cv_mutex_robust_shared=no \
|
||||
@ -39,6 +39,7 @@ APR_CONF_ENV = \
|
||||
ac_cv_sizeof_struct_iovec=8 \
|
||||
ac_cv_sizeof_pid_t=4 \
|
||||
ac_cv_struct_rlimit=yes \
|
||||
ac_cv_strerror_r_rc_int=no \
|
||||
ac_cv_o_nonblock_inherited=no \
|
||||
apr_cv_mutex_recursive=yes \
|
||||
apr_cv_epoll=yes \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user