CVS commit: pkgsrc/lang/perl5

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jul  4 10:26:29 UTC 2023

Modified Files:
        pkgsrc/lang/perl5: distinfo
        pkgsrc/lang/perl5/patches: patch-Configure
Removed Files:
        pkgsrc/lang/perl5/patches: patch-perl.c

Log Message:
perl5: Revert reproducibility patch.

The perl configure script parses the output of "uname -a" to calculate the OS
name, version, and also has logic to alter behaviour based on the CPU type,
etc.  The reproducibility patch breaks all that by only running "uname -s", so
all of the logic returns nothing.

This at minimum breaks the build on SunOS platforms, but likely breaks others,
if not hiding nasty bugs on platforms that on the surface appear to build ok.


To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 pkgsrc/lang/perl5/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/perl5/patches/patch-Configure
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/perl5/patches/patch-perl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/perl5/distinfo
diff -u pkgsrc/lang/perl5/distinfo:1.179 pkgsrc/lang/perl5/distinfo:1.180
--- pkgsrc/lang/perl5/distinfo:1.179    Mon Jul  3 21:06:13 2023
+++ pkgsrc/lang/perl5/distinfo  Tue Jul  4 10:26:28 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.179 2023/07/03 21:06:13 nikita Exp $
+$NetBSD: distinfo,v 1.180 2023/07/04 10:26:28 jperkin Exp $
 
 BLAKE2s (perl-5.36.1.tar.xz) = d1bfb3348be21613b3bde6246682ba15afe58d2dd786e99ffa8325ee368256c3
 SHA512 (perl-5.36.1.tar.xz) = 8d1ec654c59d078bfc477f11c9526233199a85e4d4f6f5a55bf9eb7802cd355189c669cc6785d2d5e741c1de4d740b7a0cfd3c0198122586a07ac7f527fb14af
 Size (perl-5.36.1.tar.xz) = 13053604 bytes
-SHA1 (patch-Configure) = afbc6660012128531e53ec7da8f077c5e39f0dfd
+SHA1 (patch-Configure) = a72983dba63f32f57418f2702b039585ba7236a7
 SHA1 (patch-Makefile.SH) = 56203aea57c429a94760f039a978463b8859b0a9
 SHA1 (patch-caretx.c) = b76b4175a58123fa4dfd2adf36b2207dcb6cf65a
 SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm) = 79e5aeccfa272ca5ec08bffc616d8053ae90ac51
@@ -14,4 +14,3 @@ SHA1 (patch-hints_linux.sh) = 4baa8f8069
 SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
 SHA1 (patch-hints_solaris__2.sh) = 364a28ca57dbabe1f902b601e336532996db6a0e
 SHA1 (patch-installperl) = b129d64cc17b898b44fe6282b8b1df36e342d0ef
-SHA1 (patch-perl.c) = 2e2e536a8a7e5165af7c429d36181ef4105f5e4e

Index: pkgsrc/lang/perl5/patches/patch-Configure
diff -u pkgsrc/lang/perl5/patches/patch-Configure:1.12 pkgsrc/lang/perl5/patches/patch-Configure:1.13
--- pkgsrc/lang/perl5/patches/patch-Configure:1.12      Mon Jul  3 21:06:13 2023
+++ pkgsrc/lang/perl5/patches/patch-Configure   Tue Jul  4 10:26:29 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-Configure,v 1.12 2023/07/03 21:06:13 nikita Exp $
+$NetBSD: patch-Configure,v 1.13 2023/07/04 10:26:29 jperkin Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 * Move $loclibpth to the end of $dlist, instead of the beginning.
@@ -8,66 +8,57 @@ $NetBSD: patch-Configure,v 1.12 2023/07/
 * Several other changes.
 * Add rpath for QNX
 
-* reproducibility patch from guix:
-Don't encode the current timestamp.
-
-This affects the output of `perl -V`, specifically the message "Compiled
-at [...]".
-
-The 'cf_time' and 'cf_by' values show up in 'config.h' and
-in 'Config_heavy.pl'.
-
-Use the output of 'uname -s' instead of 'uname -a' to avoid recording
-the kernel version ('uname -o' leads to directory names like
-'x86_64-gnulinux' instead of 'x86_64-linux', which might cause breakage
-down the road.)
-
 --- Configure.orig     2021-05-04 06:52:48.000000000 +0000
 +++ Configure
-@@ -3317,7 +3317,7 @@
- : Try to determine whether config.sh was made on this system
- case "$config_sh" in
- '')
--myuname=`$uname -a 2>/dev/null`
-+myuname=`$uname -s 2>/dev/null`
- $test -z "$myuname" && myuname=`hostname 2>/dev/null`
- # Downcase everything to avoid ambiguity.
- # Remove slashes and single quotes so we can use parts of this in
-@@ -3520,7 +3520,7 @@
+@@ -3482,13 +3482,14 @@ EOM
+                       osvers="$3"
                        ;;
-               MiNT)   osname=mint
+               dragonfly) osname=dragonfly
+-                      osvers="$3"
++                      osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
                        ;;
--              minix)  osname=minix
-+              minix*) osname=minix
+               dynixptx*) osname=dynixptx
+                       osvers=`echo "$4"|sed 's/^v//'`
+                       ;;
+               freebsd) osname=freebsd
+-                      osvers="$3" ;;
++                      osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
++                      ;;
+               genix)  osname=genix ;;
+               gnu)    osname=gnu
+                       osvers="$3" ;;
+@@ -3513,8 +3514,11 @@ EOM
+               minix)  osname=minix
                        osvers=`$uname -r`
                        ;;
++              minix*) osname=minix
++                      osvers=`$uname -r`
++                      ;;
                netbsd*) osname=netbsd
-@@ -3549,6 +3549,9 @@
+-                      osvers="$3"
++                      osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
+                       ;;
+               news-os) osvers="$3"
+                       case "$3" in
+@@ -3524,7 +3528,7 @@ EOM
+                       ;;
+               nonstop-ux) osname=nonstopux ;;
+               openbsd) osname=openbsd
+-                      osvers="$3"
++                      osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
+                       ;;
+               os2)    osname=os2
+                       osvers="$4"
+@@ -3539,6 +3543,9 @@ EOM
                qnx) osname=qnx
                        osvers="$4"
                        ;;
 +              sco_sv) osname=sco_sv
-+                      osvers="$3"
++                      osvers=`$uname -r`v`$uname -v`
 +                      ;;
                solaris) osname=solaris
                        case "$3" in
                        5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
-@@ -3889,13 +3889,13 @@
- . ./posthint.sh
- 
- : who configured the system
--cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`
-+cf_time="1970-01-01"
- case "$cf_by" in
- "")
-       cf_by=`(logname) 2>/dev/null`
-       case "$cf_by" in
-       "")
--              cf_by=`(whoami) 2>/dev/null`
-+              cf_by="pkgsrc"
-               case "$cf_by" in
-               "") cf_by=unknown ;;
-               esac ;;
 @@ -4861,7 +4868,7 @@ esac
  # If using gcc or clang, we can get better values for libpth, incpth
  # and usrinc directly from the compiler.