Attachment 21808 Details for Bug 38084 – file.diff

[patch] file.diff

file.diff (text/plain), 5.88 KB, created by Gea-Suan Lin on 2002-05-14 21:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gea-Suan Lin

Created: 2002-05-14 21:40:02 UTC

Size: 5.88 KB

patch

obsolete

>diff -ruN /usr/ports/security/amavisd/Makefile amavisd/Makefile
>--- /usr/ports/security/amavisd/Makefile	Mon May 13 09:30:40 2002
>+++ amavisd/Makefile	Wed May 15 04:21:27 2002
>@@ -7,13 +7,14 @@
> 
> PORTNAME=	amavisd
> PORTVERSION=	20020300
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://www.amavis.org/dist/perl/
> DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}
> 
> MAINTAINER=	gslin@ccca.nctu.edu.tw
> 
>-RUN_DEPENDS=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
>+BUILD_DEPENDS=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
> 		${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha \
> 		${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
> 		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
>@@ -27,42 +28,46 @@
> 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
> 		${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}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
>+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
>+RUN_DEPENDS=	${BUILD_DEPENDS}
> 
> GNU_CONFIGURE=	yes
> 
>-AMAVISUSER?=	root
>+AMAVISUSER?=	vscan
>+AMAVISGROUP?=	vscan
> 
>-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc --with-amavisuser=${AMAVISUSER}
>+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc --with-amavisuser=${AMAVISUSER}:${AMAVISGROUP}
> 
> .if defined(WITH_POSTFIX)
> CONFIGURE_ARGS+=	--enable-postfix
>-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
> MTA?=		postfix
>+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
> .elif defined(WITH_POSTFIX_CURRENT)
> CONFIGURE_ARGS+=	--enable-postfix
>-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
> MTA?=		postfix
>-.elif defined(WITH_QMAIL)
>-CONFIGURE_ARGS+=	--enable-qmail
>-RUN_DEPENDS+=	${LOCALBASE}/bin/qmail-smtpd:${PORTSDIR}/mail/qmail
>-MTA?=		qmail
>+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
> .else
> CONFIGURE_ARGS+=	--enable-sendmail
> MTA?=		sendmail
> .endif
> 
> post-patch:
>-	@${SED} "s,%%AMAVISUSER%%,${AMAVISUSER}," ${FILESDIR}/amavisd.sh.sample > ${WRKSRC}/amavisd.sh.sample
>+	@${SED} 's,%%AMAVISUSER%%,${AMAVISUSER},g' ${FILESDIR}/amavisd.sh > ${WRKSRC}/amavisd.sh
>+
>+pre-install:
>+	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${AMAVISUSER} ${AMAVISGROUP}
> 
> post-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.sh.sample ${PREFIX}/etc/rc.d
>+	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.sh ${PREFIX}/etc/rc.d
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for FILE in FAQ INSTALL README README.exim README.milter README.postfix README.qmail README.scanners README.sendmail doc/amavis.html doc/amavis.m4 doc/amavis.png doc/amavis.txt
> 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
> .endfor
>+	@${ECHO} "==============================================================================="
> 	@${ECHO} "Please read ${DOCSDIR}/README.${MTA}"
>+	@${ECHO} "==============================================================================="
> .endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/security/amavisd/files/amavisd.sh amavisd/files/amavisd.sh
>--- /usr/ports/security/amavisd/files/amavisd.sh	Thu Jan  1 08:00:00 1970
>+++ amavisd/files/amavisd.sh	Tue May 14 03:57:20 2002
>@@ -0,0 +1,20 @@
>+#!/bin/sh
>+
>+if ! PREFIX=$(expr $0 : "$/.*$/etc/rc\.d/$(basename $0)\$"); then
>+	echo "$0: Cannot determine the PREFIX" >&2
>+	exit 1
>+fi
>+
>+case "$1" in
>+start)
>+	[ -x ${PREFIX}/sbin/amavisd ] && su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd'
>+	;;
>+stop)
>+	echo -n ' amavisd'
>+	;;
>+*)
>+	echo "Usage: `basename $0` {start|stop}" >&2
>+	;;
>+esac
>+
>+exit 0
>diff -ruN /usr/ports/security/amavisd/files/amavisd.sh.sample amavisd/files/amavisd.sh.sample
>--- /usr/ports/security/amavisd/files/amavisd.sh.sample	Mon May 13 09:30:40 2002
>+++ amavisd/files/amavisd.sh.sample	Thu Jan  1 08:00:00 1970
>@@ -1,20 +0,0 @@
>-#!/bin/sh
>-
>-if ! PREFIX=$(expr $0 : "$/.*$/etc/rc\.d/$(basename $0)\$"); then
>-	echo "$0: Cannot determine the PREFIX" >&2
>-	exit 1
>-fi
>-
>-case "$1" in
>-start)
>-	[ -x ${PREFIX}/amavisd ] && su - %%AMAVISUSER%% -c ${PREFIX}/amavisd > /dev/null 2>&1 && echo -n ' amavisd'
>-	;;
>-stop)
>-	echo -n ' amavisd'
>-	;;
>-*)
>-	echo "Usage: `basename $0` {start|stop}" >&2
>-	;;
>-esac
>-
>-exit 0
>diff -ruN /usr/ports/security/amavisd/pkg-install amavisd/pkg-install
>--- /usr/ports/security/amavisd/pkg-install	Thu Jan  1 08:00:00 1970
>+++ amavisd/pkg-install	Wed May 15 04:24:07 2002
>@@ -0,0 +1,39 @@
>+#!/bin/sh
>+#
>+#	$FreeBSD$
>+#
>+
>+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
>+BATCH=${BATCH:=no}
>+
>+USER=$1
>+GROUP=$2
>+
>+if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
>+    echo "You already have a group \"${GROUP}\", so I will use it."
>+else
>+    if /usr/sbin/pw groupadd ${GROUP} -h -
>+    then
>+	echo "Added group \"${GROUP}\"."
>+    else
>+	echo "Adding group \"${GROUP}\" failed..."
>+	echo "Please create it, and try again."
>+	exit 1
>+    fi
>+fi
>+
>+if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
>+    echo "You already have a user \"${USER}\", so I will use it."
>+else
>+    if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
>+       -d /var/amavis \
>+       -s /bin/sh \
>+       -c "Scanning Virus Account"
>+    then
>+	echo "Added user \"${USER}\"."
>+    else
>+	echo "Adding user \"${USER}\" failed..."
>+	echo "Please create it, and try again."
>+	exit 1
>+    fi
>+fi
>diff -ruN /usr/ports/security/amavisd/pkg-plist amavisd/pkg-plist
>--- /usr/ports/security/amavisd/pkg-plist	Mon May 13 09:30:40 2002
>+++ amavisd/pkg-plist	Tue May 14 03:59:15 2002
>@@ -13,6 +13,6 @@
> %%PORTDOCS%%share/doc/amavisd/amavis.txt
> %%PORTDOCS%%@dirrm share/doc/amavisd
> etc/amavisd.conf
>-etc/rc.d/amavisd.sh.sample
>+etc/rc.d/amavisd.sh
> sbin/amavis
> sbin/amavisd

Actions: View | Diff

Attachments on bug 38084: 21808