Attachment 80592 Details for Bug 115560 – simscan-1.1_3.patch

[patch] simscan-1.1_3.patch

simscan-1.1_3.patch (text/plain), 10.09 KB, created by Renato Botelho on 2007-08-15 21:00:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2007-08-15 21:00:04 UTC

Size: 10.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/mail/simscan/Makefile,v
>retrieving revision 1.6
>diff -u -u -r1.6 Makefile
>--- Makefile	13 Mar 2007 20:11:19 -0000	1.6
>+++ Makefile	15 Aug 2007 19:22:24 -0000
>@@ -7,10 +7,9 @@
> 
> PORTNAME=	simscan
> PORTVERSION=	1.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail security
> MASTER_SITES=	http://www.inter7.com/simscan/
>-MASTER_SITE_SUBDIR=	${PORTNAME}
> DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
> 
> MAINTAINER=	toxa@toxahost.ru
>@@ -22,8 +21,13 @@
> 
> WORKDIR?=	${QMAIL_PREFIX}/${PORTNAME}
> QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
>-PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX} \
>+
>+SUB_FILES=	pkg-message \
>+		pkg-install \
>+		pkg-deinstall
>+SUB_LIST=	QMAIL_PREFIX=${QMAIL_PREFIX} \
> 		SIMSCAN_DIR=${PORTNAME}
>+PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX}
> 
> OPTIONS=	CLAMAV "Support for ClamAV Virus Scanning" on \
> 		RIPMIME "Ripmime Processing (if Clamav ScanMail disabled)" on \
>@@ -110,22 +114,26 @@
> 	exit 1; \
> fi
> 
>+post-patch:
>+	@${REINPLACE_CMD} -E 's,($f/daily.cvd"),\1 || test -d "$f/daily.inc",' \
>+		${WRKSRC}/configure
>+
> pre-configure:
> 	@${ECHO_MSG} ""
> 	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
> 	@${ECHO_MSG} "You may also use the following build options:"
> 	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "QMAIL_PREFIX		Base qmail directory. Default is /var/qmail"
>-	@${ECHO_MSG} "WORKDIR		Directory to unpack emails. Default is /var/qmail/simscan"
>-	@${ECHO_MSG} "QMAIL_QUEUE		Define full path and name of the qmail-queue program"
>-	@${ECHO_MSG} "			Incoming mail is passed to this program after being"
>-	@${ECHO_MSG} "			scanned by SimScan. Default is /var/qmail/bin/qmail-queue"
>-	@${ECHO_MSG} "SPAMC_ARGS		Define the arguments to pass to spamc."
>-	@${ECHO_MSG} "			Be sure to place quotes around the options you define"
>-	@${ECHO_MSG} "SPAM_HITS		Reject spam only above this hit level"
>-	@${ECHO_MSG} "			Default is 10.0. Useful without PASSTHRU option"
>-	@${ECHO_MSG} "QUARANTINE_DIR		Directory to keep spam and/or infected emails"
>-	@${ECHO_MSG} "			Default is disabled"
>+	@${ECHO_MSG} "QMAIL_PREFIX	Base qmail directory. Default is ${QMAIL_PREFIX}"
>+	@${ECHO_MSG} "WORKDIR		Directory to unpack emails. Default is ${QMAIL_PREFIX}/${PORTNAME}"
>+	@${ECHO_MSG} "QMAIL_QUEUE	Define full path and name of the qmail-queue program"
>+	@${ECHO_MSG} "		Incoming mail is passed to this program after being"
>+	@${ECHO_MSG} "		scanned by SimScan. Default is ${QMAIL_PREFIX}/bin/qmail-queue"
>+	@${ECHO_MSG} "SPAMC_ARGS	Define the arguments to pass to spamc."
>+	@${ECHO_MSG} "		Be sure to place quotes around the options you define"
>+	@${ECHO_MSG} "SPAM_HITS	Reject spam only above this hit level"
>+	@${ECHO_MSG} "		Default is 10.0. Useful without PASSTHRU option"
>+	@${ECHO_MSG} "QUARANTINE_DIR	Directory to keep spam and/or infected emails"
>+	@${ECHO_MSG} "		Default is disabled"
> 	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
> 	@${ECHO_MSG} ""
> 
>Index: pkg-deinstall
>===================================================================
>RCS file: pkg-deinstall
>diff -N pkg-deinstall
>--- pkg-deinstall	3 Apr 2005 16:04:21 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/mail/simscan/pkg-deinstall,v 1.1 2005/04/03 16:04:21 novel Exp $
>-
>-USER=simscan
>-GROUP=${USER}
>-
>-if [ x$2 != xDEINSTALL ]; then
>-    exit
>-fi
>-
>-pw groupdel -n ${GROUP} || true
>-pw userdel -n ${GROUP} || true
>Index: pkg-install
>===================================================================
>RCS file: pkg-install
>diff -N pkg-install
>--- pkg-install	9 Aug 2005 13:58:38 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,51 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/mail/simscan/pkg-install,v 1.2 2005/08/09 13:58:38 garga Exp $
>-
>-USER=simscan
>-GROUP=${USER}
>-UID=74
>-GID=${UID}
>-SIMDIR=/var/qmail/simscan
>-
>-if [ "$2" = "PRE-INSTALL" ]; then
>-
>-echo adding simscan user
>-
>-        if pw group show "${GROUP}" 2>/dev/null; then
>-                echo "You already have a group \"${GROUP}\", so I will use it."
>-        else
>-                if pw groupadd ${GROUP} -g ${GID}; then
>-                        echo "Added group \"${GROUP}\"."
>-                else
>-                        echo "Adding group \"${GROUP}\" failed..."
>-                        exit 1
>-                fi
>-        fi
>-
>-
>-        if pw user show "${USER}" 2>/dev/null; then
>-                echo "You already have a user \"${USER}\", so I will use it."
>-        else
>-                if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
>-                        -d /nonexistent -s /sbin/nologin -c "Simscan User"
>-                then
>-                        echo "Added user \"${USER}\"."
>-                else
>-                        echo "Adding user \"${USER}\" failed..."
>-                        exit 1
>-                fi
>-        fi
>-
>-elif [ "$2" = "POST-INSTALL" ]; then
>-
>-	if [ ! -d "$SIMDIR" ]; then
>-		/bin/mkdir -p "$SIMDIR" || exit 1
>-		/usr/sbin/chown "$USER:$GROUP" "$SIMDIR" || exit 1
>-		/bin/chmod 0750 "$SIMDIR" || exit 1
>-		/bin/chmod 04711 ${QMAIL_DIR}/bin/simscan
>-		/bin/chown $USER:$GROUP ${QMAIL_DIR}/bin/simscan ${QMAIL_DIR}/bin/simscanmk
>-	fi
>-fi
>-
>-exit 0
>Index: pkg-message
>===================================================================
>RCS file: pkg-message
>diff -N pkg-message
>--- pkg-message	3 Apr 2005 16:04:21 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,23 +0,0 @@
>-
>-=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
>-NOTES:
>-
>-* You have to configure your anti-virus and anti-spam products!
>-
>-* You have to modify your qmail startup files to call simscan.
>-In most cases, you just need to edit /var/qmail/tcp.smtp in
>-order to call simscan instead of qmail-queue, by setting up
>-QMAILQUEUE variable. For example:
>-
>-127.0.0.1:allow,RELAYCLIENT=""
>-192.168.0.:allow,RELAYCLIENT="",QMAILQUEUE="/var/qmail/bin/simscan"
>-:allow,QMAILQUEUE="/var/qmail/bin/simscan"
>-
>-* Don't forget to rebuild tcp.smtp.cdb from new tcp.smtp using tcprules!
>-
>-* Also, read documentation about how to configure 
>-attachment blocking and per domain processing. 
>-Additional documentation can be found here: 
>-http://qmailwiki.inter7.com/index.php?title=Simscan
>-
>-=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/mail/simscan/pkg-plist,v
>retrieving revision 1.2
>diff -u -u -r1.2 pkg-plist
>--- pkg-plist	21 Jan 2006 17:37:12 -0000	1.2
>+++ pkg-plist	15 Aug 2007 19:22:24 -0000
>@@ -1,7 +1,3 @@
> @cwd %%QMAIL_PREFIX%%
> bin/simscanmk
> bin/simscan
>-@unexec rmdir %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% || true
>-@unexec echo ""
>-@unexec echo "If you're not updating this port, you can delete %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% directory"
>-@unexec echo ""
>Index: files/pkg-deinstall.in
>===================================================================
>RCS file: files/pkg-deinstall.in
>diff -N files/pkg-deinstall.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/pkg-deinstall.in	15 Aug 2007 19:22:24 -0000
>@@ -0,0 +1,19 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+
>+USER=simscan
>+GROUP=${USER}
>+
>+if [ x$2 != xDEINSTALL ]; then
>+    exit
>+fi
>+
>+pw groupdel -n ${GROUP} || true
>+pw userdel -n ${GROUP} || true
>+
>+rmdir %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% || true
>+
>+echo ""
>+echo "If you're not updating this port, you can delete %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% directory"
>+echo ""
>Index: files/pkg-install.in
>===================================================================
>RCS file: files/pkg-install.in
>diff -N files/pkg-install.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/pkg-install.in	15 Aug 2007 19:22:24 -0000
>@@ -0,0 +1,51 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+
>+USER=simscan
>+GROUP=${USER}
>+UID=74
>+GID=${UID}
>+SIMDIR=%%QMAIL_PREFIX%%/%%SIMSCAN_DIR%%
>+
>+if [ "$2" = "PRE-INSTALL" ]; then
>+
>+echo adding simscan user
>+
>+        if pw group show "${GROUP}" 2>/dev/null; then
>+                echo "You already have a group \"${GROUP}\", so I will use it."
>+        else
>+                if pw groupadd ${GROUP} -g ${GID}; then
>+                        echo "Added group \"${GROUP}\"."
>+                else
>+                        echo "Adding group \"${GROUP}\" failed..."
>+                        exit 1
>+                fi
>+        fi
>+
>+
>+        if pw user show "${USER}" 2>/dev/null; then
>+                echo "You already have a user \"${USER}\", so I will use it."
>+        else
>+                if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
>+                        -d /nonexistent -s /sbin/nologin -c "Simscan User"
>+                then
>+                        echo "Added user \"${USER}\"."
>+                else
>+                        echo "Adding user \"${USER}\" failed..."
>+                        exit 1
>+                fi
>+        fi
>+
>+elif [ "$2" = "POST-INSTALL" ]; then
>+
>+	if [ ! -d "$SIMDIR" ]; then
>+		/bin/mkdir -p "$SIMDIR" || exit 1
>+		/usr/sbin/chown "$USER:$GROUP" "$SIMDIR" || exit 1
>+		/bin/chmod 0750 "$SIMDIR" || exit 1
>+		/bin/chmod 04711 %%QMAIL_PREFIX%%/bin/simscan
>+		/usr/sbin/chown $USER:$GROUP %%QMAIL_PREFIX%%/bin/simscan %%QMAIL_PREFIX%%/bin/simscanmk
>+	fi
>+fi
>+
>+exit 0
>Index: files/pkg-message.in
>===================================================================
>RCS file: files/pkg-message.in
>diff -N files/pkg-message.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/pkg-message.in	15 Aug 2007 19:22:24 -0000
>@@ -0,0 +1,23 @@
>+
>+=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
>+NOTES:
>+
>+* You have to configure your anti-virus and anti-spam products!
>+
>+* You have to modify your qmail startup files to call simscan.
>+In most cases, you just need to edit %%QMAIL_PREFIX%%/tcp.smtp in
>+order to call simscan instead of qmail-queue, by setting up
>+QMAILQUEUE variable. For example:
>+
>+127.0.0.1:allow,RELAYCLIENT=""
>+192.168.0.:allow,RELAYCLIENT="",QMAILQUEUE="%%QMAIL_PREFIX%%/bin/simscan"
>+:allow,QMAILQUEUE="%%QMAIL_PREFIX%%/bin/simscan"
>+
>+* Don't forget to rebuild tcp.smtp.cdb from new tcp.smtp using tcprules!
>+
>+* Also, read documentation about how to configure 
>+attachment blocking and per domain processing. 
>+Additional documentation can be found here: 
>+http://qmailwiki.inter7.com/index.php?title=Simscan
>+
>+=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=

Actions: View | Diff

Attachments on bug 115560: 80592