Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache2-mod_perl for
openSUSE:Factory checked in at 2022-04-22 21:54:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_perl (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_perl.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_perl"
Fri Apr 22 21:54:21 2022 rev:47 rq:971876 version:2.0.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_perl/apache2-mod_perl.changes
2021-09-30 23:44:45.840563402 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_perl.new.1538/apache2-mod_perl.changes
2022-04-22 21:55:28.566889533 +0200
@@ -1,0 +2,15 @@
+Thu Apr 21 15:15:11 UTC 2022 - David Anes <[email protected]>
+
+- update to 2.0.12:
+ * Add bug tracker information to README, and add CONTRIBUTING.md.
+ * Fix detection of APR's threading support on RHEL 8.
+ * Fix build for perl >= 5.33.7.
+ * Fix SIGSEGV crash due to wrong use of perl_parse().
+ * Improve installation instructions for AIX.
+- remove patch:
+ * fix_perl_5.34_build.patch (there is a fix already upstreamed)
+- refreshed patches:
+ * avoid-broken-provides.diff
+ * apache2-mod_perl-prctl-short-name.patch
+
+-------------------------------------------------------------------
Old:
----
fix_perl_5.34_build.patch
mod_perl-2.0.11.tar.gz
mod_perl-2.0.11.tar.gz.asc
New:
----
mod_perl-2.0.12.tar.gz
mod_perl-2.0.12.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_perl.spec ++++++
--- /var/tmp/diff_new_pack.XfEhEx/_old 2022-04-22 21:55:29.298890367 +0200
+++ /var/tmp/diff_new_pack.XfEhEx/_new 2022-04-22 21:55:29.302890371 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_perl
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define srcname mod_perl
Name: apache2-mod_perl
-Version: 2.0.11
+Version: 2.0.12
Release: 0
Summary: Embedded Perl for Apache
License: Apache-2.0
@@ -30,8 +30,6 @@
Patch1: avoid-broken-provides.diff
# bsc#1091625, workaround, according to mls it should be solved in perl
Patch2: apache2-mod_perl-prctl-short-name.patch
-# PATCH-FIX-UPSTREAM fix build error caused by new error checking in perl
5.34.0
-Patch3: fix_perl_5.34_build.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: db-devel
@@ -86,7 +84,6 @@
%setup -q -n %{srcname}-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs}
MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags}
-fgnu89-inline"
++++++ apache2-mod_perl-prctl-short-name.patch ++++++
--- /var/tmp/diff_new_pack.XfEhEx/_old 2022-04-22 21:55:29.370890449 +0200
+++ /var/tmp/diff_new_pack.XfEhEx/_new 2022-04-22 21:55:29.378890459 +0200
@@ -1,7 +1,7 @@
-Index: mod_perl-2.0.10/src/modules/perl/mod_perl.c
+Index: mod_perl-2.0.12/src/modules/perl/mod_perl.c
===================================================================
---- mod_perl-2.0.10.orig/src/modules/perl/mod_perl.c 2016-10-27
22:11:11.000000000 +0200
-+++ mod_perl-2.0.10/src/modules/perl/mod_perl.c 2018-07-17
10:47:27.962807330 +0200
+--- mod_perl-2.0.12.orig/src/modules/perl/mod_perl.c
++++ mod_perl-2.0.12/src/modules/perl/mod_perl.c
@@ -15,6 +15,7 @@
*/
++++++ avoid-broken-provides.diff ++++++
--- /var/tmp/diff_new_pack.XfEhEx/_old 2022-04-22 21:55:29.410890494 +0200
+++ /var/tmp/diff_new_pack.XfEhEx/_new 2022-04-22 21:55:29.410890494 +0200
@@ -1,5 +1,7 @@
---- httpd24/Apache-Test/lib/Apache/TestRequest.pm
-+++ httpd24/Apache-Test/lib/Apache/TestRequest.pm
+Index: mod_perl-2.0.12/Apache-Test/lib/Apache/TestRequest.pm
+===================================================================
+--- mod_perl-2.0.12.orig/Apache-Test/lib/Apache/TestRequest.pm
++++ mod_perl-2.0.12/Apache-Test/lib/Apache/TestRequest.pm
@@ -43,7 +43,8 @@ unless ($ENV{APACHE_TEST_PRETEND_NO_LWP}
require HTTP::Request::Common;
++++++ mod_perl-2.0.11.tar.gz -> mod_perl-2.0.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Apache-Test/Changes
new/mod_perl-2.0.12/Apache-Test/Changes
--- old/mod_perl-2.0.11/Apache-Test/Changes 2019-10-05 13:04:32.000000000
+0200
+++ new/mod_perl-2.0.12/Apache-Test/Changes 2022-01-30 14:02:19.000000000
+0100
@@ -6,6 +6,19 @@
=over 3
+=item 1.43 Nov 7 2021
+
+Our implementation of "which" should not search
+for a program in the elements of PATH when program
+already contains a path. [rjung]
+
+Fix hash generation when the openssl command
+was overwritten with the environment variable
+"APACHE_TEST_OPENSSL_CMD". [rjung]
+
+Add new config option limitrequestline needed
+when the local directory paths are long. [rjung]
+
=item 1.42 Aug 28 2019
Fix loading apache_test_config.pm for recent perls in which '.' is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Apache-Test/RELEASE
new/mod_perl-2.0.12/Apache-Test/RELEASE
--- old/mod_perl-2.0.11/Apache-Test/RELEASE 2019-10-05 13:04:33.000000000
+0200
+++ new/mod_perl-2.0.12/Apache-Test/RELEASE 2022-01-30 14:02:19.000000000
+0100
@@ -15,7 +15,7 @@
tags, so keep that in mind.
b. commit Changes
- % svn ci -m "1.42 rc1" Changes
+ % svn ci -m "1.43 rc1" Changes
c. nuke any preinstalled Apache-Test libs and run 'make test'
@@ -37,7 +37,7 @@
(or maybe longer to give most people a chance to catch up). no need
to tag this package
- Subject: [RELEASE CANDIDATE] Apache-Test-1.42 RC\d+
+ Subject: [RELEASE CANDIDATE] Apache-Test-1.43 RC\d+
a. if problems are detected during stage 2, repeat stages 1 and 2.
@@ -54,7 +54,7 @@
% make -n tag
c. commit Changes
- % svn ci -m "1.42 release" Changes
+ % svn ci -m "1.43 release" Changes
d. tag
% make tag
@@ -74,7 +74,7 @@
o dev/perl.apache.org
o modperl/perl.apache.org
- Subject: [ANNOUNCE] Apache-Test-1.42
+ Subject: [ANNOUNCE] Apache-Test-1.43
include:
- MD5 sig (as it comes from CPAN upload announce).
@@ -87,11 +87,11 @@
b. edit ./Changes:
- start a new item with incremented version + '-dev'
- =item 1.43-dev
+ =item 1.44-dev
c. bump up version numbers in this file to make it easier to do the
next release.
% perl -pi.bak -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE
d. commit Changes
- % svn ci -m "start 1.42-dev cycle" Changes RELEASE lib/Apache/Test.pm
+ % svn ci -m "start 1.43-dev cycle" Changes RELEASE lib/Apache/Test.pm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Apache-Test/lib/Apache/Test.pm
new/mod_perl-2.0.12/Apache-Test/lib/Apache/Test.pm
--- old/mod_perl-2.0.11/Apache-Test/lib/Apache/Test.pm 2019-10-05
13:04:32.000000000 +0200
+++ new/mod_perl-2.0.12/Apache-Test/lib/Apache/Test.pm 2022-01-30
14:02:19.000000000 +0100
@@ -37,7 +37,7 @@
use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
-$VERSION = '1.42';
+$VERSION = '1.43';
my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
need_module need_apache need_min_apache_version
need_min_apache_fix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Apache-Test/lib/Apache/TestCommon.pm
new/mod_perl-2.0.12/Apache-Test/lib/Apache/TestCommon.pm
--- old/mod_perl-2.0.11/Apache-Test/lib/Apache/TestCommon.pm 2019-10-05
13:04:32.000000000 +0200
+++ new/mod_perl-2.0.12/Apache-Test/lib/Apache/TestCommon.pm 2022-01-30
14:02:19.000000000 +0100
@@ -53,7 +53,7 @@
$received += length $chunk;
});
- ok t_cmp($length, $received, 'bytes in body');
+ ok t_cmp($received, $length, 'bytes in body');
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Apache-Test/lib/Apache/TestConfig.pm
new/mod_perl-2.0.12/Apache-Test/lib/Apache/TestConfig.pm
--- old/mod_perl-2.0.11/Apache-Test/lib/Apache/TestConfig.pm 2019-10-05
13:04:32.000000000 +0200
+++ new/mod_perl-2.0.12/Apache-Test/lib/Apache/TestConfig.pm 2022-01-30
14:02:19.000000000 +0100
@@ -59,38 +59,39 @@
use vars qw(%Usage);
%Usage = (
- top_dir => 'top-level directory (default is $PWD)',
- t_dir => 'the t/ test directory (default is $top_dir/t)',
- t_conf => 'the conf/ test directory (default is $t_dir/conf)',
- t_logs => 'the logs/ test directory (default is $t_dir/logs)',
- t_state => 'the state/ test directory (default is $t_dir/state)',
- t_pid_file => 'location of the pid file (default is
$t_logs/httpd.pid)',
- t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)',
- src_dir => 'source directory to look for mod_foos.so',
- serverroot => 'ServerRoot (default is $t_dir)',
- documentroot => 'DocumentRoot (default is $ServerRoot/htdocs',
- port => 'Port [port_number|select] (default ' . DEFAULT_PORT .
')',
- servername => 'ServerName (default is localhost)',
- user => 'User to run test server as (default is $USER)',
- group => 'Group to run test server as (default is $GROUP)',
- bindir => 'Apache bin/ dir (default is apxs -q BINDIR)',
- sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
- httpd => 'server to use for testing (default is $bindir/httpd)',
- target => 'name of server binary (default is apxs -q TARGET)',
- apxs => 'location of apxs (default is from
Apache2::BuildConfig)',
- startup_timeout => 'seconds to wait for the server to start (default is
60)',
- httpd_conf => 'inherit config from this file (default is apxs
derived)',
- httpd_conf_extra=> 'inherit additional config from this file',
- minclients => 'minimum number of concurrent clients (default is 1)',
- maxclients => 'maximum number of concurrent clients (default is
minclients+1)',
- threadsperchild => 'number of threads per child when using threaded MPMs
(default is 10)',
- perlpod => 'location of perl pod documents (for testing downloads)',
- proxyssl_url => 'url for testing ProxyPass / https (default is
localhost)',
- sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
- sslcaorg => 'SSL CA organization to use for tests (default is asf)',
- sslproto => 'SSL/TLS protocol version(s) to test',
- libmodperl => 'path to mod_perl\'s .so (full or relative to
LIBEXECDIR)',
- defines => 'values to add as -D defines (for example, "VAR1 VAR2")',
+ top_dir => 'top-level directory (default is $PWD)',
+ t_dir => 'the t/ test directory (default is $top_dir/t)',
+ t_conf => 'the conf/ test directory (default is $t_dir/conf)',
+ t_logs => 'the logs/ test directory (default is $t_dir/logs)',
+ t_state => 'the state/ test directory (default is $t_dir/state)',
+ t_pid_file => 'location of the pid file (default is
$t_logs/httpd.pid)',
+ t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)',
+ src_dir => 'source directory to look for mod_foos.so',
+ serverroot => 'ServerRoot (default is $t_dir)',
+ documentroot => 'DocumentRoot (default is $ServerRoot/htdocs',
+ port => 'Port [port_number|select] (default ' . DEFAULT_PORT .
')',
+ servername => 'ServerName (default is localhost)',
+ user => 'User to run test server as (default is $USER)',
+ group => 'Group to run test server as (default is $GROUP)',
+ bindir => 'Apache bin/ dir (default is apxs -q BINDIR)',
+ sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
+ httpd => 'server to use for testing (default is $bindir/httpd)',
+ target => 'name of server binary (default is apxs -q TARGET)',
+ apxs => 'location of apxs (default is from
Apache2::BuildConfig)',
+ startup_timeout => 'seconds to wait for the server to start (default is
60)',
+ httpd_conf => 'inherit config from this file (default is apxs
derived)',
+ httpd_conf_extra => 'inherit additional config from this file',
+ minclients => 'minimum number of concurrent clients (default is 1)',
+ maxclients => 'maximum number of concurrent clients (default is
minclients+1)',
+ threadsperchild => 'number of threads per child when using threaded MPMs
(default is 10)',
+ limitrequestline => 'global LimitRequestLine setting (default is 128)',
+ perlpod => 'location of perl pod documents (for testing
downloads)',
+ proxyssl_url => 'url for testing ProxyPass / https (default is
localhost)',
+ sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
+ sslcaorg => 'SSL CA organization to use for tests (default is asf)',
+ sslproto => 'SSL/TLS protocol version(s) to test',
+ libmodperl => 'path to mod_perl\'s .so (full or relative to
LIBEXECDIR)',
+ defines => 'values to add as -D defines (for example, "VAR1
VAR2")',
(map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth
php)),
);
@@ -368,6 +369,9 @@
$vars->{maxclientsthreadedmpm} = $vars->{maxsparethreadedmpm} +
$vars->{threadsperchild};
}
+ $vars->{limitrequestline} ||= 128;
+ $vars->{limitrequestlinex2} = 2 * $vars->{limitrequestline};
+
$vars->{proxy} ||= 'off';
$vars->{proxyssl_url} ||= '';
$vars->{defines} ||= '';
@@ -1778,6 +1782,11 @@
return undef unless $program;
+ # No need to search PATH components
+ # if $program already contains a path
+ return $program if !OSX and !WINFU and
+ $program =~ /\// and -f $program and -x $program;
+
my @dirs = File::Spec->path();
require Config;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Apache-Test/lib/Apache/TestSSLCA.pm
new/mod_perl-2.0.12/Apache-Test/lib/Apache/TestSSLCA.pm
--- old/mod_perl-2.0.11/Apache-Test/lib/Apache/TestSSLCA.pm 2019-10-05
13:04:33.000000000 +0200
+++ new/mod_perl-2.0.12/Apache-Test/lib/Apache/TestSSLCA.pm 2022-01-30
14:02:19.000000000 +0100
@@ -423,7 +423,7 @@
for my $file ($dh->read) {
next unless $file =~ /\.cr[tl]$/;
- chomp(my $hash = `openssl $type -noout -hash < $file`);
+ chomp(my $hash = `$openssl $type -noout -hash < $file`);
next unless $hash;
my $symlink = "$hash.r$n";
$n++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/CONTRIBUTING.md
new/mod_perl-2.0.12/CONTRIBUTING.md
--- old/mod_perl-2.0.11/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100
+++ new/mod_perl-2.0.12/CONTRIBUTING.md 2022-01-30 14:02:20.000000000 +0100
@@ -0,0 +1,59 @@
+# How to Contribute
+
+Help with mod_perl is always welcome. You do not have to know any code
+to help out - we also need help testing, answering questions, improving
+documentation, etc.
+
+
+## Issues
+
+Bugs and problems can be reported at:
+
+https://rt.cpan.org/Dist/Display.html?Name=mod_perl
+
+which can be accessed from the "Issues" link in the left-hand menu on
+the metacpan.org page, https://metacpan.org/pod/mod_perl2 .
+
+(Note: You will need to log in to https://rt.cpan.org in order to get
+the "Report a new bug" button on the bug tracker page.)
+
+
+### Discussions
+
+There is a low-volume mailing list for mod_perl users and developers to
+share ideas, solve problems and discuss things related to mod_perl and
+the Apache::* modules.
+
+Send an email to <[email protected]>. Before doing so, you should
+subscribe by sending an email to <[email protected]>.
+Send an email to <[email protected]> to unsubscribe.
+
+There is also a low-volume mailing list for discussions about the
+development of the core mod_perl.
+
+Send an email to <[email protected]>. Before doing so, you should
+subscribe by sending an email to <[email protected]>.
+Send an email to <[email protected]> to unsubscribe.
+
+
+## Testing
+
+You can help by testing mod_perl as widely as possible. Running the
+tests on a wide variety of platforms, Apache httpd versions, Perl
+versions and other factors is a great help in uncovering problems and
+improving mod_perl.
+
+
+## Code development
+
+Development happens in a Subversion repo. The canonical location is
+currently at:
+
+https://svn.apache.org/repos/asf/perl/
+
+The current mod_perl 2.0 development branch is at modperl/trunk under
+the above URL.
+
+Create your own copy of that branch by running:
+
+svn co https://svn.apache.org/repos/asf/perl/modperl/trunk/ mod_perl2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/Changes new/mod_perl-2.0.12/Changes
--- old/mod_perl-2.0.11/Changes 2019-10-05 13:04:34.000000000 +0200
+++ new/mod_perl-2.0.12/Changes 2022-01-30 14:02:20.000000000 +0100
@@ -1,3 +1,5 @@
+=encoding utf8
+
=head1 NAME
Changes - Apache mod_perl changes logfile
@@ -10,6 +12,21 @@
=over 3
+=item 2.0.12 January 30, 2022
+
+Add bug tracker information to README, and add CONTRIBUTING.md. [Steve Hay]
+
+Fix detection of APR's threading support on RHEL 8. [Petr P??sa??
+<[email protected]>]
+
+Fix build for perl >= 5.33.7. [Leon Timmermans <[email protected]>]
+
+Fix SIGSEGV crash due to wrong use of perl_parse(). [Charles Pigott
+<[email protected]>]
+
+Improve installation instructions for AIX. [Rainer Tammer
+<[email protected]>]
+
=item 2.0.11 October 5, 2019
Fix t/modules/apache_resource.t failures [Steve Hay]
@@ -726,7 +743,7 @@
which files and/or dirs need to be removed [Stas]
restore the DESTDIR support partially nuked by the apache2 rename
-branch [Torsten F?rtsch <torsten.foertsch gmx.net>]
+branch [Torsten F??rtsch <torsten.foertsch gmx.net>]
add APR::Status to provide functions corresponding to the
APR_STATUS_IS_* macros of apr_errno.h, especially those composites
@@ -1138,7 +1155,7 @@
- Leave entries from other packages alone
$filter->remove now works with native (non-modperl) filters + test
-[Torsten F?rtsch <torsten.foertsch gmx.net>]
+[Torsten F??rtsch <torsten.foertsch gmx.net>]
@@ -2160,7 +2177,7 @@
Apache::Status now generates HTML 4.01 Strict (and in many cases, also
ISO-HTML) compliant output. Also add a simple CSS to make the reports
-look nicer. [Ville Skytt? <[email protected]>]
+look nicer. [Ville Skytt?? <[email protected]>]
APR::Pool::DESTROY implemented and tweaked to only
destroy pools created via APR::Pool->new() [Geoffrey Young]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/INSTALL new/mod_perl-2.0.12/INSTALL
--- old/mod_perl-2.0.11/INSTALL 2019-10-05 13:04:39.000000000 +0200
+++ new/mod_perl-2.0.12/INSTALL 2022-01-30 14:02:21.000000000 +0100
@@ -4,6 +4,16 @@
% make && make test
% make install
+Simple install on AIX:
+
+ You will need GNU make to compile mod_perl. The AIX make does not work.
+ If you have installed GNU make from the AIX Toolbox:
+
+ % export MAKE="/opt/freeware/bin/gmake"
+ % perl Makefile.PL MP_APXS=/usr/local/apache2/bin/apxs
+ % gmake && gmake test
+ % gmake install
+
Simple config:
LoadModule perl_module modules/mod_perl.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/MANIFEST new/mod_perl-2.0.12/MANIFEST
--- old/mod_perl-2.0.11/MANIFEST 2019-10-05 13:04:39.000000000 +0200
+++ new/mod_perl-2.0.12/MANIFEST 2022-01-30 14:02:21.000000000 +0100
@@ -108,6 +108,7 @@
Apache-Test/t/response/TestMore/testpm.pm
Apache-Test/t/sok.t
BRANCHING
+CONTRIBUTING.md
Changes
INSTALL
LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/META.yml new/mod_perl-2.0.12/META.yml
--- old/mod_perl-2.0.11/META.yml 2019-10-05 13:04:39.000000000 +0200
+++ new/mod_perl-2.0.12/META.yml 2022-01-30 14:02:21.000000000 +0100
@@ -1,5 +1,5 @@
name: mod_perl
-version: 2.0.11
+version: 2.0.12
installdirs: site
distribution_type: module
no_index:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/README new/mod_perl-2.0.12/README
--- old/mod_perl-2.0.11/README 2019-10-05 13:04:40.000000000 +0200
+++ new/mod_perl-2.0.12/README 2022-01-30 14:02:21.000000000 +0100
@@ -3,8 +3,8 @@
*** Prerequisites ***
Apache:
- Dynamic mod_perl (DSO): Apache 2.0.47 - 2.4.41.
- Static mod_perl: Apache 2.0.51 - 2.4.41.
+ Dynamic mod_perl (DSO): Apache 2.0.47 - 2.4.51.
+ Static mod_perl: Apache 2.0.51 - 2.4.51.
Newer Apache versions may work with this version of mod_perl. If
not, the svn version likely will, which can be obtained from:
@@ -62,6 +62,13 @@
For comments, questions, bug-reports, etc., join the mod_perl users
list by sending mail to [email protected].
+Bugs can also be reported at:
+https://rt.cpan.org/Dist/Display.html?Name=mod_perl
+which can be accessed from the "Issues" link in the left-hand menu on
+the metacpan.org page, https://metacpan.org/pod/mod_perl2 .
+(Note: You will need to log in to https://rt.cpan.org in order to get
+the "Report a new bug" button on the bug tracker page.)
+
When reporting bugs please follow the instructions at:
http://perl.apache.org/docs/2.0/user/help/help.html#Reporting_Problems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/RELEASE new/mod_perl-2.0.12/RELEASE
--- old/mod_perl-2.0.11/RELEASE 2019-10-05 13:04:40.000000000 +0200
+++ new/mod_perl-2.0.12/RELEASE 2022-01-30 14:02:21.000000000 +0100
@@ -11,7 +11,7 @@
need on how to add your key. if you need further help on gpg
(like how to create a key in the first place) you can look here
- http://people.apache.org/~geoff/gpghowto.html
+ https://people.apache.org/~geoff/gpghowto.html
Copy the KEYS file into place:
% scp KEYS people.apache.org:/www/www.apache.org/dist/perl/KEYS
@@ -30,7 +30,7 @@
make sure you give the correct permissions to them.
1. 'make mydist' - to make sure nothing is missing from the manifest,
- etc. Now test this generated package mod_perl-2.0.11.tar.gz (not
+ etc. Now test this generated package mod_perl-2.0.12.tar.gz (not
the current build) with as many
configurations as possible on as many platforms as possible,
unpacking the package each time afresh.
@@ -40,7 +40,7 @@
- edit META.yml to the rc\d version above in the version key
b. commit Changes
- % svn ci -m "2.0.11 rc1" Changes
+ % svn ci -m "2.0.12 rc1" Changes
c. nuke any preinstalled mod_perl libs and run 'make test'
@@ -58,7 +58,7 @@
candidate alert to the modperl/dev list (may be longer to give most
people a chance to catch up). no need to tag this package
- Subject: [RELEASE CANDIDATE]: mod_perl-2.0.11 RC\d+
+ Subject: [RELEASE CANDIDATE]: mod_perl-2.0.12 RC\d+
2a. if problems are detected during stage 2, repeat stages 1 and 2.
@@ -79,28 +79,28 @@
% make -n tag
d. commit Changes README Makefile.PL
- % svn ci -m "2.0.11 release" Changes README Makefile.PL
+ % svn ci -m "2.0.12 release" Changes README Makefile.PL
e. tag
% make tag
f. Update the svn:externals in the new tag to refer to the new docs tag that
was created by the previous step:
- % svn co https://svn.apache.org/repos/asf/perl/modperl/tags/2_0_11
- % svn propedit svn:externals 2_0_11
+ % svn co https://svn.apache.org/repos/asf/perl/modperl/tags/2_0_12
+ % svn propedit svn:externals 2_0_12
Update the docs line from:
^/perl/modperl/docs/trunk/src/docs/2.0
to:
- ^/perl/modperl/docs/tags/2_0_11/src/docs/2.0
+ ^/perl/modperl/docs/tags/2_0_12/src/docs/2.0
The complete svn:externals should now look like:
- % svn propget svn:externals 2_0_11
+ % svn propget svn:externals 2_0_12
Apache-Test ^/perl/Apache-Test/tags/<X>
Apache-Reload ^/perl/Apache-Reload/tags/<Y>
Apache-SizeLimit ^/perl/Apache-SizeLimit/tags/<Z>
- docs ^/perl/modperl/docs/tags/2_0_11/src/docs/2.0
+ docs ^/perl/modperl/docs/tags/2_0_12/src/docs/2.0
where <X>, <Y> and <Z> are the tags of the releases of Apache-Test,
Apache-Reload and Apache-SizeLimit included in this release of mod_perl.
- % svn ci -m "2.0.11 release"
+ % svn ci -m "2.0.12 release"
g. create the final package
% make dist
@@ -114,13 +114,13 @@
a. sign your local copy of the tarball:
- % gpg --detach-sign --armor mod_perl-2.0.11.tar.gz
+ % gpg --detach-sign --armor mod_perl-2.0.12.tar.gz
- % pgps -b --armor mod_perl-2.0.11.tar.gz
+ % pgps -b --armor mod_perl-2.0.12.tar.gz
- b. create MD5 and SHA1 checksums of the tarball:
- % md5sum mod_perl-2.0.11.tar.gz >mod_perl-2.0.11.tar.gz.md5
- % sha1sum mod_perl-2.0.11.tar.gz >mod_perl-2.0.11.tar.gz.sha1
+ b. create SHA256 and SHA512 checksums of the tarball:
+ % sha256sum mod_perl-2.0.12.tar.gz >mod_perl-2.0.12.tar.gz.sha256
+ % sha512sum mod_perl-2.0.12.tar.gz >mod_perl-2.0.12.tar.gz.sha512
5. Release the package and update links
@@ -129,19 +129,19 @@
chair to give you the needed permissions if you do not have them.
b. delete the previous release's files from the same location (they will
- already have been archived at http://archive.apache.org/dist/perl/)
+ already have been archived at https://archive.apache.org/dist/perl/)
c. update the example command-lines in README.html in the same location
d. ask one of the other developers to double check the signature file
and tarball: download both files and verify the signature:
- http://www.apache.org/dist/perl/mod_perl-2.0.11.tar.gz.asc
- http://www.apache.org/dist/perl/mod_perl-2.0.11.tar.gz
+ https://www.apache.org/dist/perl/mod_perl-2.0.12.tar.gz.asc
+ https://www.apache.org/dist/perl/mod_perl-2.0.12.tar.gz
- % gpg --verify mod_perl-2.0.11.tar.gz.asc
+ % gpg --verify mod_perl-2.0.12.tar.gz.asc
- % pgpv mod_perl-2.0.11.tar.gz.asc
+ % pgpv mod_perl-2.0.12.tar.gz.asc
e. respond to the automated email that will arrive requesting that release
data be filled in at https://reporter.apache.org/addrelease.html?perl
@@ -150,7 +150,7 @@
% vi modperl-docs/src/download/index_top.html
% vi modperl-docs/doap_Perl.rdf
and commit.
- % svn ci -m "2.0.11 release" \
+ % svn ci -m "2.0.12 release" \
modperl-docs/src/download/index_top.html \
modperl-docs/doap_Perl.rdf
@@ -161,7 +161,7 @@
on your local machine, you can just directly edit download/index.html
with the changes that were made to modperl-docs/download/index_top.html)
- The change to the website will appear at http://perl.apache.org/ sometime
+ The change to the website will appear at https://perl.apache.org/ sometime
later (but maybe not until the next day).
6. Upload the package to CPAN
@@ -176,13 +176,12 @@
Note, to post to announce@, you must be sending from an apache.org address.
- Subject: [ANNOUNCE] mod_perl 2.0.11
+ Subject: [ANNOUNCE] mod_perl 2.0.12
include:
- link at perl.apache.org:
- http://apache.org/dist/perl/mod_perl-2.0.11.tar.gz
- http://apache.org/dist/perl/mod_perl-2.0.11.tar.gz.asc (pgp sig)
- - MD5 sig (as it comes from CPAN upload announce).
+ https://perl.apache.org/download/index.html
+ - SHA256 and SHA512 sigs
- the latest Changes
8. Prepare for the next cycle
@@ -194,7 +193,7 @@
c. edit ./Changes:
- start a new item with incremented version + '-dev'
- =item 2.0.12-dev
+ =item 2.0.13-dev
d. add a release entry in STATUS
@@ -203,7 +202,7 @@
% perl -pi.bak -e 's/(\d+)([._])(\d+)(\2)(\d+)/join($2, $1, $3, $5+1)/eg'
RELEASE
f. commit the changed files
- % svn ci -m "start 2.0.11-dev cycle" Changes META.yml lib/mod_perl2.pm \
+ % svn ci -m "start 2.0.12-dev cycle" Changes META.yml lib/mod_perl2.pm \
STATUS RELEASE
9. Old Versions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/STATUS new/mod_perl-2.0.12/STATUS
--- old/mod_perl-2.0.11/STATUS 2019-10-05 13:04:43.000000000 +0200
+++ new/mod_perl-2.0.12/STATUS 2022-01-30 14:02:22.000000000 +0100
@@ -1,8 +1,9 @@
mod_perl 2.0 STATUS: -*-text-*-
- Last modified at [$Date: 2016-10-27 22:49:40 +0100 (Thu, 27 Oct 2016) $]
+ Last modified at [$Date: 2019-10-05 13:03:20 +0100 (Sat, 05 Oct 2019) $]
Release:
--------
+ 2.000.11 : Released Oct 05, 2019
2.000.10 : Released Oct 27, 2016
2.000.09 : Released Jun 18, 2015
2.000.08 : Released Apr 17, 2013
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/lib/Apache2/Build.pm
new/mod_perl-2.0.12/lib/Apache2/Build.pm
--- old/mod_perl-2.0.11/lib/Apache2/Build.pm 2019-10-05 13:04:39.000000000
+0200
+++ new/mod_perl-2.0.12/lib/Apache2/Build.pm 2022-01-30 14:02:21.000000000
+0100
@@ -1493,11 +1493,21 @@
return $self->{apr_config} if $self->{apr_config};
+ my $fh;
my $header = catfile $self->apr_includedir, "apr.h";
- open my $fh, $header or do {
- error "Unable to open $header: $!";
- return undef;
- };
+ if (WIN32) {
+ open $fh, $header or do {
+ error "Unable to open $header: $!";
+ return undef;
+ };
+ }
+ else {
+ my @command = ($self->perl_config('cpp'), '-dM', $header);
+ open $fh, '-|', @command or do {
+ error "Unable to preprocess $header with @command: $!";
+ return undef;
+ };
+ }
my %cfg;
while (<$fh>) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/lib/ModPerl/DummyVersions.pm
new/mod_perl-2.0.12/lib/ModPerl/DummyVersions.pm
--- old/mod_perl-2.0.11/lib/ModPerl/DummyVersions.pm 2019-10-05
13:04:39.000000000 +0200
+++ new/mod_perl-2.0.12/lib/ModPerl/DummyVersions.pm 2022-01-30
14:02:21.000000000 +0100
@@ -77,95 +77,95 @@
$APR::Util::VERSION = 0.009000;
package Apache2::Access;
-$Apache2::Access::VERSION = 2.000011;
+$Apache2::Access::VERSION = 2.000012;
package Apache2::CmdParms;
-$Apache2::CmdParms::VERSION = 2.000011;
+$Apache2::CmdParms::VERSION = 2.000012;
package Apache2::Command;
-$Apache2::Command::VERSION = 2.000011;
+$Apache2::Command::VERSION = 2.000012;
package Apache2::Connection;
-$Apache2::Connection::VERSION = 2.000011;
+$Apache2::Connection::VERSION = 2.000012;
package Apache2::ConnectionUtil;
-$Apache2::ConnectionUtil::VERSION = 2.000011;
+$Apache2::ConnectionUtil::VERSION = 2.000012;
package Apache2::Directive;
-$Apache2::Directive::VERSION = 2.000011;
+$Apache2::Directive::VERSION = 2.000012;
package Apache2::Filter;
-$Apache2::Filter::VERSION = 2.000011;
+$Apache2::Filter::VERSION = 2.000012;
package Apache2::FilterRec;
-$Apache2::FilterRec::VERSION = 2.000011;
+$Apache2::FilterRec::VERSION = 2.000012;
package Apache2::HookRun;
-$Apache2::HookRun::VERSION = 2.000011;
+$Apache2::HookRun::VERSION = 2.000012;
package Apache2::Log;
-$Apache2::Log::VERSION = 2.000011;
+$Apache2::Log::VERSION = 2.000012;
package Apache2::MPM;
-$Apache2::MPM::VERSION = 2.000011;
+$Apache2::MPM::VERSION = 2.000012;
package Apache2::Module;
-$Apache2::Module::VERSION = 2.000011;
+$Apache2::Module::VERSION = 2.000012;
package Apache2::Process;
-$Apache2::Process::VERSION = 2.000011;
+$Apache2::Process::VERSION = 2.000012;
package Apache2::Provider;
-$Apache2::Provider::VERSION = 2.000011;
+$Apache2::Provider::VERSION = 2.000012;
package Apache2::RequestIO;
-$Apache2::RequestIO::VERSION = 2.000011;
+$Apache2::RequestIO::VERSION = 2.000012;
package Apache2::RequestRec;
-$Apache2::RequestRec::VERSION = 2.000011;
+$Apache2::RequestRec::VERSION = 2.000012;
package Apache2::RequestUtil;
-$Apache2::RequestUtil::VERSION = 2.000011;
+$Apache2::RequestUtil::VERSION = 2.000012;
package Apache2::Response;
-$Apache2::Response::VERSION = 2.000011;
+$Apache2::Response::VERSION = 2.000012;
package Apache2::ServerRec;
-$Apache2::ServerRec::VERSION = 2.000011;
+$Apache2::ServerRec::VERSION = 2.000012;
package Apache2::ServerUtil;
-$Apache2::ServerUtil::VERSION = 2.000011;
+$Apache2::ServerUtil::VERSION = 2.000012;
package Apache2::SubProcess;
-$Apache2::SubProcess::VERSION = 2.000011;
+$Apache2::SubProcess::VERSION = 2.000012;
package Apache2::SubRequest;
-$Apache2::SubRequest::VERSION = 2.000011;
+$Apache2::SubRequest::VERSION = 2.000012;
package Apache2::URI;
-$Apache2::URI::VERSION = 2.000011;
+$Apache2::URI::VERSION = 2.000012;
package Apache2::Util;
-$Apache2::Util::VERSION = 2.000011;
+$Apache2::Util::VERSION = 2.000012;
package ModPerl::Global;
-$ModPerl::Global::VERSION = 2.000011;
+$ModPerl::Global::VERSION = 2.000012;
package ModPerl::InterpPool;
-$ModPerl::InterpPool::VERSION = 2.000011;
+$ModPerl::InterpPool::VERSION = 2.000012;
package ModPerl::Interpreter;
-$ModPerl::Interpreter::VERSION = 2.000011;
+$ModPerl::Interpreter::VERSION = 2.000012;
package ModPerl::MethodLookup;
-$ModPerl::MethodLookup::VERSION = 2.000011;
+$ModPerl::MethodLookup::VERSION = 2.000012;
package ModPerl::TiPool;
-$ModPerl::TiPool::VERSION = 2.000011;
+$ModPerl::TiPool::VERSION = 2.000012;
package ModPerl::TiPoolConfig;
-$ModPerl::TiPoolConfig::VERSION = 2.000011;
+$ModPerl::TiPoolConfig::VERSION = 2.000012;
package ModPerl::Util;
-$ModPerl::Util::VERSION = 2.000011;
+$ModPerl::Util::VERSION = 2.000012;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/lib/mod_perl2.pm
new/mod_perl-2.0.12/lib/mod_perl2.pm
--- old/mod_perl-2.0.11/lib/mod_perl2.pm 2019-10-05 13:04:39.000000000
+0200
+++ new/mod_perl-2.0.12/lib/mod_perl2.pm 2022-01-30 14:02:21.000000000
+0100
@@ -20,7 +20,7 @@
use strict;
BEGIN {
- our $VERSION = "2.000011";
+ our $VERSION = "2.000012";
our $VERSION_TRIPLET;
if ($VERSION =~ /(\d+)\.(\d\d\d)(\d+)/) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/mod_perl.spec
new/mod_perl-2.0.12/mod_perl.spec
--- old/mod_perl-2.0.11/mod_perl.spec 2019-10-05 13:04:40.000000000 +0200
+++ new/mod_perl-2.0.12/mod_perl.spec 2022-01-30 14:02:21.000000000 +0100
@@ -1,7 +1,7 @@
-%define _version 2.0.11
-%define _release 1
-%define _source https://apache.org/dist/perl/mod_perl-2.0.11.tar.gz
-%define _dirname mod_perl-2.0.11
+%define _version 2.0.12
+%define _release
+%define _source https://apache.org/dist/perl/mod_perl-2.0.12-rc1.tar.gz
+%define _dirname mod_perl-2.0.12-rc1
%define _httpd_min_ver 2.0.47
%define _perl_min_ver 5.6.1
Name: mod_perl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/src/modules/perl/modperl_config.c
new/mod_perl-2.0.12/src/modules/perl/modperl_config.c
--- old/mod_perl-2.0.11/src/modules/perl/modperl_config.c 2019-10-05
13:04:41.000000000 +0200
+++ new/mod_perl-2.0.12/src/modules/perl/modperl_config.c 2022-01-30
14:02:22.000000000 +0100
@@ -163,7 +163,8 @@
scfg->PerlPostConfigRequire =
apr_array_make(p, 1, sizeof(modperl_require_file_t *));
- scfg->argv = apr_array_make(p, 2, sizeof(char *));
+ /* 2 arguments + NULL terminator */
+ scfg->argv = apr_array_make(p, 3, sizeof(char *));
scfg->setvars = apr_table_make(p, 2);
scfg->configvars = apr_table_make(p, 2);
@@ -219,6 +220,9 @@
*argc = scfg->argv->nelts;
+ /* perl_parse() expects a NULL terminated argv array */
+ modperl_config_srv_argv_push(NULL);
+
MP_TRACE_g_do(dump_argv(scfg));
return (char **)scfg->argv->elts;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/src/modules/perl/modperl_env.c
new/mod_perl-2.0.12/src/modules/perl/modperl_env.c
--- old/mod_perl-2.0.11/src/modules/perl/modperl_env.c 2019-10-05
13:04:41.000000000 +0200
+++ new/mod_perl-2.0.12/src/modules/perl/modperl_env.c 2022-01-30
14:02:22.000000000 +0100
@@ -541,7 +541,10 @@
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;
+#if (PERL_REVISION == 5 && PERL_VERSION == 8 && PERL_SUBVERSION > 8) || \
+ MP_PERL_VERSION_AT_LEAST(5, 9, 3)
nmg->mg_flags |= MGf_LOCAL;
+#endif
return 1;
}
@@ -679,7 +682,10 @@
/* 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;
+#if (PERL_REVISION == 5 && PERL_VERSION == 8 && PERL_SUBVERSION > 8) || \
+ MP_PERL_VERSION_AT_LEAST(5, 9, 3)
mg->mg_flags |= MGf_LOCAL;
+#endif
}
void modperl_env_unload(pTHX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_perl-2.0.11/src/modules/perl/modperl_perl.c
new/mod_perl-2.0.12/src/modules/perl/modperl_perl.c
--- old/mod_perl-2.0.11/src/modules/perl/modperl_perl.c 2019-10-05
13:04:42.000000000 +0200
+++ new/mod_perl-2.0.12/src/modules/perl/modperl_perl.c 2022-01-30
14:02:22.000000000 +0100
@@ -268,7 +268,7 @@
#ifdef MP_NEED_HASH_SEED_FIXUP
if (MP_init_hash_seed_set) {
#if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
- memcpy(&PL_hash_seed, &MP_init_hash_seed,
+ memcpy(PL_hash_seed, &MP_init_hash_seed,
sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
PL_hash_seed_set = MP_init_hash_seed_set;
