1 |
commit: 87b4594255ffbc32de676c9a636a1278d4d9db18 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 30 11:30:24 2017 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 30 11:31:33 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b45942 |
7 |
|
8 |
www-apache/mod_perl: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
www-apache/mod_perl/Manifest | 1 - |
13 |
.../files/mod_perl-2.0.8-bundled-Apache-Test.patch | 127 ----------------- |
14 |
www-apache/mod_perl/mod_perl-2.0.8.ebuild | 156 --------------------- |
15 |
3 files changed, 284 deletions(-) |
16 |
|
17 |
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest |
18 |
index 2fb03577734..d725f21537d 100644 |
19 |
--- a/www-apache/mod_perl/Manifest |
20 |
+++ b/www-apache/mod_perl/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST mod_perl-2.0.10.tar.gz 3846211 SHA256 d1cf83ed4ea3a9dfceaa6d9662ff645177090749881093051020bf42f9872b64 SHA512 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca WHIRLPOOL 5ca9c3d961292a36d6be08e6f619385d54dd3551fc27a7387f53604e9971429c732fc988df50c35b1d62d520bab763fe4d127beb09aef86209583f2ef0d21eaf |
23 |
-DIST mod_perl-2.0.8.tar.gz 3790026 SHA256 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SHA512 d5090651699c4436fe8d0a525226543c971aa05db337dc1b1e89023183df1c7dd8b8775f3a0f7d3b9ec40e8c058ac23bd24141cf15a5fe5806226d634dfb4c87 WHIRLPOOL d22e1c353339b08ad752e9f9c7fc0ec4d6a173c4cd3004380b14098e1028737e0eb69d2f56dbe0da3cbfb01b31232c5073d7edb28bf4fed6b2ccd67b09ad7080 |
24 |
|
25 |
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch |
26 |
deleted file mode 100644 |
27 |
index 2e4da922aea..00000000000 |
28 |
--- a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch |
29 |
+++ /dev/null |
30 |
@@ -1,127 +0,0 @@ |
31 |
---- a/Makefile.PL |
32 |
-+++ b/Makefile.PL |
33 |
-@@ -24,7 +24,7 @@ BEGIN { |
34 |
- |
35 |
- } |
36 |
- |
37 |
--use lib qw(lib Apache-Test/lib); |
38 |
-+use lib qw(lib); |
39 |
- |
40 |
- use Config; |
41 |
- use File::Spec::Functions; |
42 |
-@@ -117,16 +117,6 @@ sub get_DEFINE { |
43 |
- } |
44 |
- |
45 |
- sub configure { |
46 |
-- |
47 |
-- # mod_perl test suite relies on having Apache-Test bundled with |
48 |
-- # the mod_perl source, since any pre-installed version may not do |
49 |
-- # the right thing |
50 |
-- unless (-d "Apache-Test") { |
51 |
-- error "Can't find a sub-directory Apache-Test. " . |
52 |
-- "Make sure that you are using a complete source distribution"; |
53 |
-- exit 1; |
54 |
-- } |
55 |
-- |
56 |
- set_modperl_version(); |
57 |
- |
58 |
- if ($old_modperl_version) { |
59 |
-@@ -798,14 +788,9 @@ run_tests : test_clean |
60 |
- run_subtests :: |
61 |
- cd ModPerl-Registry && $(MAKE) test |
62 |
- |
63 |
--run_subtests :: |
64 |
-- cd Apache-Reload && $(MAKE) test |
65 |
-- |
66 |
- EOF |
67 |
- |
68 |
- $preamble .= <<'EOF' unless $build->mpm_is_threaded(); |
69 |
--run_subtests :: |
70 |
-- cd Apache-SizeLimit && $(MAKE) test |
71 |
- |
72 |
- EOF |
73 |
- |
74 |
-@@ -816,37 +801,6 @@ EOF |
75 |
- return $preamble; |
76 |
- } |
77 |
- |
78 |
--sub MY::postamble { |
79 |
-- my $self = shift; |
80 |
-- |
81 |
-- my $string = $self->ModPerl::BuildMM::MY::postamble; |
82 |
-- |
83 |
-- $string .= <<'EOF'; |
84 |
--mydist : Apache-Test/META.yml mod_perl.spec manifest tardist |
85 |
-- |
86 |
--rpm: dist |
87 |
-- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm |
88 |
-- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ |
89 |
-- --define "_srcrpmdir $(PWD)/rpm" \ |
90 |
-- $(DISTVNAME).tar.gz |
91 |
-- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ |
92 |
-- @rm -rf $(PWD)/rpm/*/ |
93 |
-- |
94 |
--mod_perl.spec: build/make_rpm_spec |
95 |
-- $(PERL) build/make_rpm_spec |
96 |
-- |
97 |
--Apache-Test/META.yml: |
98 |
-- cd Apache-Test && make metafile |
99 |
-- |
100 |
--tag : |
101 |
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) |
102 |
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) |
103 |
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) |
104 |
--EOF |
105 |
-- |
106 |
-- return $string; |
107 |
--} |
108 |
-- |
109 |
- # this is a workaround so that ModPerl::MM will move MY::constants |
110 |
- # away, and Apache-Test/Makefile.PL which has its own MY::constants |
111 |
- # won't get complaints on MY::constants redefined |
112 |
---- a/ModPerl-Registry/Makefile.PL |
113 |
-+++ b/ModPerl-Registry/Makefile.PL |
114 |
-@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean); |
115 |
- |
116 |
- # prerequisites |
117 |
- my %require = ( |
118 |
-- "Apache::Test" => "", # any version will do? |
119 |
-+ "Apache::Test" => 0, # any version will do? |
120 |
- ); |
121 |
- |
122 |
- my @scripts = qw(t/TEST t/SMOKE); |
123 |
---- a/lib/ModPerl/BuildMM.pm |
124 |
-+++ b/lib/ModPerl/BuildMM.pm |
125 |
-@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE} |
126 |
- ModPerl::MM::override_eu_mm_mv_all_methods(@methods); |
127 |
- use strict 'refs'; |
128 |
- |
129 |
--my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; |
130 |
-- |
131 |
- #to override MakeMaker MOD_INSTALL macro |
132 |
- sub mod_install { |
133 |
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . |
134 |
-- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . |
135 |
-+ qq{-MModPerl::BuildMM \\}."\n" . |
136 |
- q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; |
137 |
- } |
138 |
- |
139 |
-@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble { |
140 |
- |
141 |
- push @target, |
142 |
- '$(FULLPERL) -I$(INST_LIB) ' . |
143 |
-- "-I$apache_test_dir -MModPerl::BuildMM " . |
144 |
-+ "-MModPerl::BuildMM " . |
145 |
- "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; |
146 |
- |
147 |
- # Win32 doesn't normally install man pages |
148 |
---- a/lib/ModPerl/Manifest.pm |
149 |
-+++ b/lib/ModPerl/Manifest.pm |
150 |
-@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest); |
151 |
- my @add_files = qw{ |
152 |
- MANIFEST |
153 |
- mod_perl.spec |
154 |
-- Apache-Test/META.yml |
155 |
- }; |
156 |
- |
157 |
- sub get_svn_files { |
158 |
|
159 |
diff --git a/www-apache/mod_perl/mod_perl-2.0.8.ebuild b/www-apache/mod_perl/mod_perl-2.0.8.ebuild |
160 |
deleted file mode 100644 |
161 |
index e53722324e0..00000000000 |
162 |
--- a/www-apache/mod_perl/mod_perl-2.0.8.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,156 +0,0 @@ |
165 |
-# Copyright 1999-2017 Gentoo Foundation |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
- |
168 |
-EAPI="5" |
169 |
- |
170 |
-inherit depend.apache apache-module perl-module eutils |
171 |
- |
172 |
-DESCRIPTION="An embedded Perl interpreter for Apache2" |
173 |
-SRC_URI="mirror://apache/perl/${P}.tar.gz" |
174 |
-HOMEPAGE="https://projects.apache.org/projects/mod_perl.html" |
175 |
- |
176 |
-LICENSE="GPL-2" |
177 |
-KEYWORDS="alpha amd64 ppc ppc64 x86" |
178 |
-IUSE="debug" |
179 |
-SLOT="1" |
180 |
- |
181 |
-# Make sure we always use the latest Apache-Test version or even check the |
182 |
-# version of the bundled Apache-Test! |
183 |
-# |
184 |
-# We need both, apache and perl but either apache without threads or perl with |
185 |
-# ithreads, bug 373943 |
186 |
-DEPEND="<www-servers/apache-2.4 |
187 |
- >=dev-perl/Apache-Test-1.360 |
188 |
- >=dev-perl/CGI-3.08 |
189 |
- dev-lang/perl |
190 |
- www-servers/apache |
191 |
- || ( www-servers/apache[-threads] dev-lang/perl[ithreads] )" |
192 |
-RDEPEND="${DEPEND}" |
193 |
-PDEPEND=">=dev-perl/Apache-Reload-0.11 |
194 |
- >=dev-perl/Apache-SizeLimit-0.95" |
195 |
- |
196 |
-APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" |
197 |
-APACHE2_MOD_CONF="2.0.3/75_${PN}.2.2" |
198 |
-APACHE2_MOD_DEFINE="PERL" |
199 |
- |
200 |
-SRC_TEST="do" |
201 |
- |
202 |
-DOCFILES="Changes INSTALL README STATUS" |
203 |
- |
204 |
-need_apache2 |
205 |
- |
206 |
-src_prepare() { |
207 |
- perl-module_src_prepare |
208 |
- |
209 |
- # I am not entirely happy with this solution, but here's what's |
210 |
- # going on here if someone wants to take a stab at another |
211 |
- # approach. When userpriv compilation is off, then the make |
212 |
- # process drops to user "nobody" to run the test servers. This |
213 |
- # server is closed, and then the socket is rebound using |
214 |
- # SO_REUSEADDR. If the same user does this, there is no problem, |
215 |
- # and the socket may be rebound immediately. If a different user |
216 |
- # (yes, in my testing, even root) attempts to rebind, it fails. |
217 |
- # Since the "is the socket available yet" code and the |
218 |
- # second-batch bind call both run as root, this will fail. |
219 |
- |
220 |
- # The upstream settings on my test machine cause the second batch |
221 |
- # of tests to fail, believing the socket to still be in use. I |
222 |
- # tried patching various parts to make them run as the user |
223 |
- # specified in $config->{vars}{user} using getpwnam, but found |
224 |
- # this patch to be fairly intrusive, because the userid must be |
225 |
- # restored and the patch must be applied to multiple places. |
226 |
- |
227 |
- # For now, we will simply extend the timeout in hopes that in the |
228 |
- # non-userpriv case, the socket will clear from the kernel tables |
229 |
- # normally, and the tests will proceed. |
230 |
- |
231 |
- # If anybody is still having problems, then commenting out "make |
232 |
- # test" below should allow the software to build properly. |
233 |
- |
234 |
- # Robert Coie <rac@g.o> 2003.05.06 |
235 |
-# sed -i -e "s/sleep \$_/sleep \$_ << 2/" \ |
236 |
-# "${S}"/Apache-Test/lib/Apache/TestServer.pm \ |
237 |
-# || die "problem editing TestServer.pm" |
238 |
- |
239 |
- # rendhalver - this got redone for 2.0.1 and seems to fix the make test problems |
240 |
- epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch |
241 |
- |
242 |
- # bug 352724 |
243 |
- epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch" |
244 |
- rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ |
245 |
- sed -i -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \ |
246 |
- -e 's:^lib/Bundle/Apache2.pm::' MANIFEST || die |
247 |
-} |
248 |
- |
249 |
-src_configure() { |
250 |
- local myargs= |
251 |
- |
252 |
- if use debug; then |
253 |
- myargs="MP_TRACE=1 MP_DEBUG=1" |
254 |
- else |
255 |
- myargs="MP_TRACE=0 MP_DEBUG=0" |
256 |
- fi |
257 |
- |
258 |
- perl Makefile.PL \ |
259 |
- PREFIX="${EPREFIX}"/usr \ |
260 |
- INSTALLDIRS=vendor \ |
261 |
- MP_USE_DSO=1 \ |
262 |
- MP_APXS=${APXS} \ |
263 |
- ${myargs} || die |
264 |
-} |
265 |
- |
266 |
-src_test() { |
267 |
- # make test notes whether it is running as root, and drops |
268 |
- # privileges all the way to "nobody" if so, so we must adjust |
269 |
- # write permissions accordingly in this case. |
270 |
- |
271 |
- # IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail! |
272 |
- if [[ "$(id -u)" == "0" ]]; then |
273 |
- chown nobody:nobody "${WORKDIR}" |
274 |
- chown nobody:nobody "${T}" |
275 |
- fi |
276 |
- |
277 |
- # this does not || die because of bug 21325. kudos to smark for |
278 |
- # the idea of setting HOME. |
279 |
- TMPDIR="${T}" HOME="${T}/" perl-module_src_test |
280 |
-} |
281 |
- |
282 |
-src_install() { |
283 |
- apache-module_src_install |
284 |
- |
285 |
- emake DESTDIR="${D}" install || die |
286 |
- |
287 |
- # TODO: add some stuff from docs/ back? |
288 |
- |
289 |
- # rendhalver - fix the perllocal.pod that gets installed |
290 |
- # it seems to me that this has been getting installed for ages |
291 |
- perl_delete_localpod |
292 |
- # Remove empty .bs files as well |
293 |
- perl_delete_packlist |
294 |
- |
295 |
- insinto "${APACHE_MODULES_CONFDIR}" |
296 |
- doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl || die |
297 |
- |
298 |
- # this is an attempt to get @INC in line with /usr/bin/perl. |
299 |
- # there is blib garbage in the mainstream one that can only be |
300 |
- # useful during internal testing, so we wait until here and then |
301 |
- # just go with a clean slate. should be much easier to see what's |
302 |
- # happening and revert if problematic. |
303 |
- |
304 |
- # Sorry for this evil hack... |
305 |
- perl_set_version # just to be sure... |
306 |
- sed -i -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ |
307 |
- -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ |
308 |
- -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die |
309 |
- |
310 |
- for fname in $(find "${D}" -type f -not -name '*.so'); do |
311 |
- grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}" |
312 |
- sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} |
313 |
- done |
314 |
- # All the rest |
315 |
- perl_remove_temppath |
316 |
-} |
317 |
- |
318 |
-pkg_postinst() { |
319 |
- apache-module_pkg_postinst |
320 |
-} |