perl/mod_perl: Updated for version 2.0.12.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 5 insertions, 89 deletions

diff --git a/perl/mod_perl/mod_perl-2.0.11-Do-not-use-deprecated-ap_get_server_version-in-Serve.patch b/perl/mod_perl/mod_perl-2.0.11-Do-not-use-deprecated-ap_get_server_version-in-Serve.patch
deleted file mode 100644
index b55ad539fc69..000000000000
--- a/perl/mod_perl/mod_perl-2.0.11-Do-not-use-deprecated-ap_get_server_version-in-Serve.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e839fb0bb30327de7a1b7ca9cef7c05b4a59eae4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 1 Jul 2020 11:38:44 +0200
-Subject: [PATCH] Do not use deprecated ap_get_server_version() in
- Server::Status
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It produced warnings with httpd 2.4.
-
-CPAN RT#124972
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- docs/api/Apache2/ServerUtil.pod | 3 ++-
- lib/Apache2/Status.pm           | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/docs/api/Apache2/ServerUtil.pod b/docs/api/Apache2/ServerUtil.pod
-index 96e3a28..6828ce8 100644
---- a/docs/api/Apache2/ServerUtil.pod
-+++ b/docs/api/Apache2/ServerUtil.pod
-@@ -29,7 +29,6 @@ Apache2::ServerUtil - Perl API for Apache server record utils
-   # server build and version info:
-   $when_built = Apache2::ServerUtil::get_server_built(); 
-   $description = Apache2::ServerUtil::get_server_description(); 
--  $version = Apache2::ServerUtil::get_server_version();
-   $banner = Apache2::ServerUtil::get_server_banner(); 
-   
-   # ServerRoot value
-@@ -365,6 +364,8 @@ Get the server version string
- 
-   $version = Apache2::ServerUtil::get_server_version();
- 
-+This function is deprecated. Use C<get_server_banner()> instead.
-+
- =over 4
- 
- =item ret: C<$version> ( string )
-diff --git a/lib/Apache2/Status.pm b/lib/Apache2/Status.pm
-index 65c3208..ee4bb8c 100644
---- a/lib/Apache2/Status.pm
-+++ b/lib/Apache2/Status.pm
-@@ -142,7 +142,7 @@ sub handler {
- sub header {
-     my $r = shift;
-     my $start = scalar localtime $^T;
--    my $srv = Apache2::ServerUtil::get_server_version();
-+    my $srv = Apache2::ServerUtil::get_server_banner();
-     $r->content_type("text/html");
-     my $v = $^V ? sprintf "v%vd", $^V : $];
-     $r->print(<<"EOF");
--- 
-2.25.4
-
diff --git a/perl/mod_perl/mod_perl-2.0.11-Fix-build-with-perl-5.33.7.patch b/perl/mod_perl/mod_perl-2.0.11-Fix-build-with-perl-5.33.7.patch
deleted file mode 100644
index 5b754abaee02..000000000000
--- a/perl/mod_perl/mod_perl-2.0.11-Fix-build-with-perl-5.33.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 916376b4559d194ca618ce52c5a937fb000350be Mon Sep 17 00:00:00 2001
-From: Steve Hay <stevehay@apache.org>
-Date: Tue, 20 Apr 2021 13:55:29 +0000
-Subject: [PATCH] Fix build for perl >= 5.33.7
-
-Patch by Leon Timmermans <fawaka@gmail.com> from https://github.com/Perl/perl5/issues/18617
-
-git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1889014 13f79535-47bb-0310-9956-ffa450edef68
----
- src/modules/perl/modperl_perl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/perl/modperl_perl.c b/src/modules/perl/modperl_perl.c
-index fe0f484f..9ec744f9 100644
---- a/src/modules/perl/modperl_perl.c
-+++ b/src/modules/perl/modperl_perl.c
-@@ -268,7 +268,7 @@ void modperl_hash_seed_set(pTHX)
- #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;
diff --git a/perl/mod_perl/mod_perl.SlackBuild b/perl/mod_perl/mod_perl.SlackBuild
index c1d0143f80a3..041e3a3cc82f 100644
--- a/perl/mod_perl/mod_perl.SlackBuild
+++ b/perl/mod_perl/mod_perl.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mod_perl
 
 # Copyright 2007-2012 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mod_perl
-VERSION=${VERSION:-2.0.11}
+VERSION=${VERSION:-2.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -85,9 +85,6 @@ sed -i -e '1098,1102d' Apache-Test/lib/Apache/TestRun.pm
 sed -i '51,56c push @INC, "xs/tables/current24";' lib/ModPerl/MapUtil.pm
 sed -i -e '66d' src/modules/perl/modperl_sys.c
 
-patch -p1 < $CWD/mod_perl-2.0.11-Do-not-use-deprecated-ap_get_server_version-in-Serve.patch
-patch -p1 < $CWD/mod_perl-2.0.11-Fix-build-with-perl-5.33.7.patch
-
 # Remove failing tests, CPAN RT#118919, CPAN RT#132919
 for F in \
   ModPerl-Registry/t/closure.t \
diff --git a/perl/mod_perl/mod_perl.info b/perl/mod_perl/mod_perl.info
index 4c74ab020a7e..ce30e6fde8b3 100644
--- a/perl/mod_perl/mod_perl.info
+++ b/perl/mod_perl/mod_perl.info
@@ -1,8 +1,8 @@
 PRGNAM="mod_perl"
-VERSION="2.0.11"
+VERSION="2.0.12"
 HOMEPAGE="https://perl.apache.org/"
-DOWNLOAD="http://apache.org/dist/perl/mod_perl-2.0.11.tar.gz"
-MD5SUM="897708961bcc079b53c91860f95a2b59"
+DOWNLOAD="http://apache.org/dist/perl/mod_perl-2.0.12.tar.gz"
+MD5SUM="1b4af8c30051d0767c818099c2a2a82e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""