Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jan 2004 17:00:26 +0100 (CET)
From:      Jan-Peter Koopmann <j.koopmann@seceidos.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        sergei@FreeBSD.org
Subject:   ports/61130: [MAINTAINER] mail/MailScanner-devel: update to 4.26.4
Message-ID:  <200401091600.i09G0Qqe011655@services.intern.seceidos.de>
Resent-Message-ID: <200401091610.i09GAElH030126@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         61130
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner-devel: update to 4.26.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 09 08:10:14 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jan-Peter Koopmann
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan  5 10:56:46 CET
>Description:
- Update to 4.26.4

Moreover I added a few new RUN_DEPENDS for the virus_wrapper scripts and now patch some
MailScanner scripts to use FreeBSD conform directories.

I did not know how to add the new file Sophos.install.freebsd so I just included it in the
diff. Please add it to the CVS dir.

Thanks,
  JP

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- MailScanner-devel-4.26.4.patch begins here ---
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/Makefile /server-root/ports/mail/MailScanner-devel/Makefile
--- /server-root/ports/mail/MailScanner-devel.orig/Makefile	Wed Dec 24 16:50:13 2003
+++ /server-root/ports/mail/MailScanner-devel/Makefile	Fri Jan  9 16:49:30 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.26.1
-PORTREVISION=	1
+PORTVERSION=	4.26.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 PKGNAMESUFFIX=	-devel
@@ -29,7 +28,9 @@
 
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
-		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
+		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
+		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
+		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
 CONFLICTS=	MailScanner-[0-9]*
 
@@ -82,6 +83,15 @@
 		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
 	${PERL} -pi \
 		-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
+	${PERL} -pi -e \
+		's,/usr/bin/clamscan,/usr/local/bin/clamscan,g;' \
+		${WRKSRC}/lib/clamav-wrapper
+	${PERL} -pi -e \
+		's,/usr/bin/wget,/usr/local/bin/wget,g;' \
+		${WRKSRC}/lib/sophos-autoupdate
+	${PERL} -pi -e \
+		's,/usr/bin/unzip,/usr/local/bin/unzip,g;' \
+		${WRKSRC}/lib/sophos-autoupdate
 
 do-install:
 	# Step 1: Install libexec files
@@ -148,6 +158,8 @@
 	cd ${WRKSRC}/docs/man && \
 		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
 		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
