pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/38151 (lsof build error)
The following reply was made to PR pkg/38151; it has been noted by GNATS.
From: Bernd Ernesti <pr200803%veego.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/38151 (lsof build error)
Date: Sun, 9 Mar 2008 19:33:00 +0100
I added an include for stdbool.h in dlsof.h which fixed the compile
error.
Then there would be the next error, see pkg/37939 for a patch,
where I only needed one of the diffs from it.
Here is my current patch which works for me.
The PKGREVISION part is maybe not needed, because these are only
compile errors for -current.
The dnode.c part is from pkg/37939.
Bernd
--- Makefile 17 Dec 2007 12:15:59 -0000 1.94
+++ Makefile 9 Mar 2008 11:28:26 -0000
@@ -2,7 +2,7 @@
DISTNAME= lsof_4.78
PKGNAME= ${DISTNAME:S/_/-/}.${OS_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
--- distinfo 28 Dec 2007 16:15:39 -0000 1.73
+++ distinfo 9 Mar 2008 11:42:27 -0000
@@ -5,7 +5,7 @@
Size (lsof_4.78.tar.bz2) = 756729 bytes
SHA1 (patch-aa) = 051015025297ab131c30ceb62e926750c365d14a
SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
-SHA1 (patch-ad) = 3c0444a3a22520abdce4584c3fe07334662cea15
+SHA1 (patch-ad) = 6110e1b14e1f9d5a9c3839e296bf72a050bdbaa4
SHA1 (patch-ae) = 1d8c1c3baf9575631c23d3ced7b12fab1df95cd6
-SHA1 (patch-af) = 7481b1d10b12b7c6216858db30b25a3b985e4d3d
+SHA1 (patch-af) = 63ef8b1fa37a4134ed0c312764e3253280741018
SHA1 (patch-ag) = febdf5429228a921496d89bb6e589e22ee21e728
--- patches/patch-ad 21 Nov 2007 11:01:55 -0000 1.14
+++ patches/patch-ad 9 Mar 2008 11:12:21 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.14 2007/11/21 11:01:55 apb Exp $
+$NetBSD$
--- dialects/n+obsd/dnode.c.orig 2007-04-24 18:22:06.000000000 +0200
-+++ dialects/n+obsd/dnode.c
-@@ -38,6 +38,9 @@ static char *rcsid = "$Id: dnode.c,v 1.3
++++ dialects/n+obsd/dnode.c 2008-03-09 12:00:41.000000000 +0100
+@@ -38,6 +38,9 @@
#include "lsof.h"
@@ -12,7 +12,7 @@
#if defined(HAS_DINODE_U)
#define DINODE_U dinode_u
-@@ -194,12 +197,17 @@ process_node(va)
+@@ -194,12 +197,17 @@
unsigned char ns;
unsigned char rdevs;
char *ep, *ty;
@@ -31,7 +31,19 @@
enum vtype type;
struct vnode *v, vb;
struct l_vfs *vfs;
-@@ -414,7 +422,7 @@ process_overlaid_node:
+@@ -276,7 +284,11 @@
+
+ #if defined(HASPTYFS)
+ struct ptyfsnode pt;
++# if defined(NETBSDV) && __NetBSD_Version__ >= 499005000
++ struct specnode sn;
++# else
+ struct specinfo si;
++# endif
+ #endif /* defined(HASPTYFS) */
+
+ #if defined(HASNULLFS)
+@@ -414,7 +426,7 @@
*/
if (!v->v_data
|| kread((KA_T)v->v_data, (char *)&kn, sizeof(kn))) {
@@ -40,7 +52,7 @@
(void) snpf(Namech, Namechl,
"can't read kernfs_node at: %s",
print_kptr((KA_T)v->v_data, (char *)NULL, 0));
-@@ -449,7 +457,7 @@ process_overlaid_node:
+@@ -449,7 +461,7 @@
* size are fixed; otherwise, safely stat() the file to get the
* inode number and size.
*/
@@ -49,7 +61,7 @@
(void) snpf(Namech, Namechl, "%s", _PATH_KERNFS);
ksb.st_ino = (ino_t)2;
ksb.st_size = DEV_BSIZE;
-@@ -471,6 +479,19 @@ process_overlaid_node:
+@@ -471,6 +483,19 @@
nty = MFSNODE;
break;
@@ -69,7 +81,7 @@
#if defined(HASMSDOSFS)
case VT_MSDOSFS:
if (!v->v_data
-@@ -619,6 +640,7 @@ process_overlaid_node:
+@@ -619,6 +644,7 @@
}
@@ -77,7 +89,7 @@
if ((lff = i.i_lockf)) {
/*
-@@ -667,6 +689,7 @@ process_overlaid_node:
+@@ -667,6 +693,7 @@
break;
} while ((lfp = lf.lf_next) && lfp != lff);
}
@@ -85,7 +97,23 @@
break;
default:
if (v->v_type == VBAD || v->v_type == VNON)
-@@ -900,6 +923,13 @@ process_overlaid_node:
+@@ -802,9 +829,15 @@
+
+ #if defined(HASPTYFS)
+ case PTYFSNODE:
++# if defined(NETBSDV) && __NetBSD_Version__ >= 499005000
++ if (v->v_un.vu_specnode
++ && !kread((KA_T)v->v_un.vu_specnode, (char *)&sn, sizeof(sn))) {
++ rdev = sn.sn_rdev;
++# else
+ if (v->v_un.vu_specinfo
+ && !kread((KA_T)v->v_un.vu_specinfo, (char *)&si, sizeof(si))) {
+ rdev = si.si_rdev;
++# endif
+ rdevs = 1;
+ }
+ if (vfs) {
+@@ -900,6 +933,13 @@
break;
#endif /* defined(HASPTYFS) */
@@ -99,7 +127,7 @@
}
/*
-@@ -1019,6 +1049,13 @@ process_overlaid_node:
+@@ -1019,6 +1059,13 @@
Lf->sz_def = 1;
break;
@@ -113,7 +141,7 @@
#if defined(HASEXT2FS)
case EXT2NODE:
# if defined(HASI_E2FS_PTR)
-@@ -1221,6 +1258,9 @@ process_overlaid_node:
+@@ -1221,6 +1268,9 @@
Lf->dev_def = Lf->rdev_def = 0;
(void) snpf(Namech, Namechl, "%#x", m.mfs_baseoff);
enter_dev_ch("memory");
--- patches/patch-af 17 Dec 2007 11:13:41 -0000 1.13
+++ patches/patch-af 9 Mar 2008 11:42:25 -0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-af,v 1.13 2007/12/17 11:13:41 tron Exp $
+$NetBSD$
--- dialects/n+obsd/dlsof.h.orig 2006-03-28 23:54:15.000000000 +0200
-+++ dialects/n+obsd/dlsof.h
-@@ -161,6 +161,7 @@ struct nameidata; /* to satisfy a functi
++++ dialects/n+obsd/dlsof.h 2008-03-09 12:22:03.000000000 +0100
+@@ -95,6 +95,10 @@
+ # endif /* (defined(OPENBSDV) && OPENBSDV<3030)
+ || (defined(NETBSDV) && __NetBSD_Version__>=106060000) */
+
++# if defined(NETBSDV) && __NetBSD_Version__>=499005200
++#include <stdbool.h>
++# endif /* defined(NETBSDV) && __NetBSD_Version__>=499005200 */
++
+ #include <sys/mount.h>
+
+ # if (defined(OPENBSDV) && OPENBSDV>=3030) \
+@@ -161,6 +165,7 @@
#include <sys/socketvar.h>
#include <sys/un.h>
#include <sys/unpcb.h>
@@ -10,7 +21,7 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
-@@ -170,7 +171,6 @@ struct nameidata; /* to satisfy a functi
+@@ -170,7 +175,6 @@
#include <netinet6/in6_pcb.h>
# endif /* defined(HASIPv6) && defined(NETBSDV) &&
!defined(HASINRIAIPv6) */
@@ -18,7 +29,7 @@
#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
-@@ -264,6 +264,9 @@ struct sockproto {
+@@ -264,6 +268,9 @@
#undef KERNEL
#include <ufs/mfs/mfsnode.h>
@@ -28,7 +39,7 @@
# if defined(HASNFSPROTO)
#include <nfs/rpcv2.h>
-@@ -489,7 +492,12 @@ extern KA_T Kpa;
+@@ -489,7 +496,12 @@
struct l_vfs {
KA_T addr; /* kernel address */
fsid_t fsid; /* file system ID */
@@ -41,7 +52,7 @@
char *dir; /* mounted directory */
char *fsname; /* file system name */
struct l_vfs *next; /* forward link */
-@@ -581,4 +589,12 @@ struct sfile {
+@@ -581,4 +593,12 @@
# endif /* defined(HASNCVPID) */
# endif /* defined(HASNCACHE) */
Home |
Main Index |
Thread Index |
Old Index