diff options
Diffstat (limited to 'www-apache/mod_suphp')
| -rw-r--r-- | www-apache/mod_suphp/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apache/mod_suphp/Manifest | 34 | ||||
| -rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild | 5 | ||||
| -rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild | 18 |
4 files changed, 29 insertions, 34 deletions
diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog index 61b6886adc5b..66d0dd086414 100644 --- a/www-apache/mod_suphp/ChangeLog +++ b/www-apache/mod_suphp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apache/mod_suphp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.9 2006/06/05 18:16:40 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.10 2006/06/05 21:08:18 chtekk Exp $ + + 05 Jun 2006; Luca Longinotti <chtekk@gentoo.org> + mod_suphp-0.6.1-r1.ebuild, mod_suphp-0.6.1-r2.ebuild: + Re-sync ebuilds and backport little fix from -r2 to -r1. *mod_suphp-0.6.1-r2 (05 Jun 2006) diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest index 4567b234807d..bc235737fa7f 100644 --- a/www-apache/mod_suphp/Manifest +++ b/www-apache/mod_suphp/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 70_mod_suphp.conf 1647 RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 SHA1 b033903c062af0e4c7c33bf5ed971e9dc3d7ce9b SHA256 eee1940f1f96c95d00bf5fabf65cc1e2b13d27da390c85eba540273e380292b1 MD5 8c9cc137769da71d444c2208209857a7 files/70_mod_suphp.conf 1647 RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 files/70_mod_suphp.conf 1647 @@ -18,18 +15,18 @@ MD5 4c2c4f6d464975c72a932c9eef2e3461 files/suphp.conf 905 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 files/suphp.conf 905 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7 files/suphp.conf 905 DIST suphp-0.6.1.tar.gz 361372 RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb SHA1 fddb792dcfee8195e29197b6685666cc0b75e466 SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 -EBUILD mod_suphp-0.6.1-r1.ebuild 3039 RMD160 4d7557a630964940186f6cfba7e196333700a8a6 SHA1 dcff6c7a666e3ed14b8498cecad92ec64d6fb561 SHA256 aa7c84b42a46ac326a4eb28ee019591907e3e15b6d0cb69ca454226be36d2549 -MD5 40e0ef2a4302366586436504d031fee3 mod_suphp-0.6.1-r1.ebuild 3039 -RMD160 4d7557a630964940186f6cfba7e196333700a8a6 mod_suphp-0.6.1-r1.ebuild 3039 -SHA256 aa7c84b42a46ac326a4eb28ee019591907e3e15b6d0cb69ca454226be36d2549 mod_suphp-0.6.1-r1.ebuild 3039 -EBUILD mod_suphp-0.6.1-r2.ebuild 3100 RMD160 b7c48e79fc4d052f60cebd5d4287dacbd2a85b57 SHA1 3a916e3de946073e5ef10fba6fcfa27456dc9d3f SHA256 3bd6a1363cbd4b74fefd14c28b47fb0b55453f7b5d18d54756ee834ef8bb9ef0 -MD5 9127442c28612aa156645c59c80ef2fa mod_suphp-0.6.1-r2.ebuild 3100 -RMD160 b7c48e79fc4d052f60cebd5d4287dacbd2a85b57 mod_suphp-0.6.1-r2.ebuild 3100 -SHA256 3bd6a1363cbd4b74fefd14c28b47fb0b55453f7b5d18d54756ee834ef8bb9ef0 mod_suphp-0.6.1-r2.ebuild 3100 -MISC ChangeLog 1422 RMD160 5671e048ce9ecc0ee35dce2294c6425c6366beb5 SHA1 475a8f7fdadf3b9e20643ff7d56df002b0c21a71 SHA256 b8847ca4c67e420769bb4a8a6eb1d5585da779e59562b1091e45ab2c2962a21f -MD5 1136b282a99f149de50e0425528e5162 ChangeLog 1422 -RMD160 5671e048ce9ecc0ee35dce2294c6425c6366beb5 ChangeLog 1422 -SHA256 b8847ca4c67e420769bb4a8a6eb1d5585da779e59562b1091e45ab2c2962a21f ChangeLog 1422 +EBUILD mod_suphp-0.6.1-r1.ebuild 3067 RMD160 4a006e451fa8b51455e80865712a395f317cf965 SHA1 66008300af52336c5bec27863274c85114995da4 SHA256 e6cc6414a00d43f8646c0a45caeca8fd0d89f645c1178703935d88afcc6ebcbd +MD5 658891ab5b43bc914afd5b7c7fc38502 mod_suphp-0.6.1-r1.ebuild 3067 +RMD160 4a006e451fa8b51455e80865712a395f317cf965 mod_suphp-0.6.1-r1.ebuild 3067 +SHA256 e6cc6414a00d43f8646c0a45caeca8fd0d89f645c1178703935d88afcc6ebcbd mod_suphp-0.6.1-r1.ebuild 3067 +EBUILD mod_suphp-0.6.1-r2.ebuild 3113 RMD160 3024992717fe05dd6c002dd4739267509368dca5 SHA1 cf6d4c1ee04cc56869d82f44ed7c0552584a8c93 SHA256 c97805d8299bf1772da6a4b2ad88179ae6336f2c203438d08cb9491a25332456 +MD5 b4223f4948a9549ef6d0849f5e23e10a mod_suphp-0.6.1-r2.ebuild 3113 +RMD160 3024992717fe05dd6c002dd4739267509368dca5 mod_suphp-0.6.1-r2.ebuild 3113 +SHA256 c97805d8299bf1772da6a4b2ad88179ae6336f2c203438d08cb9491a25332456 mod_suphp-0.6.1-r2.ebuild 3113 +MISC ChangeLog 1590 RMD160 4461edb27ec4dd678b21876d4b36c25382df3c0f SHA1 856b155f0feaf5654765a0178bec11dacbd6bf67 SHA256 4273f52226cd47f4d102ee482a4197479c8680ec7998c9e1b5bae50bb711050d +MD5 31512c4ffd4f67ae7769b49ac580c87d ChangeLog 1590 +RMD160 4461edb27ec4dd678b21876d4b36c25382df3c0f ChangeLog 1590 +SHA256 4273f52226cd47f4d102ee482a4197479c8680ec7998c9e1b5bae50bb711050d ChangeLog 1590 MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231 @@ -40,10 +37,3 @@ SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/di MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1-r2 235 RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1-r2 235 SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1-r2 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) - -iD8DBQFEhHUcmPFBzbX68WERApcDAJ4y8UA8S/Sjqgx3aIQEmKT+9YLTgACeLcUm -6UIVzg2UGRWH5xF/MMLRxro= -=tVc9 ------END PGP SIGNATURE----- diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild index 49ffe24bb102..24aa6c589968 100644 --- a/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild +++ b/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild,v 1.3 2006/06/05 13:24:10 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild,v 1.4 2006/06/05 21:08:18 chtekk Exp $ inherit apache-module eutils @@ -49,6 +49,7 @@ pkg_setup() { ewarn "If you want to choose another mode, put mode-force OR mode-owner" ewarn "into your USE flags and run emerge again." ewarn + SUPHP_SETIDMODE=paranoid fi einfo @@ -75,7 +76,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/suphp-apache22-compat.patch" - if has_version ">=dev-libs/apr-1.0.0"; then + if has_version ">=dev-libs/apr-1.0.0" ; then sed -e "s|apr-config|apr-1-config|g" -i configure fi } diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild index e42ae7cdce1d..d1342d7a847e 100644 --- a/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild +++ b/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild,v 1.1 2006/06/05 18:16:40 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild,v 1.2 2006/06/05 21:08:18 chtekk Exp $ inherit apache-module eutils -MY_P=${P/mod_/} +MY_P="${P/mod_/}" SETIDMODES="mode-force mode-owner mode-paranoid" -DESCRIPTION="A PHP wrapper for Apache" -HOMEPAGE="http://www.suphp.org" +DESCRIPTION="A PHP wrapper for Apache." +HOMEPAGE="http://www.suphp.org/" SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz" LICENSE="GPL-2" @@ -33,16 +33,16 @@ pkg_setup() { modecnt=0 for mode in ${SETIDMODES}; do if use ${mode}; then - if [ ${modecnt} -eq 0 ]; then + if [[ ${modecnt} -eq 0 ]]; then SUPHP_SETIDMODE=${mode/mode-} let modecnt++ - elif [ ${modecnt} -ge 1 ]; then + elif [[ ${modecnt} -ge 1 ]]; then die "You can only select ONE mode in your USE flags!" fi fi done - if [ ${modecnt} -eq 0 ]; then + if [[ ${modecnt} -eq 0 ]]; then ewarn ewarn "No mode selected, defaulting to paranoid!" ewarn @@ -87,7 +87,7 @@ src_compile() { use checkpath || myargs="${myargs} --disable-checkpath" myargs="${myargs} \ - --with-setid-mode=${SUPHP_SETIDMODE} \ + --with-setid-mode=${SUPHP_SETIDMODE} \ --with-min-uid=${SUPHP_MINUID} \ --with-min-gid=${SUPHP_MINGID} \ --with-apache-user=${SUPHP_APACHEUSER} \ @@ -114,7 +114,7 @@ src_install() { dodoc doc/apache/CONFIG doc/apache/INSTALL insinto /etc - doins ${FILESDIR}/suphp.conf + doins "${FILESDIR}/suphp.conf" } pkg_postinst() { |