| 1 |
hollow 07/09/20 06:35:32 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: mod_suphp-0.6.2-r3.ebuild |
| 5 |
Removed: mod_suphp-0.6.2-r2.ebuild mod_suphp-0.6.2.ebuild |
| 6 |
Log: |
| 7 |
fix #191640; cleanup |
| 8 |
(Portage version: 2.1.3.9) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.15 www-apache/mod_suphp/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_suphp/ChangeLog?rev=1.15&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_suphp/ChangeLog?rev=1.15&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_suphp/ChangeLog?r1=1.14&r2=1.15 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v |
| 20 |
retrieving revision 1.14 |
| 21 |
retrieving revision 1.15 |
| 22 |
diff -u -r1.14 -r1.15 |
| 23 |
--- ChangeLog 9 Sep 2007 07:34:17 -0000 1.14 |
| 24 |
+++ ChangeLog 20 Sep 2007 06:35:31 -0000 1.15 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for www-apache/mod_suphp |
| 27 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.14 2007/09/09 07:34:17 hollow Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.15 2007/09/20 06:35:31 hollow Exp $ |
| 30 |
+ |
| 31 |
+*mod_suphp-0.6.2-r3 (20 Sep 2007) |
| 32 |
+ |
| 33 |
+ 20 Sep 2007; Benedikt Böhm <hollow@g.o> -mod_suphp-0.6.2.ebuild, |
| 34 |
+ -mod_suphp-0.6.2-r2.ebuild, +mod_suphp-0.6.2-r3.ebuild: |
| 35 |
+ fix #191640; cleanup |
| 36 |
|
| 37 |
*mod_suphp-0.6.2-r2 (09 Sep 2007) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: mod_suphp-0.6.2-r3.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2007 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild,v 1.1 2007/09/20 06:35:31 hollow Exp $ |
| 52 |
|
| 53 |
inherit apache-module autotools eutils |
| 54 |
|
| 55 |
MY_P="${P/mod_/}" |
| 56 |
|
| 57 |
SETIDMODES="mode-force mode-owner mode-paranoid" |
| 58 |
|
| 59 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 60 |
|
| 61 |
DESCRIPTION="A PHP wrapper for Apache2" |
| 62 |
HOMEPAGE="http://www.suphp.org/" |
| 63 |
SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz" |
| 64 |
LICENSE="GPL-2" |
| 65 |
SLOT="0" |
| 66 |
IUSE="checkpath ${SETIDMODES}" |
| 67 |
|
| 68 |
S="${WORKDIR}/${MY_P}" |
| 69 |
|
| 70 |
APXS2_S="${S}/src/apache2" |
| 71 |
APACHE2_MOD_CONF="70_${PN}" |
| 72 |
APACHE2_MOD_DEFINE="SUPHP" |
| 73 |
|
| 74 |
need_apache2 |
| 75 |
|
| 76 |
pkg_setup() { |
| 77 |
modecnt=0 |
| 78 |
for mode in ${SETIDMODES} ; do |
| 79 |
if use ${mode} ; then |
| 80 |
if [[ ${modecnt} -eq 0 ]] ; then |
| 81 |
SUPHP_SETIDMODE=${mode/mode-} |
| 82 |
let modecnt++ |
| 83 |
elif [[ ${modecnt} -ge 1 ]] ; then |
| 84 |
die "You can only select ONE mode in your USE flags!" |
| 85 |
fi |
| 86 |
fi |
| 87 |
done |
| 88 |
|
| 89 |
if [[ ${modecnt} -eq 0 ]] ; then |
| 90 |
ewarn |
| 91 |
ewarn "No mode selected, defaulting to paranoid!" |
| 92 |
ewarn |
| 93 |
ewarn "If you want to choose another mode, put mode-force OR mode-owner" |
| 94 |
ewarn "into your USE flags and run emerge again." |
| 95 |
ewarn |
| 96 |
SUPHP_SETIDMODE=paranoid |
| 97 |
fi |
| 98 |
|
| 99 |
elog |
| 100 |
elog "Using ${SUPHP_SETIDMODE/mode-} mode" |
| 101 |
elog |
| 102 |
elog "You can manipulate several configure options of this" |
| 103 |
elog "ebuild through environment variables:" |
| 104 |
elog |
| 105 |
elog "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)" |
| 106 |
elog "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)" |
| 107 |
elog "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)" |
| 108 |
elog "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)" |
| 109 |
elog |
| 110 |
|
| 111 |
apache-module_pkg_setup |
| 112 |
} |
| 113 |
|
| 114 |
src_unpack() { |
| 115 |
unpack "${A}" |
| 116 |
cd "${S}" |
| 117 |
|
| 118 |
epatch "${FILESDIR}"/${P}-handler.patch |
| 119 |
|
| 120 |
eautoreconf |
| 121 |
} |
| 122 |
|
| 123 |
src_compile() { |
| 124 |
local myargs="" |
| 125 |
use checkpath || myargs="${myargs} --disable-checkpath" |
| 126 |
|
| 127 |
: ${SUPHP_MINUID:=1000} |
| 128 |
: ${SUPHP_MINGID:=100} |
| 129 |
: ${SUPHP_APACHEUSER:="apache"} |
| 130 |
: ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"} |
| 131 |
|
| 132 |
myargs="${myargs} \ |
| 133 |
--with-setid-mode=${SUPHP_SETIDMODE} \ |
| 134 |
--with-min-uid=${SUPHP_MINUID} \ |
| 135 |
--with-min-gid=${SUPHP_MINGID} \ |
| 136 |
--with-apache-user=${SUPHP_APACHEUSER} \ |
| 137 |
--with-logfile=${SUPHP_LOGFILE} \ |
| 138 |
--with-apxs=${APXS2} \ |
| 139 |
--with-apr=/usr/bin/$(apr_config)" |
| 140 |
econf ${myargs} || die "econf failed" |
| 141 |
|
| 142 |
emake || die "make failed" |
| 143 |
} |
| 144 |
|
| 145 |
src_install() { |
| 146 |
apache-module_src_install |
| 147 |
dosbin src/suphp |
| 148 |
fperms 4755 /usr/sbin/suphp |
| 149 |
|
| 150 |
dodoc ChangeLog doc/CONFIG |
| 151 |
|
| 152 |
docinto apache |
| 153 |
dodoc doc/apache/CONFIG doc/apache/INSTALL |
| 154 |
|
| 155 |
insinto /etc |
| 156 |
doins "${FILESDIR}/suphp.conf" |
| 157 |
} |
| 158 |
|
| 159 |
pkg_postinst() { |
| 160 |
# Make sure the suphp binary is set setuid |
| 161 |
chmod 4755 "${ROOT}"/usr/sbin/suphp |
| 162 |
|
| 163 |
apache-module_pkg_postinst |
| 164 |
} |
| 165 |
|
| 166 |
|
| 167 |
|
| 168 |
-- |
| 169 |
gentoo-commits@g.o mailing list |
Archives