- updated to 20020630

Changed files:
    amavisd-new-avp.patch -> 1.1
    amavisd-new-clamav.patch -> 1.2
    amavisd-new-paths.patch -> 1.2
    amavisd-new.spec -> 1.8

diff --git a/amavisd-new-avp.patch b/amavisd-new-avp.patch
new file mode 100644 (file)
index 0000000..43dd9a1
--- /dev/null
+++ b/amavisd-new-avp.patch
@@ -0,0 +1,12 @@
+diff -urN amavisd-new-20020630.org/amavis/amavisd.in amavisd-new-20020630/amavis/amavisd.in
+--- amavisd-new-20020630.org/amavis/amavisd.in Mon Sep  9 21:11:20 2002
++++ amavisd-new-20020630/amavis/amavisd.in     Tue Sep 10 12:25:35 2002
+@@ -3669,7 +3669,7 @@
+ use vars qw($output @virusname $scan_status);
+ 
+ BEGIN {
+-  import Amavis::Conf qw(:av);
++  import Amavis::Conf qw(:av $TEMPBASE);
+   import Amavis::Util qw(do_log am_id retcode);
+ }
+ 

diff --git a/amavisd-new-clamav.patch b/amavisd-new-clamav.patch
index bb7b672f0a6c2cc8b8703347fa71dab65f724210..2728bb4e5992f866913ff7e51c3d35edf510d5c2 100644 (file)
--- a/amavisd-new-clamav.patch
+++ b/amavisd-new-clamav.patch
@@ -1,7 +1,7 @@
-diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.conf.in amavisd-snapshot-20020300/amavis/amavisd.conf.in
---- amavisd-snapshot-20020300.org/amavis/amavisd.conf.in       Thu Jun  6 22:51:22 2002
-+++ amavisd-snapshot-20020300/amavis/amavisd.conf.in   Thu Jun  6 22:56:59 2002
-@@ -42,6 +42,9 @@
+diff -urN amavisd-new-20020630.org/amavis/amavisd.conf.in amavisd-new-20020630/amavis/amavisd.conf.in
+--- amavisd-new-20020630.org/amavis/amavisd.conf.in    Mon Sep  9 21:11:20 2002
++++ amavisd-new-20020630/amavis/amavisd.conf.in        Mon Sep  9 21:11:31 2002
+@@ -39,6 +39,9 @@
  $avp = "@avp@";
  $AVPDIR = dirname($avp);
  
@@ -11,29 +11,29 @@ diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.conf.in amavisd-snapshot-
  # KasperskyLab AVPDaemon / AvpDaemonClient
  #
  # use AvpDaemon and AvpDaemonClient
-diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.in amavisd-snapshot-20020300/amavis/amavisd.in
---- amavisd-snapshot-20020300.org/amavis/amavisd.in    Thu Jun  6 22:51:22 2002
-+++ amavisd-snapshot-20020300/amavis/amavisd.in        Thu Jun  6 23:19:59 2002
-@@ -332,7 +332,7 @@
- 
- # Av scanners and related vars
- use vars qw ( $antivir $avp $avpdc $AVPDIR $csav $drweb $fprot $fprotd $fsav
--  $inocucmd $mks $nod32 $nod32cli $norman $oav $panda $rav $sophos
-+  $inocucmd $mks $nod32 $nod32cli $norman $oav $panda $rav $sophos $clamav
-   $sophos_ide_path $cscmdline $scs_host $scs_port $uvscan $vbengcl $vexira 
-   $vfind $vscan $sophie_sockname $trophie_sockname );
- 
-@@ -1070,6 +1070,7 @@
+diff -urN amavisd-new-20020630.org/amavis/amavisd.in amavisd-new-20020630/amavis/amavisd.in
+--- amavisd-new-20020630.org/amavis/amavisd.in Mon Sep  9 21:11:20 2002
++++ amavisd-new-20020630/amavis/amavisd.in     Mon Sep  9 21:12:05 2002
+@@ -76,7 +76,7 @@
+           $virus_quarantine_to $spam_quarantine_to
+       )],
+       'av' => [qw(
+-          $antivir $avp $avpdc $AVPDIR $csav $drweb $fprot $fprotd $fsav
++          $antivir $avp $avpdc $AVPDIR $csav $drweb $fprot $fprotd $fsav $clamav
+           $inocucmd $mks $nod32 $nod32cli $norman $oav $panda $rav $sophos
+           $sophos_ide_path $cscmdline $scs_host $scs_port $uvscan $vbengcl
+           $vexira $vfind $vscan $sophie_sockname $trophie_sockname
+@@ -3715,6 +3715,7 @@
  @avp_scanner_frag@
  @avpdc_scanner_frag@
  @cai_scanner_frag@
 +@clamav_scanner_frag@
  @csav_scanner_frag@
  @cyber_scanner_frag@
- @fprot_scanner_frag@
-diff -urN amavisd-snapshot-20020300.org/amavis/av/clamav amavisd-snapshot-20020300/amavis/av/clamav
---- amavisd-snapshot-20020300.org/amavis/av/clamav     Thu Jan  1 01:00:00 1970
-+++ amavisd-snapshot-20020300/amavis/av/clamav Fri Jun  7 00:07:04 2002
+ @drweb_scanner_frag@
+diff -urN amavisd-new-20020630.org/amavis/av/clamav amavisd-new-20020630/amavis/av/clamav
+--- amavisd-new-20020630.org/amavis/av/clamav  Thu Jan  1 01:00:00 1970
++++ amavisd-new-20020630/amavis/av/clamav      Mon Sep  9 21:11:31 2002
 @@ -0,0 +1,21 @@
 +#
 +# clamav (GPL) http://www.konarski.edu.pl/~zolw/clam.html
@@ -56,18 +56,18 @@ diff -urN amavisd-snapshot-20020300.org/amavis/av/clamav amavisd-snapshot-200203
 +        }
 +}
 +
-diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
---- amavisd-snapshot-20020300.org/configure.in Thu Jun  6 22:51:22 2002
-+++ amavisd-snapshot-20020300/configure.in     Thu Jun  6 22:59:01 2002
-@@ -385,6 +385,7 @@
+diff -urN amavisd-new-20020630.org/configure.in amavisd-new-20020630/configure.in
+--- amavisd-new-20020630.org/configure.in      Mon Sep  9 21:11:20 2002
++++ amavisd-new-20020630/configure.in  Mon Sep  9 21:15:39 2002
+@@ -397,6 +397,7 @@
    avp_scanner_frag=$srcdir/amavis/av/avp
    avpdc_scanner_frag=$srcdir/amavis/av/avpdc
    cai_scanner_frag=$srcdir/amavis/av/cai
 +  clamav_scanner_frag=$srcdir/amavis/av/clamav
    csav_scanner_frag=$srcdir/amavis/av/csav
    cyber_scanner_frag=$srcdir/amavis/av/cyber
-   fprot_scanner_frag=$srcdir/amavis/av/fprot
-@@ -456,6 +457,15 @@
+   drweb_scanner_frag=$srcdir/amavis/av/drweb
+@@ -472,6 +473,17 @@
    cai_scanner_frag=$srcdir/amavis/av/cai
  fi
  
@@ -75,6 +75,8 @@ diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/c
 +clamav_scanner_frag=/dev/null
 +AC_CHECKING([*** Clam AntiVirus Scanner ***])
 +AC_PATH_PROG(clamscan, clamscan, , $PATH:/bin:/usr/bin:/usr/local/bin)
++$clamav = $clamscan
++AC_SUBST(clamav)
 +if test "x$clamscan" != "x" ; then
 +  avscanner="$avscanner Clam AntiVirus Scanner"
 +  clamav_scanner_frag=$srcdir/amavis/av/clamav
@@ -83,7 +85,7 @@ diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/c
  ### Command AntiVirus for Linux
  csav_scanner_frag=/dev/null
  AC_CHECKING([*** Command AntiVirus for Linux ***])
-@@ -698,7 +708,7 @@
+@@ -740,7 +752,7 @@
  fi
  
  AC_MSG_CHECKING([if any virus scanners are installed at all])
