Attachment 29313 Details for Bug 48984 – file.diff

[patch] file.diff

file.diff (text/plain), 5.11 KB, created by Blaz Zupan on 2003-03-06 20:40:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Blaz Zupan

Created: 2003-03-06 20:40:09 UTC

Size: 5.11 KB

patch

obsolete

>diff -urN amavisd-new.old/Makefile amavisd-new/Makefile
>--- amavisd-new.old/Makefile	Fri Feb 21 18:54:44 2003
>+++ amavisd-new/Makefile	Thu Mar  6 21:24:48 2003
>@@ -8,6 +8,7 @@
> 
> PORTNAME=	amavisd-new
> PORTVERSION=	20021227.p2
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://www.ijs.si/software/amavisd/
> DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
>@@ -15,7 +16,8 @@
> MAINTAINER=	blaz@si.FreeBSD.org
> COMMENT=	Performance-enhanced daemonized version of amavis-perl
> 
>-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
>+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO \
>+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
> 		${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
> 		${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \
> 		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
>@@ -73,11 +75,14 @@
> 		       -e 's,%%PREFIX%%,${PREFIX},g' \
> 	               < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
> 	done
>-	${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
>-	       -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
>-	       -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
>-	       -e 's,%%AMAVISQUARANTINE%%,${AMAVISQUARANTINE},g' \
>-		< ${WRKSRC}/amavisd.conf > ${WRKDIR}/amavisd.conf
>+	for file in amavisd.conf amavisd amavisdconf; do \
>+		${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
>+		       -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
>+		       -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
>+		       -e 's,%%AMAVISQUARANTINE%%,${AMAVISQUARANTINE},g' \
>+		       -e 's,%%PREFIX%%,${PREFIX},g' \
>+		       < ${WRKSRC}/$${file} > ${WRKDIR}/$${file}; \
>+	done
> 
> pre-install:
> 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
>@@ -87,7 +92,8 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${PREFIX}/sbin
> 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
> .endif
>-	${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin
>+	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
>+	${INSTALL_SCRIPT} ${WRKDIR}/amavisdconf ${PREFIX}/sbin
> 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
> 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d
> .if !defined(NOPORTDOCS)
>diff -urN amavisd-new.old/files/amavisd.sh.tmpl amavisd-new/files/amavisd.sh.tmpl
>--- amavisd-new.old/files/amavisd.sh.tmpl	Sat Jan  4 12:52:47 2003
>+++ amavisd-new/files/amavisd.sh.tmpl	Thu Mar  6 21:20:12 2003
>@@ -7,7 +7,6 @@
> 
> DIR=%%AMAVISDIR%%
> PIDFILE=$DIR/amavisd.pid
>-CONFIGFILE=${PREFIX}/etc/amavisd.conf
> SOCKFILES=$DIR/amavis*.sock
> MILTERFLAG=$DIR/use.milter
> 
>@@ -18,7 +17,7 @@
> 		if [ -e $MILTERFLAG ]; then
> 			su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavis-milter -D -p $DIR/amavis-milter.sock"
> 		fi
>-		su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd -c ${CONFIGFILE} > /dev/null 2>&1" && echo -n ' amavisd'
>+		su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd > /dev/null 2>&1" && echo -n ' amavisd'
> 	fi
> 	;;
> stop)
>diff -urN amavisd-new.old/files/patch-amavisd amavisd-new/files/patch-amavisd
>--- amavisd-new.old/files/patch-amavisd	Thu Jan  1 01:00:00 1970
>+++ amavisd-new/files/patch-amavisd	Thu Mar  6 21:20:54 2003
>@@ -0,0 +1,11 @@
>+--- amavisd.orig	Fri Jan 10 22:03:39 2003
>++++ amavisd	Thu Mar  6 21:18:38 2003
>+@@ -5070,7 +5070,7 @@
>+ my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)]);
>+ $amavisd_path = $1  if $amavisd_path =~ m{^([A-Za-z0-9/._=+-]+)$};    # untaint
>+ 
>+-my($config_file) = '/etc/amavisd.conf';  # default location of config file
>++my($config_file) = '%%PREFIX%%/etc/amavisd.conf';  # default location of config file
>+ if (@ARGV >= 2 && $ARGV[0] eq '-c') {    # override by command line option -c
>+     shift @ARGV; $config_file = shift @ARGV;
>+     $config_file = $1  if $config_file =~ m{^([A-Za-z0-9/._=+-]+)$};  # untaint
>diff -urN amavisd-new.old/files/patch-amavisdconf amavisd-new/files/patch-amavisdconf
>--- amavisd-new.old/files/patch-amavisdconf	Thu Jan  1 01:00:00 1970
>+++ amavisd-new/files/patch-amavisdconf	Thu Mar  6 21:21:07 2003
>@@ -0,0 +1,20 @@
>+--- amavisdconf.orig	Fri Dec 27 14:56:01 2002
>++++ amavisdconf	Thu Mar  6 21:18:16 2003
>+@@ -9,7 +9,7 @@
>+ #  (none) show the value as will be used by amavisd;
>+ #   -d  show default value as in the absence of the config file;
>+ #   -n  only show variable if its value is different from the default.
>+-#   -c conf-file ... use the specified file instead of /etc/amavisd.conf
>++#   -c conf-file ... use the specified file instead of %%PREFIX%%/etc/amavisd.conf
>+ #
>+ # If a variable is specified, show only that variable, otherwise show
>+ # all configurable variables. (Note: the leading $, @ or % must be included
>+@@ -179,7 +179,7 @@
>+   }
>+ 
>+   my($what,$onevar);
>+-  my($config_file) = '/etc/amavisd.conf';
>++  my($config_file) = '%%PREFIX%%/etc/amavisd.conf';
>+   while (@ARGV) {
>+     if (@ARGV >= 1 && $ARGV[0] =~ /^-([nd])$/) {
>+       $what = $1; shift @ARGV;
>diff -urN amavisd-new.old/pkg-plist amavisd-new/pkg-plist
>--- amavisd-new.old/pkg-plist	Fri Jan 17 12:58:12 2003
>+++ amavisd-new/pkg-plist	Thu Mar  6 21:27:22 2003
>@@ -19,3 +19,4 @@
> %%AMAVIS_NOMILTER%%sbin/amavis
> %%AMAVIS_NOMILTER%%sbin/amavis-milter
> sbin/amavisd
>+sbin/amavisdconf

Actions: View | Diff

Attachments on bug 48984: 29313