8b761158464fc3e91b319b26cf10775c amavisd-new-nomilter.patch

fb8387604a140289c56ed73858945b39  amavisd-new-notest-mta.patch
d27a27b92e590a299e26c06e504c750a  amavisd-new-qmail.patch
5d73ecbab8f9539fd2643739c306a867  amavisd-new.init

Changed files:
    amavisd-new-nomilter.patch -> 1.1
    amavisd-new-notest-mta.patch -> 1.1
    amavisd-new-qmail.patch -> 1.1
    amavisd-new.init -> 1.1

diff --git a/amavisd-new-nomilter.patch b/amavisd-new-nomilter.patch
new file mode 100644 (file)
index 0000000..9a0543e
--- /dev/null
+++ b/amavisd-new-nomilter.patch
@@ -0,0 +1,42 @@
+diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
+--- amavisd-snapshot-20020300.org/configure.in Thu Jun  6 22:33:49 2002
++++ amavisd-snapshot-20020300/configure.in     Thu Jun  6 22:40:47 2002
+@@ -184,37 +184,7 @@
+   AC_PATH_PROG(libmilter_config, libmilter-config)
+   if test "x$libmilter_config" = x ; then
+ 
+-    AC_CHECK_FUNCS(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
+-
+-    ACX_PTHREAD([
+-      LIBS="$PTHREAD_LIBS $LIBS"
+-      CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-      CC="$PTHREAD_CC"
+-
+-      AC_CHECK_HEADERS(sm/gen.h,
+-        [AC_EGREP_HEADER([typedef.*bool],sm/gen.h,
+-           [AC_DEFINE(HAVE_SM_GEN_BOOL_TYPE, 1,
+-                      [ Define if <sm/gen.h> defines the bool type. ])])])
+-
+-      # maybe sendmail is using sfio (for TLS encryption)
+-      AC_CHECK_LIB(sfio,_stdprintf)
+-
+-      # sendmail 8.11: need -lsmutil
+-      # sendmail 8.12: need -lsm
+-      AC_CHECK_LIB(smutil,errstring,,[AC_CHECK_LIB(sm,sm_errstring)])
+-      AC_CHECK_LIB(smutil,strlcpy,
+-                   [AC_DEFINE(HAVE_SMUTIL_STRLCPY, 1,
+-                              [ Define if you have the strlcpy function in libsmutil. ])],
+-                   [AC_CHECK_LIB(sm,sm_strlcpy,
+-                                 [AC_DEFINE(HAVE_SM_SM_STRLCPY, 1,
+-                                            [ Define if you have the sm_strlcpy function in libsm. ])])])
+-
+-      AC_CHECK_HEADERS(libmilter/mfapi.h,
+-        [AC_CHECK_LIB(milter,smfi_main,,enable_milter=no)],
+-         enable_milter=no)
+-      ],
+-      [AC_MSG_WARN([No usable pthreads library found - disabling milter])
+-       enable_milter=no])
++       enable_milter=no
+ 
+   else
+     milter_cflags=`$libmilter_config --cflags`

diff --git a/amavisd-new-notest-mta.patch b/amavisd-new-notest-mta.patch
new file mode 100644 (file)
index 0000000..0fee315
--- /dev/null
+++ b/amavisd-new-notest-mta.patch
@@ -0,0 +1,49 @@
+diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
+--- amavisd-snapshot-20020300.org/configure.in Fri Jun  7 01:35:35 2002
++++ amavisd-snapshot-20020300/configure.in     Fri Jun  7 01:54:16 2002
+@@ -160,16 +160,6 @@
+ qmaildir=`dirname $qmailinject`
+ AC_SUBST(qmaildir)
+ 
+-if test "x$qmailinject" != "x/bin/false"; then
+-  AC_ARG_ENABLE(qmail,
+-    [  --enable-qmail                use qmail as MTA],
+-    if test "x$enableval" != "xno" ; then
+-      MTA=qmail
+-    fi,
+-    MTA=qmail
+-    config_type=qmail-queue)
+-fi
+-
+ #
+ if test "x$MTA" = "xqmail" ; then
+   AC_MSG_ERROR([qmail is not supported by amavisd])
+@@ -243,28 +233,12 @@
+     MTA=postfix
+   fi)
+ 
+-dnl Need to find out whether sendmail_wrapper is really postfix' sendmail
+-if test "x$MTA" = "xsendmail" ; then
+-  strings ${sendmail_wrapper} | grep -i postfix >/dev/null 2>&1
+-  if test $? -eq 0 ; then
+-    MTA=postfix
+-  fi
+-fi
+-
+ AC_ARG_ENABLE(exim,
+   [  --enable-exim                 use exim as MTA],
+   if test "x$enableval" = "xyes" ; then
+     MTA=exim
+   fi)
+ 
+-dnl Need to find out whether sendmail_wrapper is really exim's sendmail
+-if test "x$MTA" = "xsendmail" ; then
+-  strings ${sendmail_wrapper} | grep -i exim >/dev/null 2>&1
+-  if test $? -eq 0 ; then
+-    MTA=exim
+-  fi
+-fi
+-
+ dnl only sendmail
+ dnl relay/no relay must be known before looking
+ dnl for original sendmail.cf file

