* [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/
@ 2016-10-08 12:45 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2016-10-08 12:45 UTC (permalink / raw
To: gentoo-commits
commit: e5d15d1bb7ddafd2a9a29fed4a4def3e62356054
Author: Sergiy Borodych <Sergiy.Borodych <AT> gmail <DOT> com>
AuthorDate: Tue Oct 4 14:54:11 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 12:45:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d15d1b
www-apache/mod_perl: remove old orphan file.
Closes: https://github.com/gentoo/gentoo/pull/2473
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../files/mod_perl-2.0.7-bundled-Apache-Test.patch | 134 ---------------------
1 file changed, 134 deletions(-)
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch
deleted file mode 100644
index 478495e..00000000
--- a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index c4a0430..e85cf01 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -24,7 +24,7 @@ BEGIN {
-
- }
-
--use lib qw(lib Apache-Test/lib);
-+use lib qw(lib);
-
- use Config;
- use File::Spec::Functions;
-@@ -117,16 +117,6 @@ sub get_DEFINE {
- }
-
- sub configure {
--
-- # mod_perl test suite relies on having Apache-Test bundled with
-- # the mod_perl source, since any pre-installed version may not do
-- # the right thing
-- unless (-d "Apache-Test") {
-- error "Can't find a sub-directory Apache-Test. " .
-- "Make sure that you are using a complete source distribution";
-- exit 1;
-- }
--
- set_modperl_version();
-
- if ($old_modperl_version) {
-@@ -798,14 +788,9 @@ run_tests : test_clean
- run_subtests ::
- cd ModPerl-Registry && $(MAKE) test
-
--run_subtests ::
-- cd Apache-Reload && $(MAKE) test
--
- EOF
-
- $preamble .= <<'EOF' unless $build->mpm_is_threaded();
--run_subtests ::
-- cd Apache-SizeLimit && $(MAKE) test
-
- EOF
-
-@@ -816,36 +801,6 @@ EOF
- return $preamble;
- }
-
--sub MY::postamble {
-- my $self = shift;
--
-- my $string = $self->ModPerl::BuildMM::MY::postamble;
--
-- $string .= <<'EOF';
--mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
--
--rpm: dist
-- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
-- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
-- --define "_srcrpmdir $(PWD)/rpm" \
-- $(DISTVNAME).tar.gz
-- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
-- @rm -rf $(PWD)/rpm/*/
--
--mod_perl.spec: build/make_rpm_spec
-- $(PERL) build/make_rpm_spec
--
--Apache-Test/META.yml:
-- cd Apache-Test && make metafile
--
--tag :
-- 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)
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM)
--EOF
--
-- return $string;
--}
--
- # this is a workaround so that ModPerl::MM will move MY::constants
- # away, and Apache-Test/Makefile.PL which has its own MY::constants
- # won't get complaints on MY::constants redefined
-diff --git a/ModPerl-Registry/Makefile.PL b/ModPerl-Registry/Makefile.PL
-index e72e65c..8610935 100644
---- a/ModPerl-Registry/Makefile.PL
-+++ b/ModPerl-Registry/Makefile.PL
-@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean);
-
- # prerequisites
- my %require = (
-- "Apache::Test" => "", # any version will do?
-+ "Apache::Test" => 0, # any version will do?
- );
-
- my @scripts = qw(t/TEST t/SMOKE);
-diff --git a/lib/ModPerl/BuildMM.pm b/lib/ModPerl/BuildMM.pm
-index 1c729e2..8651999 100644
---- a/lib/ModPerl/BuildMM.pm
-+++ b/lib/ModPerl/BuildMM.pm
-@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash;
- ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
- use strict 'refs';
-
--my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";
--
- #to override MakeMaker MOD_INSTALL macro
- sub mod_install {
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
-- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .
-+ qq{-MModPerl::BuildMM \\}."\n" .
- q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
- }
-
-@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble {
-
- push @target,
- '$(FULLPERL) -I$(INST_LIB) ' .
-- "-I$apache_test_dir -MModPerl::BuildMM " .
-+ "-MModPerl::BuildMM " .
- "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
-
- # Win32 doesn't normally install man pages
-diff --git a/lib/ModPerl/Manifest.pm b/lib/ModPerl/Manifest.pm
-index 1e856bc..9f1833c 100644
---- a/lib/ModPerl/Manifest.pm
-+++ b/lib/ModPerl/Manifest.pm
-@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest);
- my @add_files = qw{
- MANIFEST
- mod_perl.spec
-- Apache-Test/META.yml
- };
-
- sub get_svn_files {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/
@ 2017-02-14 21:20 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2017-02-14 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 4ab3674a4357ebbf5cf4831ecd5138b0db298087
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Feb 13 18:11:44 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 21:17:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab3674a
www-apache/mod_perl: remove unused patch.
Closes: https://github.com/gentoo/gentoo/pull/3961
.../mod_perl/files/mod_perl_init_b554794.patch | 241 ---------------------
1 file changed, 241 deletions(-)
diff --git a/www-apache/mod_perl/files/mod_perl_init_b554794.patch b/www-apache/mod_perl/files/mod_perl_init_b554794.patch
deleted file mode 100644
index b33a34a6ef..0000000000
--- a/www-apache/mod_perl/files/mod_perl_init_b554794.patch
+++ /dev/null
@@ -1,241 +0,0 @@
---- a/src/modules/perl/modperl_env.c.orig 2015-12-28 11:42:26.604632457 +0100
-+++ b/src/modules/perl/modperl_env.c 2015-12-28 12:36:35.305228288 +0100
-@@ -120,6 +120,7 @@
- const apr_array_header_t *array;
- apr_table_entry_t *elts;
-
-+ modperl_env_init(aTHX);
- modperl_env_untie(mg_flags);
-
- array = apr_table_elts(table);
-@@ -431,13 +432,11 @@
- }
-
- /* to store the original virtual tables
-- * these are global, not per-interpreter
-+ * handy access to perl's original virtual tables
- */
--static MGVTBL MP_PERL_vtbl_env;
--static MGVTBL MP_PERL_vtbl_envelem;
-
- #define MP_PL_vtbl_call(name, meth) \
-- MP_PERL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
-+ PL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
-
- #define MP_dENV_KEY \
- STRLEN klen; \
-@@ -534,6 +533,26 @@
- return 0;
- }
-
-+static int modperl_env_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
-+{
-+ MP_TRACE_e(MP_FUNC, "setting up %%ENV element magic");
-+ sv_magicext(nsv, mg->mg_obj, toLOWER(mg->mg_type), &MP_vtbl_envelem, name, namlen);
-+
-+ return 1;
-+}
-+
-+static int modperl_env_magic_local_all(pTHX_ SV *nsv, MAGIC *mg)
-+{
-+ MAGIC *nmg;
-+ MP_TRACE_e(MP_FUNC, "localizing %%ENV");
-+ nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, &MP_vtbl_env, (char*)NULL, 0);
-+ nmg->mg_ptr = mg->mg_ptr;
-+ nmg->mg_flags |= MGf_COPY;
-+ nmg->mg_flags |= MGf_LOCAL;
-+
-+ return 1;
-+}
-+
- static int modperl_env_magic_set(pTHX_ SV *sv, MAGIC *mg)
- {
- request_rec *r = (request_rec *)EnvMgObj;
-@@ -625,15 +644,18 @@
- #endif
-
- /* override %ENV virtual tables with our own */
--static MGVTBL MP_vtbl_env = {
-+MGVTBL MP_vtbl_env = {
- 0,
- modperl_env_magic_set_all,
- 0,
- modperl_env_magic_clear_all,
-- 0
-+ 0,
-+ modperl_env_magic_copy,
-+ 0,
-+ modperl_env_magic_local_all
- };
-
--static MGVTBL MP_vtbl_envelem = {
-+MGVTBL MP_vtbl_envelem = {
- 0,
- modperl_env_magic_set,
- 0,
-@@ -641,20 +663,62 @@
- 0
- };
-
--void modperl_env_init(void)
-+void modperl_env_init(pTHX)
- {
-- /* save originals */
-- StructCopy(&PL_vtbl_env, &MP_PERL_vtbl_env, MGVTBL);
-- StructCopy(&PL_vtbl_envelem, &MP_PERL_vtbl_envelem, MGVTBL);
-+ MAGIC *mg;
-
-- /* replace with our versions */
-- StructCopy(&MP_vtbl_env, &PL_vtbl_env, MGVTBL);
-- StructCopy(&MP_vtbl_envelem, &PL_vtbl_envelem, MGVTBL);
-+ /* Find the 'E' magic on %ENV */
-+ if (!my_perl)
-+ return;
-+ if (!PL_envgv)
-+ return;
-+ if (!SvRMAGICAL(ENVHV))
-+ return;
-+ mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
-+ if (!mg)
-+ return;
-+
-+ /* Ignore it if it isn't perl's original version */
-+ if (mg->mg_virtual != &PL_vtbl_env)
-+ return;
-+
-+ MP_TRACE_e(MP_FUNC, "env_init - ptr: %x obj: %x flags: %x",
-+ mg->mg_ptr, mg->mg_obj, mg->mg_flags);
-+
-+ /* Remove it */
-+ mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
-+
-+ /* Add our version instead */
-+ mg = sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &MP_vtbl_env, (char*)NULL, 0);
-+ mg->mg_flags |= MGf_COPY;
-+ mg->mg_flags |= MGf_LOCAL;
- }
-
--void modperl_env_unload(void)
-+void modperl_env_unload(pTHX)
- {
-- /* restore originals */
-- StructCopy(&MP_PERL_vtbl_env, &PL_vtbl_env, MGVTBL);
-- StructCopy(&MP_PERL_vtbl_envelem, &PL_vtbl_envelem, MGVTBL);
-+ MAGIC *mg;
-+
-+ /* Find the 'E' magic on %ENV */
-+ if (!my_perl)
-+ return;
-+ if (!PL_envgv)
-+ return;
-+ if (!SvRMAGICAL(ENVHV))
-+ return;
-+ mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
-+ if (!mg)
-+ return;
-+
-+ /* Ignore it if it isn't our version */
-+ if (mg->mg_virtual != &MP_vtbl_env)
-+ return;
-+
-+ MP_TRACE_e(MP_FUNC, "env_unload - ptr: %x obj: %x flags: %x",
-+ mg->mg_ptr, mg->mg_obj, mg->mg_flags);
-+
-+ /* Remove it */
-+ mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
-+
-+ /* Restore perl's original version */
-+ sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &PL_vtbl_env, (char*)NULL, 0);
- }
---- a/src/modules/perl/modperl_env.h.orig 2015-12-28 11:42:34.868727490 +0100
-+++ b/src/modules/perl/modperl_env.h 2015-12-28 12:37:47.730041274 +0100
-@@ -28,7 +28,7 @@
- MP_magical_tie(ENVHV, mg_flags)
-
- #define modperl_envelem_tie(sv, key, klen) \
-- sv_magic(sv, (SV *)NULL, 'e', key, klen)
-+ sv_magicext(sv, (SV *)NULL, PERL_MAGIC_envelem, &MP_vtbl_envelem, key, klen)
-
- void modperl_env_hash_keys(pTHX);
-
-@@ -58,8 +58,11 @@
-
- void modperl_env_request_untie(pTHX_ request_rec *r);
-
--void modperl_env_init(void);
-+void modperl_env_init(pTHX);
-
--void modperl_env_unload(void);
-+void modperl_env_unload(pTHX);
-+
-+MGVTBL MP_vtbl_env;
-+MGVTBL MP_vtbl_envelem;
-
- #endif /* MODPERL_ENV_H */
-Index: trunk/src/modules/perl/modperl_perl.c
-===================================================================
---- trunk/src/modules/perl/modperl_perl.c (revision 1717473)
-+++ trunk/src/modules/perl/modperl_perl.c (revision 1717474)
-@@ -181,6 +181,8 @@
- }
- }
-
-+ modperl_env_unload(perl);
-+
- perl_destruct(perl);
-
- /* XXX: big bug in 5.6.1 fixed in 5.7.2+
-Index: trunk/src/modules/perl/mod_perl.c
-===================================================================
---- trunk/src/modules/perl/mod_perl.c (revision 1717473)
-+++ trunk/src/modules/perl/mod_perl.c (revision 1717474)
-@@ -262,6 +262,8 @@
- exit(1);
- }
-
-+ modperl_env_init(aTHX);
-+
- /* suspend END blocks to be run at server shutdown */
- endav = PL_endav;
- PL_endav = (AV *)NULL;
-@@ -576,9 +578,6 @@
- /* modifies PL_ppaddr */
- modperl_perl_pp_set_all();
-
-- /* modifies PL_vtbl_env{elem} */
-- modperl_env_init();
--
- return APR_SUCCESS;
- }
-
-@@ -597,8 +596,6 @@
-
- MP_TRACE_i(MP_FUNC, "mod_perl sys term");
-
-- modperl_env_unload();
--
- modperl_perl_pp_unset_all();
-
- PERL_SYS_TERM();
-Index: trunk/t/response/TestModperl/env.pm
-===================================================================
---- trunk/t/response/TestModperl/env.pm (revision 1717473)
-+++ trunk/t/response/TestModperl/env.pm (revision 1717474)
-@@ -15,7 +15,7 @@
- sub handler {
- my $r = shift;
-
-- plan $r, tests => 23 + keys(%ENV);
-+ plan $r, tests => 23 + 3 * keys(%ENV);
-
- my $env = $r->subprocess_env;
-
-@@ -75,6 +75,8 @@
- for my $key (sort keys %ENV) {
- eval { delete $ENV{$key}; };
- ok t_cmp($@, '', $key);
-+ ok t_cmp($ENV{$key}, undef, "ENV{$key} is empty");
-+ ok t_cmp($env->get($key), undef, "subprocess_env($key) is empty");
- }
-
- Apache2::Const::OK;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-14 21:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-08 12:45 [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2017-02-14 21:20 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox