From 48ee788e89b0bca773dc97d15a215c004a8a86d7 Mon Sep 17 00:00:00 2001 From: Valery Kartel Date: Fri, 20 Nov 2015 16:12:50 +0200 Subject: 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 ;) --- testing/apache2-mod-perl/mod_perl-remote-ip.patch | 70 ----------------------- 1 file changed, 70 deletions(-) delete mode 100644 testing/apache2-mod-perl/mod_perl-remote-ip.patch (limited to 'testing/apache2-mod-perl/mod_perl-remote-ip.patch') 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 { -- cgit v1.2.3