diff options
| author | Craig Leres <leres@FreeBSD.org> | 2020-11-12 06:11:45 +0800 |
|---|---|---|
| committer | Craig Leres <leres@FreeBSD.org> | 2020-11-12 06:11:45 +0800 |
| commit | 6e97963b05602a67516de3d4c979860e4f8284f6 (patch) | |
| tree | 52aa4fe105dbdbaa4a0a00ba0b8cca1284d87c94 /sysutils | |
| parent | 16fda1df9183fb61fb70f98c7a5eae7d3095e480 (diff) | |
| download | freebsd-ports-gnome-6e97963b05602a67516de3d4c979860e4f8284f6.tar.gz freebsd-ports-gnome-6e97963b05602a67516de3d4c979860e4f8284f6.tar.zst freebsd-ports-gnome-6e97963b05602a67516de3d4c979860e4f8284f6.zip | |
sysutils/lsof: Unbreak for 12.2-RELEASE and newer 13.0-CURRENT
The the order of fields in the namecache struct changed in stable/12
(r363891) and head (r367338); this definition is not public so lsof
has it's own copy that needs to be conditionally adjusted accordingly.
PR: 250916
Approved by: ler (maintainer)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/lsof/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/lsof/files/patch-dialects-freebsd-dlsof.h | 24 |
2 files changed, 21 insertions, 5 deletions
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index a1dc423f27ca..d14a78165af9 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -6,7 +6,7 @@ PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 13 +PORTREVISION= 14 PORTEPOCH= 8 CATEGORIES= sysutils diff --git a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h index ec64911fbfb3..17bcc69d323c 100644 --- a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h +++ b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h @@ -21,16 +21,32 @@ # if FREEBSDV>=4000 # if FREEBSDV>=5000 # if FREEBSDV<6020 -@@ -104,6 +111,12 @@ typedef struct device *device_t; - +@@ -105,6 +112,12 @@ typedef struct device *device_t; #include <sys/conf.h> -+ + +/* + * include <stdbool.h> for refcount(9) + */ +#include <stdbool.h> + - ++ # if defined(HAS_VM_MEMATTR_T) #undef vm_memattr_t + # endif /* defined(HAS_VM_MEMATTR_T) */ +@@ -652,9 +665,15 @@ struct sfile { + */ + + struct namecache { ++# if __FreeBSD_version < 1202000 || (__FreeBSD_version >= 1300000 && __FreeBSD_version < 1300105) + LIST_ENTRY(namecache) nc_hash; /* hash chain */ + LIST_ENTRY(namecache) nc_src; /* source vnode list */ + TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ ++# else ++ LIST_ENTRY(namecache) nc_src; /* source vnode list */ ++ TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ ++ LIST_ENTRY(namecache) nc_hash; /* hash chain */ ++# endif + struct vnode *nc_dvp; /* vnode of parent of name */ + struct vnode *nc_vp; /* vnode the name refers to */ + u_char nc_flag; /* flag bits */ |