Control: tags 787608 + patch Control: tags 787608 + pending Dear maintainer,
I've prepared an NMU for mrtg-rrd (versioned as 0.7-5.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. -- dam
diff -Nru mrtg-rrd-0.7/debian/changelog mrtg-rrd-0.7/debian/changelog --- mrtg-rrd-0.7/debian/changelog 2012-03-31 00:43:38.000000000 +0300 +++ mrtg-rrd-0.7/debian/changelog 2015-07-22 21:40:54.000000000 +0300 @@ -1,3 +1,12 @@ +mrtg-rrd (0.7-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch dropping 'defined' from 'defined @array' and 'defined %hash' + constructs, that are fatal in perl 5.22 + Closes: 787608 + + -- Damyan Ivanov <d...@debian.org> Wed, 22 Jul 2015 18:40:51 +0000 + mrtg-rrd (0.7-5) unstable; urgency=low * Bump Standards-Version to 3.9.3 diff -Nru mrtg-rrd-0.7/debian/patches/no-defined-hash-array.patch mrtg-rrd-0.7/debian/patches/no-defined-hash-array.patch --- mrtg-rrd-0.7/debian/patches/no-defined-hash-array.patch 1970-01-01 02:00:00.000000000 +0200 +++ mrtg-rrd-0.7/debian/patches/no-defined-hash-array.patch 2015-07-22 21:39:03.000000000 +0300 @@ -0,0 +1,43 @@ +Description: drop 'defined' from 'defined @array' and 'defined %hash' + This construct is deprecated in perl 5.20 and causes a hard error in perl 5.22 +Debian-bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=787608 +Author: Damyan Ivanov <d...@debian.org> + +--- a/mrtg-rrd.cgi ++++ b/mrtg-rrd.cgi +@@ -496,7 +496,7 @@ sub common_args($$$) + { + my ($name, $target, $q) = @_; + +- return @{$target->{args}} if defined @{$target->{args}}; ++ return @{$target->{args}} if @{$target->{args}}; + + my $noi = 1 if $target->{options}{noi}; + my $noo = 1 if $target->{options}{noo}; +@@ -521,7 +521,7 @@ sub common_args($$$) + $target->{rrd} = $dir . '/' . $tdir . $name . '.rrd'; + + %{$target->{options}} = () +- unless defined %{$target->{options}}; ++ unless %{$target->{options}}; + + $dir = $cfg->{workdir}; + $dir = $cfg->{imagedir} +@@ -908,7 +908,7 @@ EOF + print $directories{$dir}{bodytag}; + + my $subdirs_printed; +- if (defined @{$directories{$dir}{subdir}}) { ++ if (@{$directories{$dir}{subdir}}) { + $subdirs_printed = 1; + print <<EOF; + <H1>MRTG subdirectories in the directory $dir1</H1> +@@ -921,7 +921,7 @@ EOF + + print "</UL>\n"; + } +- if (defined @{$directories{$dir}{target}}) { ++ if (@{$directories{$dir}{target}}) { + print "<HR>\n" if defined $subdirs_printed; + print <<EOF; + <H1>MRTG graphs in the directory $dir1</H1> diff -Nru mrtg-rrd-0.7/debian/patches/series mrtg-rrd-0.7/debian/patches/series --- mrtg-rrd-0.7/debian/patches/series 2012-03-31 00:46:19.000000000 +0300 +++ mrtg-rrd-0.7/debian/patches/series 2015-07-22 21:36:19.000000000 +0300 @@ -1 +1,2 @@ 010_use_config_file +no-defined-hash-array.patch
signature.asc
Description: Digital signature
