fix #191640; update metadata

(Portage version: 2.1.4)

6 files changed, 40 insertions, 159 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 533900f38fb3..a30d220a1912 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.15 2007/09/20 06:35:31 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.16 2008/01/27 20:58:19 hollow Exp $
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/70_mod_suphp.conf,
+  metadata.xml, -mod_suphp-0.6.2-r1.ebuild, mod_suphp-0.6.2-r3.ebuild:
+  fix #191640; update metadata
 
 *mod_suphp-0.6.2-r3 (20 Sep 2007)
 
diff --git a/www-apache/mod_suphp/files/70_mod_suphp.conf b/www-apache/mod_suphp/files/70_mod_suphp.conf
index efffb31c50b1..809f0096f322 100644
--- a/www-apache/mod_suphp/files/70_mod_suphp.conf
+++ b/www-apache/mod_suphp/files/70_mod_suphp.conf
@@ -16,36 +16,34 @@
 #    </Location>
 
 <IfDefine SUPHP>
-	<IfModule !mod_suphp.c>
-		LoadModule suphp_module modules/mod_suphp.so
-	</IfModule>
-
-	<IfModule mod_mime.c>
-		AddType application/x-httpd-php   .php
-		AddType application/x-httpd-php5  .php5
-		AddType application/x-httpd-php4  .php4
-		AddType application/x-httpd-phtml .phtml
-		AddType application/x-suphp-cgi   .cgi .pl
-	</IfModule>
-
-	AddHandler x-httpd-php   .php
-	AddHandler x-httpd-php5  .php5
-	AddHandler x-httpd-php4  .php4
-	AddHandler x-httpd-phtml .phtml
-	AddHandler x-suphp-cgi   .cgi .pl
-
-	suPHP_Engine on
-
-	<Location />
-		SuPHP_AddHandler x-httpd-php
-		SuPHP_AddHandler x-httpd-php5
-		SuPHP_AddHandler x-httpd-php4
-		SuPHP_AddHandler x-httpd-phtml
-		SuPHP_AddHandler x-suphp-cgi
-	</Location>
-
-	# if you're using owner mode comment the following line
-	SuPHP_UserGroup apache apache
-
-	AddDirectoryIndex index.php index.php5 index.php4 index.php3 index.phtml
+LoadModule suphp_module modules/mod_suphp.so
+
+AddType application/x-httpd-php   .php
+AddType application/x-httpd-php5  .php5
+AddType application/x-httpd-php4  .php4
+AddType application/x-httpd-phtml .phtml
+AddType application/x-suphp-cgi   .cgi .pl
+
+AddHandler x-httpd-php   .php
+AddHandler x-httpd-php5  .php5
+AddHandler x-httpd-php4  .php4
+AddHandler x-httpd-phtml .phtml
+AddHandler x-suphp-cgi   .cgi .pl
+
+suPHP_Engine on
+
+<Location />
+	SuPHP_AddHandler x-httpd-php
+	SuPHP_AddHandler x-httpd-php5
+	SuPHP_AddHandler x-httpd-php4
+	SuPHP_AddHandler x-httpd-phtml
+	SuPHP_AddHandler x-suphp-cgi
+</Location>
+
+# if you're using owner mode comment the following line
+SuPHP_UserGroup apache apache
+
+AddDirectoryIndex index.php index.php5 index.php4 index.php3 index.phtml
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r1
deleted file mode 100644
index 4090dfae7750..000000000000
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/metadata.xml b/www-apache/mod_suphp/metadata.xml
index a1f5ceff2352..64a719ea1bfd 100644
--- a/www-apache/mod_suphp/metadata.xml
+++ b/www-apache/mod_suphp/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>apache</herd>
-	<maintainer>
-		<email>apache-bugs@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.2-r1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2-r1.ebuild
deleted file mode 100644
index 0449c5882fe9..000000000000
--- a/www-apache/mod_suphp/mod_suphp-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/06/03 14:54:05 phreak Exp $
-
-inherit apache-module autotools
-
-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
-
-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
-
-	apache-module_pkg_setup
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	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=${APXS2} \
-			--with-apr=/usr"
-	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.6.2-r3.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
index 9947f770fb0f..ab87a541e0ea 100644
--- a/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
+++ b/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1 2007/09/20 06:35:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild,v 1.2 2008/01/27 20:58:19 hollow Exp $
 
 inherit apache-module autotools eutils
 
@@ -23,7 +23,7 @@ APXS2_S="${S}/src/apache2"
 APACHE2_MOD_CONF="70_${PN}"
 APACHE2_MOD_DEFINE="SUPHP"
 
-need_apache2
+need_apache2_2
 
 pkg_setup() {
 	modecnt=0
@@ -68,7 +68,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-handler.patch
-
 	eautoreconf
 }
 
@@ -88,7 +87,7 @@ src_compile() {
 			--with-apache-user=${SUPHP_APACHEUSER} \
 			--with-logfile=${SUPHP_LOGFILE} \
 			--with-apxs=${APXS2} \
-			--with-apr=/usr/bin/$(apr_config)"
+			--with-apr=/usr/bin/apr-1-config"
 	econf ${myargs} || die "econf failed"
 
 	emake || die "make failed"