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 2021-09-30 23:43:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_perl (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_perl.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_perl"
Thu Sep 30 23:43:30 2021 rev:46 rq:922285 version:2.0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_perl/apache2-mod_perl.changes
2020-02-20 14:58:53.114700690 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_perl.new.2443/apache2-mod_perl.changes
2021-09-30 23:44:45.840563402 +0200
@@ -1,0 +2,5 @@
+Mon Sep 27 16:39:34 UTC 2021 - Dirk Stoecker <[email protected]>
+
+- fix build error with fix_perl_5.34_build.patch
+
+-------------------------------------------------------------------
New:
----
fix_perl_5.34_build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_perl.spec ++++++
--- /var/tmp/diff_new_pack.waVLZv/_old 2021-09-30 23:44:46.324563957 +0200
+++ /var/tmp/diff_new_pack.waVLZv/_new 2021-09-30 23:44:46.324563957 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_perl
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@
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
@@ -84,6 +86,7 @@
%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"
++++++ fix_perl_5.34_build.patch ++++++
diff -ur mod_perl-2.0.11/src/modules/perl/modperl_perl.c
mod_perl-2.0.11_fix/src/modules/perl/modperl_perl.c
--- mod_perl-2.0.11/src/modules/perl/modperl_perl.c 2019-10-05
13:04:42.000000000 +0200
+++ mod_perl-2.0.11_fix/src/modules/perl/modperl_perl.c 2021-09-27
18:45:52.566005007 +0200
@@ -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;
diff -ur mod_perl-2.0.11/src/modules/perl/modperl_util.c
mod_perl-2.0.11_fix/src/modules/perl/modperl_util.c
--- mod_perl-2.0.11/src/modules/perl/modperl_util.c 2019-10-05
13:04:43.000000000 +0200
+++ mod_perl-2.0.11_fix/src/modules/perl/modperl_util.c 2021-09-27
18:38:17.156578770 +0200
@@ -632,7 +632,7 @@
if (r->finfo.size != size) {
SvREFCNT_dec(sv);
- Perl_croak(aTHX_ "Error: read %d bytes, expected %d ('%s')",
+ Perl_croak(aTHX_ "Error: read %ld bytes, expected %ld ('%s')",
size, (apr_size_t)r->finfo.size, r->filename);
}
