diff --git a/apache2-mod_perl-perl-5.38.patch b/apache2-mod_perl-perl-5.38.patch new file mode 100644 index 0000000..26ee7bc --- /dev/null +++ b/apache2-mod_perl-perl-5.38.patch @@ -0,0 +1,14 @@ +--- trunk/src/modules/perl/modperl_io.c 2014/06/12 09:29:09 1602105 ++++ trunk/src/modules/perl/modperl_io.c 2023/06/27 08:38:15 1910623 +@@ -116,8 +116,8 @@ + save_gp(handle, 1); + + sv_setref_pv(sv, "Apache2::RequestRec", (void*)r); +- status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", +- 9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1); ++ status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", ++ 9, FALSE, mode, 0, (PerlIO *)NULL, &sv, 1); + if (status == 0) { + Perl_croak(aTHX_ "Failed to open STD%s: %" SVf, + mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE)); + diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes index fb6a4c1..61d8dfe 100644 --- a/apache2-mod_perl.changes +++ b/apache2-mod_perl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 8 09:38:00 UTC 2023 - Dominique Leuenberger + +- Add apache2-mod_perl-perl-5.38.patch: Fix build with Perl 5.38. + Usptream rev 1910623. + ------------------------------------------------------------------- Thu Apr 21 15:15:11 UTC 2022 - David Anes diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec index c57605b..b348dcc 100644 --- a/apache2-mod_perl.spec +++ b/apache2-mod_perl.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_perl # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 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,7 @@ Source2: https://www.apache.org/dist/perl/KEYS#/%{name}.keyring 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 +Patch3: apache2-mod_perl-perl-5.38.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: db-devel @@ -81,9 +82,7 @@ This package contains the include files useful for developing new software depending on apache2-mod_perl. %prep -%setup -q -n %{srcname}-%{version} -%patch1 -p1 -%patch2 -p1 +%autosetup -n %{srcname}-%{version} -p1 %build perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline"