diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2015-11-20 16:12:50 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-24 13:02:55 +0000 |
| commit | 48ee788e89b0bca773dc97d15a215c004a8a86d7 (patch) | |
| tree | efc45a8385be0cbf93bff50f215ac5220282b9e5 /testing/apache2-mod-perl/mod_perl-remote-ip.patch | |
| parent | 1d04c940d71566ac1bd81b98df86ae8f972ea343 (diff) | |
| download | aports-48ee788e89b0bca773dc97d15a215c004a8a86d7.tar.bz2 aports-48ee788e89b0bca773dc97d15a215c004a8a86d7.tar.xz | |
testing/apache2-mod-perl: more refined patch to work with perl 5.22
This patch is replaces the previous one: http://patchwork.alpinelinux.org/patch/851/
- all unused patches and post-install script are removed
- added the latest patch from https://rt.cpan.org/Public/Bug/Display.html?id=101962#txn-1558194
- many tests are fail, so 'make test' is not included in build()
- some minor cleanups in APKBUILD
Now apache not crashes to segfault with this module ;)
Diffstat (limited to 'testing/apache2-mod-perl/mod_perl-remote-ip.patch')
| -rw-r--r-- | testing/apache2-mod-perl/mod_perl-remote-ip.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/testing/apache2-mod-perl/mod_perl-remote-ip.patch b/testing/apache2-mod-perl/mod_perl-remote-ip.patch deleted file mode 100644 index e39d629d2e..0000000000 --- a/testing/apache2-mod-perl/mod_perl-remote-ip.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: xs/tables/current/Apache2/StructureTable.pm -=================================================================== ---- a/xs/tables/current/Apache2/StructureTable.pm (revision 1324590) -+++ b/xs/tables/current/Apache2/StructureTable.pm (working copy) -@@ -2708,11 +2708,11 @@ - }, - { - 'type' => 'apr_sockaddr_t *', -- 'name' => 'remote_addr' -+ 'name' => 'client_addr' - }, - { - 'type' => 'char *', -- 'name' => 'remote_ip' -+ 'name' => 'client_ip' - }, - { - 'type' => 'char *', -@@ -2955,6 +2955,14 @@ - }, - { - 'type' => 'char *', -+ 'name' => 'useragent_ip' -+ }, -+ { -+ 'type' => 'apr_sockaddr_t *', -+ 'name' => 'useragent_addr' -+ }, -+ { -+ 'type' => 'char *', - 'name' => 'the_request' - }, - { -@@ -3245,10 +3253,6 @@ - }, - { - 'type' => 'int', -- 'name' => 'loglevel' -- }, -- { -- 'type' => 'int', - 'name' => 'is_virtual' - }, - { -Index: Apache-Reload/Makefile.PL -=================================================================== ---- a/Apache-Reload/Makefile.PL (revision 1324590) -+++ b/Apache-Reload/Makefile.PL (working copy) -@@ -11,7 +11,7 @@ - # MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should - # also set MP_APXS - if ($ENV{MOD_PERL_2_BUILD}) { -- push @ARGV, "-apxs", $ENV{MP_APXS}; -+ push @ARGV, "-apxs $ENV{MP_APXS}"; - my $mp_gen = satisfy_mp_generation(2); - } - else { -Index: Apache-SizeLimit/Makefile.PL -=================================================================== ---- a/Apache-SizeLimit/Makefile.PL (revision 1324590) -+++ b/Apache-SizeLimit/Makefile.PL (working copy) -@@ -11,7 +11,7 @@ - # MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should - # also set MP_APXS - if ($ENV{MOD_PERL_2_BUILD}) { -- push @ARGV, "-apxs", $ENV{MP_APXS}; -+ push @ARGV, "-apxs $ENV{MP_APXS}"; - my $mp_gen = satisfy_mp_generation(2); - } - else { |