From root@seceidos.de  Tue Dec  2 13:31:10 2003
Return-Path: <root@seceidos.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7E80016A4CE; Tue,  2 Dec 2003 13:31:10 -0800 (PST)
Received: from mail.seceidos.de (mail.seceidos.de [213.157.28.234])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6766743FA3; Tue,  2 Dec 2003 13:31:02 -0800 (PST)
	(envelope-from root@seceidos.de)
Message-Id: <200312022130.hB2LUvgL054153@services.intern.seceidos.de>
Date: Tue, 2 Dec 2003 22:30:57 +0100 (CET)
From: Jan-Peter Koopmann <j.koopmann@seceidos.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sergei@freebsd.org
Subject: [MAINTAINER] mail/MailScanner: update to 4.25.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59908
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner: update to 4.25.14
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sergei
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 02 13:40:19 PST 2003
>Closed-Date:    Fri Dec 05 07:34:59 PST 2003
>Last-Modified:  Fri Dec 05 07:34:59 PST 2003
>Originator:     Jan-Peter Koopmann
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD services.intern.seceidos.de 4.8-STABLE FreeBSD 4.8-STABLE #0: Mon Aug  4 11:45:56 CEST
>Description:
- Update to 4.25.14

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

This PR supercedes ports/58715 which can be closed now.

Please rename mail/mailscanner to mail/MailScanner as I discussed with Sergei.

Thanks,
  JP

--- MailScanner-4.25.14.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	Sun Nov 23 12:37:23 2003
+++ /server-root/ports/mail/MailScanner/Makefile	Tue Dec  2 22:29:15 2003
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.24.5
+PORTVERSION=	4.25.14
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
-DISTNAME=	MailScanner-4.24-5
+DISTNAME=	MailScanner-4.25-14
 
 MAINTAINER=	j.koopmann@seceidos.de
 COMMENT=	A powerful virus/spam scanning framework for Sendmail and Exim
@@ -26,6 +26,8 @@
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CONFLICTS=	MailScanner-devel
+
 USE_PERL5=	yes
 
 DATADIR=	${PREFIX}/share/MailScanner
@@ -65,7 +67,7 @@
 		's,/opt/MailScanner/lib,'${PREFIX}'/libexec/MailScanner,g; \
 		s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
 	${PERL} -pi -e \
-		's,/bin/bash,'${PREFIX}'/bash,g; \
+		's,/bin/bash,'${PREFIX}'/bin/bash,g; \
 		s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
 		${WRKSRC}/bin/update_virus_scanners
 	${PERL} -pi -e \
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/distinfo /server-root/ports/mail/MailScanner/distinfo
--- /server-root/ports/mail/MailScanner.orig/distinfo	Sun Nov 23 12:37:23 2003
+++ /server-root/ports/mail/MailScanner/distinfo	Tue Dec  2 22:21:37 2003
@@ -1 +1 @@
-MD5 (MailScanner-4.24-5.tar.gz) = f43e0f6b1febf41aaf843400b1b4b3f5
+MD5 (MailScanner-4.25-14.tar.gz) = a730889387355d5e215a655a3fc5bc55
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8
--- /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.8	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8	Tue Dec  2 22:23:17 2003
@@ -0,0 +1,8 @@
+--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8	Tue Dec  2 22:22:27 2003
++++ 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.25-14" "Julian Field" "Mail"
+ .SH "NAME"
+ .LP 
+ MailScanner \- Virus/Spam Scanner for Sendmail and Exim
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.8.html /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8.html
--- /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.8.html	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8.html	Tue Dec  2 22:23:17 2003
@@ -0,0 +1,9 @@
+--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8.html	Tue Dec  2 22:22:27 2003
++++ docs/man/MailScanner.8.html	Tue Dec  2 22:23:08 2003
+@@ -1,5 +1,5 @@
+ <!-- Creator     : groff version 1.19 -->
+-<!-- CreationDate: Wed Nov 19 17:14:30 2003 -->
++<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+ <html>
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.conf.5
--- /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.conf.5	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.conf.5	Tue Dec  2 22:23:17 2003
@@ -0,0 +1,8 @@
+--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5	Tue Dec  2 22:22:27 2003
++++ 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.25-14" "Julian Field" "Mail"
+ .SH "NAME"
+ .LP 
+ MailScanner.conf \- Main configuration for MailScanner
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.conf.5.html /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.conf.5.html
--- /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanner.conf.5.html	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.conf.5.html	Tue Dec  2 22:23:17 2003
@@ -0,0 +1,9 @@
+--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5.html	Tue Dec  2 22:22:27 2003
++++ docs/man/MailScanner.conf.5.html	Tue Dec  2 22:23:08 2003
+@@ -1,5 +1,5 @@
+ <!-- Creator     : groff version 1.19 -->
+-<!-- CreationDate: Wed Nov 26 20:07:41 2003 -->
++<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+ <html>
--- MailScanner-4.25.14.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sergei 
Responsible-Changed-By: sergei 
Responsible-Changed-When: Tue Dec 2 22:00:53 PST 2003 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59908 

