version bump wrt security #215568

Package-Manager: portage-2.1.5_rc3

3 files changed, 126 insertions, 6 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 9a676b2516d7..20b2c8d4c2e7 100644
--- a/www-apache/mod_suphp/ChangeLog
+++ b/www-apache/mod_suphp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.19 2008/03/23 12:02:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.20 2008/04/19 09:18:50 hollow Exp $
+
+*mod_suphp-0.6.3 (19 Apr 2008)
+
+  19 Apr 2008; Benedikt Böhm <hollow@gentoo.org> +mod_suphp-0.6.3.ebuild:
+  version bump wrt security #215568
 
   23 Mar 2008; Benedikt Böhm <hollow@gentoo.org> mod_suphp-0.6.2-r3.ebuild:
   fix depend.apache usage wrt #208033
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index aa4e503188ae..f07b73d8e696 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -5,13 +5,15 @@ AUX 70_mod_suphp.conf 1571 RMD160 b4a850bfe6f92cc5fc5629359277d5d75d491e15 SHA1
 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
-MISC ChangeLog 3151 RMD160 adfe7f2b0bb36d2bddcf7144f371cab1e5ce9540 SHA1 2861a95a1cbc107044eca52c33975e6a064b32be SHA256 431f36e0d996402c35fbeee90bb63938b9b231b5c257673f65b0f1b7683319ea
+EBUILD mod_suphp-0.6.3.ebuild 2754 RMD160 2eabc0ffc5c1e917c5b30517539e100dd718a776 SHA1 71c70ed1a5c1d4720cd49e3bf1541f537ad94754 SHA256 cd56a168b076457fda9d4a61ad1a85191dd536e694add697b9c55224e8187626
+MISC ChangeLog 3295 RMD160 ebd91302818ce16a89085a01b753e2f1eff2917e SHA1 1ce2366ea8ea424268d8ba91db6f952442f05f3f SHA256 27a264e84b5a3df1c51efe423408e1fa2185a75ca3cd294b655377039abc263d
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH5kbPmPFBzbX68WERAuAQAJ0ZWApGWZd1Ck7zPTS3qyqAyDHg6gCcD6q5
-VtIuJqAUMXu1jpSh8j4qF4g=
-=sgZp
+iEYEARECAAYFAkgJuQMACgkQmPFBzbX68WFB7ACdEqYEqlyKXCitz9YRIKN/+ocB
+mucAnRSVzj7WVDbihR5rYqbzPdqRZfBZ
+=JLly
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.3.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.3.ebuild
new file mode 100644
index 000000000000..1d691186822c
--- /dev/null
+++ b/www-apache/mod_suphp/mod_suphp-0.6.3.ebuild
@@ -0,0 +1,113 @@
+# 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
+}