From 6cee3efe9aaeac0724160c43f5fbe44d845ee858 Mon Sep 17 00:00:00 2001 From: cjs Date: Tue, 6 Apr 1999 11:48:07 +0000 Subject: Upgrade procmail to 3.13. Move config dir from PREFIX/pkg/etc to /etc, so that machines sharing /usr do not have to share procmail config file. --- mail/procmail/Makefile | 8 +++--- mail/procmail/files/md5 | 4 +-- mail/procmail/patches/patch-ab | 57 +++++++++--------------------------------- mail/procmail/patches/patch-ac | 14 +++++------ mail/procmail/patches/patch-ae | 31 ----------------------- 5 files changed, 25 insertions(+), 89 deletions(-) delete mode 100644 mail/procmail/patches/patch-ae (limited to 'mail/procmail') diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 0de7e18b18e..38f4c062238 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.10 1998/11/04 10:36:41 hubertf Exp $ +# $NetBSD: Makefile,v 1.11 1999/04/06 11:48:07 cjs Exp $ # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp # -DISTNAME= procmail-3.11pre7 -PKGNAME= procmail-3.11p7 +DISTNAME= procmail-3.13 +PKGNAME= procmail-3.13 CATEGORIES= mail -MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ +MASTER_SITES= ftp://ftp.procmail.org/pub/procmail/ MAINTAINER= packages@netbsd.org diff --git a/mail/procmail/files/md5 b/mail/procmail/files/md5 index 6b3330f0754..335598beda1 100644 --- a/mail/procmail/files/md5 +++ b/mail/procmail/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:25:03 agc Exp $ +$NetBSD: md5,v 1.3 1999/04/06 11:48:07 cjs Exp $ -MD5 (procmail-3.11pre7.tar.gz) = 065a9da6a2198d9c6d47616b2adf2315 +MD5 (procmail-3.13.tar.gz) = 8c90af9adf933a6bc1f088efacfd9082 diff --git a/mail/procmail/patches/patch-ab b/mail/procmail/patches/patch-ab index 3a5b4628bd8..f24eb783a88 100644 --- a/mail/procmail/patches/patch-ab +++ b/mail/procmail/patches/patch-ab @@ -1,46 +1,13 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:51 agc Exp $ +$NetBSD: patch-ab,v 1.4 1999/04/06 11:48:07 cjs Exp $ -*** config.h.bak Mon Oct 30 05:09:07 1995 ---- config.h Wed Aug 28 17:10:52 1996 -*************** -*** 45,51 **** - #define TRUSTED_IDS {"root","daemon","uucp","mail","x400","network",\ - "list","slist","lists","news",0} - -! /*#define NO_fcntl_LOCK /* uncomment any of these three if you */ - /*#define NO_lockf_LOCK /* definitely do not want procmail to make */ - /*#define NO_flock_LOCK /* use of those kernel-locking methods */ - ---- 45,51 ---- - #define TRUSTED_IDS {"root","daemon","uucp","mail","x400","network",\ - "list","slist","lists","news",0} - -! #define NO_fcntl_LOCK /* uncomment any of these three if you */ - /*#define NO_lockf_LOCK /* definitely do not want procmail to make */ - /*#define NO_flock_LOCK /* use of those kernel-locking methods */ - -*************** -*** 69,79 **** - is not found, maildelivery will proceed as normal to the default - system mailbox. */ - -! #define ETCRC "/etc/procmailrc" /* optional global procmailrc startup - file (will only be read if procmail - is started with no rcfile on the command line). */ - -! #define ETCRCS "/etc/procmailrcs/" /* optional trusted path prefix for - rcfiles which will be executed with - the uid of the owner of the rcfile (this only happens if procmail is - called with the -m option, without variable assignments on the command ---- 69,79 ---- - is not found, maildelivery will proceed as normal to the default - system mailbox. */ - -! #define ETCRC "@LOCALBASE@/etc/procmailrc" /* optional global procmailrc startup - file (will only be read if procmail - is started with no rcfile on the command line). */ - -! #define ETCRCS "@LOCALBASE@/etc/procmailrcs/" /* optional trusted path prefix for - rcfiles which will be executed with - the uid of the owner of the rcfile (this only happens if procmail is - called with the -m option, without variable assignments on the command +--- config.h~ Fri Feb 26 16:11:54 1999 ++++ config.h Mon Apr 5 23:08:11 1999 +@@ -51,7 +51,7 @@ + #define TRUSTED_IDS {"root","daemon","uucp","mail","x400","network",\ + "list","slist","lists","news",0} + +-/*#define NO_fcntl_LOCK /* uncomment any of these three if you */ ++#define NO_fcntl_LOCK /* uncomment any of these three if you */ + /*#define NO_lockf_LOCK /* definitely do not want procmail to make */ + /*#define NO_flock_LOCK /* use of those kernel-locking methods */ + diff --git a/mail/procmail/patches/patch-ac b/mail/procmail/patches/patch-ac index 9e7855a7c07..751b71ab735 100644 --- a/mail/procmail/patches/patch-ac +++ b/mail/procmail/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:51 agc Exp $ +$NetBSD: patch-ac,v 1.3 1999/04/06 11:48:07 cjs Exp $ -*** initmake.bak Thu Apr 3 05:58:37 1997 ---- initmake Wed May 14 18:27:56 1997 +*** initmake~ Tue Feb 16 16:13:32 1999 +--- initmake Mon Apr 5 23:10:00 1999 *************** -*** 380,387 **** +*** 382,389 **** test -z "$MAKE" && echo "MAKE = make" >>_Makefile test a"$cc" != a"$CC" && echo "CC = $cc" >>_Makefile @@ -12,12 +12,12 @@ $NetBSD: patch-ac,v 1.2 1998/08/07 11:09:51 agc Exp $ echo >>_Makefile MANSS="" ---- 380,387 ---- +--- 382,389 ---- test -z "$MAKE" && echo "MAKE = make" >>_Makefile test a"$cc" != a"$CC" && echo "CC = $cc" >>_Makefile -! echo "CFLAGS += \$(CFLAGS1)$CFLAGS" >>_Makefile -! echo "LDFLAGS += \$(LDFLAGS1)$LDFLAGS" >>_Makefile +! echo "CFLAGS += \$(CFLAGS1)$CFLAGS" >>_Makefile +! echo "LDFLAGS += \$(LDFLAGS1)$LDFLAGS" >>_Makefile echo >>_Makefile MANSS="" diff --git a/mail/procmail/patches/patch-ae b/mail/procmail/patches/patch-ae deleted file mode 100644 index 566073322e5..00000000000 --- a/mail/procmail/patches/patch-ae +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1998/08/07 11:09:52 agc Exp $ - ---- man/procmail.man-orig Fri Apr 11 12:28:59 1997 -+++ man/procmail.man Thu Jul 9 13:04:00 1998 -@@ -215,11 +215,11 @@ - to continue the rule, and the tab to separate the comments): - .Sx 4 - R$*<@some.where>$* -- $#procmail $@/etc/procmailrcs/some.rc $:$1@some.where.procmail$2 -+ $#procmail $@@LOCALBASE@/etc/procmailrcs/some.rc $:$1@some.where.procmail$2 - R$*<@$*.procmail>$* - $1<@$2>$3 Already filtered, map back - .Ex --And /etc/procmailrcs/some.rc could be as simple as: -+And @LOCALBASE@/etc/procmailrcs/some.rc could be as simple as: - .Sx 6 - :0 # sink all junk mail - * ^Subject:.*junk -@@ -228,9 +228,9 @@ - :0 # pass along all other mail - ! \-oi \-f "$@" - .Ex --Do watch out when sending mail from within the /etc/procmailrcs/some.rc file, --if you send mail to addresses which match the first rule again, you could --be creating an endless mail loop. -+Do watch out when sending mail from within the -+@LOCALBASE@/etc/procmailrcs/some.rc file, if you send mail to addresses which -+match the first rule again, you could be creating an endless mail loop. - .SH FILES - .TP 2.3i - .B /etc/passwd -- cgit v1.2.3