perl/apache2-mod_perl
SHA256
8
0
Fork 0
forked from pool/apache2-mod_perl
Code Pull Requests Activity

Accepting request 921864 from devel:languages:perl

Browse Source 
- fix build error with fix_perl_5.34_build.patch

OBS-URL: https://build.opensuse.org/request/show/921864
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=77
This commit is contained in:
Pedro Monreal Gonzalez
2021-09-30 07:25:26 +00:00
committed by Git OBS Bridge
parent 0d720ad71f
commit bbd2008586
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apache2-mod_perl.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 27 16:39:34 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
- fix build error with fix_perl_5.34_build.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 13 08:03:41 UTC 2020 - pgajdos@suse.com Thu Feb 13 08:03:41 UTC 2020 - pgajdos@suse.com

5
apache2-mod_perl.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package apache2-mod_perl # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@ Source2: https://www.apache.org/dist/perl/KEYS#/%{name}.keyring
Patch1: avoid-broken-provides.diff Patch1: avoid-broken-provides.diff
# bsc#1091625, workaround, according to mls it should be solved in perl # bsc#1091625, workaround, according to mls it should be solved in perl
Patch2: apache2-mod_perl-prctl-short-name.patch 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: apache-rpm-macros
BuildRequires: apache2-devel BuildRequires: apache2-devel
BuildRequires: db-devel BuildRequires: db-devel
@@ -84,6 +86,7 @@ software depending on apache2-mod_perl.
%setup -q -n %{srcname}-%{version} %setup -q -n %{srcname}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline" perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline"

24
fix_perl_5.34_build.patch Normal file
View File

@@ -0,0 +1,24 @@
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);
}