- Update apr to 2.0.51

- Fix permissions on installed .h files

- ok'ed snj@, wiz@
- Thanks to epg@ for final check

This version of Apache is principally a bug fix release. Of particular note is
that 2.0.51 addresses five security vulnerabilities:

An input validation issue in IPv6 literal address parsing which can result in
a negative length parameter being passed to memcpy.
[CAN-2004-0786]

A buffer overflow in configuration file parsing could allow a local user to
gain the privileges of a httpd child if the server can be forced to parse a
carefully crafted .htaccess file.
[CAN-2004-0747]

A segfault in mod_ssl which can be triggered by a malicious remote server,
if proxying to SSL servers has been configured.
[CAN-2004-0751]

A potential infinite loop in mod_ssl which could be triggered given
particular timing of a connection abort.
[CAN-2004-0748]

A segfault in mod_dav_fs which can be remotely triggered by an indirect lock
refresh request.
[CAN-2004-0809]

For further details, see http://www.apache.org/dist/httpd/Announcement2.html
and http://apache.rmplc.co.uk/httpd/CHANGES_2.0.

5 files changed, 9 insertions, 98 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 8b72964f654..d55c341f145 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/07/17 00:14:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/09/20 17:13:06 adrianp Exp $
 
 PKGNAME=	apr-${APR_VERSION}.${APACHE_VERSION}
 CATEGORIES=	devel
