From 7a20a86f74b9017bc9c05f858eca0df3439c10ba Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sun, 13 Nov 2011 22:31:25 +0000 Subject: [PATCH] - update apr to version 0.9.20 Changes with APR 0.9.20 *) Security: CVE-2011-0419 Reimplement apr_fnmatch() from scratch using a non-recursive algorithm; now has improved compliance with the fnmatch() spec. [William Rowe] *) Updated config.guess and config.sub. [Rainer Jung] *) Fix flag character '#' in combination with format character 'x' in apr snprintf implementations. [Rainer Jung] with hat apache@ PR: ports/162247 Submitted by: Takefu Feature safe: yes --- devel/apr0/Makefile | 5 +++-- devel/apr0/distinfo | 4 ++-- ...buildcheck.sh => patch-apr-0.9.20__build__buildcheck.sh} | 6 +++--- ...ch-apr-0.9.19__buildconf => patch-apr-0.9.20__buildconf} | 6 +++--- ....9.19__config.layout => patch-apr-0.9.20__config.layout} | 4 ++-- ...-0.9.19__configure.in => patch-apr-0.9.20__configure.in} | 6 +++--- ...csup.c => patch-apr-0.9.20__threadproc__unix__procsup.c} | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) rename devel/apr0/files/{patch-apr-0.9.19__build__buildcheck.sh => patch-apr-0.9.20__build__buildcheck.sh} (72%) rename devel/apr0/files/{patch-apr-0.9.19__buildconf => patch-apr-0.9.20__buildconf} (94%) rename devel/apr0/files/{patch-apr-0.9.19__config.layout => patch-apr-0.9.20__config.layout} (57%) rename devel/apr0/files/{patch-apr-0.9.19__configure.in => patch-apr-0.9.20__configure.in} (89%) rename devel/apr0/files/{patch-apr-0.9.19__threadproc__unix__procsup.c => patch-apr-0.9.20__threadproc__unix__procsup.c} (78%) diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index 9978229b1203..d2fd09adec4a 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -6,7 +6,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -30,7 +29,7 @@ OPTIONS= THREADS "Enable Threads in apr" on \ NDBM "Enable NDBM support in apr-util" off \ DEVRANDOM "Use /dev/random or compatible in apr" on -APR_VERSION= 0.9.19 +APR_VERSION= 0.9.20 APU_VERSION= 0.9.19 NO_LATEST_LINK= yes @@ -122,6 +121,8 @@ post-patch: ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \ ${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \ ${APU_WRKDIR}/build/apu-conf.m4 + ${REINPLACE_CMD} -e 's,void main(void),int main(void),'\ + ${APR_WRKDIR}/build/apr_network.m4 run-autotools:: cd ${APR_WRKDIR} ; \ diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo index 7179e801222f..86bf5e7f6fc8 100644 --- a/devel/apr0/distinfo +++ b/devel/apr0/distinfo @@ -1,4 +1,4 @@ -SHA256 (apr-0.9.19.tar.gz) = bd2124a53fdc2a3ff2868554bef6381b96a1f9e0bdb20d1a71dbe5497025c8e4 -SIZE (apr-0.9.19.tar.gz) = 1068153 +SHA256 (apr-0.9.20.tar.gz) = db9feb30dedb916d7a4d893336e20df8c01bdfa65b4eeb36ad7c3d763860a76e +SIZE (apr-0.9.20.tar.gz) = 1084515 SHA256 (apr-util-0.9.19.tar.gz) = 9ffa9f5a1a0d2eddddd1c114e99a8f5e49aa8018db6f0bc6eeab4724d9eaa085 SIZE (apr-util-0.9.19.tar.gz) = 591729 diff --git a/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh b/devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh similarity index 72% rename from devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh rename to devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh index b6b4ab1dba0c..0222fd74e785 100644 --- a/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh +++ b/devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh @@ -1,8 +1,8 @@ ---- ./apr-0.9.19/build/buildcheck.sh.orig 2004-11-24 23:10:04.000000000 +0000 -+++ ./apr-0.9.19/build/buildcheck.sh 2010-10-20 21:08:11.853623919 +0000 +--- ./apr-0.9.20/build/buildcheck.sh.orig 2004-11-24 23:10:04.000000000 +0000 ++++ ./apr-0.9.20/build/buildcheck.sh 2010-10-20 21:08:11.853623919 +0000 @@ -26,7 +26,7 @@ # output is multiline from 1.5 onwards - + # Require libtool 1.3.3 or newer -libtool=`build/PrintPath glibtool libtool` +libtool=${LIBTOOL} diff --git a/devel/apr0/files/patch-apr-0.9.19__buildconf b/devel/apr0/files/patch-apr-0.9.20__buildconf similarity index 94% rename from devel/apr0/files/patch-apr-0.9.19__buildconf rename to devel/apr0/files/patch-apr-0.9.20__buildconf index 69b4a7eb9878..0cbc0e07a97b 100644 --- a/devel/apr0/files/patch-apr-0.9.19__buildconf +++ b/devel/apr0/files/patch-apr-0.9.20__buildconf @@ -1,5 +1,5 @@ ---- ./apr-0.9.19/buildconf.orig 2006-09-20 16:04:09.000000000 +0000 -+++ ./apr-0.9.19/buildconf 2010-10-20 21:08:11.863623823 +0000 +--- ./apr-0.9.20/buildconf.orig 2006-09-20 16:04:09.000000000 +0000 ++++ ./apr-0.9.20/buildconf 2010-10-20 21:08:11.863623823 +0000 @@ -23,7 +23,7 @@ # build/buildcheck.sh || exit 1 @@ -32,7 +32,7 @@ +IFS=.; set $lt_version; IFS=' ' +if test "$1" = "1"; then + $libtoolize --copy --automake -+ if [ -f libtool.m4 ]; then ++ if [ -f libtool.m4 ]; then + ltfile=`pwd`/libtool.m4 + else + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ diff --git a/devel/apr0/files/patch-apr-0.9.19__config.layout b/devel/apr0/files/patch-apr-0.9.20__config.layout similarity index 57% rename from devel/apr0/files/patch-apr-0.9.19__config.layout rename to devel/apr0/files/patch-apr-0.9.20__config.layout index 17374250fada..9d733a5bd23e 100644 --- a/devel/apr0/files/patch-apr-0.9.19__config.layout +++ b/devel/apr0/files/patch-apr-0.9.20__config.layout @@ -1,5 +1,5 @@ ---- ./apr-0.9.19/config.layout.orig 2004-11-24 23:02:04.000000000 +0000 -+++ ./apr-0.9.19/config.layout 2010-10-20 21:08:11.854622653 +0000 +--- ./apr-0.9.20/config.layout.orig 2004-11-24 23:02:04.000000000 +0000 ++++ ./apr-0.9.20/config.layout 2010-10-20 21:08:11.854622653 +0000 @@ -229,3 +229,7 @@ infodir: ${exec_prefix}/share/info libsuffix: -${APR_MAJOR_VERSION} diff --git a/devel/apr0/files/patch-apr-0.9.19__configure.in b/devel/apr0/files/patch-apr-0.9.20__configure.in similarity index 89% rename from devel/apr0/files/patch-apr-0.9.19__configure.in rename to devel/apr0/files/patch-apr-0.9.20__configure.in index 3bed2536ac27..e84220e923e6 100644 --- a/devel/apr0/files/patch-apr-0.9.19__configure.in +++ b/devel/apr0/files/patch-apr-0.9.20__configure.in @@ -1,12 +1,12 @@ ---- ./apr-0.9.19/configure.in.orig 2008-06-20 17:32:47.000000000 +0000 -+++ ./apr-0.9.19/configure.in 2010-10-20 21:08:11.857624440 +0000 +--- ./apr-0.9.20/configure.in.orig 2008-06-20 17:32:47.000000000 +0000 ++++ ./apr-0.9.20/configure.in 2010-10-20 21:08:11.857624440 +0000 @@ -7,6 +7,7 @@ AC_INIT(build/apr_common.m4) AC_CONFIG_HEADER(include/arch/unix/apr_private.h) AC_CONFIG_AUX_DIR(build) +AC_CONFIG_MACRO_DIR(build) - dnl + dnl dnl Include our own M4 macros along with those for libtool @@ -16,6 +17,11 @@ sinclude(build/apr_threads.m4) diff --git a/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c b/devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c similarity index 78% rename from devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c rename to devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c index acbb2b4cf7f0..846a5fcd36db 100644 --- a/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c +++ b/devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c @@ -1,5 +1,5 @@ ---- ./apr-0.9.19/threadproc/unix/procsup.c.orig 2006-09-20 16:04:09.000000000 +0000 -+++ ./apr-0.9.19/threadproc/unix/procsup.c 2010-10-20 21:08:11.859622744 +0000 +--- ./apr-0.9.20/threadproc/unix/procsup.c.orig 2006-09-20 16:04:09.000000000 +0000 ++++ ./apr-0.9.20/threadproc/unix/procsup.c 2010-10-20 21:08:11.859622744 +0000 @@ -21,6 +21,7 @@ int x;