@@ -92,11 +94,11 @@ diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/c
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([
  
-@@ -849,6 +859,7 @@
+@@ -887,6 +899,7 @@
  AC_SUBST_FILE(avp_scanner_frag)
  AC_SUBST_FILE(avpdc_scanner_frag)
  AC_SUBST_FILE(cai_scanner_frag)
 +AC_SUBST_FILE(clamav_scanner_frag)
  AC_SUBST_FILE(csav_scanner_frag)
  AC_SUBST_FILE(cyber_scanner_frag)
- AC_SUBST_FILE(fsec_scanner_frag)
+ AC_SUBST_FILE(drweb_scanner_frag)

diff --git a/amavisd-new-paths.patch b/amavisd-new-paths.patch
index d87368eac0916baeea4a639a576bb8915f2d7414..6f93af02b9c86c2052ddce9c418f3cad601a1f44 100644 (file)
--- a/amavisd-new-paths.patch
+++ b/amavisd-new-paths.patch
@@ -1,33 +1,42 @@
-diff -ur amavisd-new-20020517.orig/amavis/amavisd.conf.in amavisd-new-20020517/amavis/amavisd.conf.in
---- amavisd-new-20020517.orig/amavis/amavisd.conf.in   Fri Sep  6 19:36:07 2002
-+++ amavisd-new-20020517/amavis/amavisd.conf.in        Fri Sep  6 19:38:02 2002
-@@ -194,7 +194,7 @@
- # Location to put infected mail into
+diff -urN amavisd-new-20020630.org/amavis/amavisd.conf.in amavisd-new-20020630/amavis/amavisd.conf.in
+--- amavisd-new-20020630.org/amavis/amavisd.conf.in    Mon Sep  9 21:11:20 2002
++++ amavisd-new-20020630/amavis/amavisd.conf.in        Mon Sep  9 21:17:02 2002
+@@ -203,7 +203,7 @@
  # - empty for not quarantining, may be a file (mailbox),
  #   or a directory (no trailing slash)
+ #$QUARANTINEDIR = "/var/log/virusmails";
 -$QUARANTINEDIR = "/var/virusmails";
 +$QUARANTINEDIR = "/var/spool/amavis/virusmails";
  
  # A finer control of quarantining is available through
  # variable $virus_quarantine_to as follows:
-diff -ur amavisd-new-20020517.orig/amavis/amavisd.in.all amavisd-new-20020517/amavis/amavisd.in.all
---- amavisd-new-20020517.orig/amavis/amavisd.in.all    Fri May 17 22:53:19 2002
-+++ amavisd-new-20020517/amavis/amavisd.in.all Fri Sep  6 19:36:50 2002
-@@ -3477,7 +3477,7 @@
- $spamassasin_obj = Mail::SpamAssassin->new({
-       dont_copy_prefs => 1, local_tests_only => 1 });
- $spamassasin_obj->compile_now;        # ensure all modules etc. are preloaded
--%razor_options = ( listfile  => '/var/amavis/razor.lst' );
-+%razor_options = ( listfile  => '/var/spool/amavis/razor.lst' );
+diff -urN amavisd-new-20020630.org/amavis/amavisd.in amavisd-new-20020630/amavis/amavisd.in
+--- amavisd-new-20020630.org/amavis/amavisd.in Mon Sep  9 21:11:20 2002
++++ amavisd-new-20020630/amavis/amavisd.in     Mon Sep  9 21:17:55 2002
+@@ -131,7 +131,7 @@
+ #
+ # Receiving mail related
  
- # Read config file, which may override default settings
- read_config();
-@@ -3506,7 +3506,7 @@
-   'spam-quarantine'  => sub { ($QUARANTINEDIR, "$VIRUSFILE.gz") },
-   'archive-by-sender' =>              # just an example
-       sub { my($s) = $SENDER; $s =~ s/[^a-zA-Z0-9._=@]/-/; $s =~ s/\@/=/;
--            ( '/var/virusmails',      # directory (qmail style mailbox)
-+            ( '/var/spool/amavis/virusmails', # directory (qmail style mailbox)
-               sprintf("archive-%s-%s-%05d.gz",  # suggested file name
-                       $s, strftime("%Y%m%d-%H%M%S",localtime), $$) );
-           },
+-$unix_socketname = "/var/amavis/amavisd.sock"; # traditional amavis client protocol
++$unix_socketname = "/var/spool/amavis/amavisd.sock"; # traditional amavis client protocol
+ $inet_socket_port = "10024";      # accept also SMTP on this TCP port
+ $inet_socket_bind = "127.0.0.1";  # limit socket bind to loopback interface
+ 
+@@ -140,7 +140,7 @@
+ $gets_addr_in_quoted_form = 0;
+ 
+ # Temporary directory
+-$TEMPBASE = "/var/amavis";
++$TEMPBASE = "/var/spool/amavis";
+ 
+ 
+ $forward_method = \&Amavis::Out::mail_via_smtp;
+@@ -2589,7 +2589,7 @@
+ #     stop_at_threshold => 1,
+     });
+     $spamassasin_obj->compile_now;    # ensure all modules etc. are preloaded
+-    %razor_options = ( listfile  => '/var/amavis/razor.lst' );
++    %razor_options = ( listfile  => '/var/spool/amavis/razor.lst' );
+ }
+ 
+ # - returns true if spam detected,

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 70270cf9123af51417ab9615342f3b25523440b2..07a8808bc62dcbac862aa10090e5f0bedefe8458 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -2,8 +2,8 @@
 Summary:       A Mail Virus Scanner with SpamAssasin support - Daemon.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - Demon
 Name:          amavisd-new
