- rediff patches

diff --git a/perl-write-permissions.patch b/perl-write-permissions.patch
index 9cc71e79bb6ea59393e8de531507f55b6f744cec..b24883c8c0ceb52070f996d4f6f1b31f178505bf 100644 (file)
--- a/perl-write-permissions.patch
+++ b/perl-write-permissions.patch
@@ -1,7 +1,8 @@
---- perl-5.12.0/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm.orig     2009-08-03 21:36:03.000000000 +0200
-+++ perl-5.12.0/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm  2009-09-12 10:07:06.181527344 +0200
-@@ -813,7 +813,7 @@
-                 utime($atime,$mtime + $Is_VMS,$targetfile) unless $dry_run>1;
+diff -urNp -x '*.orig' perl-5.32.1.org/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm perl-5.32.1/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
+--- perl-5.32.1.org/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm      2020-12-18 11:04:35.000000000 +0100
++++ perl-5.32.1/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm  2021-04-01 22:48:39.572968964 +0200
+@@ -825,7 +825,7 @@ sub install { #XXX OS-SPECIFIC
+                 utime($atime,$mtime + Is_VMS,$targetfile) unless $dry_run>1;

  
  
 -                $mode = 0444 | ( $mode & 0111 ? 0111 : 0 );
  
  
 -                $mode = 0444 | ( $mode & 0111 ? 0111 : 0 );


@@ -18,9 +19,10 @@
          next unless $from =~ /\.pm$/;
          _autosplit($to,$autodir) if defined $autodir;
      }
          next unless $from =~ /\.pm$/;
          _autosplit($to,$autodir) if defined $autodir;
      }

---- perl-5.20.0/cpan/ExtUtils-Install/t/Install.t.orig 2014-05-29 13:11:07.961096445 +0200
-+++ perl-5.20.0/cpan/ExtUtils-Install/t/Install.t      2014-05-29 13:11:20.681234036 +0200
-@@ -237,7 +237,7 @@
+diff -urNp -x '*.orig' perl-5.32.1.org/cpan/ExtUtils-Install/t/Install.t perl-5.32.1/cpan/ExtUtils-Install/t/Install.t
+--- perl-5.32.1.org/cpan/ExtUtils-Install/t/Install.t  2020-12-18 11:04:35.000000000 +0100
++++ perl-5.32.1/cpan/ExtUtils-Install/t/Install.t      2021-04-01 22:48:39.572968964 +0200
+@@ -240,7 +240,7 @@ SKIP: {

                           },
      ]);
  
                           },
      ]);
  


@@ -29,7 +31,7 @@
  
      use File::Compare;
      ok(compare("$bigdir/Dummy.pm", "$bigdir/DummyHard.pm"),
  
      use File::Compare;
      ok(compare("$bigdir/Dummy.pm", "$bigdir/DummyHard.pm"),

-@@ -261,7 +261,7 @@
+@@ -264,7 +264,7 @@ SKIP: {

                           },
      ]);
  
                           },
      ]);
  

diff --git a/perl_580-errno_h-parsing.patch b/perl_580-errno_h-parsing.patch
index 7b490ba06c4b870672bf53c41cc158244d97fda1..83d6791a634b8e8ab5b1cdebf22e6c4ba6212008 100644 (file)
--- a/perl_580-errno_h-parsing.patch
+++ b/perl_580-errno_h-parsing.patch
@@ -1,7 +1,7 @@
-diff -urN perl-5.6.1.orig/ext/Errno/Errno_pm.PL perl-5.6.1/ext/Errno/Errno_pm.PL
---- perl-5.6.1.orig/ext/Errno/Errno_pm.PL      Sun Apr  8 08:09:16 2001
-+++ perl-5.6.1/ext/Errno/Errno_pm.PL   Thu Apr 12 20:58:53 2001
-@@ -37,6 +37,13 @@
+diff -urNp -x '*.orig' perl-5.32.1.org/ext/Errno/Errno_pm.PL perl-5.32.1/ext/Errno/Errno_pm.PL
+--- perl-5.32.1.org/ext/Errno/Errno_pm.PL      2020-12-18 11:04:36.000000000 +0100
++++ perl-5.32.1/ext/Errno/Errno_pm.PL  2021-04-01 22:48:31.609573602 +0200
+@@ -67,6 +67,13 @@ sub process_file {

              warn "Cannot open '$file'";
              return;
        }     
              warn "Cannot open '$file'";
              return;
        }     


