rpms/apache-mod_perl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.0.9.svn1572460 [release 2.0.9.svn1572460-1mamba;Sun Oct 05 2014]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 20:29:10 +01:00
parent ec9169e031
commit 8d09179900
9 changed files with 32 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0004-ignore-some-new-stuff-from-httpd-2.4-and-trunk-and-n.patch
View File

@ -1,38 +0,0 @@
From b26bfa434d6b84346c291ef3e3a3162546ad053c Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@sfritsch.de>
Date: Tue, 24 Apr 2012 22:28:57 +0200
Subject: [PATCH 04/28] ignore some new stuff from httpd 2.4 and trunk, and
newer aprs
these confuse "make source_scan"
---
lib/Apache2/ParseSource.pm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/Apache2/ParseSource.pm b/lib/Apache2/ParseSource.pm
index 8027548..f35c2a8 100644
--- a/lib/Apache2/ParseSource.pm
+++ b/lib/Apache2/ParseSource.pm
@@ -139,7 +139,8 @@ sub find_includes {
apr_optional mod_include mod_cgi
mod_proxy mod_ssl ssl_ apr_anylock
apr_rmm ap_config mod_log_config
- mod_perl modperl_ apreq);
+ mod_perl modperl_ apreq mod_cache
+ mod_serf mod_dav);
$unwanted = qr|^$unwanted|;
my $wanted = '';
@@ -280,6 +281,9 @@ my %enums_wanted = (
my $defines_unwanted = join '|', qw{
HTTP_VERSION APR_EOL_STR APLOG_MARK APLOG_NOERRNO APR_SO_TIMEOUT
+APR_HOOK_PROBES_ENABLED APR_HOOK_INT_DCL_UD
+APLOG_MAX_LOGLEVEL
+APR_BEGIN_DECLS APR_END_DECLS
};
sub get_constants {
--
1.7.11.4

27
0005-workaround-CScan-choking-on-glibc-s-headers.patch
View File

@ -1,27 +0,0 @@
From 2fb38b336c8a449463c0cec02a256d38a7e5e4b6 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@sfritsch.de>
Date: Tue, 24 Apr 2012 22:31:18 +0200
Subject: [PATCH 05/28] workaround CScan choking on glibc's headers
CScan gets rather confused if cpp's line number markers appear in the middle
of a function declaration
---
lib/ModPerl/CScan.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ModPerl/CScan.pm b/lib/ModPerl/CScan.pm
index 6789af3..a7314c9 100644
--- a/lib/ModPerl/CScan.pm
+++ b/lib/ModPerl/CScan.pm
@@ -943,7 +943,7 @@ sub new {
my ($sym) = gensym;
my $cmd = WIN32 ?
"$Cpp->{cppstdin} $Defines $addincludes $Cpp->{cppflags} $filename |" :
- "echo '\#include \"$filename\"' | $Cpp->{cppstdin} $Defines $addincludes $Cpp->{cppflags} $Cpp->{cppminus} |";
+ "echo '\#include \"$filename\"' | $Cpp->{cppstdin} $Defines $addincludes $Cpp->{cppflags} $Cpp->{cppminus} | grep -v '^#' |";
#my $cmd = "echo '\#include <$filename>' | $Cpp->{cppstdin} $Defines $addincludes $Cpp->{cppflags} $Cpp->{cppminus} |";
(open($sym, $cmd) or die "Cannot open pipe from `$cmd': $!")
--
1.7.11.4

25
0006-Add-U16-type-to-make-make-xs_generate-happy.patch
View File

@ -1,25 +0,0 @@
From 95087e1867cfaa93f1418bae13a83552c27d2dd7 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@sfritsch.de>
Date: Sun, 22 Apr 2012 22:39:33 +0200
Subject: [PATCH 06/28] Add U16 type to make 'make xs_generate' happy
---
xs/maps/modperl_types.map | 2 ++
1 file changed, 2 insertions(+)
diff --git a/xs/maps/modperl_types.map b/xs/maps/modperl_types.map
index 3b02f02..8c6d541 100644
--- a/xs/maps/modperl_types.map
+++ b/xs/maps/modperl_types.map
@@ -7,6 +7,8 @@ struct modperl_filter_t | Apache2::OutputFilter
SV * | SV
I32 | IV
I32 * | IV
+U16 | UV
+U16 * | UV
U32 | UV
U32 * | UV
--
1.7.11.4

26
0007-add-new-constant-CRLF_ASCII.patch
View File

@ -1,26 +0,0 @@
From 303ab6e8babc56ca8453ae62e87492592dc7e2f1 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@sfritsch.de>
Date: Sun, 22 Apr 2012 22:48:31 +0200
Subject: [PATCH 07/28] add new constant CRLF_ASCII
---
lib/ModPerl/Code.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/ModPerl/Code.pm b/lib/ModPerl/Code.pm
index e43f77c..98b037d 100644
--- a/lib/ModPerl/Code.pm
+++ b/lib/ModPerl/Code.pm
@@ -889,7 +889,8 @@ EOF
if ($name eq 'DECLINE_CMD' ||
$name eq 'DIR_MAGIC_TYPE' ||
- $name eq 'CRLF') {
+ $name eq 'CRLF' ||
+ $name eq 'CRLF_ASCII') {
print $c_fh <<EOF;
return newSVpv($alias{$name}, 0);
EOF
--
1.7.11.4

25
0008-workaround-APR_ENOKEY-not-found.patch
View File

@ -1,25 +0,0 @@
From 429b68f33687b1535c4d29aa8ad8e5b244b55e09 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@sfritsch.de>
Date: Sun, 22 Apr 2012 22:58:48 +0200
Subject: [PATCH 08/28] workaround APR_ENOKEY not found
there should be a better solution...
---
src/modules/perl/modperl_apache_includes.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/perl/modperl_apache_includes.h b/src/modules/perl/modperl_apache_includes.h
index a4209c5..c2fb6de 100644
--- a/src/modules/perl/modperl_apache_includes.h
+++ b/src/modules/perl/modperl_apache_includes.h
@@ -38,6 +38,7 @@
#include "http_core.h"
#include "http_vhost.h"
#include "ap_mpm.h"
+#include "apu_errno.h"
#include "util_filter.h"
--
1.7.11.4

39
0010-Parse-C-inlines-methods-in-CScan.patch
View File

@ -1,39 +0,0 @@
From e6e33420c23d666d479ecd3769384a86478c7d1e Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Wed, 25 Jul 2012 09:56:42 +0200
Subject: [PATCH 10/28] Parse C inlines methods in CScan
---
lib/Apache2/ParseSource.pm | 2 ++
lib/ModPerl/CScan.pm | 2 ++
2 files changed, 4 insertions(+)
diff --git a/lib/Apache2/ParseSource.pm b/lib/Apache2/ParseSource.pm
index 4e7cc08..7eafab5 100644
--- a/lib/Apache2/ParseSource.pm
+++ b/lib/Apache2/ParseSource.pm
@@ -402,6 +402,8 @@ sub get_functions {
my $c = $self->{c};
my $fdecls = $c->get($key);
+ my $inlines = $c->get('parsed_inlines');
+ push @{$fdecls}, @{$inlines};
my %seen;
my $wanted = $self->wanted_functions;
diff --git a/lib/ModPerl/CScan.pm b/lib/ModPerl/CScan.pm
index a7314c9..a57acf3 100644
--- a/lib/ModPerl/CScan.pm
+++ b/lib/ModPerl/CScan.pm
@@ -136,6 +136,8 @@ my $recipes
vdecl_hash => { filter => [ \&vdecl_hash, 'vdecls', 'mdecls' ], },
parsed_fdecls => { filter => [ \&do_declarations, 'fdecls',
'typedef_hash', 'keywords'], },
+ parsed_inlines => { filter => [ \&do_declarations, 'inlines',
+ 'typedef_hash', 'keywords'], },
keywords_rex => { filter => [ sub { my @k = keys %{ shift() };
local $" = '|';
my $r = "(?:@k)";
--
1.7.11.4

29
0021-Fix-APR__Socket-building.patch
View File

@ -1,29 +0,0 @@
From 08b6ef043f45a0db5d9c47135061c2bf95a0b304 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Wed, 25 Jul 2012 10:05:33 +0200
Subject: [PATCH 21/28] Fix APR__Socket building
---
xs/APR/Socket/APR__Socket.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xs/APR/Socket/APR__Socket.h b/xs/APR/Socket/APR__Socket.h
index dfc681c..d59fce6 100644
--- a/xs/APR/Socket/APR__Socket.h
+++ b/xs/APR/Socket/APR__Socket.h
@@ -118,10 +118,10 @@ apr_status_t mpxs_APR__Socket_poll(apr_socket_t *socket,
}
#ifndef WIN32
-static MP_INLINE int mpxs_APR__Socket_fileno(pTHX_ apr_socket_t *sock)
+static MP_INLINE int mpxs_APR__Socket_fileno(pTHX_ apr_socket_t *socket)
{
apr_os_sock_t s;
- apr_os_sock_get(&s, sock);
+ apr_os_sock_get(&s, socket);
return s;
}
#endif
--
1.7.11.4

26
0027-Do-no-cscan-expat-and-byteswap.patch
View File

@ -1,26 +0,0 @@
From 20bafd1dd5604ba87f5f5890d0366af1350f5e9b Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Wed, 25 Jul 2012 12:46:19 +0200
Subject: [PATCH 27/28] Do no cscan expat and byteswap
---
lib/Apache2/ParseSource.pm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/Apache2/ParseSource.pm b/lib/Apache2/ParseSource.pm
index 4412d76..0664af1 100644
--- a/lib/Apache2/ParseSource.pm
+++ b/lib/Apache2/ParseSource.pm
@@ -73,6 +73,9 @@ my @c_scan_defines = (
'CORE_PRIVATE', #so we get all of apache
'MP_SOURCE_SCAN', #so we can avoid some c-scan barfing
'_NETINET_TCP_H', #c-scan chokes on netinet/tcp.h
+ '_BYTESWAP_H', #c-scan chokes on byteswap.h
+ '_BITS_BYTESWAP_H', #c-scan chokes on byteswap.h
+ 'Expat_INCLUDED', #c-scan chokes on expath.h
# 'APR_OPTIONAL_H', #c-scan chokes on apr_optional.h
'apr_table_do_callback_fn_t=void', #c-scan chokes on function pointers
);
--
1.7.11.4

82
apache-mod_perl.spec
View File

@ -1,12 +1,16 @@
Name: apache-mod_perl
Version: 2.0.7
Release: 2mamba
Version: 2.0.9.svn1572460
Release: 1mamba
Summary: Apache module interface to PERL
Group: Development/Libraries/Perl
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
Source: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
# svn co http://svn.apache.org/repos/asf/perl/modperl/branches/httpd24/ -r 1572460
# mv httpd24/ httpd24-2.0.9.svn1572460
# tar cJf ../SOURCES/httpd24-2.0.9.svn1572460.tar.xz httpd24-2.0.9.svn1572460
#Source: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
Source: http://perl.apache.org/dist/httpd24-%{version}.tar.xz
URL: http://www.cpan.org
License: GPL
## AUTOBUILDREQ-BEGIN
@ -25,13 +29,7 @@ BuildRequires: libsasl-devel
Patch0: 0001-fix-compile-with-httpd-trunk-and-AP_DEBUG.patch
Patch1: 0002-per-module-loglevel-config.patch
Patch2: 0003-adjust-test-to-new-error-log-format.patch
Patch3: 0004-ignore-some-new-stuff-from-httpd-2.4-and-trunk-and-n.patch
Patch4: 0005-workaround-CScan-choking-on-glibc-s-headers.patch
Patch5: 0006-Add-U16-type-to-make-make-xs_generate-happy.patch
Patch6: 0007-add-new-constant-CRLF_ASCII.patch
Patch7: 0008-workaround-APR_ENOKEY-not-found.patch
Patch8: 0009-Parse-PROXY-constants-and-search-for-APR_INCLUDEDIR-.patch
Patch9: 0010-Parse-C-inlines-methods-in-CScan.patch
Patch10: 0011-Call-ap_reserve_module_slots_directive.patch
Patch11: 0012-Remove-OPT_INCNOEXEC.patch
Patch12: 0013-Fixed-logleve.patch
@ -42,13 +40,11 @@ Patch16: 0017-remove-apu_error.h-include.patch
Patch17: 0018-svav_getstr-has-to-return-apr_status_t.patch
Patch18: 0019-Remove-proxy-from-constants.t.patch
Patch19: 0020-Link-APR.so-against-libaprutil-1.patch
Patch20: 0021-Fix-APR__Socket-building.patch
Patch21: 0022-Use-APLOG_MODULE_INDEX-in-ap_log_error.patch
Patch22: 0023-Define-perl_module-in-Const.xs.patch
Patch23: 0024-Include-apu_errno.h.patch
Patch24: 0025-Include-also-from-INCLUDEDIR-disable-test_loglevel.patch
Patch25: 0026-Disable-LimitExcept.patch
Patch26: 0027-Do-no-cscan-expat-and-byteswap.patch
Patch27: 0028-Set-DefaultRuntimeDir-to-run-and-create-it.patch
Requires: apache >= 2.0.48
Provides: perl(Apache2::FunctionTable), perl(Apache2::StructureTable)
@ -61,38 +57,30 @@ BuildRoot: %{_tmppath}/perl-root
Apache module interface to PERL.
%prep
%setup -q -n mod_perl-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%setup -q -n httpd24-%{version}
#%patch0 -p1
#%patch1 -p1
##%patch2 -p1
##%patch8 -p1
#%patch10 -p1
##%patch11 -p1
##%patch12 -p1
##%patch13 -p1
##%patch14 -p1
##%patch15 -p1
##%patch16 -p1
##%patch17 -p1
#%patch18 -p1
#%patch19 -p1
##%patch21 -p1
#%patch22 -p1
##%patch23 -p1
##%patch24 -p1
##%patch25 -p1
#%patch27 -p1
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/mod_perl-%{version}/find_provides.sh
%define __find_provides %{_builddir}/httpd24-%{version}/find_provides.sh
cat > find_provides.sh << _EOF
#! /bin/sh
@ -103,15 +91,6 @@ _EOF
chmod +x find_provides.sh
%build
perl Makefile.PL \
PREFIX=%{_prefix} \
MP_APXS=%{_bindir}/apxs \
MP_APR_CONFIG=%{_bindir}/apr-1-config \
INSTALLDIRS=vendor
make source_scan
make xs_generate
perl Makefile.PL \
PREFIX=%{_prefix} \
MP_APXS=%{_bindir}/apxs \
@ -175,6 +154,9 @@ exit 0
%{_libdir}/apache/mod_perl.so
%changelog
* Sun Oct 05 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.9.svn1572460-1mamba
- update to 2.0.9.svn1572460
* Thu Nov 15 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.7-2mamba
- perl 5.16 mass rebuild