diff options
author | Christian Heim <phreak@gentoo.org> | 2007-07-29 15:56:00 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2007-07-29 15:56:00 +0000 |
commit | 0fc11780f44d085df158cdbc80a72cfefc2dc63a (patch) | |
tree | 3bb44a9286b67fb8e253f39412039a0be152a5d6 | |
parent | Moving net-www/mod_auth_kerb to www-apache/mod_auth_kerb (#81244). (diff) | |
download | historical-0fc11780f44d085df158cdbc80a72cfefc2dc63a.tar.gz historical-0fc11780f44d085df158cdbc80a72cfefc2dc63a.tar.bz2 historical-0fc11780f44d085df158cdbc80a72cfefc2dc63a.zip |
Moving net-www/mod_auth_mysql to www-apache/mod_auth_mysql (#81244).
Package-Manager: portage-2.1.3_rc9
11 files changed, 599 insertions, 34 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..471f120f2e38 --- /dev/null +++ b/www-apache/mod_auth_mysql/Manifest @@ -0,0 +1,45 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +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 1156 RMD160 354e7d3db9d50dbc0b9455e5d1f1babe8b8e062f SHA1 ee68ab69146b313e418dc8893f6dd9256544c7f1 SHA256 51fbddc5bfbc72c72156d9062a8e9afe1157c93aef70f63e57dff00f8aef7493 +MD5 cc6452cb40e87e3ddf12da2087becd36 mod_auth_mysql-3.0.0-r1.ebuild 1156 +RMD160 354e7d3db9d50dbc0b9455e5d1f1babe8b8e062f mod_auth_mysql-3.0.0-r1.ebuild 1156 +SHA256 51fbddc5bfbc72c72156d9062a8e9afe1157c93aef70f63e57dff00f8aef7493 mod_auth_mysql-3.0.0-r1.ebuild 1156 +EBUILD mod_auth_mysql-3.0.0-r2.ebuild 1346 RMD160 2df575652699ecd701ec9352774c930800ffa8c5 SHA1 51627d8c3e7eef4b5d4a6f02efc8a1e1b9a36ff3 SHA256 7dd8429619ab3c3678236cb7a9d8e612e9981ae278743fc7d80e9820c25b4990 +MD5 c2dcec416f6a58526c6c7415f40a1796 mod_auth_mysql-3.0.0-r2.ebuild 1346 +RMD160 2df575652699ecd701ec9352774c930800ffa8c5 mod_auth_mysql-3.0.0-r2.ebuild 1346 +SHA256 7dd8429619ab3c3678236cb7a9d8e612e9981ae278743fc7d80e9820c25b4990 mod_auth_mysql-3.0.0-r2.ebuild 1346 +MISC ChangeLog 4739 RMD160 bc6824f3590adf19982ffd13cb838b0db5cde338 SHA1 5cc997e7f98641f24ce934611453d591fe46cd1b SHA256 298ad25712d94ff17937d9fdb229112c1f45f7db6f05e0acad7e2c192fba89e8 +MD5 52285ae7e0b06835ae02e1c0dfd6f6c1 ChangeLog 4739 +RMD160 bc6824f3590adf19982ffd13cb838b0db5cde338 ChangeLog 4739 +SHA256 298ad25712d94ff17937d9fdb229112c1f45f7db6f05e0acad7e2c192fba89e8 ChangeLog 4739 +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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.5 (GNU/Linux) + +iD8DBQFGrLibyuNVb5qfaOYRArfeAJ9fTTTmjqjSIpCxLrtbZJVauZpZugCeISF2 +H1XyminBETKX789Fup77S7E= +=mjbT +-----END PGP SIGNATURE----- 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 +} diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest index 69e79b176942..806d66536743 100644 --- a/www-apache/mod_fcgid/Manifest +++ b/www-apache/mod_fcgid/Manifest @@ -1,37 +1,25 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 20_mod_fcgid-2.1.conf 249 RMD160 3d829c445ae9b581101075596b68ba2f705fa2b0 SHA1 6ec5e7e4749084c5384f837fc106adea960912bd SHA256 df93a788c23a66f03eddb5ad4266d93b3a26ec441fe15de643ff7422dd03a8e8 -MD5 8f4759ac16bff4dbdec07f97fb1ba52f files/20_mod_fcgid-2.1.conf 249 -RMD160 3d829c445ae9b581101075596b68ba2f705fa2b0 files/20_mod_fcgid-2.1.conf 249 -SHA256 df93a788c23a66f03eddb5ad4266d93b3a26ec441fe15de643ff7422dd03a8e8 files/20_mod_fcgid-2.1.conf 249 -AUX 20_mod_fcgid.conf 192 RMD160 ddec2de99f2c3a56021d1bac3e2249914d78919f SHA1 d2c58fd81558707e2e7ec53f2d730abd0d208e73 SHA256 eb0cf50fdb8434dae0751f9578ce55067876d29d1fb6bdd85b300651ad6b058d -MD5 afcfa360a9a77fd3bdb6c2ec89efa594 files/20_mod_fcgid.conf 192 -RMD160 ddec2de99f2c3a56021d1bac3e2249914d78919f files/20_mod_fcgid.conf 192 -SHA256 eb0cf50fdb8434dae0751f9578ce55067876d29d1fb6bdd85b300651ad6b058d files/20_mod_fcgid.conf 192 -AUX mod_fcgid-2.1-apr_shm_remove.patch 2478 RMD160 481ba7c2b1228173d2e99b24650bfc969fb22281 SHA1 2646671841db3f0da64065effc1331fab464bd2a SHA256 8d9c87aee1663688112ac771ff4f7dff13dee54377aa610695a86ed9ace93362 -MD5 5d1637c1ddc4d6929ab67123edf6aa98 files/mod_fcgid-2.1-apr_shm_remove.patch 2478 -RMD160 481ba7c2b1228173d2e99b24650bfc969fb22281 files/mod_fcgid-2.1-apr_shm_remove.patch 2478 -SHA256 8d9c87aee1663688112ac771ff4f7dff13dee54377aa610695a86ed9ace93362 files/mod_fcgid-2.1-apr_shm_remove.patch 2478 +AUX 20_mod_fcgid.conf 75 RMD160 b89f7be034a4d0331b26f3476bca4ec378019d1e SHA1 76b07fe41032a2a21357ec8385c9cf331c11ad8a SHA256 1dd1b5a71604df6d205769225244ab7312890408dfa911d235e8fae12e1adc0f +MD5 b90dde3aa4651ba71699d0e299fe7f29 files/20_mod_fcgid.conf 75 +RMD160 b89f7be034a4d0331b26f3476bca4ec378019d1e files/20_mod_fcgid.conf 75 +SHA256 1dd1b5a71604df6d205769225244ab7312890408dfa911d235e8fae12e1adc0f files/20_mod_fcgid.conf 75 DIST mod_fcgid.1.10.tar.gz 51547 RMD160 17ff09a4006ee10f5c47e045df34985d0c53880b SHA1 e762889d046ddec3aa52361e5996c30973ea9079 SHA256 13b1e2197aff37f14c05cfb4e795cfe77ca36fc25d59b5ccfbe7ac8917fc705a -DIST mod_fcgid.2.0.tar.gz 274974 RMD160 6e62c6c1a828489d3faa5b074e21688a449f9ca3 SHA1 386f1c6f44bbbdd599392ae2fbf0170a8f8d5e80 SHA256 714e2eac93807e768a8a81c9d157e02fd674eab472302211a137657c9241cef1 DIST mod_fcgid.2.1.tar.gz 54359 RMD160 cf8ec344ad2e108ad0b47085b0509e2c13a062c1 SHA1 4d69edaadaed11753254bd8b37a355c1151d8225 SHA256 9d847f66f8067c5b8de06088a04356d22cee9ced2db7d04be6d6a7613c6b83df EBUILD mod_fcgid-1.10.ebuild 918 RMD160 c55a6dc253b0439fff3f35631bec4049799a7586 SHA1 712d1b7b2d5e0e294aaa7b1e0be404cbac791196 SHA256 01595687db68b483061960b36e463288439a085495ea4948c8f570d5749e662c MD5 3750857370aa43a6cf534e35a4102c21 mod_fcgid-1.10.ebuild 918 RMD160 c55a6dc253b0439fff3f35631bec4049799a7586 mod_fcgid-1.10.ebuild 918 SHA256 01595687db68b483061960b36e463288439a085495ea4948c8f570d5749e662c mod_fcgid-1.10.ebuild 918 -EBUILD mod_fcgid-2.0.ebuild 941 RMD160 9d3e744de350acc25de0f77a49937a7d5554eae8 SHA1 69c9f8c39c1584bc536b5a966a808c13de21a77c SHA256 5057ff5a53826bbd96c10c458a2169396be9f4682bcd11b69b18bf2bd077452a -MD5 fe346b671f71d842a2295fa1148f8e1b mod_fcgid-2.0.ebuild 941 -RMD160 9d3e744de350acc25de0f77a49937a7d5554eae8 mod_fcgid-2.0.ebuild 941 -SHA256 5057ff5a53826bbd96c10c458a2169396be9f4682bcd11b69b18bf2bd077452a mod_fcgid-2.0.ebuild 941 EBUILD mod_fcgid-2.1-r1.ebuild 1443 RMD160 e5cbf8f15a0b6151cff5faf280b9f78f8e958c10 SHA1 c067d831576de6b1b5a8b81a7805b7ccd2d92822 SHA256 5c2d9818e1911b4204ad19216fe1263ba373944139f10fed2119fe52bdad21ec MD5 79537b1a83bfeadf09bb833e8cde16f2 mod_fcgid-2.1-r1.ebuild 1443 RMD160 e5cbf8f15a0b6151cff5faf280b9f78f8e958c10 mod_fcgid-2.1-r1.ebuild 1443 SHA256 5c2d9818e1911b4204ad19216fe1263ba373944139f10fed2119fe52bdad21ec mod_fcgid-2.1-r1.ebuild 1443 -MISC ChangeLog 5517 RMD160 327798d47c2d1bd0201a3d4cf894f4b342e59825 SHA1 3f09987bc62054936583623cdc6661a2fe704fd5 SHA256 dbedf702b082b18b8a94aa5292aac33fbdd7269465217b6c1fc9bc727f0f9072 -MD5 95801ff8c35fa5f028f593d8591dfff1 ChangeLog 5517 -RMD160 327798d47c2d1bd0201a3d4cf894f4b342e59825 ChangeLog 5517 -SHA256 dbedf702b082b18b8a94aa5292aac33fbdd7269465217b6c1fc9bc727f0f9072 ChangeLog 5517 +EBUILD mod_fcgid-2.1-r2.ebuild 986 RMD160 bbfea6418085fe59989e19c999687e1da8194410 SHA1 7aa560e14e4ad922442100a6a2dcb963c7a5ba4f SHA256 aebc17037dc62cc56c7c948f20ddba49aaae034cbcf803b7daa78da6975f7859 +MD5 cccb3c2334daeb2bfc9de856e1c43213 mod_fcgid-2.1-r2.ebuild 986 +RMD160 bbfea6418085fe59989e19c999687e1da8194410 mod_fcgid-2.1-r2.ebuild 986 +SHA256 aebc17037dc62cc56c7c948f20ddba49aaae034cbcf803b7daa78da6975f7859 mod_fcgid-2.1-r2.ebuild 986 +MISC ChangeLog 5849 RMD160 ec4ce9c5703c07235d25c613e82c5479c948a8fc SHA1 c8f4b39c1d904a7c221ea14388caad8b7b3cbea6 SHA256 a04867b16208570a928add8a08e47205196f077a31a3b6f5489fb75792a4baf3 +MD5 906aa2e92a65e4f23b5345fa84b6ec87 ChangeLog 5849 +RMD160 ec4ce9c5703c07235d25c613e82c5479c948a8fc ChangeLog 5849 +SHA256 a04867b16208570a928add8a08e47205196f077a31a3b6f5489fb75792a4baf3 ChangeLog 5849 MISC metadata.xml 483 RMD160 56be90c965ab5663636d639624c7778409e72347 SHA1 4704b1f7b6e558722c8613e66df8d148165d7a64 SHA256 9acd2c7ac26a99c1ba655aa7912526906c3e5d03529aeadcb08f9b40373244bc MD5 b04c3f93349f84b2bc615931f1c1d6c9 metadata.xml 483 RMD160 56be90c965ab5663636d639624c7778409e72347 metadata.xml 483 @@ -39,16 +27,9 @@ SHA256 9acd2c7ac26a99c1ba655aa7912526906c3e5d03529aeadcb08f9b40373244bc metadata MD5 92d1d41c746ce4d5e649feb6dce9f55f files/digest-mod_fcgid-1.10 241 RMD160 df236422a0b78713ff744e71c1c72c2bd516e18b files/digest-mod_fcgid-1.10 241 SHA256 03226104e0c41b539d58b2f65d9698ff65d5d5461701f313732d998071c52969 files/digest-mod_fcgid-1.10 241 -MD5 65e82bd509eda541b3a5bbb888db3ca0 files/digest-mod_fcgid-2.0 241 -RMD160 c26c43ac0c73a544a81333bd30f4eadb659a29a3 files/digest-mod_fcgid-2.0 241 -SHA256 1da3316476d03feb41672616bf14933b998cdab976b60f867647c56d81dfdd31 files/digest-mod_fcgid-2.0 241 MD5 c332373544b3839233ac7199b1b3048c files/digest-mod_fcgid-2.1-r1 238 RMD160 b8344a3f713ccefee2f752a5b31259a52f19d67d files/digest-mod_fcgid-2.1-r1 238 SHA256 cc68ac5febecd1750373fb497c2f00536f093a83f0f19efd5d7b174d3c2d97fa files/digest-mod_fcgid-2.1-r1 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.4 (GNU/Linux) - -iD8DBQFGVfIdyuNVb5qfaOYRAn3KAJ9cHjJD2/LYIUPDIf3atnZxmomYcACfVxBI -m7tNd3C8LNn7k+JsIQpXZtk= -=7sdn ------END PGP SIGNATURE----- +MD5 c332373544b3839233ac7199b1b3048c files/digest-mod_fcgid-2.1-r2 238 +RMD160 b8344a3f713ccefee2f752a5b31259a52f19d67d files/digest-mod_fcgid-2.1-r2 238 +SHA256 cc68ac5febecd1750373fb497c2f00536f093a83f0f19efd5d7b174d3c2d97fa files/digest-mod_fcgid-2.1-r2 238 |