@@ -13,5 +13,5 @@ diff -urN perl-5.6.1.orig/ext/Errno/Errno_pm.PL perl-5.6.1/ext/Errno/Errno_pm.PL
 +            return;
 +      }
      } else {
 +            return;
 +      }
      } else {

-       unless(open(FH,"< $file")) {
+       unless(open(FH, '<', $file)) {

            # This file could be a temporary file created by cppstdin
            # This file could be a temporary file created by cppstdin

diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch
index 49d6ab29e3c8e84e4952deb499103250225acbaa..f276779fcbf1f5746ffe82dbf8db603e218d755d 100644 (file)
--- a/perl_585-microperl_uconfig.patch
+++ b/perl_585-microperl_uconfig.patch
@@ -1,6 +1,17 @@
---- perl-5.14.0/uconfig.sh.orig        2010-03-14 22:15:34.000000000 +0100
-+++ perl-5.14.0/uconfig.sh     2010-04-13 18:38:00.35323141 +0200
-@@ -5,12 +5,7 @@
+diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.h perl-5.32.1/uconfig.h
+--- perl-5.32.1.org/uconfig.h  2020-12-18 11:04:36.000000000 +0100
++++ perl-5.32.1/uconfig.h      2021-04-01 22:48:37.569619974 +0200
+@@ -5261,5 +5261,5 @@
+ 
+ /* Generated from:
+  * 14796a77fb4ae3335f5e589a98445bc6e838b688194f6f112537495f0814f5d5 config_h.SH
+- * 6e8898de349ca5bd5102aa12be91e6884110157cb9267e661f6fc797bbd54649 uconfig.sh
++ * 5d72b5bac11a4773e6490158d2275d9d933929c27b1a0728324e14addf64b9cb uconfig.sh
+  * ex: set ro: */
+diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.sh perl-5.32.1/uconfig.sh
+--- perl-5.32.1.org/uconfig.sh 2020-12-18 11:04:36.000000000 +0100
++++ perl-5.32.1/uconfig.sh     2021-04-01 22:48:37.569619974 +0200
+@@ -6,12 +6,7 @@ afs='false'

  afsroot='/afs'
  alignbytes='4'
  aphostname='/bin/hostname'
  afsroot='/afs'
  alignbytes='4'
  aphostname='/bin/hostname'


@@ -13,25 +24,25 @@
  bootstrap_charset='undef'
  byteorder='1234'
  castflags='0'
  bootstrap_charset='undef'
  byteorder='1234'
  castflags='0'

-@@ -44,7 +39,7 @@
- d_accessx='undef'
+@@ -48,7 +43,7 @@ d_accessx='undef'
+ d_acosh='undef'

  d_aintl='undef'
  d_alarm='undef'
 -d_archlib='undef'
 +d_archlib='define'
  d_asctime64='undef'
  d_asctime_r='undef'
  d_aintl='undef'
  d_alarm='undef'
 -d_archlib='undef'
 +d_archlib='define'
  d_asctime64='undef'
  d_asctime_r='undef'

- d_atolf='undef'
-@@ -232,7 +232,7 @@
- d_link='undef'
+ d_asinh='undef'
+@@ -292,7 +287,7 @@ d_llroundl='undef'
+ d_localeconv_l='undef'

  d_localtime64='undef'
  d_localtime_r='undef'
 -d_localtime_r_needs_tzset='undef'
 +d_localtime_r_needs_tzset='define'
  d_locconv='undef'
  d_lockf='undef'
  d_localtime64='undef'
  d_localtime_r='undef'
 -d_localtime_r_needs_tzset='undef'
 +d_localtime_r_needs_tzset='define'
  d_locconv='undef'
  d_lockf='undef'

- d_longdbl='undef'
-@@ -662,14 +657,10 @@
+ d_log1p='undef'
+@@ -774,15 +769,11 @@ obj_ext='.o'

  old_pthread_create_joinable=''
  optimize=''
  orderlib='false'
  old_pthread_create_joinable=''
  optimize=''
  orderlib='false'


@@ -46,8 +57,9 @@
 -privlibexp='/usr/local/lib/perl5/5.32'
  procselfexe=''
  prototype='undef'
 -privlibexp='/usr/local/lib/perl5/5.32'
  procselfexe=''
  prototype='undef'

-@@ -700,8 +691,6 @@
- sPRIXU64='"LX"'
+ ptrsize='4'
+@@ -813,8 +804,6 @@ sPRIu64='"Lu"'
+ sPRIx64='"Lx"'

  sSCNfldbl='"llf"'
  sched_yield='sched_yield()'
 -scriptdir='/usr/local/bin'
  sSCNfldbl='"llf"'
  sched_yield='sched_yield()'
 -scriptdir='/usr/local/bin'


@@ -55,12 +67,3 @@
  seedfunc='Perl_drand48_init'
  selectminbits='32'
  selecttype=int
  seedfunc='Perl_drand48_init'
  selectminbits='32'
  selecttype=int

---- p/uconfig.h~       2012-08-03 19:35:26.000000000 +0200
-+++ p/uconfig.h        2012-08-28 19:39:39.192490428 +0200
-@@ -4735,5 +4735,5 @@
- 
- /* Generated from:
-  * 14796a77fb4ae3335f5e589a98445bc6e838b688194f6f112537495f0814f5d5 config_h.SH
-- * 6e8898de349ca5bd5102aa12be91e6884110157cb9267e661f6fc797bbd54649 uconfig.sh
-+ * 5d72b5bac11a4773e6490158d2275d9d933929c27b1a0728324e14addf64b9cb uconfig.sh
-  * ex: set ro: */