Package: mailscanner / 4.79.11-2.2

update_virus_scanners.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
#! /bin/sh /usr/share/dpatch/dpatch-run
## update_virus_scanners.dpatch by Simon Walter <Simon Walter <simon.walter@hp-factory.de>>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: changes path to debian specific path.

@DPATCH@
Index: mailscanner-4.79.11/bin/update_virus_scanners
===================================================================
--- mailscanner-4.79.11.orig/bin/update_virus_scanners	2010-04-11 18:10:44.000000000 +0200
+++ mailscanner-4.79.11/bin/update_virus_scanners	2010-04-11 18:39:34.000000000 +0200
@@ -1,12 +1,9 @@
 #!/bin/sh
 
-SCANNERSCONF=/opt/MailScanner/etc/virus.scanners.conf
-#LOCKDIR=`perl -n -e 'print "$_" if chomp && s/^\s*Lock\s*file\s*Dir\s*=\s*([^\s#]+).*$/$1/i' /opt/MailScanner/etc/MailScanner.conf`
-#RUNASU=`perl -n -e 'print "$_" if chomp && s/^\s*Run\s*As\s*User\s*=\s*([^\s#]+).*$/$1/i' /opt/MailScanner/etc/MailScanner.conf`
-#RUNASG=`perl -n -e 'print "$_" if chomp && s/^\s*Run\s*As\s*Group\s*=\s*([^\s#]+).*$/$1/i' /opt/MailScanner/etc/MailScanner.conf`
-LOCKDIR=`/opt/MailScanner/bin/Quick.Peek lockfiledir /opt/MailScanner/etc/MailScanner.conf`
-RUNASU=`/opt/MailScanner/bin/Quick.Peek runasuser /opt/MailScanner/etc/MailScanner.conf`
-RUNASG=`/opt/MailScanner/bin/Quick.Peek runasgroup /opt/MailScanner/etc/MailScanner.conf`
+SCANNERSCONF=/etc/MailScanner/virus.scanners.conf
+LOCKDIR=`/usr/sbin/Quick.Peek lockfiledir /etc/MailScanner/MailScanner.conf`
+RUNASU=`/usr/sbin/Quick.Peek runasuser /etc/MailScanner/MailScanner.conf`
+RUNASG=`/usr/sbin/Quick.Peek runasgroup /etc/MailScanner/MailScanner.conf`
 
 Disabled=no
 if [ "x$Disabled" = "xyes" ]; then
@@ -35,14 +32,14 @@
   GREP=grep
 fi
 
-[ -x /opt/MailScanner/bin/mailscanner_create_locks ] && \
-/opt/MailScanner/bin/mailscanner_create_locks "$LOCKDIR" "$RUNASU" "$RUNASG"
+[ -x /usr/sbin/mailscanner_create_locks ] && \
+/usr/sbin/mailscanner_create_locks "$LOCKDIR" "$RUNASU" "$RUNASG"
 
 cat ${SCANNERSCONF} | sed -e 's/#.*$//' | ${GREP} -e -wrapper | \
 while read NAME WRAPPER PACKAGEDIR
 do
   #echo String is $NAME $WRAPPER $PACKAGEDIR
-  UPDATER=`echo $WRAPPER | sed -e 's/wrapper$/autoupdate/g'`
+  UPDATER=`echo $WRAPPER | sed -e 's/wrapper/autoupdate/g'`
   LOCK=`echo $WRAPPER | sed -e 's/^.*\///g' -e 's/-wrapper$//'`
   LOCK="${LOCKDIR}/${LOCK}Busy.lock"
   if [ -n "${NAME}" -a -n "${WRAPPER}" -a -n "${PACKAGEDIR}" ]