Document "AuthBasicAuthoritative Off" in the configuration examples.

Package-Manager: portage-2.1.2.9

3 files changed, 73 insertions, 51 deletions

diff --git a/net-www/mod_auth_mysql/ChangeLog b/net-www/mod_auth_mysql/ChangeLog
index 5fcee53f46cf..60870094005e 100644
--- a/net-www/mod_auth_mysql/ChangeLog
+++ b/net-www/mod_auth_mysql/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for net-www/mod_auth_mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.26 2007/01/13 20:25:36 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.27 2007/06/14 20:58:50 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.
 
+  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:
diff --git a/net-www/mod_auth_mysql/Manifest b/net-www/mod_auth_mysql/Manifest
index e71a47a38f6b..e67a7b4a61cf 100644
--- a/net-www/mod_auth_mysql/Manifest
+++ b/net-www/mod_auth_mysql/Manifest
@@ -1,7 +1,10 @@
-AUX 12_mod_auth_mysql.conf 3566 RMD160 23d0039dabd61e5b526793791521b232c551cd6e SHA1 daa9f3eb5f84741e8a727ba1e7989a99affd4660 SHA256 545a3bea899690afbd4b739b07150f7fb8414c777c8527687b5d95ab0deed582
-MD5 d6baa28feeb088701ed677185d61b93d files/12_mod_auth_mysql.conf 3566
-RMD160 23d0039dabd61e5b526793791521b232c551cd6e files/12_mod_auth_mysql.conf 3566
-SHA256 545a3bea899690afbd4b739b07150f7fb8414c777c8527687b5d95ab0deed582 files/12_mod_auth_mysql.conf 3566
+-----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
@@ -19,10 +22,10 @@ EBUILD mod_auth_mysql-3.0.0-r2.ebuild 1335 RMD160 60af0dff928527bb825833cc388fc1
 MD5 5654bbfe2e3d04c9fbf27c7b68e85d2d mod_auth_mysql-3.0.0-r2.ebuild 1335
 RMD160 60af0dff928527bb825833cc388fc16a284603b4 mod_auth_mysql-3.0.0-r2.ebuild 1335
 SHA256 7601d2ace0e471ec88eddeeec8f9e15b2ee9c74fe402f2569d6d294c68bc567a mod_auth_mysql-3.0.0-r2.ebuild 1335
-MISC ChangeLog 4239 RMD160 0b34b695d81f8e1a54000c8d8a198dd1bd8af844 SHA1 6a29732ada22dcc2483260f4bb0472ba139765f1 SHA256 ff31e4bbd238033c1f02b1ab40e30c042c45c6e3b79f04f8aec1e8007df14e91
-MD5 783306ff4725510e79102ea572b9fd2e ChangeLog 4239
-RMD160 0b34b695d81f8e1a54000c8d8a198dd1bd8af844 ChangeLog 4239
-SHA256 ff31e4bbd238033c1f02b1ab40e30c042c45c6e3b79f04f8aec1e8007df14e91 ChangeLog 4239
+MISC ChangeLog 4393 RMD160 7fa9bb6725a8978387427c33aa88d391e2589127 SHA1 c207ac72a8ded96ab42625a6af51104fa0c8f984 SHA256 71a20cd6e4ade50dd775b49f4c0ba4ca21e49df41a49716637090ea5ba957cf8
+MD5 74be7e5a91a9d11f1764da1fc17c1f0b ChangeLog 4393
+RMD160 7fa9bb6725a8978387427c33aa88d391e2589127 ChangeLog 4393
+SHA256 71a20cd6e4ade50dd775b49f4c0ba4ca21e49df41a49716637090ea5ba957cf8 ChangeLog 4393
 MISC metadata.xml 180 RMD160 b762599c4a9e042758cf4e58cf968d0dfaf37c8b SHA1 d3170a92499dc385c738add0d516d840e74b6415 SHA256 325b6e1d31edfdcaf7d563f03276382d77e6edf58d8f7d653086b7e726792c51
 MD5 b821e26d622d74f6ce77d24ef5fed492 metadata.xml 180
 RMD160 b762599c4a9e042758cf4e58cf968d0dfaf37c8b metadata.xml 180
@@ -33,3 +36,10 @@ SHA256 7fb0f2919dde6fe5282ca3665ce7672d0cce01a2f0c414ad0d1c8c9e9d119df1 files/di
 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.4 (GNU/Linux)
+
+iD8DBQFGcawayuNVb5qfaOYRAoJAAJ4onk9c4T7TSkpcv3AFvbMkc+lrcgCfWC0e
+NGzRLRze+D47IIgbM5BtWt8=
+=dKb/
+-----END PGP SIGNATURE-----
diff --git a/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf b/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf
index cd3007e46121..bd4908794b47 100644
--- a/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf
+++ b/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf
@@ -1,15 +1,12 @@
 <IfDefine AUTH_MYSQL>
-  <IfModule !mod_auth_mysql.c>
-    LoadModule mysql_auth_module    modules/mod_auth_mysql.so
-  </IfModule>
+	<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
@@ -30,17 +27,20 @@
 #    INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'));
 #
 #<Directory /home/httpd>
-#    AuthName "MySQL authenticated zone"
-#    AuthType Basic
-#
-#    AuthMySQLUser authuser
-#    AuthMySQLPassword PaSsW0Rd
-#    AuthMySQLDB auth
-#    AuthMySQLUserTable users
-#    AuthMySQLNameField user_name
-#    AuthMySQLPasswordField user_passwd
-#
-#    require valid-user
+#	# 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
@@ -64,18 +64,21 @@
 #    INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'), 'admin');
 #
 #<Directory /home/httpd>
-#    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
+#	# 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
@@ -111,19 +114,24 @@
 #    INSERT INTO groups VALUES ('testadmin', 'user');
 #
 #<Directory /home/httpd>
-#    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
+#	# 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