diff options
-rw-r--r-- | www-apache/mod_suphp/ChangeLog | 9 | ||||
-rw-r--r-- | www-apache/mod_suphp/Manifest | 32 | ||||
-rw-r--r-- | www-apache/mod_suphp/files/digest-mod_suphp-0.6.2 | 3 | ||||
-rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild | 4 | ||||
-rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild | 4 | ||||
-rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.2.ebuild | 108 |
6 files changed, 143 insertions, 17 deletions
diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog index 66d0dd086414..d87d2b9f4d75 100644 --- a/www-apache/mod_suphp/ChangeLog +++ b/www-apache/mod_suphp/ChangeLog @@ -1,6 +1,13 @@ # 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.10 2006/06/05 21:08:18 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.11 2006/11/29 05:22:18 vericgar Exp $ + +*mod_suphp-0.6.2 (29 Nov 2006) + + 29 Nov 2006; Michael Stewart <vericgar@gentoo.org> + mod_suphp-0.6.1-r1.ebuild, mod_suphp-0.6.1-r2.ebuild, + +mod_suphp-0.6.2.ebuild: + Version bump for Apache 2.2 support. Fixes bug 155941 05 Jun 2006; Luca Longinotti <chtekk@gentoo.org> mod_suphp-0.6.1-r1.ebuild, mod_suphp-0.6.1-r2.ebuild: diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest index bc235737fa7f..4519251a50a0 100644 --- a/www-apache/mod_suphp/Manifest +++ b/www-apache/mod_suphp/Manifest @@ -15,18 +15,23 @@ 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 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 +DIST suphp-0.6.2.tar.gz 372228 RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 SHA1 3aaf232ca722a495c10caac2b573c215bfc80253 SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc +EBUILD mod_suphp-0.6.1-r1.ebuild 3072 RMD160 b21501b53f1755d1e1ccfa25c2f010eda4d58665 SHA1 fc76cf62ec0eba8805e130e0330272685588e2c0 SHA256 88df83b5d85688d10e7328441fb4611a74368a61c5225a4b36b54b3b155a4eff +MD5 162f4df7ab005009a2fd448570012081 mod_suphp-0.6.1-r1.ebuild 3072 +RMD160 b21501b53f1755d1e1ccfa25c2f010eda4d58665 mod_suphp-0.6.1-r1.ebuild 3072 +SHA256 88df83b5d85688d10e7328441fb4611a74368a61c5225a4b36b54b3b155a4eff mod_suphp-0.6.1-r1.ebuild 3072 +EBUILD mod_suphp-0.6.1-r2.ebuild 3118 RMD160 cc2244bf6e5fb43ad7e43e825a2f7b64aba7d927 SHA1 0b74d0526e8b59934f02ab1a11de95f161f2c9bd SHA256 3fce53af5d090346391e6db59c0e8af77b47ebc08b59b19f58cfbb02cf710105 +MD5 bb18af8a54bc69ee98eeb7217e082775 mod_suphp-0.6.1-r2.ebuild 3118 +RMD160 cc2244bf6e5fb43ad7e43e825a2f7b64aba7d927 mod_suphp-0.6.1-r2.ebuild 3118 +SHA256 3fce53af5d090346391e6db59c0e8af77b47ebc08b59b19f58cfbb02cf710105 mod_suphp-0.6.1-r2.ebuild 3118 +EBUILD mod_suphp-0.6.2.ebuild 2696 RMD160 74c335913b0e7f25481c3006903c823d190b7cbd SHA1 52c9c9f310370892a815aa52ae9274340bb1af10 SHA256 ee4c6630a432c45342d4f03f9b99c41d6204b8a8f94c64d04a05d38a1de4cf9f +MD5 d79e93fd1d51991367932ae45fc93599 mod_suphp-0.6.2.ebuild 2696 +RMD160 74c335913b0e7f25481c3006903c823d190b7cbd mod_suphp-0.6.2.ebuild 2696 +SHA256 ee4c6630a432c45342d4f03f9b99c41d6204b8a8f94c64d04a05d38a1de4cf9f mod_suphp-0.6.2.ebuild 2696 +MISC ChangeLog 1817 RMD160 f6eb73c5fa93b25bdaccc4ce6c740222c9323268 SHA1 2562ebf5147f597eec2d8bdd6711b7b1f632dc5d SHA256 664d83b5edb2ee29be1591cc018326d648426bb3da75e222d1cdbc22e3fa4204 +MD5 1fb6bb93fb3039fd1b03d0d70c48e508 ChangeLog 1817 +RMD160 f6eb73c5fa93b25bdaccc4ce6c740222c9323268 ChangeLog 1817 +SHA256 664d83b5edb2ee29be1591cc018326d648426bb3da75e222d1cdbc22e3fa4204 ChangeLog 1817 MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231 @@ -37,3 +42,6 @@ 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 +MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2 235 +RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2 235 +SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2 235 diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2 new file mode 100644 index 000000000000..4090dfae7750 --- /dev/null +++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2 @@ -0,0 +1,3 @@ +MD5 06ca9e592a5c6dd3dcb9360c958369c1 suphp-0.6.2.tar.gz 372228 +RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 suphp-0.6.2.tar.gz 372228 +SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc suphp-0.6.2.tar.gz 372228 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 24aa6c589968..13a1d9ff15ea 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.4 2006/06/05 21:08:18 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild,v 1.5 2006/11/29 05:22:18 vericgar Exp $ inherit apache-module eutils @@ -27,7 +27,7 @@ APXS2_S="${S}/src/apache2" APACHE2_MOD_CONF="70_${PN}" APACHE2_MOD_DEFINE="SUPHP" -need_apache2 +need_apache 2.0 pkg_setup() { modecnt=0 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 d1342d7a847e..32da975f5fb1 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,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-r2.ebuild,v 1.2 2006/06/05 21:08:18 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild,v 1.3 2006/11/29 05:22:18 vericgar Exp $ inherit apache-module eutils @@ -27,7 +27,7 @@ APXS2_S="${S}/src/apache2" APACHE2_MOD_CONF="70_${PN}" APACHE2_MOD_DEFINE="SUPHP" -need_apache2 +need_apache 2.0 pkg_setup() { modecnt=0 diff --git a/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild new file mode 100644 index 000000000000..8a7bfee8a548 --- /dev/null +++ b/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild @@ -0,0 +1,108 @@ +# 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.2.ebuild,v 1.1 2006/11/29 05:22:18 vericgar Exp $ + +inherit apache-module eutils + +MY_P="${P/mod_/}" + +SETIDMODES="mode-force mode-owner mode-paranoid" + +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" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="checkpath ${SETIDMODES}" +SLOT="0" + +S="${WORKDIR}/${MY_P}" + +APXS1_S="${S}/src/apache" +APACHE1_MOD_CONF="70_${PN}" +APACHE1_MOD_DEFINE="SUPHP" + +APXS2_S="${S}/src/apache2" +APACHE2_MOD_CONF="70_${PN}" +APACHE2_MOD_DEFINE="SUPHP" + +need_apache 2.x + +pkg_setup() { + modecnt=0 + for mode in ${SETIDMODES}; do + if use ${mode}; then + if [[ ${modecnt} -eq 0 ]]; then + SUPHP_SETIDMODE=${mode/mode-} + let modecnt++ + elif [[ ${modecnt} -ge 1 ]]; then + die "You can only select ONE mode in your USE flags!" + fi + fi + done + + if [[ ${modecnt} -eq 0 ]]; then + ewarn + ewarn "No mode selected, defaulting to paranoid!" + ewarn + 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 + einfo "Using ${SUPHP_SETIDMODE/mode-} mode" + einfo + einfo "You can manipulate several configure options of this" + einfo "ebuild through environment variables:" + einfo + einfo "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)" + einfo "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)" + einfo "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)" + einfo "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)" + einfo + + : ${SUPHP_MINUID:=1000} + : ${SUPHP_MINGID:=100} + : ${SUPHP_APACHEUSER:="apache"} + : ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"} +} + +src_compile() { + local myargs= + use checkpath || myargs="${myargs} --disable-checkpath" + + myargs="${myargs} \ + --with-setid-mode=${SUPHP_SETIDMODE} \ + --with-min-uid=${SUPHP_MINUID} \ + --with-min-gid=${SUPHP_MINGID} \ + --with-apache-user=${SUPHP_APACHEUSER} \ + --with-logfile=${SUPHP_LOGFILE} \ + --with-apxs=${APXS2} \ + --with-apr=/usr" + econf ${myargs} || die "econf failed" + + emake || die "make failed" +} + +src_install() { + apache-module_src_install + dosbin src/suphp + + dodoc ChangeLog doc/CONFIG + + docinto apache + dodoc doc/apache/CONFIG doc/apache/INSTALL + + insinto /etc + doins "${FILESDIR}/suphp.conf" +} + +pkg_postinst() { + # make suphp setuid + chmod 4755 /usr/sbin/suphp + + apache-module_pkg_postinst +} |