- outdated

Changed files:
    amavisd-new-bin.patch -> 1.2
    amavisd-new-cpio-reads-tar.patch -> 1.2
    amavisd-new-real_sender.patch -> 1.2

diff --git a/amavisd-new-bin.patch b/amavisd-new-bin.patch
deleted file mode 100644 (file)
index 0c6be87..0000000
--- a/amavisd-new-bin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- amavisd-new-20030314/amavisd       Tue Jun 17 18:50:14 2003
-+++ amavisd    Tue Jun 17 21:13:43 2003
-@@ -7224,7 +7224,7 @@
-       ($scan_status,$output,$virusnames) = &$command(@_);
-     } else {
-       my(@args) = split(' ',$args);
--      if (grep { m[^({}/)?\*$] } @args) {  # must list each file individually
-+      if (grep { m#^({}/)?\*$# } @args) {  # must list each file individually
-           local(*DIR); my($f); my(@bare_fnames);
-           opendir(DIR, "$tempdir/parts")
-               or die "Can't open directory $tempdir/parts: $!";
-@@ -7241,10 +7241,15 @@
-           }
-           closedir(DIR) or die "$av_name: Can't close directory: $!";
-           # replace * with bare file name
--          for my $a (@args)
--              { $a =~ s[^({}/)?\*$][ join(' ', map {$1.$_} @bare_fnames) ]e }
-+# don't use $a: perldoc -f sort
-+#         for my $a (@args)
-+#             { $a =~ s#^({}/)?\*$# join(' ', map {$1.$_} @bare_fnames) #e }
-+          @args = map {
-+                  s#^({}/)?\*$# join(' ', map {$1.$_} @bare_fnames) #e;
-+                  split / +/;
-+          } @args;
-       }
--      for (@args) { s[{}][$tempdir/parts]g } # replace {} with directory name
-+      for (@args) { s#{}#$tempdir/parts#g } # replace {} with directory name
-       # NOTE: RAV does not like '</dev/null' in its command!
-       do_log(2, "Using $av_name: " . join(' ',$command,@args));
-       my($proc_fh) = run_command(undef, "&1", $command, @args);

diff --git a/amavisd-new-cpio-reads-tar.patch b/amavisd-new-cpio-reads-tar.patch
deleted file mode 100644 (file)
index 9ced1cd..0000000
--- a/amavisd-new-cpio-reads-tar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sbin/amavisd~      Tue Aug  5 16:33:10 2003
-+++ sbin/amavisd       Tue Aug  5 17:20:41 2003
-@@ -3844,7 +3844,7 @@
-       /^\.lzo$/  && defined $lzop
-           && return do_uncompress($part,$tempdir,"$lzop -d -c");
-       /^\.cpio$/ && defined $cpio && return do_cpio($part,$tempdir);
--#     /^\.tar$/  && defined $cpio && return do_cpio($part,$tempdir);
-+      /^\.tar$/  && defined $cpio && return do_cpio($part,$tempdir);
-       /^\.tar$/  && return do_tar($part,$tempdir);  # fallback
-       /^\.zip$/  && return do_unzip($part,0,$tempdir);
-       /^\.rar$/  && return do_unrar($part,0,$tempdir);

diff --git a/amavisd-new-real_sender.patch b/amavisd-new-real_sender.patch
deleted file mode 100644 (file)
index 3654e7b..0000000
--- a/amavisd-new-real_sender.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./amavisd.org      Thu Mar 11 12:09:45 2004
-+++ ./amavisd  Thu Mar 11 12:10:33 2004
-@@ -5928,7 +5928,7 @@
- #   my($notify_virus_admin_only_if_sender_is_local) = 0;
- 
-     # try to find a per-sender administrator
--    my($admin) = lookup($msginfo->sender, \%virus_admin,$virus_admin,$mailto);
-+    my($admin) = lookup($msginfo->sender_source, \%virus_admin,$virus_admin,$mailto);
-     if ($admin eq '') {
-       do_log(4, "Skip virus_admin notification for <".$msginfo->sender.
-                 ">, no admin specified");