diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-06-05 21:08:18 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-06-05 21:08:18 +0000 |
| commit | 64a33e3bd17ac78dafc38abd46cd9459e1b486af (patch) | |
| tree | 5c747286215d7514bd89168f0330f2d8ceb913d2 /www-apache | |
| parent | Move some possibly unnecessary USE flags into a separate section and update a... (diff) | |
| download | gentoo-2-64a33e3bd17ac78dafc38abd46cd9459e1b486af.tar.gz gentoo-2-64a33e3bd17ac78dafc38abd46cd9459e1b486af.tar.bz2 gentoo-2-64a33e3bd17ac78dafc38abd46cd9459e1b486af.zip | |
Re-sync ebuilds.
(Portage version: 2.1_rc4-r2)
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/mod_suphp/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild | 5 | ||||
| -rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild | 18 |
3 files changed, 17 insertions, 12 deletions
diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog index 61b6886adc5b..66d0dd086414 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.9 2006/06/05 18:16:40 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.10 2006/06/05 21:08:18 chtekk Exp $ + + 05 Jun 2006; Luca Longinotti <chtekk@gentoo.org> + mod_suphp-0.6.1-r1.ebuild, mod_suphp-0.6.1-r2.ebuild: + Re-sync ebuilds and backport little fix from -r2 to -r1. *mod_suphp-0.6.1-r2 (05 Jun 2006) 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 index 49ffe24bb102..24aa6c589968 100644 --- a/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild +++ b/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.3 2006/06/05 13:24:10 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild,v 1.4 2006/06/05 21:08:18 chtekk Exp $ inherit apache-module eutils @@ -49,6 +49,7 @@ pkg_setup() { 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 einfo @@ -75,7 +76,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/suphp-apache22-compat.patch" - if has_version ">=dev-libs/apr-1.0.0"; then + if has_version ">=dev-libs/apr-1.0.0" ; then sed -e "s|apr-config|apr-1-config|g" -i configure fi } diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild index e42ae7cdce1d..d1342d7a847e 100644 --- a/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild +++ b/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild @@ -1,15 +1,15 @@ # 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-r2.ebuild,v 1.1 2006/06/05 18:16:40 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild,v 1.2 2006/06/05 21:08:18 chtekk Exp $ inherit apache-module eutils -MY_P=${P/mod_/} +MY_P="${P/mod_/}" SETIDMODES="mode-force mode-owner mode-paranoid" -DESCRIPTION="A PHP wrapper for Apache" -HOMEPAGE="http://www.suphp.org" +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" @@ -33,16 +33,16 @@ pkg_setup() { modecnt=0 for mode in ${SETIDMODES}; do if use ${mode}; then - if [ ${modecnt} -eq 0 ]; then + if [[ ${modecnt} -eq 0 ]]; then SUPHP_SETIDMODE=${mode/mode-} let modecnt++ - elif [ ${modecnt} -ge 1 ]; then + elif [[ ${modecnt} -ge 1 ]]; then die "You can only select ONE mode in your USE flags!" fi fi done - if [ ${modecnt} -eq 0 ]; then + if [[ ${modecnt} -eq 0 ]]; then ewarn ewarn "No mode selected, defaulting to paranoid!" ewarn @@ -87,7 +87,7 @@ src_compile() { use checkpath || myargs="${myargs} --disable-checkpath" myargs="${myargs} \ - --with-setid-mode=${SUPHP_SETIDMODE} \ + --with-setid-mode=${SUPHP_SETIDMODE} \ --with-min-uid=${SUPHP_MINUID} \ --with-min-gid=${SUPHP_MINGID} \ --with-apache-user=${SUPHP_APACHEUSER} \ @@ -114,7 +114,7 @@ src_install() { dodoc doc/apache/CONFIG doc/apache/INSTALL insinto /etc - doins ${FILESDIR}/suphp.conf + doins "${FILESDIR}/suphp.conf" } pkg_postinst() { |