Moving net-www/mod_auth_mysql to www-apache/mod_auth_mysql (#81244).

(Portage version: 2.1.3_rc9)

10 files changed, 574 insertions, 0 deletions

diff --git a/www-apache/mod_auth_mysql/ChangeLog b/www-apache/mod_auth_mysql/ChangeLog
new file mode 100644
index 000000000000..a023f559753a
--- /dev/null
+++ b/www-apache/mod_auth_mysql/ChangeLog
@@ -0,0 +1,134 @@
+# ChangeLog for net-www/mod_auth_mysql
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/ChangeLog,v 1.1 2007/07/29 15:56:00 phreak Exp $
+
+ 07 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
+  -files/12_mod_auth_mysql.conf, -files/mod_auth_mysql.patch, metadata.xml,
+  -mod_auth_mysql-3.0.0.ebuild, mod_auth_mysql-3.0.0-r1.ebuild:
+  Ebuild cleanup, set mysql as herd too.
+
+  29 Jul 2007; Christian Heim <phreak@gentoo.org>
+  +files/mod_auth_mysql-3.0.0-apache-2.2.patch,
+  +files/12_mod_auth_mysql.conf,
+  +files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch, +metadata.xml,
+  +mod_auth_mysql-3.0.0-r1.ebuild, +mod_auth_mysql-3.0.0-r2.ebuild:
+  Moving net-www/mod_auth_mysql to www-apache/mod_auth_mysql (#81244).
+
+  14 Jun 2007; Christian Heim <phreak@gentoo.org>
+  files/12_mod_auth_mysql.conf:
+  Document "AuthBasicAuthoritative Off" in the configuration examples.
+
+  13 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/12_mod_auth_mysql.conf, -files/2.8.1/12_mod_auth_mysql.conf,
+  mod_auth_mysql-3.0.0-r1.ebuild, mod_auth_mysql-3.0.0-r2.ebuild:
+  Cleanup.
+
+*mod_auth_mysql-3.0.0-r2 (09 Jan 2007)
+
+  09 Jan 2007; Christian Heim <phreak@gentoo.org>
+  +files/mod_auth_mysql-3.0.0-apache-2.2.patch,
+  +files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch,
+  +mod_auth_mysql-3.0.0-r2.ebuild:
+  Revision bump, including a fix for =net-www/apache-2.2* (hopefully fixing
+  #128501).
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
+  mod_auth_mysql-3.0.0.ebuild, mod_auth_mysql-3.0.0-r1.ebuild:
+  dev-db/mysql => virtual/mysql
+
+*mod_auth_mysql-3.0.0-r1 (05 Jun 2006)
+
+  05 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
+  -mod_auth_mysql-2.8.1.ebuild, +mod_auth_mysql-3.0.0-r1.ebuild:
+  fix #132391
+
+  04 Jun 2006; Michael Stewart <vericgar@gentoo.org>
+  -mod_auth_mysql-2.0.0_pre20030510.ebuild:
+  Remove old-style ebuilds
+
+  10 Dec 2005; Simon Stelling <blubb@gentoo.org>
+  mod_auth_mysql-3.0.0.ebuild:
+  stable on amd64
+
+  23 Oct 2005; Mark Loeser <halcy0n@gentoo.org> mod_auth_mysql-3.0.0.ebuild:
+  Stable on x86; bug #106448
+
+*mod_auth_mysql-3.0.0 (12 Aug 2005)
+
+  12 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  +mod_auth_mysql-3.0.0.ebuild:
+  version bump
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org>
+  mod_auth_mysql-2.0.0_pre20030510.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  25 Mar 2005; <blubb@gentoo.org> mod_auth_mysql-2.8.1.ebuild:
+  added ~amd64
+
+  17 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
+  -mod_auth_mysql-1.11.ebuild, mod_auth_mysql-2.8.1.ebuild,
+  -mod_auth_mysql-20030510-r1.ebuild, -mod_auth_mysql-20030510-r2.ebuild,
+  -mod_auth_mysql-20030510.ebuild:
+  cleanup
+
+  07 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
+  mod_auth_mysql-20030510.ebuild:
+  Fixed IUSE
+
+*mod_auth_mysql-2.0.0_pre20030510 (01 Feb 2005)
+
+  01 Feb 2005; Michael Stewart <vericgar@gentoo.org>
+  +mod_auth_mysql-2.0.0_pre20030510.ebuild:
+  Copied 20030510-r2 to 2.0.0_pre2030510 to fix bug #79678
+
+  22 Jan 2005; Christian Parpart <trapni@gentoo.org> 
+  mod_auth_mysql-2.8.1.ebuild:
+  apache herd package refresh - version bump to 2.8.1
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  mod_auth_mysql-20030510.ebuild:
+  QA - fix use invocation
+
+  20 Jun 2004; Chuck Short <zul@gentoo.org> mod_auth_mysql-1.11.ebuild,
+  mod_auth_mysql-20030510-r1.ebuild, mod_auth_mysql-20030510-r2.ebuild,
+  mod_auth_mysql-20030510.ebuild:
+  Ebuild clean up.
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> metadata.xml,
+  mod_auth_mysql-20030510-r1.ebuild, mod_auth_mysql-20030510-r2.ebuild,
+  mod_auth_mysql-20030510.ebuild, files/mod_auth_mysql.patch:
+  Added metadata.xml.
+  Added patch closes #52865.
+  -r2 marked stable.
+
+  22 Apr 2004; Chuck Short <zul@gentoo.org> mod_auth_mysql-20030510-r2.ebuild:
+  Installation of apache1 and apache2 modules. Closes #40265.
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  mod_auth_mysql-1.11.ebuild, mod_auth_mysql-20030510-r1.ebuild,
+  mod_auth_mysql-20030510-r2.ebuild, mod_auth_mysql-20030510.ebuild:
+  fix tail -1 issue and copyright headers
+
+*mod_auth_mysql-20030510-r2 (01 Oct 2003)
+
+  01 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  mod_auth_mysql-20030510-r2.ebuild:
+  fix bug #11254
+
+*mod_auth_mysql-20030510-r1 (08 Sep 2003)
+
+  08 Sep 2003; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
+  mod_auth_mysql-20030510-r1.ebuild:
+  complete bug #11254
+
+*mod_auth_mysql-20030510 (25 May 2003)
+
+  25 May 2003; Robin Johnson <robbat2@gentoo.org>
+  mod_auth_mysql-20030510.ebuild: 
+  Version bump, slight fixes to ebuild for updated version.
+
+*mod_auth_mysql-1.11 (28 Nov 2002)
+
+  28 Nov 2002; Donny Davies <woodchip@gentoo.org> :
+  Initial import; created by me.
diff --git a/www-apache/mod_auth_mysql/Manifest b/www-apache/mod_auth_mysql/Manifest
new file mode 100644
index 000000000000..4ace802af703
--- /dev/null
+++ b/www-apache/mod_auth_mysql/Manifest
@@ -0,0 +1,35 @@
+AUX 12_mod_auth_mysql.conf 3885 RMD160 c63d36137bb6467f3538d9ab596b98a186492dc8 SHA1 c9c279f5bbbe211a2699b6187ea1441e48a06440 SHA256 0dfbbca6d2e2c635471e43a526bd14881170295f2f193a4ce2c3460d2548e6ca
+MD5 0bde08bf0f0d76fcea52d0a26c5cd372 files/12_mod_auth_mysql.conf 3885
+RMD160 c63d36137bb6467f3538d9ab596b98a186492dc8 files/12_mod_auth_mysql.conf 3885
+SHA256 0dfbbca6d2e2c635471e43a526bd14881170295f2f193a4ce2c3460d2548e6ca files/12_mod_auth_mysql.conf 3885
+AUX mod_auth_mysql-3.0.0-apache-2.2.patch 5919 RMD160 e478e80251f790b2cf26e66ed3c58a73cd7cd9e0 SHA1 809938d6e15d0eb2daef31876fba41632e641e0e SHA256 ff8ec4537ea365cc365adaf5118165e5f655fdc6d5359f2200ccce2c96d836ff
+MD5 946b8d5a75359850b36293194db5d634 files/mod_auth_mysql-3.0.0-apache-2.2.patch 5919
+RMD160 e478e80251f790b2cf26e66ed3c58a73cd7cd9e0 files/mod_auth_mysql-3.0.0-apache-2.2.patch 5919
+SHA256 ff8ec4537ea365cc365adaf5118165e5f655fdc6d5359f2200ccce2c96d836ff files/mod_auth_mysql-3.0.0-apache-2.2.patch 5919
+AUX mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686 RMD160 08b2912658033b725f21ef4dc1a784fbf21d4daa SHA1 42778fbee4fd313837f21eddbcf8c1ffd90fafd4 SHA256 c4a056b01b6bdd8aab1e37d9e7bf6e621cab1b9de49bccaae197a343f6ee4370
+MD5 3d91692af8b78ef37bc5343194d1ab2c files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686
+RMD160 08b2912658033b725f21ef4dc1a784fbf21d4daa files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686
+SHA256 c4a056b01b6bdd8aab1e37d9e7bf6e621cab1b9de49bccaae197a343f6ee4370 files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686
+DIST mod_auth_mysql-3.0.0.tar.gz 19257 RMD160 ef68d6ec7c99c4059a38ba74f41c22e2f88f3863 SHA1 885dd0bfc64210d32e6705fdb10b2c0ca831a27c SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4
+EBUILD mod_auth_mysql-3.0.0-r1.ebuild 1153 RMD160 21fb30867fecacfdeebc031a0b9904f07c042c12 SHA1 f053b5dd4f21a279b8a701899dd0e73914a1373c SHA256 e0e145d7a92f873af1f8a0a4f513fd8be952b7d83096d2bcf53db521b022ced1
+MD5 bfc75aebb2427bf3d72cef4e5241ba71 mod_auth_mysql-3.0.0-r1.ebuild 1153
+RMD160 21fb30867fecacfdeebc031a0b9904f07c042c12 mod_auth_mysql-3.0.0-r1.ebuild 1153
+SHA256 e0e145d7a92f873af1f8a0a4f513fd8be952b7d83096d2bcf53db521b022ced1 mod_auth_mysql-3.0.0-r1.ebuild 1153
+EBUILD mod_auth_mysql-3.0.0-r2.ebuild 1343 RMD160 ca6c1bf703d8709d34973145bf6f920748eebc25 SHA1 b6371c31627cf254fc9671f30661dae011d13497 SHA256 b8ae92e7e556b71fbb0d1a26f50d3841e7f9de8280224fbd0488db7a397ef190
+MD5 a32e2fe2e89c4d30aa77c4e0982aeb53 mod_auth_mysql-3.0.0-r2.ebuild 1343
+RMD160 ca6c1bf703d8709d34973145bf6f920748eebc25 mod_auth_mysql-3.0.0-r2.ebuild 1343
+SHA256 b8ae92e7e556b71fbb0d1a26f50d3841e7f9de8280224fbd0488db7a397ef190 mod_auth_mysql-3.0.0-r2.ebuild 1343
+MISC ChangeLog 4737 RMD160 ea6e2b88321eb186dcc4178cf56dd11761917222 SHA1 41657d00e2f5099ded4366028cd48f758243dad8 SHA256 c0624e33555d167d9e2699ba1b28fa4f1b975679918f358da490be2292c31d47
+MD5 ca476a6e3af43ab3d51c06a3e9322306 ChangeLog 4737
+RMD160 ea6e2b88321eb186dcc4178cf56dd11761917222 ChangeLog 4737
+SHA256 c0624e33555d167d9e2699ba1b28fa4f1b975679918f358da490be2292c31d47 ChangeLog 4737
+MISC metadata.xml 180 RMD160 b762599c4a9e042758cf4e58cf968d0dfaf37c8b SHA1 d3170a92499dc385c738add0d516d840e74b6415 SHA256 325b6e1d31edfdcaf7d563f03276382d77e6edf58d8f7d653086b7e726792c51
+MD5 b821e26d622d74f6ce77d24ef5fed492 metadata.xml 180
+RMD160 b762599c4a9e042758cf4e58cf968d0dfaf37c8b metadata.xml 180
+SHA256 325b6e1d31edfdcaf7d563f03276382d77e6edf58d8f7d653086b7e726792c51 metadata.xml 180
+MD5 cf735f899a63217e7f240b412e718a2c files/digest-mod_auth_mysql-3.0.0-r1 259
+RMD160 20e33e33c83e428507b0a94b824aac39c2c989d1 files/digest-mod_auth_mysql-3.0.0-r1 259
+SHA256 7fb0f2919dde6fe5282ca3665ce7672d0cce01a2f0c414ad0d1c8c9e9d119df1 files/digest-mod_auth_mysql-3.0.0-r1 259
+MD5 cf735f899a63217e7f240b412e718a2c files/digest-mod_auth_mysql-3.0.0-r2 259
+RMD160 20e33e33c83e428507b0a94b824aac39c2c989d1 files/digest-mod_auth_mysql-3.0.0-r2 259
+SHA256 7fb0f2919dde6fe5282ca3665ce7672d0cce01a2f0c414ad0d1c8c9e9d119df1 files/digest-mod_auth_mysql-3.0.0-r2 259
diff --git a/www-apache/mod_auth_mysql/files/12_mod_auth_mysql.conf b/www-apache/mod_auth_mysql/files/12_mod_auth_mysql.conf
new file mode 100644
index 000000000000..bd4908794b47
--- /dev/null
+++ b/www-apache/mod_auth_mysql/files/12_mod_auth_mysql.conf
@@ -0,0 +1,137 @@
+<IfDefine AUTH_MYSQL>
+	<IfModule !mod_auth_mysql.c>
+		LoadModule mysql_auth_module	modules/mod_auth_mysql.so
+	</IfModule>
+</IfDefine>
+
+<IfModule mod_auth_mysql.c>
+# mod_auth_mysql can be used to limit access to documents by checking
+# data in a MySQL database.
+
+# This will enable user-based MySQL authentication of everything
+# within /home/httpd.  You'll need to do the following as the MySQL
+# root user beforehand:
+#
+#    CREATE DATABASE auth;
+#    USE auth;
+#    CREATE TABLE users (
+#      user_name CHAR(30) NOT NULL,
+#      user_passwd CHAR(20) NOT NULL,
+#      PRIMARY KEY (user_name)
+#    );
+#    GRANT SELECT
+#      ON auth.users
+#      TO authuser@localhost
+#      IDENTIFIED BY 'PaSsW0Rd';
+#
+#    INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'));
+#
+#<Directory /home/httpd>
+#	# If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
+#	# the following line:
+#	#AuthBasicAuthoritative Off
+#	AuthName "MySQL authenticated zone"
+#	AuthType Basic
+#
+#	AuthMySQLUser authuser
+#	AuthMySQLPassword PaSsW0Rd
+#	AuthMySQLDB auth
+#	AuthMySQLUserTable users
+#	AuthMySQLNameField user_name
+#	AuthMySQLPasswordField user_passwd
+#
+#	require valid-user
+#</Directory>
+
+# This will enable group-based MySQL authentication of everything
+# within /home/httpd.  You'll need to do the following as the MySQL
+# root user beforehand:
+#
+#    CREATE DATABASE auth;
+#    USE auth;
+#    CREATE TABLE users (
+#      user_name CHAR(30) NOT NULL,
+#      user_passwd CHAR(20) NOT NULL,
+#      user_group CHAR(20) NOT NULL,
+#      PRIMARY KEY (user_name)
+#    );
+#    GRANT SELECT
+#      ON auth.users
+#      TO authuser@localhost
+#      IDENTIFIED BY 'PaSsW0Rd';
+#
+#    INSERT INTO users VALUES ('testuser',  ENCRYPT('testpass'), 'user');
+#    INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'), 'admin');
+#
+#<Directory /home/httpd>
+#	# If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
+#	# the following line:
+#	#AuthBasicAuthoritative Off
+#	AuthName "MySQL group authenticated zone"
+#	AuthType Basic
+#
+#	AuthMySQLUser authuser
+#	AuthMySQLPassword PaSsW0Rd
+#	AuthMySQLDB auth
+#	AuthMySQLUserTable users
+#	AuthMySQLNameField user_name
+#	AuthMySQLPasswordField user_passwd
+#	AuthMySQLGroupField user_group
+#
+#	require group admin
+#</Directory>
+
+# Like the above this enables group-based MySQL authentication of
+# everything within /home/httpd, but this configuration allows users to
+# belong to more than one group.  You'll need to do the following as
+# the MySQL root user beforehand:
+#
+#    CREATE DATABASE auth;
+#    USE auth;
+#    CREATE TABLE users (
+#      user_name CHAR(30) NOT NULL,
+#      user_passwd CHAR(20) NOT NULL,
+#      PRIMARY KEY (user_name)
+#    );
+#    CREATE TABLE groups (
+#      user_name CHAR(30) NOT NULL,
+#      user_group CHAR(20) NOT NULL,
+#      PRIMARY KEY (user_name, user_group)
+#    );
+#    GRANT SELECT
+#      ON auth.users
+#      TO authuser@localhost
+#      IDENTIFIED BY 'PaSsW0Rd';
+#    GRANT SELECT
+#      ON auth.groups
+#      TO authuser@localhost
+#      IDENTIFIED BY 'PaSsW0Rd';
+#
+#    INSERT INTO users VALUES ('testuser',  ENCRYPT('testpass'));
+#    INSERT INTO groups VALUES ('testuser', 'user');
+#    INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'));
+#    INSERT INTO groups VALUES ('testadmin', 'admin');
+#    INSERT INTO groups VALUES ('testadmin', 'user');
+#
+#<Directory /home/httpd>
+#	# If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
+#	# the following line:
+#	#AuthBasicAuthoritative Off
+#	AuthName "MySQL group authenticated zone"
+#	AuthType Basic
+#
+#	AuthMySQLUser authuser
+#	AuthMySQLPassword PaSsW0Rd
+#	AuthMySQLDB auth
+#	AuthMySQLUserTable users
+#	AuthMySQLNameField user_name
+#	AuthMySQLPasswordField user_passwd
+#	AuthMySQLGroupTable groups
+#	AuthMySQLGroupField user_group
+#
+#	require group user
+#</Directory>
+
+</IfModule>
+
+# vim: syntax=apache
diff --git a/www-apache/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r1 b/www-apache/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r1
new file mode 100644
index 000000000000..b841d6624e79
--- /dev/null
+++ b/www-apache/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r1
@@ -0,0 +1,3 @@
+MD5 a9ffde3dabeddf32de50bf75597c809e mod_auth_mysql-3.0.0.tar.gz 19257
+RMD160 ef68d6ec7c99c4059a38ba74f41c22e2f88f3863 mod_auth_mysql-3.0.0.tar.gz 19257
+SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4 mod_auth_mysql-3.0.0.tar.gz 19257
diff --git a/www-apache/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r2 b/www-apache/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r2
new file mode 100644
index 000000000000..b841d6624e79
--- /dev/null
+++ b/www-apache/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r2
@@ -0,0 +1,3 @@
+MD5 a9ffde3dabeddf32de50bf75597c809e mod_auth_mysql-3.0.0.tar.gz 19257
+RMD160 ef68d6ec7c99c4059a38ba74f41c22e2f88f3863 mod_auth_mysql-3.0.0.tar.gz 19257
+SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4 mod_auth_mysql-3.0.0.tar.gz 19257
diff --git a/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch b/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch
new file mode 100644
index 000000000000..30881f878d23
--- /dev/null
+++ b/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch
@@ -0,0 +1,131 @@
+Index: mod_auth_mysql-3.0.0/mod_auth_mysql.c
+===================================================================
+--- mod_auth_mysql-3.0.0.orig/mod_auth_mysql.c
++++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
+@@ -206,7 +206,7 @@
+   #define SNPRINTF apr_snprintf
+   #define PSTRDUP apr_pstrdup
+   #define PSTRNDUP apr_pstrndup
+-  #define STRCAT ap_pstrcat
++  #define STRCAT apr_pstrcat
+   #define POOL apr_pool_t
+   #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
+   #include "ap_compat.h"
+@@ -237,7 +237,7 @@
+   #define SNPRINTF ap_snprintf
+   #define PSTRDUP ap_pstrdup
+   #define PSTRNDUP ap_pstrndup
+-  #define STRCAT ap_pstrcat
++  #define STRCAT apr_pstrcat
+   #define POOL pool
+   #include <stdlib.h>
+   #include "ap_sha1.h"
+@@ -589,87 +589,87 @@ static void * create_mysql_auth_dir_conf
+ static
+ command_rec mysql_auth_cmds[] = {
+ 	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("AuthMySQLPort", ap_set_int_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlport),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlport),
+ 	OR_AUTHCFG, "mysql server port number"),
+ 
+ 	AP_INIT_TAKE1("AuthMySQLSocket", ap_set_string_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlsocket),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlsocket),
+ 	OR_AUTHCFG, "mysql server socket path"),
+ 
+ 	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 User 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("AuthMySQLGroupUserNameField", ap_set_string_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupUserNameField),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupUserNameField),
+ 	OR_AUTHCFG, "mysql User ID field name within Group 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_TAKE1("AuthMySQLPwEncryption", ap_set_string_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlEncryptionField),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlEncryptionField),
+ 	OR_AUTHCFG, "mysql password encryption method"),
+ 
+ 	AP_INIT_TAKE1("AuthMySQLSaltField", ap_set_string_slot,
+-	(void*) APR_XtOffsetOf(mysql_auth_config_rec, mysqlSaltField),
++	(void*) APR_OFFSETOF(mysql_auth_config_rec, mysqlSaltField),
+ 	OR_AUTHCFG, "mysql salfe field name within table"),
+ 
+ /*	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"),
+ 
+ 	AP_INIT_FLAG("AuthMySQLEnable", ap_set_flag_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlEnable),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlEnable),
+ 	OR_AUTHCFG, "enable mysql authorization"),
+ 
+ 	AP_INIT_TAKE1("AuthMySQLUserCondition", ap_set_string_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlUserCondition),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlUserCondition),
+ 	OR_AUTHCFG, "condition to add to user where-clause"),
+ 
+ 	AP_INIT_TAKE1("AuthMySQLGroupCondition", ap_set_string_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupCondition),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupCondition),
+ 	OR_AUTHCFG, "condition to add to group where-clause"),
+ 
+ 	AP_INIT_TAKE1("AuthMySQLCharacterSet", ap_set_string_slot,
+-	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlCharacterSet),
++	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlCharacterSet),
+ 	OR_AUTHCFG, "mysql character set to be used"),
+ 
+   { NULL }
diff --git a/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch b/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch
new file mode 100644
index 000000000000..e7f6eb31ef3f
--- /dev/null
+++ b/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch
@@ -0,0 +1,35 @@
+Index: mod_auth_mysql-3.0.0/mod_auth_mysql.c
+===================================================================
+--- mod_auth_mysql-3.0.0.orig/mod_auth_mysql.c
++++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
+@@ -288,6 +288,7 @@ static short pw_crypted(POOL * pool, con
+ static short pw_aes(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
+ #endif
+ static short pw_sha1(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
++static short pw_apr(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
+ static short pw_plain(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
+ 
+ static char * format_remote_host(request_rec * r, char ** parm);
+@@ -318,7 +319,8 @@ static encryption encryptions[] = {{"cry
+ #if _AES
+ 					   {"aes", SALT_REQUIRED, pw_aes},
+ #endif
+-					   {"sha1", NO_SALT, pw_sha1}};
++					   {"sha1", NO_SALT, pw_sha1},
++					   {"apr", NO_SALT, pw_apr}};
+ typedef struct {		/* User formatting patterns */
+   char pattern;			/* Pattern to match */
+   char * (*func)(request_rec * r, char ** parm);
+@@ -856,6 +858,12 @@ static short pw_sha1(POOL * pool, const 
+   return  strcasecmp(bin2hex(pool, scrambled_sent_pw, enc_len), real_pw) == 0;
+ }
+ 
++/* checks passwords from htpasswd */
++static short pw_apr(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
++  /* apr_password_validate will do the job */
++  return apr_password_validate(sent_pw, real_pw) == APR_SUCCESS;
++}
++
+ /* checks plain text passwords */
+ static short pw_plain(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
+   return strcmp(real_pw, sent_pw) == 0;
diff --git a/www-apache/mod_auth_mysql/metadata.xml b/www-apache/mod_auth_mysql/metadata.xml
new file mode 100644
index 000000000000..1bd30cf25759
--- /dev/null
+++ b/www-apache/mod_auth_mysql/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>apache</herd>
+	<herd>mysql</herd>
+</pkgmetadata>
diff --git a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..8bee26823b21
--- /dev/null
+++ b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild,v 1.1 2007/07/29 15:56:00 phreak Exp $
+
+inherit apache-module
+
+DESCRIPTION="Basic authentication for Apache using a MySQL database."
+HOMEPAGE="http://modauthmysql.sourceforge.net/"
+SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/mysql
+		sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+APXS1_ARGS="-DENABLE=0 -c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
+APACHE1_MOD_CONF="12_mod_auth_mysql"
+APACHE1_MOD_DEFINE="AUTH_MYSQL"
+
+APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
+APACHE2_MOD_CONF="12_mod_auth_mysql"
+APACHE2_MOD_DEFINE="AUTH_MYSQL"
+
+DOCFILES="README"
+
+need_apache
+
+pkg_postinst() {
+	if ! useq apache2 ; then
+		elog "With regard to bug #132391 the behaviour of ${PN}"
+		elog "has changed for Apache-1.3.XX."
+		elog
+		elog "You now need to enable ${PN} in your .htaccess"
+		elog "files explicitely using:"
+		elog
+		elog "  AuthMySQLEnable On"
+	fi
+}
diff --git a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..9aea1bbc6736
--- /dev/null
+++ b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.1 2007/07/29 15:56:00 phreak Exp $
+
+inherit apache-module eutils
+
+DESCRIPTION="Basic authentication for Apache using a MySQL database."
+HOMEPAGE="http://modauthmysql.sourceforge.net/"
+SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/mysql
+		sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+APXS1_ARGS="-DENABLE=0 -c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
+APACHE1_MOD_CONF="12_mod_auth_mysql"
+APACHE1_MOD_DEFINE="AUTH_MYSQL"
+
+APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
+APACHE2_MOD_CONF="12_mod_auth_mysql"
+APACHE2_MOD_DEFINE="AUTH_MYSQL"
+
+DOCFILES="README"
+
+need_apache
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S} -p1" epatch "${FILESDIR}/${P}-apache-2.2.patch"
+	EPATCH_OPTS="-d ${S} -p1" epatch "${FILESDIR}/${P}-htpasswd2-auth-style.patch"
+}
+
+pkg_postinst() {
+	if ! useq apache2 ; then
+		elog "With regard to bug #132391 the behaviour of ${PN}"
+		elog "has changed for Apache-1.3.XX."
+		elog
+		elog "You now need to enable ${PN} in your .htaccess"
+		elog "files explicitely using:"
+		elog
+		elog "  AuthMySQLEnable On"
+	fi
+}