version bump wrt #253537

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 104 insertions, 128 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 29bf8ab471e3..cc0108fcbad2 100644
--- a/www-apache/mod_suphp/ChangeLog
+++ b/www-apache/mod_suphp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_suphp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.21 2008/08/23 04:37:54 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.22 2009/09/17 10:16:44 hollow Exp $
+
+*mod_suphp-0.7.1 (17 Sep 2009)
+
+  17 Sep 2009; Benedikt Böhm <hollow@gentoo.org>
+  -mod_suphp-0.6.2-r3.ebuild, +mod_suphp-0.7.1.ebuild:
+  version bump wrt #253537
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index 5fcd25e764f5..6a8dc6dbcf49 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70_mod_suphp.conf 1571 RMD160 b4a850bfe6f92cc5fc5629359277d5d75d491e15 SHA1 986eddf86c4a360cad015c8f2693d0afd72eb2e6 SHA256 c529e5867cb45574b40e3362c4f07a2b67e38231e008348cf8a7365df4a30fbf
 AUX mod_suphp-0.6.2-handler.patch 1913 RMD160 8851b829261c3f932e713dc185c2df823cfa8530 SHA1 992f868fb1a5af4174b54ffdb82cd367c5bbfcd3 SHA256 cf833a5445e9608b58ea0d3430d70f5a5779e6b4536815e14539813bde560d45
 AUX suphp.conf 905 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 SHA1 33d586b5cdb661cf7ceba6987e88dda849886374 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7
-DIST suphp-0.6.2.tar.gz 372228 RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 SHA1 3aaf232ca722a495c10caac2b573c215bfc80253 SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc
 DIST suphp-0.6.3.tar.gz 376505 RMD160 29e481ac44d7574379a095b94994401464772789 SHA1 277ef6d8f58a1beb544011da491fa1afac5cf5f8 SHA256 1973bd17f339342a9ce363c0a95787776dfd525c0bd2c1b934ad0832a850ad47
-EBUILD mod_suphp-0.6.2-r3.ebuild 2764 RMD160 37d203a460a441634b04f4fefbe334bb29a1b800 SHA1 c6d30af8a5ebd14a3e2dbd9e77d8bb7551d66578 SHA256 f6b30a18b0fe68ee5cfc0cf77a83e4cefc9c295bbbad7dbc9b787144515d8b34
+DIST suphp-0.7.1.tar.gz 386521 RMD160 e5e7e71494af322c3ab33d6a35fbcf96334c098c SHA1 9eb82b62b5f71c01d7d8b2510c685141b78e54f5 SHA256 91d180046f95f66c9ad12f3ca67bba87e2b64338543145e68370babc4434e58a
 EBUILD mod_suphp-0.6.3.ebuild 2754 RMD160 2eabc0ffc5c1e917c5b30517539e100dd718a776 SHA1 71c70ed1a5c1d4720cd49e3bf1541f537ad94754 SHA256 cd56a168b076457fda9d4a61ad1a85191dd536e694add697b9c55224e8187626
