From 81a50a766a046569b5ce229b4875456da8bca06e Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 28 May 2013 21:46:20 +0200
Subject: and more perl 5.18 fixes

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 spampd/perl-5.18-fixes.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 spampd/perl-5.18-fixes.patch

(limited to 'spampd/perl-5.18-fixes.patch')

diff --git a/spampd/perl-5.18-fixes.patch b/spampd/perl-5.18-fixes.patch
new file mode 100644
index 0000000..9b4637b
--- /dev/null
+++ b/spampd/perl-5.18-fixes.patch
@@ -0,0 +1,42 @@
+diff --git a/spampd b/spampd
+index 7b1f234..2798d50 100644
+--- a/spampd
++++ b/spampd
+@@ -937,6 +937,10 @@ if ( !$options{logsock} ) {
+ 	};
+ }
+ 
++# untaint some args to prevent errors in other modules
++($pidfile) = ($pidfile =~ /^(.+)$/);
++($relayhost) = ($relayhost =~ /^(.+)$/);
++($relayport) = ($relayport =~ /^(.+)$/);
+ 
+ my $server = bless {
+     server => {host => $host,
+@@ -1147,10 +1151,10 @@ L<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.htm>.
+ 
+ =head1 Requires
+ 
+-=over 5
+-
+ Perl modules:
+ 
++=over 5
++
+ =item B<Mail::SpamAssassin>
+ 
+ =item B<Net::Server::PreForkSimple>
+@@ -1478,11 +1482,11 @@ Prints usage information.
+ 
+ =head2 Deprecated Options
+ 
+-=over 5
+-
+ The following options are no longer used but still accepted for backwards
+ compatibility with prevoius I<spampd> versions:
+ 
++=over 5
++
+ =item  B<--dead-letters>
+ 
+ =item  B<--heloname>
-- 
cgit v1.2.3-24-g4f1b