diff --git a/amavisd-new-qmail.patch b/amavisd-new-qmail.patch
new file mode 100644 (file)
index 0000000..1170d53
--- /dev/null
+++ b/amavisd-new-qmail.patch
@@ -0,0 +1,14 @@
+diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
+--- amavisd-snapshot-20020300.org/configure.in Thu Jun  6 22:33:49 2002
++++ amavisd-snapshot-20020300/configure.in     Thu Jun  6 22:35:50 2002
+@@ -155,7 +155,8 @@
+ dnl unless --disable-qmail specified
+ dnl
+ 
+-AC_PATH_PROG(qmailinject,qmail-inject,/bin/false,/var/qmail/bin:/usr/local/qmail/bin)
++qmailinject=/usr/lib/qmail/qmail-inject
++AC_SUBST(qmailinject)
+ 
+ qmaildir=`dirname $qmailinject`
+ AC_SUBST(qmaildir)
+ 

diff --git a/amavisd-new.init b/amavisd-new.init
new file mode 100644 (file)
index 0000000..c9e7bca
--- /dev/null
+++ b/amavisd-new.init
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# amavisd              Start/Stop the amavisd daemon.
+#
+# chkconfig:   345 40 60
+#
+# description: amavisd is daemonized antivirus daemon
+#
+# processname: amavisd
+# config:      /etc/amavisd.conf
+# pidfile:     /var/lock/subsys/amavisd
+
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Get service config
+[ -f /etc/sysconfig/amavisd ] && . /etc/sysconfig/amavisd
+
+
+# See how we were called.
+case "$1" in
+  start)
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/amavisd ]; then
+               msg_starting Amavisd
+               daemon 'su -s /bin/sh amavis -c "/bin/nice /usr/sbin/amavisd"'
+               touch /var/lock/subsys/amavisd
+       else
+               msg_Already_Running Amavisd
+               exit 1
+       fi
+       ;;
+  stop)
+        # Stop daemons.
+        if [ -f /var/lock/subsys/amavisd ]; then
+                msg_stopping Amavisd 
+               killproc amavisd;
+                rm -f /var/lock/subsys/amavisd >/dev/null 2>&1
+        else
+                msg_Not_Running Amavisd
+                exit 1
+        fi
+       ;;
+  status)
+       status amavisd
+       ;;
+  restart)
+       $0 stop
+       $0 start
+       ;;
+  *)
+       msg_usage "$0 {start|stop|status|restart}"
+       exit 1
+esac
+
+exit $RETVAL