From b14ab5052e11a4676a11e1776c9396582726c723 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Thu, 7 Dec 2006 16:36:11 +0000 Subject: [PATCH] Ebuild cleanup, set mysql as herd too. Package-Manager: portage-2.1.2_rc2-r2 --- net-www/mod_auth_mysql/Manifest | 39 ++---- .../files/12_mod_auth_mysql.conf | 129 ------------------ .../files/digest-mod_auth_mysql-3.0.0 | 3 - .../mod_auth_mysql/files/mod_auth_mysql.patch | 12 -- .../mod_auth_mysql-3.0.0.ebuild | 28 ---- 5 files changed, 12 insertions(+), 199 deletions(-) delete mode 100644 net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf delete mode 100644 net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0 delete mode 100644 net-www/mod_auth_mysql/files/mod_auth_mysql.patch delete mode 100644 net-www/mod_auth_mysql/mod_auth_mysql-3.0.0.ebuild diff --git a/net-www/mod_auth_mysql/Manifest b/net-www/mod_auth_mysql/Manifest index 1d48ebf20ffa..290fad8180f3 100644 --- a/net-www/mod_auth_mysql/Manifest +++ b/net-www/mod_auth_mysql/Manifest @@ -1,35 +1,20 @@ -AUX 12_mod_auth_mysql.conf 3571 RMD160 e8bb94a09125afc0f9e44a964c8aaf1fd16db1f7 SHA1 d7d15108675f475cff58c233e09d4d002b723b69 SHA256 a30c6c8954c7d4a9583fe5f0131b84e1afed442da8fa755f4a3b233976a5fc53 -MD5 01cc878ba30a6e2ad327de787e21a999 files/12_mod_auth_mysql.conf 3571 -RMD160 e8bb94a09125afc0f9e44a964c8aaf1fd16db1f7 files/12_mod_auth_mysql.conf 3571 -SHA256 a30c6c8954c7d4a9583fe5f0131b84e1afed442da8fa755f4a3b233976a5fc53 files/12_mod_auth_mysql.conf 3571 AUX 2.8.1/12_mod_auth_mysql.conf 3566 RMD160 23d0039dabd61e5b526793791521b232c551cd6e SHA1 daa9f3eb5f84741e8a727ba1e7989a99affd4660 SHA256 545a3bea899690afbd4b739b07150f7fb8414c777c8527687b5d95ab0deed582 MD5 d6baa28feeb088701ed677185d61b93d files/2.8.1/12_mod_auth_mysql.conf 3566 RMD160 23d0039dabd61e5b526793791521b232c551cd6e files/2.8.1/12_mod_auth_mysql.conf 3566 SHA256 545a3bea899690afbd4b739b07150f7fb8414c777c8527687b5d95ab0deed582 files/2.8.1/12_mod_auth_mysql.conf 3566 -AUX mod_auth_mysql.patch 357 RMD160 1bf677239251a83019b841b0166037462adddf1e SHA1 79faadf4c556b401e8b0f3007ff7449794a3f034 SHA256 82eab8c7d2bbfcb773c1ff7f7a66cca3f6e701d0fb83bfafa94e6f74cefd9313 -MD5 dd4f31c36839f4faadcf855915e348c3 files/mod_auth_mysql.patch 357 -RMD160 1bf677239251a83019b841b0166037462adddf1e files/mod_auth_mysql.patch 357 -SHA256 82eab8c7d2bbfcb773c1ff7f7a66cca3f6e701d0fb83bfafa94e6f74cefd9313 files/mod_auth_mysql.patch 357 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 1202 RMD160 2b80347dac7d96b15074d7d3cd53d7b86dab18cf SHA1 250e2048d77ee92a3d27d308738b1622a4fa1bb5 SHA256 8fcf4814d01db37eb30046fb508db5e083ed70d60e9e0c3d7e2b89224617d3e8 -MD5 808f63fd880e11227eca2c9566753a00 mod_auth_mysql-3.0.0-r1.ebuild 1202 -RMD160 2b80347dac7d96b15074d7d3cd53d7b86dab18cf mod_auth_mysql-3.0.0-r1.ebuild 1202 -SHA256 8fcf4814d01db37eb30046fb508db5e083ed70d60e9e0c3d7e2b89224617d3e8 mod_auth_mysql-3.0.0-r1.ebuild 1202 -EBUILD mod_auth_mysql-3.0.0.ebuild 878 RMD160 dab96c26e8b945411aaa94527aead866cd11252e SHA1 515f0b47b5655fd7dffd0a46059ab0ad9d21b529 SHA256 c316a03250ed4d5ec2812bfd3efd136ba0bdf61180cd4c9f977152e711d9179c -MD5 3b9ccb6b003b122195864991bbcb99f0 mod_auth_mysql-3.0.0.ebuild 878 -RMD160 dab96c26e8b945411aaa94527aead866cd11252e mod_auth_mysql-3.0.0.ebuild 878 -SHA256 c316a03250ed4d5ec2812bfd3efd136ba0bdf61180cd4c9f977152e711d9179c mod_auth_mysql-3.0.0.ebuild 878 -MISC ChangeLog 3486 RMD160 82a4fdbc4d63f6495fcfbc68605d6c3efef15a32 SHA1 fb6f0486ae818077fac2cd8ad657eb3ddc666823 SHA256 1218f7c22d2e74f21596a0e82f84a7cc627d704bfb4bd2f6bfc83df4e74e83a8 -MD5 0b75d3041247726756e5d8ef245ee8c1 ChangeLog 3486 -RMD160 82a4fdbc4d63f6495fcfbc68605d6c3efef15a32 ChangeLog 3486 -SHA256 1218f7c22d2e74f21596a0e82f84a7cc627d704bfb4bd2f6bfc83df4e74e83a8 ChangeLog 3486 -MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 -MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226 -RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226 -SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226 -MD5 cf735f899a63217e7f240b412e718a2c files/digest-mod_auth_mysql-3.0.0 259 -RMD160 20e33e33c83e428507b0a94b824aac39c2c989d1 files/digest-mod_auth_mysql-3.0.0 259 -SHA256 7fb0f2919dde6fe5282ca3665ce7672d0cce01a2f0c414ad0d1c8c9e9d119df1 files/digest-mod_auth_mysql-3.0.0 259 +EBUILD mod_auth_mysql-3.0.0-r1.ebuild 1208 RMD160 8a111ed8be9acb8f8ff090a45f2c7f7f48863511 SHA1 4a0d6fc5ed8b075ca3de24d9f5e2c0fb27c197dc SHA256 c4ef339e147d20d7a9f677c5e03f74c33d7ed12efc6a315a09c1ba8ff5b7506d +MD5 71ed2ad791392fc46a2c6b49a1dc5b69 mod_auth_mysql-3.0.0-r1.ebuild 1208 +RMD160 8a111ed8be9acb8f8ff090a45f2c7f7f48863511 mod_auth_mysql-3.0.0-r1.ebuild 1208 +SHA256 c4ef339e147d20d7a9f677c5e03f74c33d7ed12efc6a315a09c1ba8ff5b7506d mod_auth_mysql-3.0.0-r1.ebuild 1208 +MISC ChangeLog 3721 RMD160 126a844b88837b220a33192832445b67a83a58ad SHA1 92f2505daacf6a2a49dc3c90d111d5aa006298a6 SHA256 69fd7fc1aad9d264c2fabd7a959debfae99c65b9f0ac7fe90185bd800b68ea62 +MD5 fdc2911743f3ec7342ead08906a8baad ChangeLog 3721 +RMD160 126a844b88837b220a33192832445b67a83a58ad ChangeLog 3721 +SHA256 69fd7fc1aad9d264c2fabd7a959debfae99c65b9f0ac7fe90185bd800b68ea62 ChangeLog 3721 +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 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 deleted file mode 100644 index 6d87594c8d85..000000000000 --- a/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf +++ /dev/null @@ -1,129 +0,0 @@ - - - LoadModule mysql_auth_module extramodules/mod_auth_mysql.so - - - - - -# -# 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')); -# -# -# AuthName "MySQL authenticated zone" -# AuthType Basic -# -# AuthMySQLUser authuser -# AuthMySQLPassword PaSsW0Rd -# AuthMySQLDB auth -# AuthMySQLUserTable users -# AuthMySQLNameField user_name -# AuthMySQLPasswordField user_passwd -# -# require valid-user -# - -# 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'); -# -# -# 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 -# - -# 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'); -# -# -# 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 -# - - diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0 deleted file mode 100644 index b841d6624e79..000000000000 --- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0 +++ /dev/null @@ -1,3 +0,0 @@ -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/net-www/mod_auth_mysql/files/mod_auth_mysql.patch b/net-www/mod_auth_mysql/files/mod_auth_mysql.patch deleted file mode 100644 index 785a5aba0ace..000000000000 --- a/net-www/mod_auth_mysql/files/mod_auth_mysql.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mod_auth_mysql.c.orig Thu Jun 3 11:40:27 2004 -+++ mod_auth_mysql.c Thu Jun 3 11:32:24 2004 -@@ -746,6 +746,9 @@ - "mysql user %s not in group table %s: %s", - user, sec->mysqlgrptable, r->uri); - #endif -+ if (!sec->mysqlAuthoritative) -+ return DECLINED; -+ - ap_note_basic_auth_failure(r); - #ifdef APACHE2 - return HTTP_UNAUTHORIZED; diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0.ebuild deleted file mode 100644 index e7d5e34d1288..000000000000 --- a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0.ebuild,v 1.5 2006/11/23 16:14:15 vivo Exp $ - -inherit eutils apache-module - -DESCRIPTION="Basic authentication for Apache using a MySQL database" -HOMEPAGE="http://modauthmysql.sourceforge.net/" -SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz" - -DEPEND="virtual/mysql" -LICENSE="Apache-1.1" -KEYWORDS="amd64 x86" -SLOT="0" - -BASE_CONFIG_PVR="2.8.1" - -APXS1_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" -APACHE1_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql" -APACHE1_MOD_DEFINE="AUTH_MYSQL" - -APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" -APACHE2_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql" -APACHE2_MOD_DEFINE="AUTH_MYSQL" - -DOCFILES="README" - -need_apache -- 2.26.2