+	# Sophos install script
+	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
 	@${WRKSRC}/bin/upgrade_MailScanner_conf \
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/distinfo /server-root/ports/mail/MailScanner-devel/distinfo
--- /server-root/ports/mail/MailScanner-devel.orig/distinfo	Tue Dec 16 22:17:00 2003
+++ /server-root/ports/mail/MailScanner-devel/distinfo	Fri Jan  9 16:49:44 2004
@@ -1 +1 @@
-MD5 (MailScanner-4.26-1.tar.gz) = 96efae6f60d1cff764151a6c10298088
+MD5 (MailScanner-4.26-4.tar.gz) = 6c7ef8fe632f9f490bc63ef5a8972c43
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/files/Sophos.install.freebsd /server-root/ports/mail/MailScanner-devel/files/Sophos.install.freebsd
--- /server-root/ports/mail/MailScanner-devel.orig/files/Sophos.install.freebsd	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/MailScanner-devel/files/Sophos.install.freebsd	Wed Jan  7 19:52:25 2004
@@ -0,0 +1,92 @@
+#!/usr/local/bin/bash
+#
+# $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
+#
+# Run this script to install Sophos in the right place, with the right
+# options for the MailScanner.
+# Run this script from inside the directory in which you have copied
+# and unpacked the Sophos distribution.
+# Tweaked for FreeBSD.
+
+SOPHOS=/usr/local/Sophos
+SCRIPTS=/usr/local/libexec/MailScanner
+COMPD=freebsd.elf.tar.Z
+DISTRIB=freebsd.elf.tar
+
+mkdir -p ${SOPHOS}
+chown -R root ${SOPHOS}
+chmod -R go+rX ${SOPHOS}
+
+# Clear out any old libs from /usr/local/lib which is where
+# a default SAVI installation will have left them
+echo Clearing out old default Sophos installation libraries
+rm -f /usr/local/lib/libsavi.so*
+
+# Have we got to uncompress the distribution for them?
+if [ -f $COMPD ]; then
+  echo Uncompressing Sophos distribution
+  uncompress $COMPD
+fi
+
+# Have we got to unpack the distribution for them?
+if [ -f $DISTRIB ]; then
+  # Is there an old unpacked distribution here too??
+  if [ -d sav-install ]; then
+    echo Clearing out unpacked distribution
+    rm -rf sav-install
+  fi
+  # Unpack the distribution
+  echo Unpacking distribution
+  tar xBf $DISTRIB
+fi
+
+# JKF 31/08/2001 Remove any existing vdl.dat files
+if [ -f ${SOPHOS}/lib/vdl.dat ]; then
+  rm -f ${SOPHOS}/lib/vdl*
+fi
+if [ -f ${SOPHOS}/lib/vdln.dat ]; then
+  rm -f ${SOPHOS}/lib/vdl*
+fi
+if [ -f ${SOPHOS}/lib/vdl01.vdb ]; then
+  rm -f ${SOPHOS}/lib/vdl*
+fi
+
+# Are we in the right directory, or one above it?
+if [ -d sav-install ]; then
+  cd sav-install
+fi
+
+# Check we have found the install.sh script
+if [ \! -f install.sh ]; then
+  echo Please cd into the directory containing the Sophos install.sh
+  echo script and run this command again.
+  exit 1
+fi
+
+echo Installing Sophos for MailScanner
+./install.sh -v -d ${SOPHOS} -s lib -ni
+
+if [ -f /etc/sav.conf ]; then
+  echo Removing troublesome and useless configuration file /etc/sav.conf
+  rm -f /etc/sav.conf
+fi
+
+echo Creating links so Perl-SAVI module compiles
+[ -e ${SOPHOS}/lib/libsavi.so.2 ] && ln -sf libsavi.so.2 ${SOPHOS}/lib/libsavi.so
+[ -e ${SOPHOS}/lib/libsavi.so.3 ] && ln -sf libsavi.so.3 ${SOPHOS}/lib/libsavi.so
+
+echo
+echo Fetching latest IDE virus identities from www.sophos.com
+${SCRIPTS}/sophos-autoupdate
+
+if [ -f ${SCRIPTS}/sophos-wrapper ]; then
+  chmod a=rx ${SCRIPTS}/sophos-wrapper
+  echo Done.
+else
+  echo Something has gone wrong. There should be a copy of the
+  echo script sophos-wrapper in the directory ${SCRIPTS}.
+  echo Please re-install the MailScanner or fetch another copy of
+  echo sophoswrapper from the distribution web site.
+fi
+
+exit 0
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8
--- /server-root/ports/mail/MailScanner-devel.orig/files/patch-docs:man:MailScanner.8	Tue Dec 16 22:17:01 2003
+++ /server-root/ports/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8	Wed Jan  7 19:03:56 2004
@@ -2,7 +2,7 @@
 +++ docs/man/MailScanner.8	Tue Dec  2 22:23:08 2003
 @@ -1,4 +1,4 @@
 -.TH "MailScanner" "8" "4.25-10" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.26-1" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.26-3" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner \- Virus/Spam Scanner for Sendmail and Exim
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5
--- /server-root/ports/mail/MailScanner-devel.orig/files/patch-docs:man:MailScanner.conf.5	Tue Dec 16 22:17:01 2003
+++ /server-root/ports/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5	Wed Jan  7 19:04:18 2004
@@ -2,7 +2,7 @@
 +++ docs/man/MailScanner.conf.5	Tue Dec  2 22:23:08 2003
 @@ -1,4 +1,4 @@
 -.TH "MailScanner.conf" "5" "4.25-10" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.26-1" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.26-3" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/pkg-message /server-root/ports/mail/MailScanner-devel/pkg-message
--- /server-root/ports/mail/MailScanner-devel.orig/pkg-message	Thu Nov 20 23:10:36 2003
+++ /server-root/ports/mail/MailScanner-devel/pkg-message	Wed Jan  7 19:44:16 2004
@@ -31,4 +31,7 @@
 	to update your virus-wrappers, autoupdates, reports and
 	languages.conf
 
+	Sophos users: Please take a look at the Sophos install
+	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd
+
 *************************************************************************
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner-devel.orig/pkg-plist /server-root/ports/mail/MailScanner-devel/pkg-plist
--- /server-root/ports/mail/MailScanner-devel.orig/pkg-plist	Wed Dec 24 16:50:13 2003
+++ /server-root/ports/mail/MailScanner-devel/pkg-plist	Fri Jan  9 16:54:58 2004
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/mail/MailScanner-devel/pkg-plist,v 1.5 2003/12/24 15:50:13 sergei Exp $
+@comment $FreeBSD$
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
@@ -380,6 +380,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
 %%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
+%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/building.txt
 %%PORTDOCS%%%%DOCSDIR%%/donations.shtml
 %%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
@@ -410,8 +411,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/install/mcafee.shtml
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.61
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.61
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
@@ -451,12 +454,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/support.html
 %%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/users.shtml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/tcp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/mcp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/man
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/install/tcp
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/install/mcp
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/install
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrm %%DATADIR%%/reports/sk
 @dirrm %%DATADIR%%/reports/se
 @dirrm %%DATADIR%%/reports/ro
--- MailScanner-devel-4.26.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401091600.i09G0Qqe011655>