@@ -58,6 +58,9 @@ do-configure:
 post-install:
 	${RM} ${PREFIX}/libexec/apr/libtool
 	${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${PREFIX}/libexec/apr/libtool
+	@${CHMOD} ${SHAREMODE} ${PREFIX}/include/apr-0/*.h
+	@${CHMOD} ${BINMODE} ${PREFIX}/include/apr-0
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/include/apr-0/
 
 .include "../../www/apache2/Makefile.common"
 
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 900e0a12349..63d7af17d8c 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/16 23:21:50 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/20 17:13:06 adrianp Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napr}
 BUILDLINK_PACKAGES+=	apr
 
 .if !empty(APR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apr+=	apr>=0.9.5.2.0.50
+BUILDLINK_DEPENDS.apr+=	apr>=0.9.5.2.0.51
 BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr
 
 BUILDLINK_FILES.apr+=	bin/apr-config
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index 812fe4c7bf3..efc4541eaf3 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/07/14 08:31:12 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2004/09/20 17:13:06 adrianp Exp $
 
-SHA1 (httpd-2.0.50.tar.gz) = 7b6f591b2e728473ebe0164bf5297b1fa86f4fe2
-Size (httpd-2.0.50.tar.gz) = 6338536 bytes
-SHA1 (patch-aa) = 17e79d6c54c855c4210f68e5facca1002d2512fa
-SHA1 (patch-ab) = bb9a9f0fbf5d48748f2a0826509a19b915d2bc72
+SHA1 (httpd-2.0.51.tar.gz) = 68ce1da942226c0a6276c9c313d21fe794a95222
+Size (httpd-2.0.51.tar.gz) = 6735558 bytes
 SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
 SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120
 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
diff --git a/devel/apr/patches/patch-aa b/devel/apr/patches/patch-aa
deleted file mode 100644
index fa462c9273d..00000000000
--- a/devel/apr/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/05/30 10:14:22 epg Exp $
-
---- apr/apr-config.in.orig	Mon Apr 21 09:21:59 2003
-+++ apr/apr-config.in
-@@ -143,12 +143,17 @@ if test "$tmpbindir" = "$thisdir"; then
-   location=installed
- elif test "$APR_SOURCE_DIR" = "$thisdir"; then
-   location=source
-+elif echo "$thisdir" | grep buildlink > /dev/null 2>&1; then
-+  location=buildlink
-+  BUILDLINK_DIR="`dirname $thisdir`"
- else
-   location=build
- fi
- 
- if test "$location" = "installed"; then
-     LA_FILE="$libdir/lib${APR_LIBNAME}.la"
-+elif test "$location" = "buildlink"; then
-+    LA_FILE="$BUILDLINK_DIR/lib/lib${APR_LIBNAME}.la"
- else
-     LA_FILE="$thisdir/lib${APR_LIBNAME}.la"
- fi
-@@ -180,6 +185,8 @@ while test $# -gt 0; do
-         flags="$includedir"
-     elif test "$location" = "source"; then
-         flags="$APR_SOURCE_DIR/include"
-+    elif test "$location" = "buildlink"; then
-+        flags="$BUILDLINK_DIR/include/apr-${APR_MAJOR_VERSION}"
-     else
-         # this is for VPATH builds
-         flags="$thisdir/include $APR_SOURCE_DIR/include"
-@@ -212,6 +219,8 @@ while test $# -gt 0; do
-         flags="$flags -I$includedir $EXTRA_INCLUDES"
-     elif test "$location" = "source"; then
-         flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-+    elif test "$location" = "buildlink"; then
-+        flags="$flags -I$BUILDLINK_DIR/include/apr-${APR_MAJOR_VERSION} $EXTRA_INCLUDES"
-     else
-         # this is for VPATH builds
-         flags="$flags -I$thisdir/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-@@ -222,7 +231,7 @@ while test $# -gt 0; do
-     exit 0
-     ;;
-     --installbuilddir)
--    if test "$location" = "installed"; then
-+    if test "$location" = "installed" || test "$location" = "buildlink"; then
-         echo "${installbuilddir}"
-     elif test "$location" = "source"; then
-         echo "$APR_SOURCE_DIR/build"
diff --git a/devel/apr/patches/patch-ab b/devel/apr/patches/patch-ab
deleted file mode 100644
index a932d52e29a..00000000000
--- a/devel/apr/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/05/30 10:14:22 epg Exp $
-
---- apr-util/apu-config.in.orig	Sat Mar 22 22:32:57 2003
-+++ apr-util/apu-config.in
-@@ -129,6 +129,9 @@ if test "$tmpbindir" = "$thisdir"; then
-     location=installed
- elif test "$APU_SOURCE_DIR" = "$thisdir"; then
-     location=source
-+elif echo "$thisdir" | grep buildlink > /dev/null 2>&1; then
-+    location=buildlink
-+    BUILDLINK_DIR="`dirname $thisdir`"
- else
-     location=build
- fi
-@@ -139,6 +142,8 @@ if test "$location" = "installed"; then
-     LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/lib/libexpat.la -lexpat g"`
-     LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"`
-     INCLUDES=`echo "$INCLUDES" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s -I$prefix/lib  g"`
-+elif test "$location" = "buildlink"; then
-+    LA_FILE="$BUILDLINK_DIR/lib/lib${APRUTIL_LIBNAME}.la"
- else
-     LA_FILE="$thisdir/lib${APRUTIL_LIBNAME}.la"
- fi
-@@ -173,6 +178,8 @@ while test $# -gt 0; do
-         flags="$includedir"
-     elif test "$location" = "source"; then
-         flags="$APU_SOURCE_DIR/include"
-+    elif test "$location" = "buildlink"; then
-+        flags="$BUILDLINK_DIR/include/apr-${APRUTIL_MAJOR_VERSION}"
-     else
-         # this is for VPATH builds
-         flags="$thisdir/include $APU_SOURCE_DIR/include"
-@@ -185,6 +192,8 @@ while test $# -gt 0; do
-         flags="$flags -I$includedir $INCLUDES"
-     elif test "$location" = "source"; then
-         flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
-+    elif test "$location" = "buildlink"; then
-+        flags="$flags -I$BUILDLINK_DIR/include/apr-${APRUTIL_MAJOR_VERSION} $INCLUDES"
-     else
-         # this is for VPATH builds
-         flags="$flags -I$thisdir/include -I$APU_SOURCE_DIR/include $INCLUDES"