added some useflags

(Portage version: 2.0.51.22-r1)

4 files changed, 39 insertions, 21 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index f8e11402eb2f..8756cf3e0709 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.2 2005/08/08 11:02:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.3 2005/08/16 09:30:56 hollow Exp $
+
+  16 Aug 2005; Benedikt Boehm <hollow@gentoo.org> mod_suphp-0.6.0.ebuild:
+  added mode use flags; added checkpath use flag; added use flags to disable
+  uid/gid checks; thx to jakub; bug #102513
 
   08 Aug 2005; David Holm <dholm@gentoo.org> mod_suphp-0.6.0.ebuild:
   Added to ~ppc.
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index cc9cbd7e459a..1783f4e6d353 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 003f2fa8f89e05c86688b441591b8e21 mod_suphp-0.6.0.ebuild 2173
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
-MD5 613292e10f68d24a544a760d60dfb13e ChangeLog 498
-MD5 ed1eb993e0e2f4740048b2225959862b files/70_mod_suphp.conf 1590
+MD5 72e8d49e278230804f8f4519501af869 ChangeLog 694
+MD5 8bfff1f23b1d312902efb5439cb9328b mod_suphp-0.6.0.ebuild 2645
+MD5 8c9cc137769da71d444c2208209857a7 files/70_mod_suphp.conf 1647
 MD5 4c2c4f6d464975c72a932c9eef2e3461 files/suphp.conf 905
 MD5 350380d3dd8b4a29db78e1f336344688 files/digest-mod_suphp-0.6.0 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC92iTmPFBzbX68WERAp+BAJ9NbGFWZ+7MORPBw7Yq0DUiNuuqZACglH4g
-/VWZx6QIYemv+80vVvan/aQ=
-=J0C6
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_suphp/files/70_mod_suphp.conf b/www-apache/mod_suphp/files/70_mod_suphp.conf
index 1be8706b2c4f..efffb31c50b1 100644
--- a/www-apache/mod_suphp/files/70_mod_suphp.conf
+++ b/www-apache/mod_suphp/files/70_mod_suphp.conf
@@ -44,6 +44,7 @@
 		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
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 fae86bdddfd7..785b3739e3b5 100644
--- a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
+++ b/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2005 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.3 2005/08/08 11:02:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild,v 1.4 2005/08/16 09:30:56 hollow 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=""
+IUSE="checkpath ${SETIDMODES}"
 SLOT="0"
 
 S="${WORKDIR}/${MY_P}"
@@ -28,6 +30,29 @@ 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 ${mode/mode-} mode"
 	einfo
 	einfo "You can manipulate several configure options of this"
 	einfo "ebuild through environment variables:"
@@ -36,26 +61,24 @@ pkg_setup() {
 	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_SETIDMODE: Mode to use for setting UID/GID (default: paranoid)"
-	einfo "                 MODE can be on of owner, config or paranoid"
 	einfo
 
 	: ${SUPHP_MINUID:=1000}
 	: ${SUPHP_MINGID:=100}
 	: ${SUPHP_APACHEUSER:="apache"}
 	: ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"}
-	: ${SUPHP_SETIDMODE:="paranoid"}
 }
 
 src_compile() {
 	local myargs=
+	use checkpath || myargs="${myargs} --disable-checkpath"
 
-	myargs="--with-setid-mode=${SUPHP_SETIDMODE} \
+	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} \
-	        --disable-checkpath \
 	        --with-apxs=${APXS2}"
 
 	CFLAGS="$(apr-config --includes) $(apu-config --includes)" \