Bug#926271: unblock: perl/5.28.1-6

Tue Apr 2 20:17:18 BST 2019

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package perl.

The version in sid fixes autopkgtest failures on arm64, ppc64 and s390x
(which were due to faulty tests) and has no runtime changes.

Changes:
 perl (5.28.1-6) unstable; urgency=medium
 .
   * Fix NDBM autopkgtests by recreating necessary hardlinks at test time
     (Closes: #925179)
   * Update patch metadata for the POSIX::mblen() fix.

The binary changes in the debdiff are just removals of the now unnecessary
test files (NDBM *.dir, replaced by hardlinks generated at test time.)

unblock perl/5.28.1-6

Many thanks for your work on the release, much appreciated!

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru perl-5.28.1/debian/changelog perl-5.28.1/debian/changelog

--- perl-5.28.1/debian/changelog	2019-03-16 16:02:28.000000000 +0200
+++ perl-5.28.1/debian/changelog	2019-03-31 14:51:22.000000000 +0300
@@ -1,3 +1,11 @@
+perl (5.28.1-6) unstable; urgency=medium
+
+  * Fix NDBM autopkgtests by recreating necessary hardlinks at test time
+    (Closes: #925179)
+  * Update patch metadata for the POSIX::mblen() fix.
+
+ -- Niko Tyni <ntyni at debian.org>  Sun, 31 Mar 2019 14:51:22 +0300
+
 perl (5.28.1-5) unstable; urgency=medium
 
   * Patch perlbug to use "editor" as the default editor. (Closes: #922609)
diff -Nru perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff
--- perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff	2019-03-16 16:02:28.000000000 +0200
+++ perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff	2019-03-31 14:42:43.000000000 +0300
@@ -1,4 +1,4 @@
-From 90d15e4f19daccb9ae8e917cd79d27c7bf368c86 Mon Sep 17 00:00:00 2001
+From c13d09cc35d629482559ef95109cb92e09f6a8e8 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <ntyni at debian.org>
 Date: Sun, 10 Mar 2019 19:40:42 +0200
 Subject: Fix POSIX::mblen mbstate_t initialization on threaded perls with
@@ -44,6 +44,7 @@
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1818953
 Bug-Debian: https://bugs.debian.org/924517
 Patch-Name: fixes/posix-mbrlen.diff
+Origin: backport, https://perl5.git.perl.org/perl.git/commit/25d7b7aa379d33ce2e8fe3e2bef4206b35739bc5
 ---
  MANIFEST           |  1 +
  ext/POSIX/POSIX.xs |  2 +-
diff -Nru perl-5.28.1/debian/source/include-binaries perl-5.28.1/debian/source/include-binaries
--- perl-5.28.1/debian/source/include-binaries	2019-03-16 16:02:28.000000000 +0200
+++ perl-5.28.1/debian/source/include-binaries	2019-03-31 14:42:57.000000000 +0300
@@ -3,14 +3,12 @@
 debian/tests/data/jessie.db
 debian/tests/data/amd64/jessie.gdbm
 debian/tests/data/jessie.gz
-debian/tests/data/amd64/jessie-ndbm.dir
 debian/tests/data/amd64/jessie-ndbm.pag
 debian/tests/data/jessie.storable
 debian/tests/data/stretch.bz2
 debian/tests/data/stretch.db
 debian/tests/data/amd64/stretch.gdbm
 debian/tests/data/stretch.gz
-debian/tests/data/amd64/stretch-ndbm.dir
 debian/tests/data/amd64/stretch-ndbm.pag
 debian/tests/data/stretch.storable
 debian/tests/data/buster.bz2
@@ -27,7 +25,6 @@
 debian/tests/data/arm64/buster-ndbm.dir
 debian/tests/data/arm64/buster-ndbm.pag
 debian/tests/data/arm64/stretch.gdbm
-debian/tests/data/arm64/stretch-ndbm.dir
 debian/tests/data/arm64/stretch-ndbm.pag
 debian/tests/data/armhf/buster.gdbm
 debian/tests/data/armhf/buster-ndbm.dir
@@ -36,11 +33,9 @@
 debian/tests/data/ppc64el/buster-ndbm.dir
 debian/tests/data/ppc64el/buster-ndbm.pag
 debian/tests/data/ppc64el/stretch.gdbm
-debian/tests/data/ppc64el/stretch-ndbm.dir
 debian/tests/data/ppc64el/stretch-ndbm.pag
 debian/tests/data/s390x/buster.gdbm
 debian/tests/data/s390x/buster-ndbm.dir
 debian/tests/data/s390x/buster-ndbm.pag
 debian/tests/data/s390x/stretch.gdbm
-debian/tests/data/s390x/stretch-ndbm.dir
 debian/tests/data/s390x/stretch-ndbm.pag
Binary files /tmp/gywYCdxNpu/perl-5.28.1/debian/tests/data/amd64/jessie-ndbm.dir and /tmp/SK1ctzlX4m/perl-5.28.1/debian/tests/data/amd64/jessie-ndbm.dir differ
Binary files /tmp/gywYCdxNpu/perl-5.28.1/debian/tests/data/amd64/stretch-ndbm.dir and /tmp/SK1ctzlX4m/perl-5.28.1/debian/tests/data/amd64/stretch-ndbm.dir differ
Binary files /tmp/gywYCdxNpu/perl-5.28.1/debian/tests/data/arm64/stretch-ndbm.dir and /tmp/SK1ctzlX4m/perl-5.28.1/debian/tests/data/arm64/stretch-ndbm.dir differ
Binary files /tmp/gywYCdxNpu/perl-5.28.1/debian/tests/data/ppc64el/stretch-ndbm.dir and /tmp/SK1ctzlX4m/perl-5.28.1/debian/tests/data/ppc64el/stretch-ndbm.dir differ
Binary files /tmp/gywYCdxNpu/perl-5.28.1/debian/tests/data/s390x/stretch-ndbm.dir and /tmp/SK1ctzlX4m/perl-5.28.1/debian/tests/data/s390x/stretch-ndbm.dir differ
diff -Nru perl-5.28.1/debian/tests/ndbm perl-5.28.1/debian/tests/ndbm
--- perl-5.28.1/debian/tests/ndbm	2019-03-16 16:02:28.000000000 +0200
+++ perl-5.28.1/debian/tests/ndbm	2019-03-31 14:42:57.000000000 +0300
@@ -6,10 +6,20 @@
 
 [ -d $DATA/$ARCH ] || exit 77
 
+TDIR=$(mktemp -d)
 echo "testing NDBM reading..."
 
-for db in $DATA/$ARCH/*-ndbm.dir; do
-    base=$(echo $db | sed 's/\.dir$//')
-    perl -MFcntl -MNDBM_File -le 'tie %h, q(NDBM_File), shift, O_RDWR, 0640 or die "opening NDBM file failed: $!"; die "contents of NDBM file not found?" if !$h{foo}; print $h{foo}' $base | grep OK
+for pag in $DATA/$ARCH/*-ndbm.pag; do
+    base=$(basename $pag .pag)
+    cp $pag $TDIR
+    dir=$(echo $pag | sed 's/\.pag$/.dir/')
+    if [ -e $dir ]; then
+        cp $dir $TDIR
+    else
+        # NDBM compat in stretch and earlier made .dir a hardlink to .pag
+        ln $TDIR/$base.pag $TDIR/$base.dir || exit 77
+    fi
+    perl -MFcntl -MNDBM_File -le 'tie %h, q(NDBM_File), shift, O_RDWR, 0640 or die "opening NDBM file failed: $!"; die "contents of NDBM file not found?" if !$h{foo}; print $h{foo}' $TDIR/$base | grep OK
 done
 
+rm -r "$TDIR"
