diff options
-rw-r--r-- | mail/procmail/Makefile | 11 | ||||
-rw-r--r-- | mail/procmail/patches/patch-ab | 13 | ||||
-rw-r--r-- | mk/mk.conf.example | 7 |
3 files changed, 23 insertions, 8 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 05907e868dd..97bfc9c9f8f 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/04/07 01:53:24 kim Exp $ +# $NetBSD: Makefile,v 1.22 2001/04/13 04:18:34 kim Exp $ # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp # @@ -15,10 +15,15 @@ MAKE_ENV= SHELL=/bin/sh .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= PROCMAIL_MAILSPOOLHOME +BUILD_DEFS+= PROCMAIL_MAILSPOOLHOME PROCMAIL_TRUSTED_IDS + +PROCMAIL_TRUSTED_IDS?=\ +"root","daemon","uucp","mail","x400","network","list","slist","lists","news",0 -.ifdef(PROCMAIL_MAILSPOOLHOME) pre-configure: + ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}" \ + >> ${WRKSRC}/config.h +.ifdef(PROCMAIL_MAILSPOOLHOME) ${ECHO} "#define MAILSPOOLHOME \"/${PROCMAIL_MAILSPOOLHOME}\"" \ >> ${WRKSRC}/src/authenticate.h .endif diff --git a/mail/procmail/patches/patch-ab b/mail/procmail/patches/patch-ab index f24eb783a88..bef3f3d76f9 100644 --- a/mail/procmail/patches/patch-ab +++ b/mail/procmail/patches/patch-ab @@ -1,10 +1,15 @@ -$NetBSD: patch-ab,v 1.4 1999/04/06 11:48:07 cjs Exp $ +$NetBSD: patch-ab,v 1.5 2001/04/13 04:18:34 kim Exp $ ---- config.h~ Fri Feb 26 16:11:54 1999 -+++ config.h Mon Apr 5 23:08:11 1999 -@@ -51,7 +51,7 @@ +--- config.h.orig Tue Aug 22 00:26:34 2000 ++++ config.h Fri Apr 13 00:06:57 2001 +@@ -62,10 +62,12 @@ + list of strings; if unauthorised users use the -f option, an extra + >From_ field will be added in the header */ + ++#if 0 #define TRUSTED_IDS {"root","daemon","uucp","mail","x400","network",\ "list","slist","lists","news",0} ++#endif -/*#define NO_fcntl_LOCK /* uncomment any of these three if you */ +#define NO_fcntl_LOCK /* uncomment any of these three if you */ diff --git a/mk/mk.conf.example b/mk/mk.conf.example index f1726602780..c3172d26d0e 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.194 2001/04/09 00:33:06 jtb Exp $ +# $NetBSD: mk.conf.example,v 1.195 2001/04/13 04:18:33 kim Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -694,6 +694,11 @@ PAPERSIZE= A4 # Possible: Any valid filename, not defined # Default: not defined +#PROCMAIL_TRUSTED_IDS=0 +# To allow all users to use the "-f" switch set this to 0. +# Possible: A list of users, terminated by a zero. +# Default: see Makefile + #QPOPPER_SERVERMODE= # Used in qpopper package to enable server mode. # Possible: defined, not defined |