Fix patch so it works with Apache 2.2.x.

APR_XtOffsetOf is marked as deprecated in 2.0 and has been removed
entirely in 2.2

3 files changed, 21 insertions, 21 deletions

diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index 6684d1100c7..1a10a191daa 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/12/08 23:34:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/25 15:51:50 sborrill Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
 PKGNAME=		ap2-auth-mysql-1.11.12
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		www databases
 MASTER_SITES=		ftp://ftp.kcilink.com/pub/
 DISTFILES=		${DISTNAME}.gz mysql-group-auth.txt
@@ -12,7 +12,7 @@ MAINTAINER=		cube@NetBSD.org
 HOMEPAGE=		ftp://ftp.kcilink.com/pub/
 COMMENT=		Module to allow Apache 2 authentication against a MySQL database
 
-CONFLICTS+=		ap-auth-mysql-*
+CONFLICTS+=		ap-auth-mysql-[0-9]*
 
 DIST_SUBDIR=		ap2-auth-mysql
 EXTRACT_ONLY=		${DISTNAME}.gz
diff --git a/www/ap2-auth-mysql/distinfo b/www/ap2-auth-mysql/distinfo
index 415de99c576..d94e69e05b4 100644
--- a/www/ap2-auth-mysql/distinfo
+++ b/www/ap2-auth-mysql/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:28 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/02/25 15:51:50 sborrill Exp $
 
 SHA1 (ap2-auth-mysql/mod_auth_mysql.c.gz) = 0e53b22ccd2ebd36a213d5e418b02e6167a1300b
 RMD160 (ap2-auth-mysql/mod_auth_mysql.c.gz) = 1c5578132b79063ac6da87d827e9fdb55f7be412
@@ -6,4 +6,4 @@ Size (ap2-auth-mysql/mod_auth_mysql.c.gz) = 6900 bytes
 SHA1 (ap2-auth-mysql/mysql-group-auth.txt) = 6c0d39ed3ac6a3955d8d8c7c4892e07ba3d3ae77
 RMD160 (ap2-auth-mysql/mysql-group-auth.txt) = aff76b74993e8501e2efa0cc366ef91a4b29821a
 Size (ap2-auth-mysql/mysql-group-auth.txt) = 1564 bytes
-SHA1 (patch-aa) = 1e3faefecba3c325614215ca5c5c4643f6b96a1d
+SHA1 (patch-aa) = 36364c3af7dd99ba9ce3f79fb4625e40e07d3911
diff --git a/www/ap2-auth-mysql/patches/patch-aa b/www/ap2-auth-mysql/patches/patch-aa
index 2220b0b00d9..195a3b79de1 100644
--- a/www/ap2-auth-mysql/patches/patch-aa
+++ b/www/ap2-auth-mysql/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/11/18 15:58:22 cube Exp $
+$NetBSD: patch-aa,v 1.3 2007/02/25 15:51:50 sborrill Exp $
 
---- mod_auth_mysql.c.orig	2004-11-14 18:27:15.000000000 +0100
-+++ mod_auth_mysql.c
+--- mod_auth_mysql.c.orig	2007-02-25 16:15:13.000000000 +0000
++++ mod_auth_mysql.c	2007-02-25 16:15:13.000000000 +0000
 @@ -189,7 +189,9 @@
  #include "http_core.h"
  #include "http_log.h"
@@ -141,43 +141,43 @@ $NetBSD: patch-aa,v 1.2 2004/11/18 15:58:22 cube Exp $
 -    (void*)XtOffsetOf(mysql_auth_config_rec, mysqlNoPasswd),
 -    OR_AUTHCFG, FLAG, "If On, only check if user exists; ignore password" },
 +    AP_INIT_TAKE1("AuthMySQLHost", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlhost),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlhost),
 +	OR_AUTHCFG, "mysql server host name"),
 +    AP_INIT_TAKE1("AuthMySQLUser", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqluser),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqluser),
 +	OR_AUTHCFG, "mysql server user name"),
 +    AP_INIT_TAKE1("AuthMySQLPassword", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlpasswd),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlpasswd),
 +	OR_AUTHCFG, "mysql server user password"),
 +    AP_INIT_TAKE1("AuthMySQLDB", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlDB),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlDB),
 +	OR_AUTHCFG, "mysql database name"),
 +    AP_INIT_TAKE1("AuthMySQLUserTable", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlpwtable),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlpwtable),
 +	OR_AUTHCFG, "mysql user table name"),
 +    AP_INIT_TAKE1("AuthMySQLGroupTable", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlgrptable),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlgrptable),
 +	OR_AUTHCFG, "mysql group table name"),
 +    AP_INIT_TAKE1("AuthMySQLNameField", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlNameField),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlNameField),
 +	OR_AUTHCFG, "mysql User ID field name within table"),
 +    AP_INIT_TAKE1("AuthMySQLGroupField", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupField),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupField),
 +	OR_AUTHCFG, "mysql Group field name within table"),
 +    AP_INIT_TAKE1("AuthMySQLPasswordField", ap_set_string_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlPasswordField),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlPasswordField),
 +	OR_AUTHCFG, "mysql Password field name within table"),
 +    AP_INIT_FLAG("AuthMySQLCryptedPasswords", ap_set_flag_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlCrypted),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlCrypted),
 +	OR_AUTHCFG, "mysql passwords are stored encrypted if On"),
 +    AP_INIT_FLAG("AuthMySQLKeepAlive", ap_set_flag_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlKeepAlive),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlKeepAlive),
 +	OR_AUTHCFG, "mysql connection kept open across requests if On"),
 +    AP_INIT_FLAG("AuthMySQLAuthoritative", ap_set_flag_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlAuthoritative),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlAuthoritative),
 +	OR_AUTHCFG, "mysql lookup is authoritative if On"),
 +    AP_INIT_FLAG("AuthMySQLNoPasswd", ap_set_flag_slot,
-+	(void*)APR_XtOffsetOf(mysql_auth_config_rec, mysqlNoPasswd),
++	(void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlNoPasswd),
 +	OR_AUTHCFG, "If On, only check if user exists; ignore password"),
    { NULL }
  };