diff -u spampd-2.30/debian/changelog spampd-2.30/debian/changelog --- spampd-2.30/debian/changelog +++ spampd-2.30/debian/changelog @@ -1,3 +1,11 @@ +spampd (2.30-22.2) unstable; urgency=high + + * Non-maintainer upload. + * Make program run with perl 5.18 by untainting several options. + (Closes: #722159) + + -- Michael Meskes Sun, 22 Dec 2013 10:26:53 +0100 + spampd (2.30-22.1) unstable; urgency=low * Non-maintainer upload. diff -u spampd-2.30/debian/patches/series spampd-2.30/debian/patches/series --- spampd-2.30/debian/patches/series +++ spampd-2.30/debian/patches/series @@ -1,3 +1,4 @@ +10-perl.patch 30-fix-Makefile.patch 45-fix-man-references.patch 50-fix-fd-usage.patch only in patch2: unchanged: --- spampd-2.30.orig/debian/patches/10-perl.patch +++ spampd-2.30/debian/patches/10-perl.patch @@ -0,0 +1,25 @@ +--- a/spampd 2013-11-04 16:03:52.000000000 +0100 ++++ b/spampd 2013-11-04 16:05:05.000000000 +0100 +@@ -900,6 +900,22 @@ + usage(0); + } + ++# Untaint some options provided by admin command line. ++$pidfile =~ /^(.*)$/; ++$pidfile = $1; ++ ++$relayhost =~ /^(.*)$/; ++$relayhost = $1; ++ ++$relayport =~ /^(.*)$/; ++$relayport = $1; ++ ++$host =~ /^(.*)$/; ++$host = $1; ++ ++$port =~ /^(.*)$/; ++$port = $1; ++ + if ( $options{tagall} ) { $tagall = 1; } + if ( $options{'log-rules-hit'} ) { $rh = 1; } + if ( $options{debug} ) { $debug = 1; $nsloglevel = 4; }