View | Details | Raw Unified | Return to bug 60395
Collapse All | Expand All

(-)qmail-scanner-update/Makefile (+8 lines)
Lines 47-52 Link Here
47
.if defined(QMAILSCAN_SPAMSTOSUFFIX)
47
.if defined(QMAILSCAN_SPAMSTOSUFFIX)
48
CONFIGURE_ARGS+=	--spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}"
48
CONFIGURE_ARGS+=	--spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}"
49
.endif
49
.endif
50
.if defined(QMAILSCAN_LANG)
51
CONFIGURE_ARGS+=	--lang "${QMAILSCAN_LANG}"
52
.endif
53
.if defined(QMAILSCAN_QUEUEBINARY)
54
CONFIGURE_ARGS+=	--qmail-queue-binary "${QMAILSCAN_QUEUEBINARY)}/qmail-queue"
55
.else
56
CONFIGURE_ARGS+=	--qmail-queue-binary "${QMAIL_DIR}/bin/qmail-queue"
57
.endif
50
58
51
SPOOLDIR=	${PREFIX}/qmailscan
59
SPOOLDIR=	${PREFIX}/qmailscan
52
PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
60
PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
(-)qmail-scanner-update/files/patch-qmail-scanner-queue.template (-5 / +10 lines)
Lines 1-5 Link Here
1
--- qmail-scanner-queue.template.orig	Thu Oct 16 02:05:10 2003
1
--- qmail-scanner-queue.template.orig	Thu Oct 16 02:05:10 2003
2
+++ qmail-scanner-queue.template	Thu Dec 11 14:28:48 2003
2
+++ qmail-scanner-queue.template	Thu Dec 19 17:48:00 2003
3
@@ -85,11 +85,17 @@ $qsmsgid=tolower("$V_HEADER-message-id")
3
@@ -85,11 +85,17 @@ $qsmsgid=tolower("$V_HEADER-message-id")
4
 
4
 
5
 
5
 
Lines 21-34 Link Here
21
 
21
 
22
 #Array of local domains that are checked against for
22
 #Array of local domains that are checked against for
23
 #deciding whether or not to send recipient alerts to
23
 #deciding whether or not to send recipient alerts to
24
@@ -294,6 +300,7 @@ if (! -d "$scandir/tmp") {
24
@@ -290,10 +296,11 @@
25
 umask(0077);
26
27
 if (! -d "$scandir/tmp") {
28
-  mkdir("$scandir/tmp") || &error_condition("cannot create $scandir/tmp - $!");
29
+  mkdir("$scandir/tmp",0755) || &error_condition("cannot create $scandir/tmp - $!");
25
 }
30
 }
26
 
31
27
 my $quarantine_event=0;
32
 my $quarantine_event=0;
28
+my $spam_event=0;
33
+my $spam_event=0;
29
 
34
30
 my $file_id = &uniq_id();
35
 my $file_id = &uniq_id();
31
 
36
32
@@ -415,7 +422,18 @@ eval {
37
@@ -415,7 +422,18 @@ eval {
33
     &email_quarantine_report;
38
     &email_quarantine_report;
34
   } else {
39
   } else {
(-)qmail-scanner-update/pkg-install (-1 / +2 lines)
Lines 30-36 Link Here
30
  ${MKDIR} -p ${SPOOLDIR}/tmp
30
  ${MKDIR} -p ${SPOOLDIR}/tmp
31
31
32
  # Mod and owner
32
  # Mod and owner
33
  ${CHOWN} ${GU_NAME}:${GU_NAME} ${PREFIX}/bin/qmail-scanner-queue.pl
33
  ${CHOWN} -R ${GU_NAME}:${GU_NAME} ${SPOOLDIR}
34
#  ${CHOWN} ${GU_NAME}:${GU_NAME} ${PREFIX}/bin/qmail-scanner-queue.pl
34
  ${CHMOD} 4755 ${PREFIX}/bin/qmail-scanner-queue.pl
35
  ${CHMOD} 4755 ${PREFIX}/bin/qmail-scanner-queue.pl
35
36
36
  # Initialize
37
  # Initialize
(-)qmail-scanner-update/pkg-plist (-10 / +10 lines)
Lines 2-14 Link Here
2
bin/qmail-scanner-queue.pl
2
bin/qmail-scanner-queue.pl
3
%%SPOOLDIR%%/quarantine-attachments.sample
3
%%SPOOLDIR%%/quarantine-attachments.sample
4
%%SPOOLDIR%%/quarantine-attachments.txt
4
%%SPOOLDIR%%/quarantine-attachments.txt
5
@unexec rmdir %%SPOOLDIR%%/archives/cur 2>1 || true
5
@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
6
@unexec rmdir %%SPOOLDIR%%/archives/new 2>1 || true
6
@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true
7
@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>1 || true
7
@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true
8
@unexec rmdir %%SPOOLDIR%%/archives 2>1 || true
8
@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true
9
@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>1 || true
9
@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
10
@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>1 || true
10
@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true
11
@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>1 || true
11
@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
12
@unexec rmdir %%SPOOLDIR%%/quarantine 2>1 || true
12
@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true
13
@unexec rmdir %%SPOOLDIR%%/tmp 2>1 || true
13
@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true
14
@unexec rmdir %%SPOOLDIR%% 2>1 || true
14
@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true

Return to bug 60395