-Version:       20020517
-Release:       2
+Version:       20020630
+Release:       1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
@@ -13,7 +13,8 @@ Patch1:               %{name}-nomilter.patch
 Patch2:                %{name}-qmail.patch
 Patch3:                %{name}-clamav.patch
 Patch4:                %{name}-paths.patch
-URL:           http://www.amavis.org/
+Patch5:                %{name}-avp.patch
+URL:           http://www.ijs.si/software/amavisd/
 BuildRequires: arc
 BuildRequires: autoconf
 BuildRequires:  automake
@@ -28,7 +29,7 @@ BuildRequires:        perl-MIME-tools
 BuildRequires: perl-Unix-Syslog
 BuildRequires: perl-Convert-UUlib
 BuildRequires: perl-Convert-TNEF
-BuildRequires: perl-libnet
+BuildRequires: perl-libnet >= 1:1.12
 BuildRequires: perl-Mail-SpamAssassin
 BuildRequires: perl-Vipuls-Razor-V1
 BuildRequires: perl-Net-Server
@@ -52,7 +53,7 @@ Requires:     unrar
 Requires:      zoo
 Requires:      perl-Mail-SpamAssassin
 Requires:      perl-Vipuls-Razor-V1
-Requires:      amavisd-daemon
+Requires:      amavisd-new-daemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
@@ -71,8 +72,9 @@ Wersja zdemonizowana.
 Summary:       A Mail Virus Scanner with SpamAssasin support - postfix back-end.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - back-end dla postfiksa
 Group:         Applications/Mail
-Provides:      amavisd-daemon
+Provides:      amavisd-new-daemon
 Obsoletes:     amavisd-daemon
+Obsoletes:     amavisd-new-daemon
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
@@ -94,8 +96,9 @@ Pakiet ten zawiera back-end dla postfiks.
 Summary:       A Mail Virus Scanner with SpamAssasin support - exim backend.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla exima
 Group:         Applications/Mail
-Provides:      amavisd-daemon
+Provides:      amavisd-new-daemon
 Obsoletes:     amavisd-daemon
+Obsoletes:     amavisd-new-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
@@ -118,8 +121,9 @@ Pakiet ten zawiera back-end dla exima.
 #Summary:      A Mail Virus Scanner - qmail backend.
 #Summary(pl):  Antywirusowy skaner poczty elektronicznej - backend dla qmaila
 #Group:                Applications/Mail
-#Provides:     amavisd-daemon
+#Provides:     amavisd-new-daemon
 #Obsoletes:    amavisd-daemon
+#Obsoletes:    amavisd-new-daemon
 #Obsoletes:    amavisd-postfix
 #Obsoletes:    amavisd-exim
 #Obsoletes:    amavisd-sendmail
@@ -141,8 +145,9 @@ Pakiet ten zawiera back-end dla exima.
 Summary:       A Mail Virus Scanner with SpamAssasin support - sendmail backend.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:         Applications/Mail
-Provides:      amavisd-daemon
+Provides:      amavisd-new-daemon
 Obsoletes:     amavisd-daemon
+Obsoletes:     amavisd-new-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
@@ -162,12 +167,12 @@ Pakiet ten zawiera back-end dla sendmaila.
 
 %prep
 %setup -q -n %{name}-%{version}
-cp -a amavis/amavisd.in.all amavis/amavisd.in
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 aclocal