New Apache 2.2 compatible revision, fix copyright headers.

(Portage version: 2.1_pre5-r3)

9 files changed, 245 insertions, 21 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 520122213386..4efc1ff462e6 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.5 2005/12/01 14:15:37 hollow Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.6 2006/03/09 20:03:09 chtekk Exp $
+
+*mod_suphp-0.6.1-r1 (09 Mar 2006)
+
+  09 Mar 2006; Luca Longinotti <chtekk@gentoo.org>
+  +files/suphp-apache22-compat.patch, +mod_suphp-0.6.1-r1.ebuild:
+  Add new Apache 2.2 compatible mod_suphp revision.
 
 *mod_suphp-0.6.1 (01 Dec 2005)
 
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index 67721601de58..dda5db760bdb 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,18 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aa4e0fecea491f317cdbaa2b179ca8b5 ChangeLog 773
+MD5 5577967182ba3e43f684fb40d21592c6 ChangeLog 978
+RMD160 04ff33492bade2abcfaa8d6976fede268b96d74a ChangeLog 978
+SHA256 4a28d899f53a9ef871e2885655f123e14e52b2c3f908fc67e1b09fffce68ae2f ChangeLog 978
 MD5 8c9cc137769da71d444c2208209857a7 files/70_mod_suphp.conf 1647
-MD5 350380d3dd8b4a29db78e1f336344688 files/digest-mod_suphp-0.6.0 63
-MD5 2c7cae5f9c20456b4355e49e91a65e8f files/digest-mod_suphp-0.6.1 63
+RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 files/70_mod_suphp.conf 1647
+SHA256 eee1940f1f96c95d00bf5fabf65cc1e2b13d27da390c85eba540273e380292b1 files/70_mod_suphp.conf 1647
+MD5 20ed141234c6ec7123f9088296b6bc26 files/digest-mod_suphp-0.6.0 235
+RMD160 bcb6993133f35ca61b87740faa22ea7033a65dc2 files/digest-mod_suphp-0.6.0 235
+SHA256 d21b2818c61cc277ecf38dd9107d17a177ea5128d67b4ad8583c02dc2d862003 files/digest-mod_suphp-0.6.0 235
+MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1 235
+RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1 235
+SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1 235
+MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1-r1 235
+RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1-r1 235
+SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1-r1 235
+MD5 d57cae6ff210d37eefad751f436d60f7 files/suphp-apache22-compat.patch 2360
+RMD160 11fd01355efef32209d5228ed0340ce9501b78c7 files/suphp-apache22-compat.patch 2360
+SHA256 b45d6cb81a31c7844cb0fe9206f9c7b77229c7bf7c20a6ef3382f70171945613 files/suphp-apache22-compat.patch 2360
 MD5 4c2c4f6d464975c72a932c9eef2e3461 files/suphp.conf 905
+RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 files/suphp.conf 905
+SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7 files/suphp.conf 905
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
-MD5 9746971345c0497bae5d50931d05be1c mod_suphp-0.6.0.ebuild 2657
-MD5 67e4e24869f448b3682e48a2ef74de12 mod_suphp-0.6.1.ebuild 2657
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjwWXmPFBzbX68WERAn+TAJ9R6esl398R6n8+2wuExoStRY5eJwCePfE2
-P5NEFoDaTcp1QyTnQLzziuA=
-=gudf
------END PGP SIGNATURE-----
+RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
+SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
+MD5 511acc874b2360b65732156203157dd3 mod_suphp-0.6.0.ebuild 2657
+RMD160 25155f4df8048da0a04d2bd0b393fd3774a99375 mod_suphp-0.6.0.ebuild 2657
+SHA256 e82830a5742ad42c6f66188fb405aa7807cb52af71ea3083fb1b4da86b8973c8 mod_suphp-0.6.0.ebuild 2657
+MD5 58df6d42af97990dce74eddcb19bde22 mod_suphp-0.6.1-r1.ebuild 2912
+RMD160 132881b654681ecd9b714dc0ba3d5b4bcf862e78 mod_suphp-0.6.1-r1.ebuild 2912
+SHA256 31e2982c828690a933c44ab696b3424d60d849d95ae5a71510fe2167de4f60b8 mod_suphp-0.6.1-r1.ebuild 2912
+MD5 30badc50c55dd721ac3c36bdb281c9a9 mod_suphp-0.6.1.ebuild 2657
+RMD160 c8f7b074daf260242330b6e2ccec56e00b44e0d7 mod_suphp-0.6.1.ebuild 2657
+SHA256 92ad1650cdabd5907b21abfa41aabcf07a56a7abdfe0be49eee99b75863f0a8e mod_suphp-0.6.1.ebuild 2657
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
index b2df809d235e..3be8cbc84378 100644
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
@@ -1 +1,3 @@
 MD5 fa89691101b9ebf18f4922b1382186c6 suphp-0.6.0.tar.gz 247534
