Fix build on -HEAD

Identified by Jean-Luc Wasmer in PR# 32527
Fixes from -HEAD by christos@ (setuserenv -> setuserenviron)
Bump to nb1

6 files changed, 108 insertions, 2 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index dde4d14c8c3..52620e8054e 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2005/12/29 06:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.82 2006/01/18 21:00:48 adrianp Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
 PKGNAME=	sendmail-${DIST_VERS}
+PKGREVISION=	1
 COMMENT=	The well known Mail Transport Agent
 
 CONFLICTS+=	postfix-[0-9]* fastforward>=0.51nb2
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index df534eab5b0..c36d52eef43 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/11/29 15:27:03 adrianp Exp $
+$NetBSD: distinfo,v 1.26 2006/01/18 21:00:48 adrianp Exp $
 
 SHA1 (sendmail.8.13.5.tar.gz) = 3c6a6caf1deaf960b340b03128df63e4cd553cde
 RMD160 (sendmail.8.13.5.tar.gz) = 976af4c8c02adb7dd4a2610f905e91027c84d92d
@@ -11,3 +11,7 @@ SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
 SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
 SHA1 (patch-ag) = 1dc55dd77a3cb2617b6f05ccbbdc3b112686b87a
 SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
+SHA1 (patch-ai) = 277891a001a14d49eda0631cbfec1383e3deeed0
+SHA1 (patch-aj) = a71a613451a168ef811e596990eb95748528fb9b
+SHA1 (patch-ak) = 2a68861ef25d88f55b876e015c4b090b382e596b
+SHA1 (patch-al) = eefcc0a1b124edb53f1a40007c883821978449ea
diff --git a/mail/sendmail/patches/patch-ai b/mail/sendmail/patches/patch-ai
new file mode 100644
index 00000000000..6051c28d28b
--- /dev/null
+++ b/mail/sendmail/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.4 2006/01/18 21:00:48 adrianp Exp $
+
+--- sendmail/conf.c.orig	2005-07-26 06:45:38.000000000 +0100
++++ sendmail/conf.c
+@@ -3899,8 +3899,8 @@ vendor_pre_defaults(e)
+ 	**  /etc/mail/sendmail.cf without this
+ 	*/
+ 
+-	setuserenv("ISP", NULL);
+-	setuserenv("SYSTYPE", NULL);
++	setuserenviron("ISP", NULL);
++	setuserenviron("SYSTYPE", NULL);
+ #endif /* apollo */
+ }
+ 
+@@ -3914,7 +3914,7 @@ vendor_post_defaults(e)
+ 
+ 	/* Makes sure the SOCK environment variable remains */
+ 	if (p = getextenv("SOCK"))
+-		setuserenv("SOCK", p);
++		setuserenviron("SOCK", p);
+ #endif /* __QNX__ */
+ #if defined(SUN_EXTENSIONS) && defined(SUN_DEFAULT_VALUES)
+ 	sun_post_defaults(e);
diff --git a/mail/sendmail/patches/patch-aj b/mail/sendmail/patches/patch-aj
new file mode 100644
index 00000000000..84c8967a60d
--- /dev/null
+++ b/mail/sendmail/patches/patch-aj
@@ -0,0 +1,51 @@
+$NetBSD: patch-aj,v 1.1 2006/01/18 21:00:48 adrianp Exp $
+
+--- sendmail/main.c.orig	2004-06-17 17:39:21.000000000 +0100
++++ sendmail/main.c
+@@ -649,7 +649,7 @@ main(argc, argv, envp)
+ 	}
+ 
+ 	/* prime the child environment */
+-	setuserenv("AGENT", "sendmail");
++	setuserenviron("AGENT", "sendmail");
+ 
+ 	(void) sm_signal(SIGPIPE, SIG_IGN);
+ 	OldUmask = umask(022);
+@@ -1318,9 +1318,9 @@ main(argc, argv, envp)
+ 	if (TimeZoneSpec == NULL)
+ 		unsetenv("TZ");
+ 	else if (TimeZoneSpec[0] != '\0')
+-		setuserenv("TZ", TimeZoneSpec);
++		setuserenviron("TZ", TimeZoneSpec);
+ 	else
+-		setuserenv("TZ", NULL);
++		setuserenviron("TZ", NULL);
+ 	tzset();
+ 
+ 	/* initialize mailbox database */
+@@ -3446,14 +3446,14 @@ getextenv(envar)
+ **		value -- the value to which it should be set.  If
+ **			null, this is extracted from the incoming
+ **			environment.  If that is not set, the call
+-**			to setuserenv is ignored.
++**			to setuserenviron is ignored.
+ **
+ **	Returns:
+ **		none.
+ */
+ 
+ void
+-setuserenv(envar, value)
++setuserenviron(envar, value)
+ 	const char *envar;
+ 	const char *value;
+ {
+@@ -3488,7 +3488,7 @@ setuserenv(envar, value)
+ 
+ 	/* make sure it is in our environment as well */
+ 	if (putenv(p) < 0)
+-		syserr("setuserenv: putenv(%s) failed", p);
++		syserr("setuserenviron: putenv(%s) failed", p);
+ }
+ /*
+ **  DUMPSTATE -- dump state
diff --git a/mail/sendmail/patches/patch-ak b/mail/sendmail/patches/patch-ak
new file mode 100644
index 00000000000..c01de974129
--- /dev/null
+++ b/mail/sendmail/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/01/18 21:00:48 adrianp Exp $
+
+--- sendmail/readcf.c.orig	2005-09-04 07:15:15.000000000 +0100
++++ sendmail/readcf.c
+@@ -679,7 +679,7 @@ readcf(cfname, safe, e)
+ 			p = strchr(bp, '=');
+ 			if (p != NULL)
+ 				*p++ = '\0';
+-			setuserenv(&bp[1], p);
++			setuserenviron(&bp[1], p);
+ 			break;
+ 
+ 		  case 'X':		/* mail filter */
diff --git a/mail/sendmail/patches/patch-al b/mail/sendmail/patches/patch-al
new file mode 100644
index 00000000000..8047557d8b2
--- /dev/null
+++ b/mail/sendmail/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/01/18 21:00:48 adrianp Exp $
+
+--- sendmail/sendmail.h.orig	2005-06-24 00:11:22.000000000 +0100
++++ sendmail/sendmail.h
+@@ -2541,7 +2541,7 @@ extern bool	setvendor __P((char *));
+ extern void	set_op_mode __P((int));
+ extern void	setoption __P((int, char *, bool, bool, ENVELOPE *));
+ extern sigfunc_t	setsignal __P((int, sigfunc_t));
+-extern void	setuserenv __P((const char *, const char *));
++extern void	setuserenviron __P((const char *, const char *));
+ extern void	settime __P((ENVELOPE *));
+ extern char	*sfgets __P((char *, int, SM_FILE_T *, time_t, char *));
+ extern char	*shortenstring __P((const char *, size_t));