Update to 4.3.9, changes not found (as preparation for security fix).

5 files changed, 35 insertions, 300 deletions

diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index e8048ae70fe..d02d35518db 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2011/04/01 14:52:24 obache Exp $
+# $NetBSD: Makefile,v 1.24 2011/04/01 15:03:48 wiz Exp $
 #
 
-DISTNAME=		libapache-mod-auth-mysql_4.3.1
-PKGNAME=		${APACHE_PKG_PREFIX}-auth-mysql-4.3.1
-PKGREVISION=		1
+DISTNAME=		mod-auth-mysql_4.3.9.orig
+PKGNAME=		${APACHE_PKG_PREFIX}-auth-mysql-4.3.9
 WRKSRC=			${WRKDIR}/${DISTNAME:S/_/-/}
 CATEGORIES=		www databases security
-MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/liba/libapache-mod-auth-mysql/}
+MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/m/mod-auth-mysql/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://packages.debian.org/sid/libapache2-mod-auth-mysql
@@ -23,6 +22,9 @@ CONFIGURE_ARGS+=	--with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/
 			--with-mysql-libs=${BUILDLINK_PREFIX.mysql-client}/lib/mysql
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/.orig//:S/_/-/}
+
 .include "../../mk/apache.mk"
 
 .if ${PKG_APACHE} == "apache13"
diff --git a/www/ap-auth-mysql/distinfo b/www/ap-auth-mysql/distinfo
index e1b6fea58da..f500abaf07a 100644
--- a/www/ap-auth-mysql/distinfo
+++ b/www/ap-auth-mysql/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2007/06/29 22:58:54 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/04/01 15:03:48 wiz Exp $
 
-SHA1 (libapache-mod-auth-mysql_4.3.1.tar.gz) = c5563028ed6574fd087944ac0507009dfc14b749
-RMD160 (libapache-mod-auth-mysql_4.3.1.tar.gz) = d64278aa11030369071f586ff2ef60becf43c062
-Size (libapache-mod-auth-mysql_4.3.1.tar.gz) = 56247 bytes
+SHA1 (mod-auth-mysql_4.3.9.orig.tar.gz) = 417efcd2fcd2cce9092843179b52b5901e38aea6
+RMD160 (mod-auth-mysql_4.3.9.orig.tar.gz) = 06d041bf229007e2d08dc86285f349d33df2e019
+Size (mod-auth-mysql_4.3.9.orig.tar.gz) = 48479 bytes
 SHA1 (patch-aa) = c18f857317b5838c955ddfea501961e0e2a88e76
-SHA1 (patch-ab) = 343dafbcfb62366b7cdaf154da774d3f7a417242
-SHA1 (patch-ac) = 1ec37362ec8e3e7298580a904063d6bb67d7a97a
-SHA1 (patch-ad) = 528d5c817b88f7b9d89aec9b8a7e430af0f29bf7
+SHA1 (patch-ab) = 7acddeb4e25a50e7460b07e498bbc71a9d125ea5
+SHA1 (patch-ac) = 4cbc888cc09c522270690d39a6625d3d5967440f
+SHA1 (patch-ad) = 37a3ebecfd5a58df42f81002e998a33f43188630
 SHA1 (patch-ae) = 2e5569026965558d9490d3a8face857f5d611b1b
diff --git a/www/ap-auth-mysql/patches/patch-ab b/www/ap-auth-mysql/patches/patch-ab
index e0eed3ae680..76a4733a2a0 100644
--- a/www/ap-auth-mysql/patches/patch-ab
+++ b/www/ap-auth-mysql/patches/patch-ab
@@ -1,12 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2006/02/23 01:02:21 ben Exp $
+$NetBSD: patch-ab,v 1.3 2011/04/01 15:03:48 wiz Exp $
 
---- configure.ac.orig	2004-05-11 05:18:38.000000000 +0000
-+++ configure.ac	2006-02-23 00:54:51.000000000 +0000
-@@ -137,12 +137,18 @@
+--- configure.ac.orig	2004-12-23 13:43:14.000000000 +0000
++++ configure.ac
+@@ -140,11 +140,16 @@ AC_CHECK_HEADERS([crypt.h])
  
