diff --git a/bootstrap-packages b/bootstrap-packages index 55b09d62bebc33443daba7b4a14d5130aebf810f..7002f0416b0bf6e2cd594947b5f361a57cca83f3 100644 --- a/bootstrap-packages +++ b/bootstrap-packages @@ -760,7 +760,7 @@ encoder/decoder. These encoding methods are specified in RFC 2045 - MIME Summary: What modules are shipped with versions of perl License: GPL+ or Artistic Epoch: 1 -Version: 5.20220520 +Version: 5.20230423 Requires: perl(List::Util) perl(version) >= 0.88 %gendep_perl_Module_CoreList BuildArch: noarch @@ -774,7 +774,7 @@ are shipped with each version of perl. Summary: Tool for listing modules shipped with perl License: GPL+ or Artistic Epoch: 1 -Version: 5.20220520 +Version: 5.20230423 Requires: perl(feature) perl(version) >= 0.88 Requires: perl-Module-CoreList = %{epoch}:%{version}-%{release} %gendep_perl_Module_CoreList_tools diff --git a/perl-5.36.0.tar.xz b/perl-5.36.1.tar.xz similarity index 60% rename from perl-5.36.0.tar.xz rename to perl-5.36.1.tar.xz index 0d59f70554a1514182c03b0730f5d66a620fbf07..cf7b9e077f878c895066308d3c6f3d350204fd46 100644 Binary files a/perl-5.36.0.tar.xz and b/perl-5.36.1.tar.xz differ diff --git a/perl-configure-c99.patch b/perl-configure-c99.patch deleted file mode 100644 index 91258f7a03d9ce6f6dfdf80f7861c8772474f49e..0000000000000000000000000000000000000000 --- a/perl-configure-c99.patch +++ /dev/null @@ -1,94 +0,0 @@ -Avoid implicit ints and implicit function declarations, for improved -compatibility with future compilers which will reject them by default. - -Submitted upstream: - -diff --git a/Configure b/Configure -index 9bd6a7ad9465c2ce..75c090edc37015da 100755 ---- a/Configure -+++ b/Configure -@@ -4638,7 +4638,7 @@ esac - # so we will take those off from locincpth. - case "$gccversion" in - 3.*) -- echo "main(){}">try.c -+ echo "int main(){}">try.c - for incdir in $locincpth; do - warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \ - grep '^c[cp]p*[01]: warning: changing search order '` -@@ -5771,6 +5771,7 @@ case "$intsize" in - #ifdef I_STDLIB - #include - #endif -+#include - int main() - { - printf("intsize=%d;\n", (int)sizeof(int)); -@@ -6844,6 +6845,7 @@ case "$doublesize" in - #ifdef I_STDLIB - #include - #endif -+#include - int main() - { - printf("%d\n", (int)sizeof(double)); -@@ -12606,7 +12608,7 @@ case "$dlsrc" in - dl_dlopen.xs) - echo "Checking whether your dlsym() needs a leading underscore ..." >&4 - $cat >dyna.c <<'EOM' --fred () { } -+void fred (void) { } - EOM - - $cat >fred.c<fred.c< - #endif - --extern int fred() ; -+extern void fred(void) ; - - int main() - { -@@ -13659,6 +13661,7 @@ $cat >try.c < - #endif -+#include - #define FILE_ptr(fp) $stdio_ptr - #define FILE_cnt(fp) $stdio_cnt - int main() { -@@ -16166,6 +16169,7 @@ echo "Checking to see if your libm supports _LIB_VERSION..." >&4 - $cat >try.c < - #include -+#include - int main (int argc, char *argv[]) - { - printf ("%d\n", _LIB_VERSION); -@@ -22063,13 +22067,15 @@ pager="$ans" - : see if ar generates random libraries by itself - echo " " - echo "Checking how to generate random libraries on your machine..." >&4 --echo 'int bar1() { return bar2(); }' > bar1.c -+echo 'extern int bar2(); int bar1() { return bar2(); }' > bar1.c - echo 'int bar2() { return 2; }' > bar2.c - $cat > foo.c < - #endif -+#include -+extern int bar1(); - int main() { printf("%d\n", bar1()); exit(0); } - EOP - $cc $ccflags -c bar1.c >/dev/null 2>&1 -@@ -22295,7 +22301,7 @@ EOM - for nfd in 'int' 'size_t' 'unsigned long' 'unsigned' ; do - for tmo in 'struct timeval *' 'const struct timeval *'; do - case "$val" in -- '') try="$extern_C select _(($nfd, $xxx, $xxx, $xxx, $tmo));" -+ '') try="$extern_C int select _(($nfd, $xxx, $xxx, $xxx, $tmo));" - if ./protochk "$try" $hdrs; then - echo "Your system accepts $xxx." - val="$xxx" diff --git a/perl.spec b/perl.spec index 0f09534331626ea17860e62248e30b24fc21dff4..0caa2f1d3d417dca29aa650d015595eb63368c33 100644 --- a/perl.spec +++ b/perl.spec @@ -1,7 +1,7 @@ # anolis_release number must be even higher, because dual-lived modules will be broken otherwise -%define anolis_release 10 +%define anolis_release 11 -%global perl_version 5.36.0 +%global perl_version 5.36.1 %global perl_epoch 4 %global tapsetdir %{_datadir}/systemtap/tapset %global perl5_testdir %{_libexecdir}/perl5-tests @@ -65,7 +65,6 @@ Patch13: perl-5.28.0-Pass-CFLAGS-to-dtrace.patch Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch Patch201: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch Patch202: perl-5.36.0-Add-definition-of-OPTIMIZE-to-.ph-files.patch -Patch203: perl-configure-c99.patch BuildRequires: bash bzip2-devel coreutils findutils gcc glibc-common make BuildRequires: sed tar zlib-devel @@ -99,7 +98,7 @@ BuildRequires: rsyslog %endif %endif -%global perl_compat perl(:MODULE_COMPAT_5.36.0) +%global perl_compat perl(:MODULE_COMPAT_5.36.1) Requires: perl-interpreter = %{perl_epoch}:%{perl_version}-%{release} Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} @@ -213,6 +212,7 @@ package. Summary: The libraries for the perl run-time License: (GPL+ or Artistic) and BSD and HSRL and MIT and UCD and Public domain Provides: %perl_compat +Provides: perl(:MODULE_COMPAT_5.36.0) Provides: perl(:VERSION) = %{perl_version} Provides: perl(:WITH_64BIT) perl(:WITH_ITHREADS) perl(:WITH_THREADS) Provides: perl(:WITH_LARGEFILES) perl(:WITH_PERLIO) perl(bytes_heavy.pl) @@ -1450,6 +1450,7 @@ License: GPL+ or Artistic Epoch: 0 Version: 2.03 Requires: perl(Carp) +Requires: perl(locale) %if %{defined perl_bootstrap} %gendep_perl_POSIX %endif @@ -1895,17 +1896,17 @@ echo "RPM Build arch: %{_arch}" /bin/sh Configure -des \ -Doptimize="none" \ - -Dccflags="$RPM_OPT_FLAGS" \ - -Dldflags="$RPM_LD_FLAGS" \ - -Dccdlflags="-Wl,--enable-new-dtags $RPM_LD_FLAGS" \ - -Dlddlflags="-shared $RPM_LD_FLAGS" \ + -Dccflags="%{build_cflags}" \ + -Dldflags="%{build_ldflags}" \ + -Dccdlflags="-Wl,--enable-new-dtags %{build_ldflags}" \ + -Dlddlflags="-shared %{build_ldflags}" \ -Dshrpdir="%{_libdir}" \ -DDEBUGGING=-g \ -Dversion=%{perl_version} \ -Dmyhostname=localhost \ -Dperladmin=root@localhost \ -Dcc='%{__cc}' \ - -Dcf_by='Red Hat, Inc.' \ + -Dcf_by='Anolis' \ -Dprefix=%{_prefix} \ %if %{without groff} -Dman1dir="%{_mandir}/man1" \ @@ -1961,7 +1962,7 @@ test -L %soname || ln -s libperl.so %soname %make_build %install -make install DESTDIR=%{buildroot} +%make_install %global build_archlib %{buildroot}%{arch_lib} %global build_privlib %{buildroot}%{priv_lib} @@ -2575,6 +2576,9 @@ LC_ALL=C TEST_JOBS=$JOBS make test_harness %{_mandir}/man3/vmsish.* %changelog +* Tue Jul 11 2023 Funda Wang - 5.36.1-11 +- New version 5.36.1 + * Wed Apr 12 2023 Chunmei Xu - 5.36.0-10 - fix requires info of perl-libs