From 46ed52beaacb5caa067ea3385d9c823c4ea06bab Mon Sep 17 00:00:00 2001
From: frueauf <frueauf@pkgsrc.org>
Date: Thu, 18 Feb 1999 23:09:45 +0000
Subject: Add arg.c.patch to PATCHFILES, should fix security hole described in
 http://www.hert.org/advisories/HERT-02.asc. Add patch to
 dialects/n+obsd/dlsof.h to define _KERNEL when including <sys/socket.h> to
 get the sockprot definition. Needed to compile on current.

---
 sysutils/lsof/Makefile         |  7 ++++---
 sysutils/lsof/files/md5        |  3 ++-
 sysutils/lsof/patches/patch-ab | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 sysutils/lsof/patches/patch-ab

(limited to 'sysutils/lsof')

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index f5db95243f7..010bd1572e2 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/02/17 05:34:32 erh Exp $
+# $NetBSD: Makefile,v 1.13 1999/02/18 23:09:45 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
@@ -12,11 +12,12 @@ MASTER_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
 			ftp://ftp.web.ad.jp/pub/UNIX/tools/lsof/  \
 			ftp://ftp.sunet.se/pub/unix/admin/lsof/
 
+PATCH_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/patches/4.40/
+PATCHFILES=		arg.c.patch
+
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www-rcd.cc.purdue.edu/~abe/
 
-CONFLICTS=		lsof-*
-
 DIST_SUBDIR=		lsof
 
 HAS_CONFIGURE=		yes
diff --git a/sysutils/lsof/files/md5 b/sysutils/lsof/files/md5
index ee931a6f1ce..80580355f49 100644
--- a/sysutils/lsof/files/md5
+++ b/sysutils/lsof/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.8 1999/02/17 05:34:33 erh Exp $
+$NetBSD: md5,v 1.9 1999/02/18 23:09:46 frueauf Exp $
 
 MD5 (lsof/lsof_4.40_W.tar.gz) = 01cc0f15f47481fa7e247486a730f5ff
+MD5 (lsof/arg.c.patch) = 83fc82fe3c9917418934b964854b4590
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
new file mode 100644
index 00000000000..315e1c50163
--- /dev/null
+++ b/sysutils/lsof/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.5 1999/02/18 23:09:46 frueauf Exp $
+
+--- dialects/n+obsd/dlsof.h-orig	Fri May 22 14:18:33 1998
++++ dialects/n+obsd/dlsof.h	Thu Feb 18 23:59:27 1999
+@@ -52,7 +52,9 @@
+ #include <sys/mount.h>
+ #include <rpc/types.h>
+ #include <sys/protosw.h>
++#define _KERNEL
+ #include <sys/socket.h>
++#undef _KERNEL
+ #include <sys/socketvar.h>
+ #include <sys/un.h>
+ #include <sys/unpcb.h>
-- 
cgit v1.2.3