From a4b737109b007e590416868435234ed0f4c9cf77 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 2 May 2016 09:34:12 +0200 Subject: [PATCH] 5.22.2 bump --- .gitignore | 1 + perl-5.10.0-libresolv.patch | 4 ++-- perl.spec | 25 +++++++++++++------------ sources | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index e0e7271..123430c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ perl-5.12.1.tar.gz /perl-5.20.2.tar.bz2 /perl-5.22.0.tar.bz2 /perl-5.22.1.tar.bz2 +/perl-5.22.2.tar.bz2 diff --git a/perl-5.10.0-libresolv.patch b/perl-5.10.0-libresolv.patch index 237d481..3c41a2c 100644 --- a/perl-5.10.0-libresolv.patch +++ b/perl-5.10.0-libresolv.patch @@ -5,8 +5,8 @@ diff -up perl-5.10.0/Configure.didi perl-5.10.0/Configure : set usesocks on the Configure command line to enable socks. : List of libraries we want. : If anyone needs extra -lxxx, put those in a hint file. --libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld" -+libswanted="cl pthread socket resolv inet nsl nm ndbm gdbm dbm db malloc dl ld" +-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld" ++libswanted="cl pthread socket resolv inet nsl ndbm gdbm dbm db malloc dl ld" libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" : We probably want to search /usr/shlib before most other libraries. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. diff --git a/perl.spec b/perl.spec index 03876ff..43e94d2 100644 --- a/perl.spec +++ b/perl.spec @@ -1,4 +1,4 @@ -%global perl_version 5.22.1 +%global perl_version 5.22.2 %global perl_epoch 4 %global perl_arch_stem -thread-multi %global perl_archname %{_arch}-%{_os}%{perl_arch_stem} @@ -28,7 +28,7 @@ Name: perl Version: %{perl_version} # release number must be even higher, because dual-lived modules will be broken otherwise -Release: 360%{?dist} +Release: 361%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -93,10 +93,6 @@ Patch27: perl-5.22.0-make-PadlistNAMES-lvalue-again.patch # Workaround for Coro, bug #1231165, CPAN RT#101063. To remove in the future. Patch28: perl-5.22.0-Revert-const-the-core-magic-vtables.patch -# Fix CVE-2016-2381 (ambiguous environment variables handling), bug #1313702, -# in upstream after 5.23.8 -Patch29: perl-5.23.8-remove-duplicate-environment-variables-from-environ.patch - # Replace ExtUtils::MakeMaker dependency with ExtUtils::MM::Utils. # This allows not to require perl-devel. Bug #1129443 Patch30: perl-5.22.1-Replace-EU-MM-dependnecy-with-EU-MM-Utils-in-IPC-Cmd.patch @@ -125,7 +121,7 @@ BuildRequires: procps, rsyslog # compat macro needed for rebuild -%global perl_compat perl(:MODULE_COMPAT_5.22.1) +%global perl_compat perl(:MODULE_COMPAT_5.22.2) # File provides Provides: perl(bytes_heavy.pl) @@ -178,6 +174,7 @@ Group: Development/Languages License: GPL+ or Artistic # Compat provides Provides: %perl_compat +Provides: perl(:MODULE_COMPAT_5.22.1) Provides: perl(:MODULE_COMPAT_5.22.0) # Interpreter version to fulfil required genersted from "require 5.006;" Provides: perl(:VERSION) = %{perl_version} @@ -1085,8 +1082,10 @@ STDOUT. %if %{dual_life} || %{rebuild_from_scratch} %package -n perl-ExtUtils-MM-Utils Summary: ExtUtils::MM methods without dependency on ExtUtils::MakeMaker -License: GPL+ or Artistic Group: Development/Libraries +License: GPL+ or Artistic +Epoch: 0 +Version: 7.04 BuildArch: noarch Requires: %perl_compat @@ -1576,7 +1575,7 @@ Summary: What modules are shipped with versions of perl Group: Development/Libraries License: GPL+ or Artistic Epoch: 1 -Version: 5.20151213 +Version: 5.20160429 Requires: %perl_compat Requires: perl(List::Util) Requires: perl(version) >= 0.88 @@ -1592,7 +1591,7 @@ Summary: Tool for listing modules shipped with perl Group: Development/Tools License: GPL+ or Artistic Epoch: 1 -Version: 5.20151213 +Version: 5.20160429 Requires: %perl_compat Requires: perl(feature) Requires: perl(version) >= 0.88 @@ -2385,7 +2384,6 @@ Perl extension for Version Objects %patch26 -p1 %patch27 -p1 %patch28 -p1 -%patch29 -p1 %patch30 -p1 %patch200 -p1 %patch201 -p1 @@ -2407,7 +2405,6 @@ perl -x patchlevel.h \ 'Fedora Patch26: Make *DBM_File desctructors thread-safe (RT#61912)' \ 'Fedora Patch27: Make PadlistNAMES() lvalue again (CPAN RT#101063)' \ 'Fedora Patch28: Make magic vtable writable as a work-around for Coro (CPAN RT#101063)' \ - 'Fedora Patch29: Fix CVE-2016-2381 (ambiguous environment variables handling)' \ 'Fedora Patch30: Replace EU::MakeMaker dependency with EU::MM::Utils in IPC::Cmd (bug #1129443)' \ 'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \ 'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \ @@ -4679,6 +4676,10 @@ popd # Old changelog entries are preserved in CVS. %changelog +* Mon May 02 2016 Jitka Plesnikova - 4:5.22.6-361 +- 5.22.2 bump (see + for release notes) + * Mon Apr 18 2016 Petr Pisar - 4:5.22.1-360 - Weak perl-Encode-devel dependency on perl-devel to Recommends level (bug #1129443) diff --git a/sources b/sources index 53010b5..e61a1ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67242b9bd642b458bec884ed2a040910 perl-5.22.1.tar.bz2 +24ec0b41fdd1a4cce0e66811ae1f5e1b perl-5.22.2.tar.bz2