-MISC ChangeLog 3408 RMD160 50387e9c19809ae50441cc3463c577aa14b73384 SHA1 fb2b7079fb74df4a1dfaf2c8f91bc6714700fbda SHA256 d15c32a43238076a46060f3addfe01939c3c650b6b13d31f1967251d7c649f20
+EBUILD mod_suphp-0.7.1.ebuild 2330 RMD160 1fb53d7ca3fa1eaef6894554dccd5fb4c3ab35f6 SHA1 4f9d2f7a1b33a6f8ac96d2702b8cb65c8b82eb4b SHA256 4c20ed791a68e2df671a71fc78f10528e1809f7bf8cb7a9a1a1c6f0ecf0d6cef
+MISC ChangeLog 3573 RMD160 83cf494249b899c465082818b5a132c2409084b4 SHA1 315baab0531e6075e9638dfd0da49647481810de SHA256 849cb12a6df4c2b2ea7d57d63f9b7ba8df5a8be4ebbdb7f5409905a3803a7fea
 MISC metadata.xml 559 RMD160 4980250c2a4e024b85d7d8e77ef23dfbc4142b4d SHA1 024daa0f96c785d0015fcd71ea849093979ca250 SHA256 ee6223983166ecaaec325a1f12570cb05df942bdb80c20c3ad6ecc32e8cbb878
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivlCcACgkQoeSe8B0zEfwuZwCeOlrdkKbJyiMNFulz8Mn218cB
-C5wAn1cEm2AlPygmrLFwYCBAFZM4AVM5
-=u20N
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
deleted file mode 100644
index 757f6652ec20..000000000000
--- a/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 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-r3.ebuild,v 1.4 2008/03/23 12:02:17 hollow Exp $
-
-inherit apache-module autotools eutils
-
-MY_P="${P/mod_/}"
-
-SETIDMODES="mode-force mode-owner mode-paranoid"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DESCRIPTION="A PHP wrapper for Apache2"
-HOMEPAGE="http://www.suphp.org/"
-SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="checkpath ${SETIDMODES}"
-
-S="${WORKDIR}/${MY_P}"
-
-APXS2_S="${S}/src/apache2"
-APACHE2_MOD_CONF="70_${PN}"
-APACHE2_MOD_DEFINE="SUPHP"
-
-need_apache2_2
-
-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
-
-	elog
-	elog "Using ${SUPHP_SETIDMODE/mode-} mode"
-	elog
-	elog "You can manipulate several configure options of this"
-	elog "ebuild through environment variables:"
-	elog
-	elog "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)"
-	elog "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)"
-	elog "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)"
-	elog "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)"
-	elog
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-handler.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myargs=""
-	use checkpath || myargs="${myargs} --disable-checkpath"
-
-	: ${SUPHP_MINUID:=1000}
-	: ${SUPHP_MINGID:=100}
-	: ${SUPHP_APACHEUSER:="apache"}
-	: ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"}
-
-	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=${APXS} \
-			--with-apr=/usr/bin/apr-1-config"
-	econf ${myargs} || die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	apache-module_src_install
-	dosbin src/suphp
-	fperms 4755 /usr/sbin/suphp
-
-	dodoc ChangeLog doc/CONFIG
-
-	docinto apache
-	dodoc doc/apache/CONFIG doc/apache/INSTALL
-
-	insinto /etc
-	doins "${FILESDIR}/suphp.conf"
-}
-
-pkg_postinst() {
-	# Make sure the suphp binary is set setuid
-	chmod 4755 "${ROOT}"/usr/sbin/suphp
-
-	apache-module_pkg_postinst
-}
diff --git a/www-apache/mod_suphp/mod_suphp-0.7.1.ebuild b/www-apache/mod_suphp/mod_suphp-0.7.1.ebuild
new file mode 100644
index 000000000000..994cf25604ba
--- /dev/null
+++ b/www-apache/mod_suphp/mod_suphp-0.7.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 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.7.1.ebuild,v 1.1 2009/09/17 10:16:44 hollow Exp $
+
+EAPI="2"
+
+inherit apache-module confutils
+
+DESCRIPTION="suPHP is a tool for executing PHP scripts with the permissions of their owners."
+HOMEPAGE="http://www.suphp.org/"
+SRC_URI="http://www.suphp.org/download/suphp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="checkpath mode-force mode-owner +mode-paranoid"
+
+S="${WORKDIR}/suphp-${PV}"
+
+APXS2_S="${S}/src/apache2"
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="SUPHP"
+
+need_apache2_2
+
+pkg_setup() {
+	confutils_require_one mode-force mode-owner mode-paranoid
+
+	if use mode-force; then
+		SUPHP_SETIDMODE="force"
+	elif use mode-owner; then
+		SUPHP_SETIDMODE="owner"
+	else
+		SUPHP_SETIDMODE="paranoid"
+	fi
+
+	elog
+	elog "Using ${SUPHP_SETIDMODE} mode"
+	elog
+	elog "You can manipulate several configure options of this"
+	elog "ebuild through environment variables:"
+	elog
+	elog "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)"
+	elog "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)"
+	elog "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)"
+	elog "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)"
+	elog
+}
+
+src_configure() {
+	local myargs=""
+	use checkpath || myargs="--disable-checkpath"
+
+	: ${SUPHP_MINUID:=1000}
+	: ${SUPHP_MINGID:=100}
+	: ${SUPHP_APACHEUSER:="apache"}
+	: ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"}
+
+	econf ${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=${APXS} \
+		--with-apr=/usr/bin/apr-1-config \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	apache-module_src_install
+	dosbin src/suphp
+	fperms 4755 /usr/sbin/suphp
+
+	dodoc ChangeLog doc/CONFIG
+
+	docinto apache
+	dodoc doc/apache/CONFIG doc/apache/INSTALL
+
+	insinto /etc
+	doins "${FILESDIR}/suphp.conf"
+}
+
+pkg_postinst() {
+	# Make sure the suphp binary is set setuid
+	chmod 4755 "${ROOT}"/usr/sbin/suphp
+
+	apache-module_pkg_postinst
+}