fix suphp.conf wrt #289694

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

4 files changed, 13 insertions, 124 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index cc0108fcbad2..72233e6fa2ed 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-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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.23 2010/01/11 08:01:46 hollow Exp $
+
+  11 Jan 2010; Benedikt Böhm <hollow@gentoo.org> -mod_suphp-0.6.3.ebuild,
+  files/suphp.conf:
+  fix suphp.conf wrt #289694
 
 *mod_suphp-0.7.1 (17 Sep 2009)
 
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index 6a8dc6dbcf49..b62d2dffbae5 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,9 +1,7 @@
 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.3.tar.gz 376505 RMD160 29e481ac44d7574379a095b94994401464772789 SHA1 277ef6d8f58a1beb544011da491fa1afac5cf5f8 SHA256 1973bd17f339342a9ce363c0a95787776dfd525c0bd2c1b934ad0832a850ad47
+AUX suphp.conf 915 RMD160 9bc6374a7ad949fff7bf4d542928a821857ffc50 SHA1 2a7d429ee3e63c43461dc4240824bc4c3e2ca6d3 SHA256 0ee6803e982918e7deead52e89a3214470447d8b38c04f5a6840944024967ba0
 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
 EBUILD mod_suphp-0.7.1.ebuild 2330 RMD160 1fb53d7ca3fa1eaef6894554dccd5fb4c3ab35f6 SHA1 4f9d2f7a1b33a6f8ac96d2702b8cb65c8b82eb4b SHA256 4c20ed791a68e2df671a71fc78f10528e1809f7bf8cb7a9a1a1c6f0ecf0d6cef
-MISC ChangeLog 3573 RMD160 83cf494249b899c465082818b5a132c2409084b4 SHA1 315baab0531e6075e9638dfd0da49647481810de SHA256 849cb12a6df4c2b2ea7d57d63f9b7ba8df5a8be4ebbdb7f5409905a3803a7fea
+MISC ChangeLog 3698 RMD160 58bb22ed6dad080d2541dc4d4fa3789c5a70997a SHA1 d4c3a83f25e2dc239f64668a89e5d20043a4a386 SHA256 4828540e9ddf769ec7979e86e4c0e5fd8c8bb8f95f06d5f001d1f1dc394823cc
 MISC metadata.xml 559 RMD160 4980250c2a4e024b85d7d8e77ef23dfbc4142b4d SHA1 024daa0f96c785d0015fcd71ea849093979ca250 SHA256 ee6223983166ecaaec325a1f12570cb05df942bdb80c20c3ad6ecc32e8cbb878
diff --git a/www-apache/mod_suphp/files/suphp.conf b/www-apache/mod_suphp/files/suphp.conf
index a2e7609c04b5..fdb70ee3ec08 100644
--- a/www-apache/mod_suphp/files/suphp.conf
+++ b/www-apache/mod_suphp/files/suphp.conf
@@ -38,10 +38,10 @@ min_gid=100
 
 [handlers]
 ;Handler for php-scripts
-x-httpd-php=php:/usr/lib/php5/bin/php-cgi
-x-httpd-php5=php:/usr/lib/php5/bin/php-cgi
-x-httpd-php4=php:/usr/lib/php4/bin/php-cgi
-x-httpd-phtml=php:/usr/lib/php5/bin/php-cgi
+x-httpd-php="php:/usr/lib/php5/bin/php-cgi"
+x-httpd-php5="php:/usr/lib/php5/bin/php-cgi"
+x-httpd-php4="php:/usr/lib/php4/bin/php-cgi"
+x-httpd-phtml="php:/usr/lib/php5/bin/php-cgi"
 
 ;Handler for CGI-scripts
-x-suphp-cgi=execute:!self
+x-suphp-cgi="execute:!self"
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.3.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.3.ebuild
deleted file mode 100644
index 1d691186822c..000000000000
--- a/www-apache/mod_suphp/mod_suphp-0.6.3.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.3.ebuild,v 1.1 2008/04/19 09:18:50 hollow Exp $
-
-inherit apache-module autotools eutils
-
-MY_P="${P/mod_/}"
-
-SETIDMODES="mode-force mode-owner mode-paranoid"
-
-DESCRIPTION="A PHP wrapper for Apache2"
-HOMEPAGE="http://www.suphp.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-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}"/${PN}-0.6.2-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
-}