- new init script and patch to mamvis-milter

Changed files:
    amavisd-new-dirperms.patch -> 1.1
    amavisd-new-milter.init -> 1.1

diff --git a/amavisd-new-dirperms.patch b/amavisd-new-dirperms.patch
new file mode 100644 (file)
index 0000000..7adb6e0
--- /dev/null
+++ b/amavisd-new-dirperms.patch
@@ -0,0 +1,30 @@
+diff -Nur amavisd-new-20030616.orig/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c amavisd-new-20030616/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c
+--- amavisd-new-20030616.orig/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c    2004-04-01 02:42:23.000000000 +0200
++++ amavisd-new-20030616/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c 2004-05-06 16:29:22.000000000 +0200
+@@ -202,7 +202,7 @@
+     int count = 0;
+ 
+     if (use_fixed_name) {
+-      if (mkdir(s, S_IRWXU) == 0) return s;  /* succeeded */
++      if (mkdir(s, S_IRWXU|S_IRWXG) == 0) return s;  /* succeeded */
+       amavis_syslog(DBG_FATAL, "(amavis_mkdtemp) creating directory %s failed: %s",
+                     s, strerror(errno));
+     }
+@@ -234,7 +234,7 @@
+       }
+ # endif
+       if (stt) {
+-          if (!mkdir(s, S_IRWXU)) {
++          if (!mkdir(s, S_IRWXU|S_IRWXG)) {
+               return s;
+           } else {
+               continue;
+@@ -884,7 +884,7 @@
+     srand48(time(NULL) ^ (mypid + (mypid << 15)));
+ #endif
+ 
+-    umask(0007);
++    umask(0077);
+ 
+     /* Process command line options */
+     while ((c = getopt(argc, argv, args)) != -1) {

diff --git a/amavisd-new-milter.init b/amavisd-new-milter.init
new file mode 100644 (file)
index 0000000..8307fc4
--- /dev/null
+++ b/amavisd-new-milter.init
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# amavis-milter                Start/Stop the amavis-milter daemon.
+#
+# chkconfig:   345 39 61
+#
+# description: amavis-milter is daemonized antivirus daemon for sendmail
+#
+# processname: amavis-milter
+# pidfile:     /var/lock/subsys/amavis-milter
+
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/amavis-milter ]; then
+               msg_starting Amavis-milter
+               su amavis -s /bin/sh -c "/usr/sbin/amavis-milter -p local:/var/spool/amavis/runtime/amavis-milter.sock 2>&1 >/dev/null &" 2>&1 > /dev/null
+               daemon sleep 3
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/amavis-milter
+       else
+               msg_already_running Amavis-milter
+       fi
+       ;;
+  stop)
+        # Stop daemons.
+        if [ -f /var/lock/subsys/amavis-milter ]; then
+                msg_stopping Amavis-milter
+               killproc amavis-milter;
+                rm -f /var/lock/subsys/amavis-milter >/dev/null 2>&1
+        else
+                msg_not_running Amavis-milter
+        fi
+       ;;
+  status)
+       status amavis-milter
+       exit $?
+       ;;
+  restart)
+       $0 stop
+       $0 start
+       exit $?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|status}"
+       exit 3
+esac
+
+exit $RETVAL