Revert previous change - use one set of sources, for maintenance reasons,

across -current pkgsrc and the 1.4 branch.

4 files changed, 5 insertions, 35 deletions

diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile
index b6bee148150..15c4d730d58 100644
--- a/sysutils/user/Makefile
+++ b/sysutils/user/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2000/05/05 01:41:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/05/09 11:15:59 agc Exp $
 #
 
 # 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
+DISTNAME=		user-20000509
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/sysutils/user/files/md5 b/sysutils/user/files/md5
index c23dcec7c04..e7cd80212a9 100644
--- a/sysutils/user/files/md5
+++ b/sysutils/user/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/05/05 01:41:56 hubertf Exp $
+$NetBSD: md5,v 1.6 2000/05/09 11:16:00 agc Exp $
 
-MD5 (user-20000505.tar.gz) = f1b38e56703801feceabba3f070363d9
+MD5 (user-20000509.tar.gz) = 97597bfcbacc11e7a83e78f3bf6a4688
diff --git a/sysutils/user/files/patch-sum b/sysutils/user/files/patch-sum
index 199719ef2a6..846c9dadf0a 100644
--- a/sysutils/user/files/patch-sum
+++ b/sysutils/user/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/05/05 01:41:56 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/05/09 11:16:00 agc Exp $
 
 MD5 (patch-aa) = 737cbe22390001687743d8964829fd4b
-MD5 (patch-ab) = 9745616b70eaf8dc2fccb7757956db9e
diff --git a/sysutils/user/patches/patch-ab b/sysutils/user/patches/patch-ab
deleted file mode 100644
index 7f92e7ba165..00000000000
--- a/sysutils/user/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$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