+RMD160 953f3be08d7e33ff64e327ee34bb84639888aa5f suphp-0.6.0.tar.gz 247534
+SHA256 6fe1c15da4d4dbb96e02e5c4d8878ffc1d5dc25c4cc3bf4e1cfda93503c69077 suphp-0.6.0.tar.gz 247534
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
index 04bc290353e8..678c9c1d791b 100644
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
@@ -1 +1,3 @@
 MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372
+RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372
+SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1
new file mode 100644
index 000000000000..678c9c1d791b
--- /dev/null
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1
@@ -0,0 +1,3 @@
+MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372
+RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372
+SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372
diff --git a/www-apache/mod_suphp/files/suphp-apache22-compat.patch b/www-apache/mod_suphp/files/suphp-apache22-compat.patch
new file mode 100644
index 000000000000..f8193d76a7b2
--- /dev/null
+++ b/www-apache/mod_suphp/files/suphp-apache22-compat.patch
@@ -0,0 +1,75 @@
+--- src/apache2/mod_suphp.c	Sat Jan  7 19:03:59 2006
++++ src/apache2/mod_suphp.c	Sat Jan  7 19:20:32 2006
+@@ -56,7 +56,7 @@
+         return -1;
+        
+     rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ);
+-    if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0))
++    if ((rv != APR_SUCCESS) || (bucket_data_len == 0))
+     {
+         return 0;
+     }
+@@ -558,7 +558,9 @@
+             return rv;
+         }
+         
+-        APR_BRIGADE_FOREACH(bucket, bb)
++		
++		bucket = APR_BRIGADE_FIRST(bb);
++		while (bucket != APR_BRIGADE_SENTINEL(bb))
+         {
+             const char *data;
+             apr_size_t len;
+@@ -582,6 +584,8 @@
+             {
+                 child_stopped_reading = 1;
+             }
++			
++			bucket = APR_BUCKET_NEXT(bucket);
+         }
+         apr_brigade_cleanup(bb);
+     }
+@@ -634,12 +638,15 @@
+             
+             const char *buf;
+             apr_size_t blen;
+-            APR_BRIGADE_FOREACH(b, bb)
++			b = APR_BRIGADE_FIRST(bb);
++			while (b != APR_BRIGADE_SENTINEL(bb))
+             {
+                 if (APR_BUCKET_IS_EOS(b))
+                     break;
+                 if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS)
+                     break;
++
++				b = APR_BUCKET_NEXT(b);
+             }
+             apr_brigade_destroy(bb);
+             suphp_log_script_err(r, proc->err);
+@@ -655,12 +662,14 @@
+             /* empty brigade (script output) */
+             const char *buf;
+             apr_size_t blen;
+-            APR_BRIGADE_FOREACH(b, bb)
++			b = APR_BRIGADE_FIRST(bb);
++			while (b != APR_BRIGADE_SENTINEL(bb))
+             {
+                 if (APR_BUCKET_IS_EOS(b))
+                     break;
+                 if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS)
+                     break;
++				b = APR_BUCKET_NEXT(b);
+             }
+             apr_brigade_destroy(bb);
+             return HTTP_MOVED_TEMPORARILY;
+--- configure	2006-03-04 19:06:30.000000000 +0100
++++ configure	2006-03-04 19:05:37.000000000 +0100
+@@ -20425,7 +20425,7 @@
+                     | cut -f2 -d"/" \
+                     | cut -f1 -d" "`
+     major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
+-    if test "$major_version" = "2.0"; then
++    if test "$major_version" = "2.2"; then
+       APACHE_VERSION_2=true
+       APACHE_VERSION_1_3=false
+     else
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
index 9515f8320060..bb82b5fadb5d 100644
--- a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
+++ b/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.ebuild,v 1.5 2005/10/01 10:13:32 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild,v 1.6 2006/03/09 20:03:09 chtekk Exp $
 
 inherit apache-module eutils
 
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
new file mode 100644
index 000000000000..aec0aa63ebec
--- /dev/null
+++ b/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild
@@ -0,0 +1,121 @@
+# 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.1 2006/03/09 20:03:09 chtekk 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="~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_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
+	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_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/suphp-apache22-compat.patch"
+	if has_version ">=dev-libs/apr-1.0.0" ; then
+		sed -e "s|apr-config|apr-1-config|g" -i configure
+	fi
+}
+
+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}"
+	if has_version ">=dev-libs/apr-1.0.0" ; then
+		CFLAGS="$(apr-1-config --includes) $(apu-1-config --includes)" \
+		econf ${myargs} || die "econf failed"
+	else
+		CFLAGS="$(apr-config --includes) $(apu-config --includes)" \
+		econf ${myargs} || die "econf failed"
+	fi
+
+	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
+}
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
index 0eb47d23601b..a32f09f1d900 100644
--- a/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
+++ b/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.1 2005/12/01 14:15:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild,v 1.2 2006/03/09 20:03:09 chtekk Exp $
 
 inherit apache-module eutils