From cb106381fd545f98471d21f07dd2757faeeecacf Mon Sep 17 00:00:00 2001
From: grange <grange@openbsd.org>
Date: Fri, 29 Oct 2004 08:37:08 +0000
Subject: [PATCH] Update to cnupm-3.6; from form@

---
 net/cnupm/Makefile                                |  4 ++--
 net/cnupm/distinfo                                |  6 +++---
 net/cnupm/patches/patch-include_cnupm_h           | 13 -------------
 net/cnupm/patches/patch-libcnupm_cnupm_restrict_c | 12 ------------
 4 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 net/cnupm/patches/patch-include_cnupm_h
 delete mode 100644 net/cnupm/patches/patch-libcnupm_cnupm_restrict_c

diff --git a/net/cnupm/Makefile b/net/cnupm/Makefile
index 86e68b40b5e..36918a1eff9 100644
--- a/net/cnupm/Makefile
+++ b/net/cnupm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2004/05/17 11:34:06 grange Exp $
+# $OpenBSD: Makefile,v 1.3 2004/10/29 08:37:08 grange Exp $
 
 COMMENT=		"IPv4/IPv6 traffic collector"
 
-DISTNAME=		cnupm-3.5
+DISTNAME=		cnupm-3.6
 CATEGORIES=		net
 
 HOMEPAGE=		http://pdp-11.org.ru/~form/cnupm
diff --git a/net/cnupm/distinfo b/net/cnupm/distinfo
index 57d83d0392c..9b40bd0f66f 100644
--- a/net/cnupm/distinfo
+++ b/net/cnupm/distinfo
@@ -1,3 +1,3 @@
-MD5 (cnupm-3.5.tar.gz) = c9b1f2670e7bd7aaeda6fa26d0434f4f
-RMD160 (cnupm-3.5.tar.gz) = af98de14c7221b61ccee6e24092de4899420c9ef
-SHA1 (cnupm-3.5.tar.gz) = 8245c5ce39862751df3dc6728a73d6ade19dd7ed
+MD5 (cnupm-3.6.tar.gz) = 4d7aa4a955cfe2752e8da2f5e3259ee6
+RMD160 (cnupm-3.6.tar.gz) = 5826410a568d0e2abf21926f459f6f42d8b6ad85
+SHA1 (cnupm-3.6.tar.gz) = b682a946cd363084f3a462489890afff5b9bf901
diff --git a/net/cnupm/patches/patch-include_cnupm_h b/net/cnupm/patches/patch-include_cnupm_h
deleted file mode 100644
index 1b6509137cf..00000000000
--- a/net/cnupm/patches/patch-include_cnupm_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-include_cnupm_h,v 1.1.1.1 2004/05/13 06:52:36 grange Exp $
---- include/cnupm.h.orig	2004-04-22 10:40:20.000000000 +0700
-+++ include/cnupm.h	2004-04-26 20:31:39.000000000 +0700
-@@ -34,7 +34,9 @@
- #define CNUPM_VERSION_MAJOR	3
- #define CNUPM_VERSION_MINOR	5
- 
-+#ifndef CNUPM_USER
- #define CNUPM_USER		"cnupm"
-+#endif
- #define CNUPM_PIDFILE		"cnupm-%s.pid"
- #define CNUPM_DUMPFILE		"cnupm-%s.dump"
- 
diff --git a/net/cnupm/patches/patch-libcnupm_cnupm_restrict_c b/net/cnupm/patches/patch-libcnupm_cnupm_restrict_c
deleted file mode 100644
index 531875a9b44..00000000000
--- a/net/cnupm/patches/patch-libcnupm_cnupm_restrict_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libcnupm_cnupm_restrict_c,v 1.1.1.1 2004/05/13 06:52:36 grange Exp $
---- libcnupm/cnupm_restrict.c.orig	2004-04-22 10:17:58.000000000 +0700
-+++ libcnupm/cnupm_restrict.c	2004-04-26 20:28:27.000000000 +0700
-@@ -55,7 +55,7 @@ cnupm_restrict(struct passwd *pw)
- #endif	/* HAVE_INITGROUPS */
- #endif	/* HAVE_LOGIN_CAP */
- 		return (-1);
--	if (chroot(pw->pw_dir) < 0 || chdir("/") < 0 || setuid(pw->pw_uid) < 0)
-+	if (chroot(pw->pw_dir) < 0 || setuid(pw->pw_uid) < 0 || chdir("/") < 0)
- 		return (-1);
- 	return (0);
- }