From: "Jan-Peter Koopmann" <Jan-Peter.Koopmann@seceidos.de>
To: <freebsd-gnats-submit@FreeBSD.org>
Cc: "Sergei Kolobov" <sergei@freebsd.org>
Subject: Re: ports/59908: [MAINTAINER] mail/MailScanner: update to 4.25.14
Date: Thu, 4 Dec 2003 14:02:08 +0100

 New revision with some slight chances thanks to Sergei! :-)
 
 Regards,
   JP
 
 --- MailScanner-4.25.14_1.patch begins here ---
 diff -ruN --exclude=3DCVS
 /server-root/ports/mail/MailScanner.orig/Makefile
 /server-root/ports/mail/MailScanner/Makefile
 --- /server-root/ports/mail/MailScanner.orig/Makefile	Sun Nov 23
 12:37:23 2003
 +++ /server-root/ports/mail/MailScanner/Makefile	Thu Dec  4
 12:01:51 2003
 @@ -6,10 +6,11 @@
  #
 =20
  PORTNAME=3D	MailScanner
 -PORTVERSION=3D	4.24.5
 +PORTVERSION=3D	4.25.14
 +PORTREVISION=3D	1
  CATEGORIES=3D	mail
  MASTER_SITES=3D	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 -DISTNAME=3D	MailScanner-4.24-5
 +DISTNAME=3D	MailScanner-4.25-14
 =20
  MAINTAINER=3D	j.koopmann@seceidos.de
  COMMENT=3D	A powerful virus/spam scanning framework for Sendmail
 and Exim
 @@ -22,9 +23,13 @@
 =20
 ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Par
 ser \
  	${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}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 +	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 =20
 -RUN_DEPENDS=3D	${BUILD_DEPENDS}
 +RUN_DEPENDS=3D	${BUILD_DEPENDS} \
 +		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
 +
 +CONFLICTS=3D	MailScanner-devel-*
 =20
  USE_PERL5=3D	yes
 =20
 @@ -65,7 +70,7 @@
 =20
 's,/opt/MailScanner/lib,'${PREFIX}'/libexec/MailScanner,g; \
  		s,/bin/false,/usr/bin/false,;'
 ${WRKSRC}/etc/virus.scanners.conf
  	${PERL} -pi -e \
 -		's,/bin/bash,'${PREFIX}'/bash,g; \
 +		's,/bin/bash,'${PREFIX}'/bin/bash,g; \
  		s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
  		${WRKSRC}/bin/update_virus_scanners
  	${PERL} -pi -e \
 diff -ruN --exclude=3DCVS
 /server-root/ports/mail/MailScanner.orig/distinfo
 /server-root/ports/mail/MailScanner/distinfo
 --- /server-root/ports/mail/MailScanner.orig/distinfo	Sun Nov 23
 12:37:23 2003
 +++ /server-root/ports/mail/MailScanner/distinfo	Tue Dec  2
 22:21:37 2003
 @@ -1 +1 @@
 -MD5 (MailScanner-4.24-5.tar.gz) =3D f43e0f6b1febf41aaf843400b1b4b3f5
 +MD5 (MailScanner-4.25-14.tar.gz) =3D a730889387355d5e215a655a3fc5bc55
 diff -ruN --exclude=3DCVS
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.8
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8
 ---
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.8	Thu Jan  1 01:00:00 1970
 +++
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8
 Tue Dec  2 22:23:17 2003
 @@ -0,0 +1,8 @@
 +--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8	Tue Dec  2
 22:22:27 2003
 ++++ 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.25-14" "Julian Field" "Mail"
 + .SH "NAME"
 + .LP=20
 + MailScanner \- Virus/Spam Scanner for Sendmail and Exim
 diff -ruN --exclude=3DCVS
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.8.html
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8.h
 tml
 ---
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.8.html	Thu Jan  1 01:00:00 1970
 +++
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.8.h
 tml	Tue Dec  2 22:23:17 2003
 @@ -0,0 +1,9 @@
 +--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8.html	Tue Dec
 2 22:22:27 2003
 ++++ docs/man/MailScanner.8.html	Tue Dec  2 22:23:08 2003
 +@@ -1,5 +1,5 @@
 + <!-- Creator     : groff version 1.19 -->
 +-<!-- CreationDate: Wed Nov 19 17:14:30 2003 -->
 ++<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
 + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 + "http://www.w3.org/TR/html4/loose.dtd">
 + <html>
 diff -ruN --exclude=3DCVS
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.conf.5
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.con
 f.5
 ---
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.conf.5	Thu Jan  1 01:00:00 1970
 +++
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.con
 f.5	Tue Dec  2 22:23:17 2003
 @@ -0,0 +1,8 @@
 +--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5	Tue Dec
 2 22:22:27 2003
 ++++ 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.25-14" "Julian Field" "Mail"
 + .SH "NAME"
 + .LP=20
 + MailScanner.conf \- Main configuration for MailScanner
 diff -ruN --exclude=3DCVS
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.conf.5.html
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.con
 f.5.html
 ---
 /server-root/ports/mail/MailScanner.orig/files/patch-docs:man:MailScanne
 r.conf.5.html	Thu Jan  1 01:00:00 1970
 +++
 /server-root/ports/mail/MailScanner/files/patch-docs:man:MailScanner.con
 f.5.html	Tue Dec  2 22:23:17 2003
 @@ -0,0 +1,9 @@
 +--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5.html
 Tue Dec  2 22:22:27 2003
 ++++ docs/man/MailScanner.conf.5.html	Tue Dec  2 22:23:08 2003
 +@@ -1,5 +1,5 @@
 + <!-- Creator     : groff version 1.19 -->
 +-<!-- CreationDate: Wed Nov 26 20:07:41 2003 -->
 ++<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
 + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 + "http://www.w3.org/TR/html4/loose.dtd">
 + <html>
 
 
State-Changed-From-To: open->closed 
State-Changed-By: sergei 
State-Changed-When: Fri Dec 5 07:34:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59908 
>Unformatted:
