- update apr1 to version 1.4.4 (security update CVE-2011-0419)

Changes: (trimmed non FreeBSD related to keep the list shorter)
http://www.apache.org/dist/apr/CHANGES-APR-1.4

Changes for APR 1.4.4
Changes for APR 1.4.3

  *) Security: CVE-2011-0419
     Reimplement apr_fnmatch() from scratch using a non-recursive
     algorithm; now has improved compliance with the fnmatch() spec.
     [William Rowe]

  *) poll, pollset, pollcb on Windows: Handle calls with no file/socket
     descriptors.  PR 49882.  [Stefan Ruppert <sr myarm.com>, Jeff Trawick]

  *) Fix address handling when accepting an AF_INET socket from a socket
     bound as AF_INET6.   PR 49678.  [Joe Orton]

  *) Add new experimental configure option --enable-allocator-uses-mmap to
     use mmap instead of malloc in apr_allocator_alloc(). This greatly reduces
     memory fragmentation with malloc implementations (e.g. glibc) that
     don't handle allocationss of a page-size-multiples in an efficient way.
     It also makes apr_allocator_max_free_set() actually have some effect
     on such platforms. [Stefan Fritsch]

  *) configure: Make definition of apr_ino_t independent of
     _FILE_OFFSET_BITS even on platforms where ino_t is 'unsigned int'.
     [Stefan Fritsch]

  *) apr_ring: Workaround for aliasing problem that causes gcc 4.5 to
     miscompile some brigade related code. PR 50190. [Stefan Fritsch]

  *) apr_file_flush_locked(): Handle short writes. [Stefan Fritsch]

  *) apr_pollset_create_ex(): Trap errors from pollset providers.
     PR 49094.  [Sami Tolvanen <sami.tolvanen mywot.com>]

  *) apr_pollset_create*(): Fix memory lifetime problem with the wakeup
     pipe when the pollset was created with APR_POLLSET_NOCOPY.
     [Neil Conway <nrc cs.berkeley.edu>]

  *) Fix detection of some Linux variants when configure is built with
     recent GNU tools.  [Eric Covener]

  *) Avoid a redundant fcntl() call in apr_file_open() where O_CLOEXEC
     is supported.  PR 46297.  [Joe Orton]

  *) Improve platform detection by updating config.guess and config.sub.
     [Rainer Jung]

  commit with apache@ hat

PR:		156997
Submitted by:	Tsurutani Naoki <turutani _at_ scphys.kyoto-u.ac.jp>

4 files changed, 9 insertions, 24 deletions

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index e7e35de5d263..d998e7b8ea8b 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -29,8 +29,8 @@ OPTIONS=	THREADS "Enable Threads in apr"				on  \
 		SQLITE  "Enable SQLite3 support in apr-util"		off \
 		DEVRANDOM "Use /dev/random or compatible in apr"	on
 
-APR_VERSION=	1.4.2
-APU_VERSION=	1.3.10
+APR_VERSION=	1.4.4
+APU_VERSION=	1.3.11
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake autoconf libtool:env
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index d3ea3cc14e31..182e1d15dcf6 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,6 +1,4 @@
-MD5 (apr-1.4.2.tar.gz) = fc80cb54f158c2674f9eeb47a1f672cd
-SHA256 (apr-1.4.2.tar.gz) = 6a0291d6f6a59d5eab5ae5441c37b78b17f7a1a2fa1478741b7178f5fbc33ebe
-SIZE (apr-1.4.2.tar.gz) = 949945
-MD5 (apr-util-1.3.10.tar.gz) = 82acd25cf3df8c72eba44eaee8b80c19
-SHA256 (apr-util-1.3.10.tar.gz) = 7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23
-SIZE (apr-util-1.3.10.tar.gz) = 768634
+SHA256 (apr-1.4.4.tar.gz) = 49819f4f28f7856995886193d822edde47062c3dd00597d4fbe575ef2bda16c8
+SIZE (apr-1.4.4.tar.gz) = 995954
+SHA256 (apr-util-1.3.11.tar.gz) = 6590d663927bf609d614ad407406dcc84af78d031650f60ab48853e9b3f4d87f
+SIZE (apr-util-1.3.11.tar.gz) = 769021
diff --git a/devel/apr1/files/patch-apr_buildconf b/devel/apr1/files/patch-apr_buildconf
deleted file mode 100644
index 780101677758..000000000000
--- a/devel/apr1/files/patch-apr_buildconf
+++ /dev/null
@@ -1,13 +0,0 @@
---- apr-1.4.2/buildconf.orig	2009-11-12 16:19:49.000000000 -0600
-+++ apr-1.4.2/buildconf	2011-02-15 16:07:59.000000000 -0600
-@@ -54,4 +54,4 @@
-     # libtool 2.x
--   aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
--   ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
-+   aclocal_dir=`sed -n '/^ *aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
-+   ltfiles=`sed -n '/^ *all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
-    for f in $ltfiles; do
-@@ -78,2 +78,3 @@
- 
-+chmod 664 build/libtool.m4
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
index f86ec6c0fd5b..3726568f3e93 100644
--- a/devel/apr1/files/patch-apr_hints.m4
+++ b/devel/apr1/files/patch-apr_hints.m4
@@ -1,6 +1,6 @@
---- apr-1.4.2/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.4.2/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
-@@ -137,11 +137,7 @@
+--- apr-1.4.4/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.4.4/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+@@ -159,11 +159,7 @@
  	;;
      *-freebsd*)
          APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])