Bug#816638: mhonarc: fails to run with perl5.22

[gregor herrmann]

Control: forwarded -1 https://rt.cpan.org/Public/Bug/Display.html?id=76857
Control: tag -1 + patch

On Mon, 07 Mar 2016 12:04:51 -0800, Jeff Breidenbach wrote:

> Yikes. I wasn't expecting this for mhonarc 2.6.19.  Patches from a perl
> programmer appreciated. Will also check with upstream.

There's a patch at
https://rt.cpan.org/Public/Bug/Display.html?id=76857 which looks like
the attached debdiff when applied against the debian package.

It looks sane, and after that I can run `./mhonarc --help' in the
source directory. No further tests done.


Cheers,
gregor

-- 
 .''`.  Homepage https://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: The Who: Squeeze Box

diff -u mhonarc-2.6.19/debian/changelog mhonarc-2.6.19/debian/changelog
--- mhonarc-2.6.19/debian/changelog
+++ mhonarc-2.6.19/debian/changelog
@@ -1,3 +1,13 @@
+mhonarc (2.6.19-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "fails to run with perl5.22":
+    fix from https://rt.cpan.org/Public/Bug/Display.html?id=76857 to avoid the
+    'defined(%hash) is deprecated' errors with Perl 5.22
+    (Closes: #816638)
+
+ -- gregor herrmann <gre...@debian.org>  Wed, 09 Mar 2016 17:07:35 +0100
+
 mhonarc (2.6.19-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- mhonarc-2.6.19.orig/lib/mhamain.pl
+++ mhonarc-2.6.19/lib/mhamain.pl
@@ -1565,7 +1565,7 @@
 ##
 sub defineIndex2MsgId {
     no warnings qw(deprecated);
-    if (!defined(%Index2MsgId)) {
+    unless (%Index2MsgId) {
 	foreach (keys %MsgId) {
 	    $Index2MsgId{$MsgId{$_}} = $_;
 	}
only in patch2:
unchanged:
--- mhonarc-2.6.19.orig/lib/mhopt.pl
+++ mhonarc-2.6.19/lib/mhopt.pl
@@ -865,7 +865,7 @@
 sub update_data_2_1_to_later {
     no warnings qw(deprecated);
     # we can preserve filter arguments
-    if (defined(%main::MIMEFiltersArgs)) {
+    if (%main::MIMEFiltersArgs) {
 	warn qq/         preserving MIMEARGS...\n/;
 	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
 	$IsDefault{'MIMEARGS'} = 0;

signature.asc
Description: Digital Signature