summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-09-15 08:35:46 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-09-15 08:35:46 +0000
commit79c792f66366cab94f558447c964219465792b88 (patch)
treea330689b6546d64a2d7ef7bd745e3da40b755b98 /www-apache
parentppc stable, bug #189690 (diff)
downloadhistorical-79c792f66366cab94f558447c964219465792b88.tar.gz
historical-79c792f66366cab94f558447c964219465792b88.tar.bz2
historical-79c792f66366cab94f558447c964219465792b88.zip
fix apache 2.0/2.2 dependencies
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_auth_mysql/ChangeLog6
-rw-r--r--www-apache/mod_auth_mysql/Manifest34
-rw-r--r--www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild22
-rw-r--r--www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild22
-rw-r--r--www-apache/mod_authnz_external/Manifest22
5 files changed, 44 insertions, 62 deletions
diff --git a/www-apache/mod_auth_mysql/ChangeLog b/www-apache/mod_auth_mysql/ChangeLog
index 40c8cbba3d03..41dd5f4d5b09 100644
--- a/www-apache/mod_auth_mysql/ChangeLog
+++ b/www-apache/mod_auth_mysql/ChangeLog
@@ -1,12 +1,16 @@
# ChangeLog for www-apache/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.3 2007/09/06 17:27:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/ChangeLog,v 1.4 2007/09/15 08:35:46 hollow 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.
+ 15 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+ mod_auth_mysql-3.0.0-r1.ebuild, mod_auth_mysql-3.0.0-r2.ebuild:
+ fix apache 2.0/2.2 dependencies
+
06 Sep 2007; Raúl Porcel <armin76@gentoo.org>
mod_auth_mysql-3.0.0-r2.ebuild:
x86 stable, as requested by phreak
diff --git a/www-apache/mod_auth_mysql/Manifest b/www-apache/mod_auth_mysql/Manifest
index 216890d34e37..fa7be40e738d 100644
--- a/www-apache/mod_auth_mysql/Manifest
+++ b/www-apache/mod_auth_mysql/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -11,18 +14,18 @@ MD5 3d91692af8b78ef37bc5343194d1ab2c files/mod_auth_mysql-3.0.0-htpasswd2-auth-s
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 f270416b20223cf738e4ca4c9a1467832a4e0c44 SHA1 8c2f3781ff04ddf16b6e5ef433c395e0edb702b5 SHA256 c6f738eb38fa5cc8e9cbf4a1f5a2518ee56f3c240e0c2188186b4b117827d1f3
-MD5 12bb0214bb0db25fc22c1c6e6f56c9f4 mod_auth_mysql-3.0.0-r2.ebuild 1346
-RMD160 f270416b20223cf738e4ca4c9a1467832a4e0c44 mod_auth_mysql-3.0.0-r2.ebuild 1346
-SHA256 c6f738eb38fa5cc8e9cbf4a1f5a2518ee56f3c240e0c2188186b4b117827d1f3 mod_auth_mysql-3.0.0-r2.ebuild 1346
-MISC ChangeLog 4864 RMD160 fc23cc64cee8a71d30edb46e094db44df318a3a8 SHA1 4c3eb70ee16cc2593f9bb8f19fafa11e999705b3 SHA256 26381115aeee31dadb6d11a45441da5d04d26d5955a8ab38cd4abb9cf9b45d8d
-MD5 9440b5e6bd77bb2ff2fccb91f6a0276c ChangeLog 4864
-RMD160 fc23cc64cee8a71d30edb46e094db44df318a3a8 ChangeLog 4864
-SHA256 26381115aeee31dadb6d11a45441da5d04d26d5955a8ab38cd4abb9cf9b45d8d ChangeLog 4864
+EBUILD mod_auth_mysql-3.0.0-r1.ebuild 719 RMD160 3b1386e2b6f2e359cc6c2b57de3cccf99eaecd27 SHA1 5ec936678b8ec1f149becab22061d1e7c2c0b0db SHA256 55fdc39cc41a760ef599c89bee5c9ec5ad52341b472fe2306350eb260c92b813
+MD5 7479aec4fe4a045959594e506b8c0d0e mod_auth_mysql-3.0.0-r1.ebuild 719
+RMD160 3b1386e2b6f2e359cc6c2b57de3cccf99eaecd27 mod_auth_mysql-3.0.0-r1.ebuild 719
+SHA256 55fdc39cc41a760ef599c89bee5c9ec5ad52341b472fe2306350eb260c92b813 mod_auth_mysql-3.0.0-r1.ebuild 719
+EBUILD mod_auth_mysql-3.0.0-r2.ebuild 908 RMD160 733fb615bd0c0920554ae348a0619616ffdcd23f SHA1 5788360352b914b2eacb361517b368e61c4326a5 SHA256 193bbe204c98e2100a7143cf42825d3da195e81c57f2d543a3412522a2d863c8
+MD5 3718f06933b2b3188dd47245851d2f04 mod_auth_mysql-3.0.0-r2.ebuild 908
+RMD160 733fb615bd0c0920554ae348a0619616ffdcd23f mod_auth_mysql-3.0.0-r2.ebuild 908
+SHA256 193bbe204c98e2100a7143cf42825d3da195e81c57f2d543a3412522a2d863c8 mod_auth_mysql-3.0.0-r2.ebuild 908
+MISC ChangeLog 5014 RMD160 6ebc49419c879166fa90cb1f3a37b2779b993708 SHA1 9d49351bde5edd7c32f251bae755d79d67655246 SHA256 210eaa753b3c00253c5404f3641a17e9639e78f4c1e3e0693498455974bdaabd
+MD5 2c0ffaa89f41e91fec9abf12744b26c5 ChangeLog 5014
+RMD160 6ebc49419c879166fa90cb1f3a37b2779b993708 ChangeLog 5014
+SHA256 210eaa753b3c00253c5404f3641a17e9639e78f4c1e3e0693498455974bdaabd ChangeLog 5014
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.6 (GNU/Linux)
+
+iD8DBQFG65lsmPFBzbX68WERAn1JAJ4q1EdWqsxXr/3MdHi1gLy5ZQzTKACfZXFR
+s5N/m13KxsP8fQDwKSfqmaY=
+=8Rm0
+-----END PGP SIGNATURE-----
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
index 8bee26823b21..334ea53d633b 100644
--- 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
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild,v 1.2 2007/09/15 08:35:46 hollow Exp $
inherit apache-module
@@ -17,26 +17,10 @@ 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_CONF="12_${PN}"
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
-}
+need_apache2_0
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
index 96a39be265e8..285dc261cdcb 100644
--- 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
@@ -1,6 +1,6 @@
# 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.2 2007/09/06 17:27:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.3 2007/09/15 08:35:46 hollow Exp $
inherit apache-module eutils
@@ -17,32 +17,16 @@ 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_CONF="12_${PN}"
APACHE2_MOD_DEFINE="AUTH_MYSQL"
DOCFILES="README"
-need_apache
+need_apache2_2
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_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index 8c3f3ca00321..4cf4f870e2a1 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,19 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX 10_mod_authnz_external.conf 1061 RMD160 f5689f031b7c50cb738a79a8a6dcd77489341fa4 SHA1 bbe886a71c9f252eec0c4ee8e98e786743d50001 SHA256 3fe3ee134240f914f7183cf289b3294af2592ca818b04658c1877baccb4b9adb
-MD5 6ea40a62f1b76bd70372f13d21ddffc5 files/10_mod_authnz_external.conf 1061
-RMD160 f5689f031b7c50cb738a79a8a6dcd77489341fa4 files/10_mod_authnz_external.conf 1061
-SHA256 3fe3ee134240f914f7183cf289b3294af2592ca818b04658c1877baccb4b9adb files/10_mod_authnz_external.conf 1061
+AUX 10_mod_authnz_external.conf 1063 RMD160 d13f78bdbc818fd00deb8507c26b5882b5de9042 SHA1 64494843ac2c74992991e085832893277de18950 SHA256 abd721bedb5f8692e46efc5a89455d75a8287cade59b68757764aaec0111c48e
+MD5 a591e87d27b2f947503d5b033616a61a files/10_mod_authnz_external.conf 1063
+RMD160 d13f78bdbc818fd00deb8507c26b5882b5de9042 files/10_mod_authnz_external.conf 1063
+SHA256 abd721bedb5f8692e46efc5a89455d75a8287cade59b68757764aaec0111c48e files/10_mod_authnz_external.conf 1063
DIST mod_authnz_external-3.1.0.tar.gz 171832 RMD160 380398a58b06ba3352f1ff0dc7758dba6d455327 SHA1 0b699abaeaf693edad8f1b7435cab77d28af0bec SHA256 c3b26376042c0ba85d99ef0266af0bc9d893cce2da41b71c640ee3a9c415b86c
EBUILD mod_authnz_external-3.1.0.ebuild 691 RMD160 25ba2652c81ebd5843644c992fe21546f11e080f SHA1 c73f1a80bab9944a45fbf0407c95f85a2b551490 SHA256 21ad84ad2db2540f6e8b553c4ba7a1de6f7093f141cd756ab7b9531f95a8a513
MD5 a764e5459ab9c57c69facaddbcc69d25 mod_authnz_external-3.1.0.ebuild 691
RMD160 25ba2652c81ebd5843644c992fe21546f11e080f mod_authnz_external-3.1.0.ebuild 691
SHA256 21ad84ad2db2540f6e8b553c4ba7a1de6f7093f141cd756ab7b9531f95a8a513 mod_authnz_external-3.1.0.ebuild 691
-MISC ChangeLog 523 RMD160 d5b1ca0c532122ae460f83c09b270c8912ae53b4 SHA1 d19869c2317216cab3c6a64ba2eabfe1049a9957 SHA256 dd47f498bef587aa73a0c0be9c6a0e5905cb188550c98087b4b8cdc8643c4c1a
-MD5 f6ecd9c578cc55bad7ec71f6052b3278 ChangeLog 523
-RMD160 d5b1ca0c532122ae460f83c09b270c8912ae53b4 ChangeLog 523
-SHA256 dd47f498bef587aa73a0c0be9c6a0e5905cb188550c98087b4b8cdc8643c4c1a ChangeLog 523
+MISC ChangeLog 625 RMD160 865814ed84ae97993ea1e245a00894badaeb93de SHA1 d94129b605ad68c8642c588a9b11e9ef6528b212 SHA256 bd5ecba59723f74f469a1bbf39930259f9145b2c96ae05f20aee2ff2fc7ed80d
+MD5 ba7f470c55980948d46375cf845410af ChangeLog 625
+RMD160 865814ed84ae97993ea1e245a00894badaeb93de ChangeLog 625
+SHA256 bd5ecba59723f74f469a1bbf39930259f9145b2c96ae05f20aee2ff2fc7ed80d ChangeLog 625
MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -24,7 +24,7 @@ SHA256 1b4683c45313f52c96993dabb118535942e36a4e98e3525ddc1c2a9b0f4d6d01 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.6 (GNU/Linux)
-iD8DBQFG5Rh/mPFBzbX68WERAiCkAJ4wGf13kFLLmmfVHgUIv7NS8tWXpACglYVh
-iiQ7c2moZ8fHQv4SvCp5Os0=
-=IyDD
+iD8DBQFG65oKmPFBzbX68WERAmZsAJ4gWCfnmrvDgJ56JMhHOisoRcCIKgCfRFXr
+YzOe9XJHrjsXD2I0mKSvsWM=
+=78WW
-----END PGP SIGNATURE-----