Fix compilation against >=sys-devel/libtool-1.5.23b, thanks to Chris Ripp <chris at ripp.net> in #178648.

Package-Manager: portage-2.1.2.9

4 files changed, 146 insertions, 5 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 6539ca29c51c..57360b837103 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.12 2007/01/15 19:20:06 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.13 2007/06/03 14:54:05 phreak Exp $
+
+*mod_suphp-0.6.2-r1 (03 Jun 2007)
+
+  03 Jun 2007; Christian Heim <phreak@gentoo.org>
+  +mod_suphp-0.6.2-r1.ebuild:
+  Fix compilation against >=sys-devel/libtool-1.5.23b, thanks to Chris Ripp
+  <chris at ripp.net> in #178648.
 
   15 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
   -files/suphp-apache22-compat.patch, -files/suphp-mod_userdir.patch,
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index 842f31cc773a..d20cd2312b4f 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70_mod_suphp.conf 1647 RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 SHA1 b033903c062af0e4c7c33bf5ed971e9dc3d7ce9b SHA256 eee1940f1f96c95d00bf5fabf65cc1e2b13d27da390c85eba540273e380292b1
 MD5 8c9cc137769da71d444c2208209857a7 files/70_mod_suphp.conf 1647
 RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 files/70_mod_suphp.conf 1647
@@ -7,14 +10,18 @@ MD5 4c2c4f6d464975c72a932c9eef2e3461 files/suphp.conf 905
 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 files/suphp.conf 905
 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7 files/suphp.conf 905
 DIST suphp-0.6.2.tar.gz 372228 RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 SHA1 3aaf232ca722a495c10caac2b573c215bfc80253 SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc
+EBUILD mod_suphp-0.6.2-r1.ebuild 2757 RMD160 cd7544024b5db1179db5eb05199775c88da06acd SHA1 3732f603afe460b031fd888117195626c80171fe SHA256 e25628eacf5ba8dd9a912b95ef94ed71335984c693c1cfeda00e0a9ab857f30f
+MD5 b38b931702a317e4899ced56276c96c0 mod_suphp-0.6.2-r1.ebuild 2757
+RMD160 cd7544024b5db1179db5eb05199775c88da06acd mod_suphp-0.6.2-r1.ebuild 2757
+SHA256 e25628eacf5ba8dd9a912b95ef94ed71335984c693c1cfeda00e0a9ab857f30f mod_suphp-0.6.2-r1.ebuild 2757
 EBUILD mod_suphp-0.6.2.ebuild 2719 RMD160 e39796c766df6151098c1457e4aadbce7eac5435 SHA1 79f61a1dd6e3d9128a69595f50cac2c2eee6b012 SHA256 f3f991b24e31817fef02fefd6b10c2ff4fb06c54a00d6dff7ebaf5f9c269f60e
 MD5 b37391f5e14f12f3311fb0715403a4ed mod_suphp-0.6.2.ebuild 2719
 RMD160 e39796c766df6151098c1457e4aadbce7eac5435 mod_suphp-0.6.2.ebuild 2719
 SHA256 f3f991b24e31817fef02fefd6b10c2ff4fb06c54a00d6dff7ebaf5f9c269f60e mod_suphp-0.6.2.ebuild 2719
-MISC ChangeLog 2046 RMD160 23e597a392b9989b9ea3b8f724144b131913f305 SHA1 22606309f72582b2ac07923b2a1a22ece73a746b SHA256 3ffca98190ff642b42c88379d1284659b3c25880cdda74e08fd273849a9c4f95
-MD5 973a6b838889af2eb3d6060805f55249 ChangeLog 2046
-RMD160 23e597a392b9989b9ea3b8f724144b131913f305 ChangeLog 2046
-SHA256 3ffca98190ff642b42c88379d1284659b3c25880cdda74e08fd273849a9c4f95 ChangeLog 2046
+MISC ChangeLog 2272 RMD160 e63bb6832cb58a098da953ed99e39c95ea278abc SHA1 6fa13cb976fc9eb27e6eee36430a7c808c6ef6fb SHA256 e443838da4ff51528f1dfa4416c2c8a1ae0eb261077c2752668397f9ec685e41
+MD5 7d7e81481ae51ad4f56e6db331ba50e8 ChangeLog 2272
+RMD160 e63bb6832cb58a098da953ed99e39c95ea278abc ChangeLog 2272
+SHA256 e443838da4ff51528f1dfa4416c2c8a1ae0eb261077c2752668397f9ec685e41 ChangeLog 2272
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -22,3 +29,13 @@ SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata
 MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2 235
 RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2 235
 SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2 235
+MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2-r1 235
+RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2-r1 235
+SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGYtYWyuNVb5qfaOYRAn//AJ9PJ9pOiLOfKRQuvVeFVkk+LvHQqQCdGrqe
+qNn70Izqxc5k8mTxpj+U/LE=
+=G5eK
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..4090dfae7750
--- /dev/null
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r1
@@ -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.2-r1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..0449c5882fe9
--- /dev/null
+++ b/www-apache/mod_suphp/mod_suphp-0.6.2-r1.ebuild
@@ -0,0 +1,114 @@
+# 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
+}