- # Checks for header files.
- AC_CHECK_HEADERS([crypt.h])
-+AC_CHECK_LIB([crypt], [crypt])
+ AC_CHECK_LIB([crypt], [crypt])
  
 -if test -n $HAVE_CRYPT_H; then
 +if test -n $HAVE_CRYPT_H -a $HAVE_LIBCRYPT; then
@@ -22,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2006/02/23 01:02:21 ben Exp $
  
  int main()
  {
-@@ -154,8 +160,13 @@
+@@ -156,8 +161,13 @@ AC_DEFINE(CRYPT_MD5, 1, [Enable crypt() 
  ,,)
  	AC_TRY_RUN(
  [
diff --git a/www/ap-auth-mysql/patches/patch-ac b/www/ap-auth-mysql/patches/patch-ac
index 7cac8112cf9..a1f6a17b51c 100644
--- a/www/ap-auth-mysql/patches/patch-ac
+++ b/www/ap-auth-mysql/patches/patch-ac
@@ -1,200 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2006/02/23 01:02:21 ben Exp $
+$NetBSD: patch-ac,v 1.3 2011/04/01 15:03:48 wiz Exp $
 
---- configure.orig	2004-05-11 05:19:18.000000000 +0000
-+++ configure	2006-02-23 00:54:18.000000000 +0000
-@@ -953,7 +953,7 @@
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
+--- configure.orig	2004-12-23 13:43:14.000000000 +0000
++++ configure
+@@ -3192,7 +3202,7 @@ _ACEOF
  fi
  
-@@ -1886,7 +1886,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -1944,7 +1945,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2060,7 +2062,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2114,7 +2117,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2159,7 +2163,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2203,7 +2208,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2282,7 +2288,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2765,7 +2772,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2935,7 +2943,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3002,7 +3011,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3118,7 +3128,81 @@
- done
- 
  
 -if test -n $HAVE_CRYPT_H; then
-+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char crypt ();
-+int
-+main ()
-+{
-+crypt ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_crypt_crypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_crypt_crypt=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+if test $ac_cv_lib_crypt_crypt = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBCRYPT 1
-+_ACEOF
-+
-+  LIBS="-lcrypt $LIBS"
-+
-+fi
-+
-+
 +if test -n $HAVE_CRYPT_H -a $HAVE_LIBCRYPT; then
  	if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&5
-@@ -3133,8 +3217,13 @@
+@@ -3207,8 +3291,13 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -208,7 +25,7 @@ $NetBSD: patch-ac,v 1.2 2006/02/23 01:02:21 ben Exp $
  
  int main()
  {
-@@ -3181,8 +3270,13 @@
+@@ -3255,8 +3344,13 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -222,48 +39,3 @@ $NetBSD: patch-ac,v 1.2 2006/02/23 01:02:21 ben Exp $
  
  int main()
  {
-@@ -3294,7 +3388,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3366,7 +3461,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4187,6 +4283,11 @@
- 
- 
- 
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -4225,12 +4326,6 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
diff --git a/www/ap-auth-mysql/patches/patch-ad b/www/ap-auth-mysql/patches/patch-ad
index 18e35246a42..71fba069cc7 100644
--- a/www/ap-auth-mysql/patches/patch-ad
+++ b/www/ap-auth-mysql/patches/patch-ad
@@ -1,26 +1,9 @@
-$NetBSD: patch-ad,v 1.3 2007/06/29 22:58:55 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2011/04/01 15:03:48 wiz Exp $
 
---- mod_auth_mysql.c.orig	2004-06-27 11:34:55.000000000 +0000
+--- mod_auth_mysql.c.orig	2004-12-23 13:43:14.000000000 +0000
 +++ mod_auth_mysql.c
-@@ -29,14 +29,14 @@
- #define SNPRINTF apr_snprintf
- #define PSTRDUP apr_pstrdup
- #define PSTRCAT apr_pstrcat
--#define APACHELOG(severity, handle, message ...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, 0, handle->server, message)
-+#define APACHELOG(severity, handle, message...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, 0, handle->server, message)
- #else
- #define PALLOC ap_palloc
- #define PCALLOC ap_pcalloc
- #define SNPRINTF ap_snprintf
- #define PSTRDUP ap_pstrdup
- #define PSTRCAT ap_pstrcat
--#define APACHELOG(severity, handle, message ...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, handle->server, message)
-+#define APACHELOG(severity, handle, message...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, handle->server, message)
- #endif
- 
- #include <httpd.h>
-@@ -51,12 +51,18 @@
- #include <ap_md5.h>
+@@ -55,12 +55,18 @@
+ #include <ap_sha1.h>
  #endif
  
 +#ifndef APR_XtOffsetOf
@@ -38,7 +21,7 @@ $NetBSD: patch-ad,v 1.3 2007/06/29 22:58:55 joerg Exp $
  #endif
  
  #ifndef TRUE
-@@ -94,7 +100,7 @@ unsigned long auth_db_client_flag = 0;
+@@ -98,7 +104,7 @@ unsigned long auth_db_client_flag = 0;
  #define CRYPT_MD5_ENCRYPTION_FLAG	1<<3
  #endif
  #define PHP_MD5_ENCRYPTION_FLAG		1<<4
@@ -46,8 +29,8 @@ $NetBSD: patch-ad,v 1.3 2007/06/29 22:58:55 joerg Exp $
 +#if defined(HAVE_CRYPT_H) || defined(HAVE_LIBCRYPT)
  #define CRYPT_ENCRYPTION_FLAG		1<<5
  #endif
- 
-@@ -126,7 +132,7 @@ static int check_crypt_MD5_encryption(co
+ #define SHA1SUM_ENCRYPTION_FLAG		1<<6
+@@ -131,7 +137,7 @@ static int check_crypt_MD5_encryption(co
  }
  #endif
  
@@ -56,7 +39,7 @@ $NetBSD: patch-ad,v 1.3 2007/06/29 22:58:55 joerg Exp $
  static int check_crypt_encryption(const char *passwd, char *enc_passwd)
  {
  	return (!strcmp(crypt(passwd, enc_passwd), enc_passwd));
-@@ -206,7 +212,9 @@ encryption_type_entry supported_encrypti
+@@ -250,7 +256,9 @@ encryption_type_entry supported_encrypti
  #if CRYPT_MD5
  	{ "Crypt_MD5",		check_crypt_MD5_encryption,		CRYPT_MD5_ENCRYPTION_FLAG },
  #endif
@@ -64,25 +47,5 @@ $NetBSD: patch-ad,v 1.3 2007/06/29 22:58:55 joerg Exp $
  	{ "Crypt",		check_crypt_encryption,			CRYPT_ENCRYPTION_FLAG },
 +#endif
  	{ "PHP_MD5",		check_PHP_MD5_encryption,		PHP_MD5_ENCRYPTION_FLAG	},
+ 	{ "SHA1Sum",	check_SHA1Sum_encryption, SHA1SUM_ENCRYPTION_FLAG},
  	/* add additional encryption types below */
- 	{ NULL,			NULL,					0 }
-@@ -1463,14 +1471,17 @@ int mysql_authenticate_basic_user(reques
- 		return res;
- 	}
- 
-+#ifdef APACHE2
- 	APACHELOG(DEBUG, r,
- 		"Starting basic user auth for [%s] in %s, child pid %i",
--#ifdef APACHE2
- 		r->user,
-+		sec->dir, getpid());
- #else
-+	APACHELOG(DEBUG, r,
-+		"Starting basic user auth for [%s] in %s, child pid %i",
- 		c->user,
--#endif
- 		sec->dir, getpid());
-+#endif
- 
- #ifdef APACHE2
- 	switch (mysql_check_user_password(r, r->user, sent_pw, sec)) {