ports/61132: [MAINTAINER] mail/MailScanner: Minor Bug fixes
Jan-Peter Koopmann
j.koopmann at seceidos.de
Fri Jan 9 16:20:34 UTC 2004
>Number: 61132
>Category: ports
>Synopsis: [MAINTAINER] mail/MailScanner: Minor Bug fixes
>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:20:12 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:
I added some missing RUN_DEPENDS, changed the Makefile to adjust a two more scripts
to use FreeBSD paths and added an additional install file. I did not know how to add the
new file in the filesdir to the CVS tree. Could you please take care of this?
Thanks,
JP
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- MailScanner-4.25.14_3.patch begins here ---
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/Makefile /server-root/ports/mail/MailScanner/Makefile
--- /server-root/ports/mail/MailScanner.orig/Makefile Wed Dec 24 17:03:38 2003
+++ /server-root/ports/mail/MailScanner/Makefile Fri Jan 9 17:06:27 2004
@@ -7,7 +7,7 @@
PORTNAME= MailScanner
PORTVERSION= 4.25.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
DISTNAME= MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
@@ -24,11 +24,13 @@
${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
- ${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
+ ${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
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-devel-*
@@ -79,8 +81,17 @@
s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/lib/MailScanner/ConfigDefs.pl
- ${PERL} -pi \
- -e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
+ ${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:
#
@@ -148,6 +159,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.orig/files/Sophos.install.freebsd /server-root/ports/mail/MailScanner/files/Sophos.install.freebsd
--- /server-root/ports/mail/MailScanner.orig/files/Sophos.install.freebsd Thu Jan 1 01:00:00 1970
+++ /server-root/ports/mail/MailScanner/files/Sophos.install.freebsd Fri Jan 9 17:04:44 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.orig/pkg-plist /server-root/ports/mail/MailScanner/pkg-plist
--- /server-root/ports/mail/MailScanner.orig/pkg-plist Wed Dec 24 17:03:38 2003
+++ /server-root/ports/mail/MailScanner/pkg-plist Fri Jan 9 17:07:07 2004
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/mail/MailScanner/pkg-plist,v 1.5 2003/12/24 16:03:38 sergei Exp $
+ at 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
@@ -451,12 +452,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%%
+ at dirrm share/nls/en_US.US-ASCII
+ at dirrm share/nls/POSIX
+ at dirrm %%PORTDOCS%%%%DOCSDIR%%/man
+ at dirrm %%PORTDOCS%%%%DOCSDIR%%/install/tcp
+ at dirrm %%PORTDOCS%%%%DOCSDIR%%/install/mcp
+ at dirrm %%PORTDOCS%%%%DOCSDIR%%/install
+ at dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+ at dirrm %%PORTDOCS%%%%DOCSDIR%%
@dirrm %%DATADIR%%/reports/sk
@dirrm %%DATADIR%%/reports/se
@dirrm %%DATADIR%%/reports/ro
--- MailScanner-4.25.14_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list