From 06e71ce390d3ea23de41d27170fb225c26678d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 29 Jan 2018 16:53:11 +0100 Subject: [PATCH] Move guard_old_libcrypt_fix patch --- perl.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/perl.spec b/perl.spec index 1bb6a1c..0e445ec 100644 --- a/perl.spec +++ b/perl.spec @@ -257,16 +257,16 @@ Patch75: perl-5.27.7-Reenable-numeric-first-argument-of-system-on-VMS.pat Patch76: perl-5.26.1-perl-131746-avoid-undefined-behaviour-in-Copy-etc.patch Patch77: perl-5.27.3-avoid-the-address-of-.-will-always-evaluate-as-.-war.patch +# Conditionalize a fix for an old and long fixed bug +# in libcrypt / glibc, rhbz#1536752 +Patch78: perl-5.26.1-guard_old_libcrypt_fix.patch + # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch # Link XS modules to libperl.so with EU::MM on Linux, bug #960048 Patch201: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch -# Conditionalize a fix for an old and long fixed bug -# in libcrypt / glibc, rhbz#1536752 -Patch202: perl-5.26.1-guard_old_libcrypt_fix.patch - # Update some of the bundled modules # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions @@ -2853,9 +2853,9 @@ Perl extension for Version Objects %patch75 -p1 %patch76 -p1 %patch77 -p1 +%patch78 -p1 %patch200 -p1 %patch201 -p1 -%patch202 -p1 %if !%{defined perl_bootstrap} # Local patch tracking @@ -2902,6 +2902,7 @@ perl -x patchlevel.h \ 'Fedora Patch72: Fix tainting of s/// with overloaded replacement (RT#115266)' \ 'Fedora Patch73: Expand system() arguments before a fork (RT#121105)' \ 'Fedora Patch76: Avoid undefined behavior when copying memory in Glob and pp_caller (RT#131746)' \ + 'Fedora Patch78: Fix compatibility with libxcrypt (bug #1536752)' \ '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' \ %{nil}