| 1 |
hollow 08/06/01 12:36:47 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: mod_perl-2.0.4.ebuild |
| 5 |
Log: |
| 6 |
version bump wrt #220909 |
| 7 |
(Portage version: 2.1.5.2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.66 www-apache/mod_perl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_perl/ChangeLog?rev=1.66&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_perl/ChangeLog?rev=1.66&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_perl/ChangeLog?r1=1.65&r2=1.66 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v |
| 19 |
retrieving revision 1.65 |
| 20 |
retrieving revision 1.66 |
| 21 |
diff -u -r1.65 -r1.66 |
| 22 |
--- ChangeLog 28 May 2008 13:25:32 -0000 1.65 |
| 23 |
+++ ChangeLog 1 Jun 2008 12:36:46 -0000 1.66 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for www-apache/mod_perl |
| 26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.65 2008/05/28 13:25:32 gmsoft Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.66 2008/06/01 12:36:46 hollow Exp $ |
| 29 |
+ |
| 30 |
+*mod_perl-2.0.4 (01 Jun 2008) |
| 31 |
+ |
| 32 |
+ 01 Jun 2008; Benedikt Böhm <hollow@g.o> +mod_perl-2.0.4.ebuild: |
| 33 |
+ version bump wrt #220909 |
| 34 |
|
| 35 |
28 May 2008; Guy Martin <gmsoft@g.o> ChangeLog: |
| 36 |
Stable on hppa. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 www-apache/mod_perl/mod_perl-2.0.4.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.4.ebuild?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.4.ebuild?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: mod_perl-2.0.4.ebuild |
| 46 |
=================================================================== |
| 47 |
# Copyright 1999-2008 Gentoo Foundation |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.4.ebuild,v 1.1 2008/06/01 12:36:46 hollow Exp $ |
| 50 |
|
| 51 |
inherit apache-module perl-module eutils multilib |
| 52 |
|
| 53 |
DESCRIPTION="An embedded Perl interpreter for Apache2" |
| 54 |
SRC_URI="mirror://cpan/authors/id/P/PG/PGOLLUCCI/${P}.tar.gz" |
| 55 |
HOMEPAGE="http://perl.apache.org/" |
| 56 |
|
| 57 |
LICENSE="GPL-2" |
| 58 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 59 |
IUSE="" |
| 60 |
SLOT="1" |
| 61 |
|
| 62 |
# see bug 30087 for why sudo is in here |
| 63 |
DEPEND=">=dev-perl/Apache-Test-1.27 |
| 64 |
>=virtual/perl-CGI-3.08 |
| 65 |
>=dev-perl/Compress-Zlib-1.09 |
| 66 |
app-admin/sudo" |
| 67 |
RDEPEND="${DEPEND}" |
| 68 |
|
| 69 |
APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" |
| 70 |
APACHE2_MOD_CONF="2.0.3/75_${PN}" |
| 71 |
APACHE2_MOD_DEFINE="PERL" |
| 72 |
|
| 73 |
DOCFILES="Changes INSTALL LICENSE README STATUS" |
| 74 |
|
| 75 |
need_apache2 |
| 76 |
|
| 77 |
pkg_setup() { |
| 78 |
has_apache_threads_in dev-lang/perl ithreads |
| 79 |
} |
| 80 |
|
| 81 |
src_unpack() { |
| 82 |
unpack ${A} |
| 83 |
cd "${S}" |
| 84 |
|
| 85 |
# I am not entirely happy with this solution, but here's what's |
| 86 |
# going on here if someone wants to take a stab at another |
| 87 |
# approach. When userpriv compilation is off, then the make |
| 88 |
# process drops to user "nobody" to run the test servers. This |
| 89 |
# server is closed, and then the socket is rebound using |
| 90 |
# SO_REUSEADDR. If the same user does this, there is no problem, |
| 91 |
# and the socket may be rebound immediately. If a different user |
| 92 |
# (yes, in my testing, even root) attempts to rebind, it fails. |
| 93 |
# Since the "is the socket available yet" code and the |
| 94 |
# second-batch bind call both run as root, this will fail. |
| 95 |
|
| 96 |
# The upstream settings on my test machine cause the second batch |
| 97 |
# of tests to fail, believing the socket to still be in use. I |
| 98 |
# tried patching various parts to make them run as the user |
| 99 |
# specified in $config->{vars}{user} using getpwnam, but found |
| 100 |
# this patch to be fairly intrusive, because the userid must be |
| 101 |
# restored and the patch must be applied to multiple places. |
| 102 |
|
| 103 |
# For now, we will simply extend the timeout in hopes that in the |
| 104 |
# non-userpriv case, the socket will clear from the kernel tables |
| 105 |
# normally, and the tests will proceed. |
| 106 |
|
| 107 |
# If anybody is still having problems, then commenting out "make |
| 108 |
# test" below should allow the software to build properly. |
| 109 |
|
| 110 |
# Robert Coie <rac@g.o> 2003.05.06 |
| 111 |
|
| 112 |
sed -i -e "s/sleep \$_/sleep \$_ << 2/" \ |
| 113 |
"${S}"/Apache-Test/lib/Apache/TestServer.pm \ |
| 114 |
|| die "problem editing TestServer.pm" |
| 115 |
|
| 116 |
# rendhalver - this got redone for 2.0.1 and seems to fix the make test problems |
| 117 |
epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch |
| 118 |
} |
| 119 |
|
| 120 |
src_compile() { |
| 121 |
perl Makefile.PL \ |
| 122 |
PREFIX="${D}"/usr \ |
| 123 |
MP_TRACE=1 \ |
| 124 |
MP_DEBUG=1 \ |
| 125 |
MP_USE_DSO=1 \ |
| 126 |
MP_APXS=${APXS} \ |
| 127 |
INSTALLDIRS=vendor </dev/null || die |
| 128 |
|
| 129 |
# reported that parallel make is broken in bug 30257 |
| 130 |
emake -j1 || die |
| 131 |
} |
| 132 |
|
| 133 |
src_test() { |
| 134 |
# make test notes whether it is running as root, and drops |
| 135 |
# privileges all the way to "nobody" if so, so we must adjust |
| 136 |
# write permissions accordingly in this case. |
| 137 |
|
| 138 |
# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail! |
| 139 |
if [[ "$(id -u)" == "0" ]]; then |
| 140 |
chown nobody:nobody "${WORKDIR}" |
| 141 |
chown nobody:nobody "${T}" |
| 142 |
fi |
| 143 |
|
| 144 |
# this does not || die because of bug 21325. kudos to smark for |
| 145 |
# the idea of setting HOME. |
| 146 |
TMPDIR="${T}" HOME="${T}/" make test |
| 147 |
} |
| 148 |
|
| 149 |
src_install() { |
| 150 |
apache-module_src_install |
| 151 |
|
| 152 |
dodir "${APACHE_MODULESDIR}" |
| 153 |
make install \ |
| 154 |
MODPERL_AP_LIBEXECDIR="${D}${APACHE_MODULESDIR}" \ |
| 155 |
MODPERL_AP_INCLUDEDIR="${D}${APACHE_INCLUDEDIR}" \ |
| 156 |
MP_INST_APACHE2=1 \ |
| 157 |
INSTALLDIRS=vendor || die |
| 158 |
|
| 159 |
# rendhalver - fix the perllocal.pod that gets installed |
| 160 |
# it seems to me that this has been getting installed for ages |
| 161 |
fixlocalpod |
| 162 |
|
| 163 |
insinto "${APACHE_MODULES_CONFDIR}" |
| 164 |
doins "${FILESDIR}"/${PV}/apache2-mod_perl-startup.pl |
| 165 |
cp -pPR docs "${D}"/usr/share/doc/${PF} |
| 166 |
cp -pPR todo "${D}"/usr/share/doc/${PF} |
| 167 |
|
| 168 |
# this is an attempt to get @INC in line with /usr/bin/perl. |
| 169 |
# there is blib garbage in the mainstream one that can only be |
| 170 |
# useful during internal testing, so we wait until here and then |
| 171 |
# just go with a clean slate. should be much easier to see what's |
| 172 |
# happening and revert if problematic. |
| 173 |
for FILE in $(grep -lr portage "${D}"/*|grep -v ".so"); do |
| 174 |
sed -i -e "s:${D}:/:g" ${FILE} |
| 175 |
done |
| 176 |
} |
| 177 |
|
| 178 |
|
| 179 |
|
| 180 |
-- |
| 181 |
gentoo-commits@l.g.o mailing list |
Archives