Attachment 22108 Details for Bug 38469 – amavisd.diff

[patch] amavisd.diff

amavisd.diff (text/plain), 3.25 KB, created by Yen-Ming Lee on 2002-05-23 23:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yen-Ming Lee

Created: 2002-05-23 23:00:07 UTC

Size: 3.25 KB

patch

obsolete

>diff -ruN --exclude CVS /usr/ports/security/amavisd/Makefile amavisd/Makefile
>--- /usr/ports/security/amavisd/Makefile	Mon May 20 05:24:20 2002
>+++ amavisd/Makefile	Fri May 24 01:28:23 2002
>@@ -7,9 +7,10 @@
> 
> PORTNAME=	amavisd
> PORTVERSION=	20020300
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	security
>-MASTER_SITES=	http://www.amavis.org/dist/perl/
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	amavis
> DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}
> 
> MAINTAINER=	gslin@ccca.nctu.edu.tw
>@@ -29,7 +30,7 @@
> 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \
> 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
> 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
>-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
>+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
> RUN_DEPENDS=	${BUILD_DEPENDS}
> 
> GNU_CONFIGURE=	yes
>diff -ruN --exclude CVS /usr/ports/security/amavisd/files/amavisd-milter.sh amavisd/files/amavisd-milter.sh
>--- /usr/ports/security/amavisd/files/amavisd-milter.sh	Mon May 20 03:37:05 2002
>+++ amavisd/files/amavisd-milter.sh	Fri May 24 01:23:24 2002
>@@ -7,7 +7,7 @@
> 
> case "$1" in
> start)
>-	( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
>+	( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
> 	AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }')
> 	AMAVIS_MILTER=$(/bin/ps -xU %%AMAVISUSER%% | grep amavis-milter | awk '{ print $1 }')
> 	( /bin/test "$AMAVISD" || /bin/test "$AMAVIS_MILTER" ) && \
>@@ -17,7 +17,7 @@
> 	su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd-milter'
> 	;;
> stop)
>-	( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
>+	( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
> 	AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }')
> 	AMAVIS_MILTER=$(/bin/ps -xU %%AMAVISUSER%% | grep amavis-milter | awk '{ print $1 }')
> 	( /bin/test "$AMAVISD" || /bin/test "$AMAVIS_MILTER" ) && \
>diff -ruN --exclude CVS /usr/ports/security/amavisd/files/amavisd.sh amavisd/files/amavisd.sh
>--- /usr/ports/security/amavisd/files/amavisd.sh	Mon May 20 05:24:20 2002
>+++ amavisd/files/amavisd.sh	Fri May 24 01:23:26 2002
>@@ -7,7 +7,7 @@
> 
> case "$1" in
> start)
>-	( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
>+	( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
> 	AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }')
> 	( /bin/test "$AMAVISD" ) && \
> 	su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD" > /dev/null
>@@ -15,7 +15,7 @@
> 	su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd'
> 	;;
> stop)
>-	( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
>+	( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1
> 	AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }')
> 	( /bin/test "$AMAVISD") && \
> 	su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD" > /dev/null && echo -n ' amavisd'

Actions: View | Diff

Attachments on bug 38469: 22108