Version bump

Package-Manager: portage-2.0.53_rc7

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 3f67bb5f30a6861580e66fbfb8fa3635c206956f..52012221338619d559fe9445b8ee7d48466f7c38 100644 (file)
--- a/www-apache/mod_suphp/ChangeLog
+++ b/www-apache/mod_suphp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2005/08/16 09:50:29 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.5 2005/12/01 14:15:37 hollow Exp $
+
+*mod_suphp-0.6.1 (01 Dec 2005)
+
+  01 Dec 2005; Benedikt Boehm <hollow@gentoo.org> +mod_suphp-0.6.1.ebuild:
+  Version bump
 
   16 Aug 2005; Benedikt Boehm <hollow@gentoo.org> mod_suphp-0.6.0.ebuild:
   added mode use flags; added checkpath use flag; thx to jakub; bug #102513

diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index 68f692e4450cc789cc438f49bc5f900fd13adcb1..67721601de585981f598088dbc13617d94bb2746 100644 (file)
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 48f533b4bd4884120335dab53ec3ff5b ChangeLog 650
+MD5 aa4e0fecea491f317cdbaa2b179ca8b5 ChangeLog 773
 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
 MD5 4c2c4f6d464975c72a932c9eef2e3461 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)
 
-iD8DBQFDSXlJKf2g/qXtneoRAjjiAKDB0pM2r5doDbNOMjIxQ+dclTkELQCgn0a7
-g4gbZU7uVL4tXVWdJXOZmHY=
-=7J04
+iD8DBQFDjwWXmPFBzbX68WERAn+TAJ9R6esl398R6n8+2wuExoStRY5eJwCePfE2
+P5NEFoDaTcp1QyTnQLzziuA=
+=gudf
 -----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..04bc290
--- /dev/null
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
@@ -0,0 +1 @@
+MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372

diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
new file mode 100644 (file)
index 0000000..0eb47d2
--- /dev/null
+++ b/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
@@ -0,0 +1,106 @@
+# 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.1.ebuild,v 1.1 2005/12/01 14:15:37 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="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_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}"
+
+       CFLAGS="$(apr-config --includes) $(apu-config --includes)" \
+       econf ${myargs} || die "econf failed"
+
+       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
+}