Control: tags 809198 + patch Control: tags 809198 + pending Dear maintainer,
I've prepared an NMU for maildirsync (versioned as 1.2-2.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Vieja Trova Santiaguera: Mil Gracias
diff -Nru maildirsync-1.2/debian/changelog maildirsync-1.2/debian/changelog
--- maildirsync-1.2/debian/changelog 2014-12-13 16:33:19.000000000 +0100
+++ maildirsync-1.2/debian/changelog 2015-12-31 00:07:48.000000000 +0100
@@ -1,3 +1,14 @@
+maildirsync (1.2-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "maildirsync broken with perl 5.22":
+ add patch use-UNIVERSAL.patch, taken from upstream's svn repo.
+ Also remove the disabled maildirsync.pl.diff patch which did something
+ similar but with ref, which is not recommended (cf. perldoc -f ref).
+ (Closes: #809198)
+
+ -- gregor herrmann <gre...@debian.org> Thu, 31 Dec 2015 00:06:24 +0100
+
maildirsync (1.2-2) unstable; urgency=low
* Fixed: perl-5.18's hash randomization breaks the sample script
diff -Nru maildirsync-1.2/debian/patches/maildirsync.pl.diff maildirsync-1.2/debian/patches/maildirsync.pl.diff
--- maildirsync-1.2/debian/patches/maildirsync.pl.diff 2014-12-13 16:29:48.000000000 +0100
+++ maildirsync-1.2/debian/patches/maildirsync.pl.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-Index: maildirsync-1.2/maildirsync.pl
-===================================================================
---- maildirsync-1.2.orig/maildirsync.pl 2011-08-30 11:34:05.484546482 -0430
-+++ maildirsync-1.2/maildirsync.pl 2011-08-30 11:35:09.052535202 -0430
-@@ -10,7 +10,6 @@
- use IO::Handle;
- use IPC::Open2;
- use Fcntl qw(SEEK_SET);
--use UNIVERSAL qw(isa);
- use strict;
- use warnings;
- require 5.006;
-@@ -96,8 +95,8 @@
- exit_with_error("Invalid parameter value: $optname: $value") if $value !~ /^$regex$/;
- }
- verbose 4 => "add option $optname = ".($value || "");
-- if (!isa($OPT{$optname}, 'ARRAY')) {
-- $OPT{$optname} = $value;
-+ if (!(ref($OPT{$optname}) eq 'ARRAY')) {
-+ $OPT{$optname} = $value;
- } else {
- push @{$OPT{$optname}}, $value;
- }
diff -Nru maildirsync-1.2/debian/patches/series maildirsync-1.2/debian/patches/series
--- maildirsync-1.2/debian/patches/series 2014-12-13 16:33:20.000000000 +0100
+++ maildirsync-1.2/debian/patches/series 2015-12-31 00:03:00.000000000 +0100
@@ -1,2 +1,3 @@
pod-5.18.patch
gpiero.diff
+use-UNIVERSAL.patch
diff -Nru maildirsync-1.2/debian/patches/use-UNIVERSAL.patch maildirsync-1.2/debian/patches/use-UNIVERSAL.patch
--- maildirsync-1.2/debian/patches/use-UNIVERSAL.patch 1970-01-01 01:00:00.000000000 +0100
+++ maildirsync-1.2/debian/patches/use-UNIVERSAL.patch 2015-12-31 00:05:45.000000000 +0100
@@ -0,0 +1,28 @@
+Description: "use UNIVERSAL" is a fatal error since perl 5.22
+ cf. http://perldoc.perl.org/perldelta.html#use-UNIVERSAL-%27...%27-is-now-a-fatal-error
+Origin: upstream repo, https://code.google.com/p/maildirsync/source/diff?spec=svn58ee8130a127e84780822fcb17462b0aa932e6a7&old=0ec79f1f52bdf33059684dc75c1de71eb5fcbb81&r=58ee8130a127e84780822fcb17462b0aa932e6a7&format=unidiff&path=%2Fmaildirsync.pl
+Bug-Debian: https://bugs.debian.org/809198
+Reviewed-by: gregor herrmann <gre...@debian.org>
+Last-Update: 2015-12-31
+Applied-Upstream: r58ee8130a127
+
+--- a/maildirsync.pl
++++ b/maildirsync.pl
+@@ -10,7 +10,7 @@
+ use IO::Handle;
+ use IPC::Open2;
+ use Fcntl qw(SEEK_SET);
+-use UNIVERSAL qw(isa);
++use Scalar::Util 'reftype';
+ use strict;
+ use warnings;
+ require 5.006;
+@@ -96,7 +96,7 @@
+ exit_with_error("Invalid parameter value: $optname: $value") if $value !~ /^$regex$/;
+ }
+ verbose 4 => "add option $optname = ".($value || "");
+- if (!isa($OPT{$optname}, 'ARRAY')) {
++ if (!reftype($OPT{$optname}) eq 'ARRAY') {
+ $OPT{$optname} = $value;
+ } else {
+ push @{$OPT{$optname}}, $value;
signature.asc
Description: Digital Signature
