Bump to 20000505. Changes:

 * Add note on how to update distfile, mostly taken from pkg_install pkg.
 * Move 1.4 patches from src/usr.sbin/user/user.c to pkgsrc (I didn't want
   to add it to doc/HACKS :)

4 files changed, 39 insertions, 5 deletions

diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile
index d84ad9f3ee2..b6bee148150 100644
--- a/sysutils/user/Makefile
+++ b/sysutils/user/Makefile
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2000/03/13 11:20:37 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/05/05 01:41:55 hubertf Exp $
 #
 
-DISTNAME=		user-20000313
+# Note to package maintainers:
+# To update the distfile of this pkg, cd to /usr/src/usr.sbin,
+# "tar pzvcf user-`date +%Y%m%d`.tar.gz user" and upload that
+# file to ${MASTER_SITE_LOCAL}.
+DISTNAME=		user-20000505
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/sysutils/user/files/md5 b/sysutils/user/files/md5
index f09e76104a1..c23dcec7c04 100644
--- a/sysutils/user/files/md5
+++ b/sysutils/user/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/03/13 11:20:38 agc Exp $
+$NetBSD: md5,v 1.5 2000/05/05 01:41:56 hubertf Exp $
 
-MD5 (user-20000313.tar.gz) = 80be94227471a6e12cc13341641d2197
+MD5 (user-20000505.tar.gz) = f1b38e56703801feceabba3f070363d9
diff --git a/sysutils/user/files/patch-sum b/sysutils/user/files/patch-sum
index b04d8aef368..199719ef2a6 100644
--- a/sysutils/user/files/patch-sum
+++ b/sysutils/user/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/01/13 17:31:15 hubertf Exp $
+$NetBSD: patch-sum,v 1.4 2000/05/05 01:41:56 hubertf Exp $
 
 MD5 (patch-aa) = 737cbe22390001687743d8964829fd4b
+MD5 (patch-ab) = 9745616b70eaf8dc2fccb7757956db9e
diff --git a/sysutils/user/patches/patch-ab b/sysutils/user/patches/patch-ab
new file mode 100644
index 00000000000..7f92e7ba165
--- /dev/null
+++ b/sysutils/user/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1 2000/05/05 01:41:56 hubertf Exp $
+
+--- user.c	Fri May  5 03:21:02 2000
++++ user.c.orig	Fri May  5 03:20:51 2000
+@@ -202,6 +202,24 @@
+ 	return ret;
+ }
+ 
++#define NetBSD_1_4_K	104110000
++
++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < NetBSD_1_4_K)
++/* bounds checking strncpy */
++static int
++strlcpy(char *to, char *from, size_t tosize)
++{
++	size_t	n;
++	int	fromsize;
++
++	fromsize = strlen(from);
++	n = MIN(tosize - 1, fromsize);
++	(void) memcpy(to, from, n);
++	to[n] = '\0';
++	return fromsize;
++}
++#endif
++
+ #ifdef EXTENSIONS
+ /* return 1 if all of `s' is numeric */
+ static int