4b97cd2fb4
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
43 lines
867 B
Diff
43 lines
867 B
Diff
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>
|