Attachment 38090 Details for Bug 60395 – file.diff

[patch] file.diff

file.diff (text/plain), 3.67 KB, created by jfkimura on 2003-12-19 11:30:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jfkimura

Created: 2003-12-19 11:30:15 UTC

Size: 3.67 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 60395: 38090