Version bump for Apache 2.2 support. Fixes bug 155941

(Portage version: 2.1.2_pre2-r5)

5 files changed, 123 insertions, 5 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/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
+}