head 1.37; access; symbols pkgsrc-2026Q1:1.37.0.170 pkgsrc-2026Q1-base:1.37 pkgsrc-2025Q4:1.37.0.168 pkgsrc-2025Q4-base:1.37 pkgsrc-2025Q3:1.37.0.166 pkgsrc-2025Q3-base:1.37 pkgsrc-2025Q2:1.37.0.164 pkgsrc-2025Q2-base:1.37 pkgsrc-2025Q1:1.37.0.162 pkgsrc-2025Q1-base:1.37 pkgsrc-2024Q4:1.37.0.160 pkgsrc-2024Q4-base:1.37 pkgsrc-2024Q3:1.37.0.158 pkgsrc-2024Q3-base:1.37 pkgsrc-2024Q2:1.37.0.156 pkgsrc-2024Q2-base:1.37 pkgsrc-2024Q1:1.37.0.154 pkgsrc-2024Q1-base:1.37 pkgsrc-2023Q4:1.37.0.152 pkgsrc-2023Q4-base:1.37 pkgsrc-2023Q3:1.37.0.150 pkgsrc-2023Q3-base:1.37 pkgsrc-2023Q2:1.37.0.148 pkgsrc-2023Q2-base:1.37 pkgsrc-2023Q1:1.37.0.146 pkgsrc-2023Q1-base:1.37 pkgsrc-2022Q4:1.37.0.144 pkgsrc-2022Q4-base:1.37 pkgsrc-2022Q3:1.37.0.142 pkgsrc-2022Q3-base:1.37 pkgsrc-2022Q2:1.37.0.140 pkgsrc-2022Q2-base:1.37 pkgsrc-2022Q1:1.37.0.138 pkgsrc-2022Q1-base:1.37 pkgsrc-2021Q4:1.37.0.136 pkgsrc-2021Q4-base:1.37 pkgsrc-2021Q3:1.37.0.134 pkgsrc-2021Q3-base:1.37 pkgsrc-2021Q2:1.37.0.132 pkgsrc-2021Q2-base:1.37 pkgsrc-2021Q1:1.37.0.130 pkgsrc-2021Q1-base:1.37 pkgsrc-2020Q4:1.37.0.128 pkgsrc-2020Q4-base:1.37 pkgsrc-2020Q3:1.37.0.126 pkgsrc-2020Q3-base:1.37 pkgsrc-2020Q2:1.37.0.122 pkgsrc-2020Q2-base:1.37 pkgsrc-2020Q1:1.37.0.102 pkgsrc-2020Q1-base:1.37 pkgsrc-2019Q4:1.37.0.124 pkgsrc-2019Q4-base:1.37 pkgsrc-2019Q3:1.37.0.120 pkgsrc-2019Q3-base:1.37 pkgsrc-2019Q2:1.37.0.118 pkgsrc-2019Q2-base:1.37 pkgsrc-2019Q1:1.37.0.116 pkgsrc-2019Q1-base:1.37 pkgsrc-2018Q4:1.37.0.114 pkgsrc-2018Q4-base:1.37 pkgsrc-2018Q3:1.37.0.112 pkgsrc-2018Q3-base:1.37 pkgsrc-2018Q2:1.37.0.110 pkgsrc-2018Q2-base:1.37 pkgsrc-2018Q1:1.37.0.108 pkgsrc-2018Q1-base:1.37 pkgsrc-2017Q4:1.37.0.106 pkgsrc-2017Q4-base:1.37 pkgsrc-2017Q3:1.37.0.104 pkgsrc-2017Q3-base:1.37 pkgsrc-2017Q2:1.37.0.100 pkgsrc-2017Q2-base:1.37 pkgsrc-2017Q1:1.37.0.98 pkgsrc-2017Q1-base:1.37 pkgsrc-2016Q4:1.37.0.96 pkgsrc-2016Q4-base:1.37 pkgsrc-2016Q3:1.37.0.94 pkgsrc-2016Q3-base:1.37 pkgsrc-2016Q2:1.37.0.92 pkgsrc-2016Q2-base:1.37 pkgsrc-2016Q1:1.37.0.90 pkgsrc-2016Q1-base:1.37 pkgsrc-2015Q4:1.37.0.88 pkgsrc-2015Q4-base:1.37 pkgsrc-2015Q3:1.37.0.86 pkgsrc-2015Q3-base:1.37 pkgsrc-2015Q2:1.37.0.84 pkgsrc-2015Q2-base:1.37 pkgsrc-2015Q1:1.37.0.82 pkgsrc-2015Q1-base:1.37 pkgsrc-2014Q4:1.37.0.80 pkgsrc-2014Q4-base:1.37 pkgsrc-2014Q3:1.37.0.78 pkgsrc-2014Q3-base:1.37 pkgsrc-2014Q2:1.37.0.76 pkgsrc-2014Q2-base:1.37 pkgsrc-2014Q1:1.37.0.74 pkgsrc-2014Q1-base:1.37 pkgsrc-2013Q4:1.37.0.72 pkgsrc-2013Q4-base:1.37 pkgsrc-2013Q3:1.37.0.70 pkgsrc-2013Q3-base:1.37 pkgsrc-2013Q2:1.37.0.68 pkgsrc-2013Q2-base:1.37 pkgsrc-2013Q1:1.37.0.66 pkgsrc-2013Q1-base:1.37 pkgsrc-2012Q4:1.37.0.64 pkgsrc-2012Q4-base:1.37 pkgsrc-2012Q3:1.37.0.62 pkgsrc-2012Q3-base:1.37 pkgsrc-2012Q2:1.37.0.60 pkgsrc-2012Q2-base:1.37 pkgsrc-2012Q1:1.37.0.58 pkgsrc-2012Q1-base:1.37 pkgsrc-2011Q4:1.37.0.56 pkgsrc-2011Q4-base:1.37 pkgsrc-2011Q3:1.37.0.54 pkgsrc-2011Q3-base:1.37 pkgsrc-2011Q2:1.37.0.52 pkgsrc-2011Q2-base:1.37 pkgsrc-2011Q1:1.37.0.50 pkgsrc-2011Q1-base:1.37 pkgsrc-2010Q4:1.37.0.48 pkgsrc-2010Q4-base:1.37 pkgsrc-2010Q3:1.37.0.46 pkgsrc-2010Q3-base:1.37 pkgsrc-2010Q2:1.37.0.44 pkgsrc-2010Q2-base:1.37 pkgsrc-2010Q1:1.37.0.42 pkgsrc-2010Q1-base:1.37 pkgsrc-2009Q4:1.37.0.40 pkgsrc-2009Q4-base:1.37 pkgsrc-2009Q3:1.37.0.38 pkgsrc-2009Q3-base:1.37 pkgsrc-2009Q2:1.37.0.36 pkgsrc-2009Q2-base:1.37 pkgsrc-2009Q1:1.37.0.34 pkgsrc-2009Q1-base:1.37 pkgsrc-2008Q4:1.37.0.32 pkgsrc-2008Q4-base:1.37 pkgsrc-2008Q3:1.37.0.30 pkgsrc-2008Q3-base:1.37 cube-native-xorg:1.37.0.28 cube-native-xorg-base:1.37 pkgsrc-2008Q2:1.37.0.26 pkgsrc-2008Q2-base:1.37 cwrapper:1.37.0.24 pkgsrc-2008Q1:1.37.0.22 pkgsrc-2008Q1-base:1.37 pkgsrc-2007Q4:1.37.0.20 pkgsrc-2007Q4-base:1.37 pkgsrc-2007Q3:1.37.0.18 pkgsrc-2007Q3-base:1.37 pkgsrc-2007Q2:1.37.0.16 pkgsrc-2007Q2-base:1.37 pkgsrc-2007Q1:1.37.0.14 pkgsrc-2007Q1-base:1.37 pkgsrc-2006Q4:1.37.0.12 pkgsrc-2006Q4-base:1.37 pkgsrc-2006Q3:1.37.0.10 pkgsrc-2006Q3-base:1.37 pkgsrc-2006Q2:1.37.0.8 pkgsrc-2006Q2-base:1.37 pkgsrc-2006Q1:1.37.0.6 pkgsrc-2006Q1-base:1.37 pkgsrc-2005Q4:1.37.0.4 pkgsrc-2005Q4-base:1.37 pkgsrc-2005Q3:1.37.0.2 pkgsrc-2005Q3-base:1.37 pkgsrc-2005Q2:1.36.0.2 pkgsrc-2005Q2-base:1.36 pkgsrc-2005Q1:1.34.0.2 pkgsrc-2005Q1-base:1.34 pkgsrc-2004Q4:1.32.0.2 pkgsrc-2004Q4-base:1.32 pkgsrc-2004Q3:1.29.0.2 pkgsrc-2004Q3-base:1.29 pkgsrc-2004Q2:1.28.0.2 pkgsrc-2004Q2-base:1.28 pkgsrc-2004Q1:1.26.0.2 pkgsrc-2004Q1-base:1.26 pkgsrc-2003Q4:1.24.0.2 pkgsrc-2003Q4-base:1.24 netbsd-1-6-1:1.17.0.2 netbsd-1-6-1-base:1.17 netbsd-1-6:1.12.0.2 buildlink2-base:1.11 comdex-fall-1999:1.7 netbsd-1-4-PATCH001:1.7 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.37 date 2005.09.15.02.45.13; author atatat; state Exp; branches; next 1.36; 1.36 date 2005.05.17.04.45.08; author atatat; state dead; branches; next 1.35; 1.35 date 2005.03.23.04.35.56; author atatat; state Exp; branches; next 1.34; 1.34 date 2005.03.19.19.47.33; author atatat; state Exp; branches; next 1.33; 1.33 date 2005.01.17.14.54.01; author atatat; state dead; branches; next 1.32; 1.32 date 2004.11.30.02.02.13; author atatat; state Exp; branches; next 1.31; 1.31 date 2004.11.28.22.39.07; author atatat; state Exp; branches; next 1.30; 1.30 date 2004.11.07.18.16.27; author kim; state Exp; branches; next 1.29; 1.29 date 2004.07.13.13.42.41; author atatat; state dead; branches; next 1.28; 1.28 date 2004.04.29.04.19.22; author atatat; state Exp; branches; next 1.27; 1.27 date 2004.04.01.20.15.54; author tron; state Exp; branches; next 1.26; 1.26 date 2004.01.17.19.31.30; author atatat; state dead; branches; next 1.25; 1.25 date 2004.01.13.02.50.28; author atatat; state Exp; branches; next 1.24; 1.24 date 2003.11.22.23.19.47; author christos; state dead; branches; next 1.23; 1.23 date 2003.10.04.20.22.35; author atatat; state Exp; branches; next 1.22; 1.22 date 2003.08.13.13.24.16; author atatat; state Exp; branches; next 1.21; 1.21 date 2003.06.19.03.09.38; author atatat; state dead; branches; next 1.20; 1.20 date 2003.05.03.16.55.29; author atatat; state Exp; branches; next 1.19; 1.19 date 2003.04.19.02.09.09; author christos; state Exp; branches; next 1.18; 1.18 date 2003.03.27.14.13.27; author atatat; state dead; branches; next 1.17; 1.17 date 2003.02.03.01.03.14; author atatat; state Exp; branches; next 1.16; 1.16 date 2002.10.12.03.13.41; author atatat; state dead; branches; next 1.15; 1.15 date 2002.09.13.16.55.15; author atatat; state Exp; branches; next 1.14; 1.14 date 2002.09.13.15.53.10; author tron; state Exp; branches; next 1.13; 1.13 date 2002.09.12.19.12.19; author tron; state dead; branches; next 1.12; 1.12 date 2002.08.19.22.52.25; author atatat; state Exp; branches 1.12.2.1; next 1.11; 1.11 date 2001.10.22.12.39.18; author atatat; state dead; branches; next 1.10; 1.10 date 2001.10.09.14.05.15; author atatat; state Exp; branches; next 1.9; 1.9 date 2001.10.09.13.57.46; author atatat; state Exp; branches; next 1.8; 1.8 date 2000.02.19.03.58.26; author wiz; state dead; branches; next 1.7; 1.7 date 99.05.05.17.40.37; author bad; state Exp; branches; next 1.6; 1.6 date 99.03.28.17.29.53; author christos; state Exp; branches; next 1.5; 1.5 date 99.02.18.23.09.46; author frueauf; state Exp; branches; next 1.4; 1.4 date 99.02.17.05.34.33; author erh; state dead; branches; next 1.3; 1.3 date 98.10.22.12.17.21; author drochner; state Exp; branches; next 1.2; 1.2 date 98.06.11.16.25.32; author frueauf; state dead; branches; next 1.1; 1.1 date 98.04.02.09.35.39; author frueauf; state Exp; branches; next ; 1.12.2.1 date 2002.08.20.12.53.14; author wiz; state Exp; branches; next ; desc @@ 1.37 log @Add back what was patch-ac (from kristerw) as patch-ab since it's not a patch to lsof that the author would be interested in taking back as it only addresses the use of pkgsrc on Darwin: Do not ask the user about the path to the darwin XNU kernel header files in the case they are not found -- report an error instead (since going interactive breaks bulk building...) We are in a "freeze" at the moment, but this ought to fix the build of a leaf package under Darwin. @ text @$NetBSD$ --- dialects/darwin/get-hdr-loc.sh.orig 2005-05-27 16:18:54.000000000 -0400 +++ dialects/darwin/get-hdr-loc.sh @@@@ -48,10 +48,9 @@@@ do echo "and then installed. (See 00FAQ for download and installation" 1>&2 echo "instructions.)" 1>&2 echo "" 1>&2 - echo "Please specify the path to the place where they were installed." 1>&2 - echo "" 1>&2 echo "---------------------------------------------------------------" 1>&2 fi # } + exit 1 END=0 while test $END = 0 # { @ 1.36 log @Upgrade to lsof version 4.75, thereby getting rid of most of the accumulated patches. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.75 May 16, 2005 ... Improved the BSDI, FreeBSD, NetBSD, OpenBSD and Solaris kvm_open() and kvm_openfiles() error messages. Enabled support for NetBSD 2.99.12. Also, add the "uname -r" value to the lsof package version. This means that lintpkgsrc will report the lsof package as being out of date if you update your kernel without updating lsof. It's entirely likely that lsof will continue to work, but it might not (and it will warn you anyway), but it's nice to know that it might be good to rebuild it. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.35 2005/03/23 04:35:56 atatat Exp $ d3 11 a13 37 Fix build on 3.0 branch and 3.99.x current. --- Configure.orig 2005-01-17 08:24:32.000000000 -0500 +++ Configure @@@@ -2346,15 +2346,28 @@@@ return(0); } LSOF_TSTBIGF=" " LSOF_VERS="2099010" ;; - 2.99.11) + 2.99.*) LSOF_TSTBIGF=" " - LSOF_VERS="2099011" + LSOF_VERS="2099010" ;; 2*) LSOF_VERS="2000000" echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" echo "!!!WARNING!!! Configuring for NetBSD 2.0" ;; + 3.0*) + LSOF_TSTBIGF=" " + LSOF_VERS="3000000" + ;; + 3.99.*) + LSOF_TSTBIGF=" " + LSOF_VERS="3099000" + ;; + 3*) + LSOF_VERS="3000000" + echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" + echo "!!!WARNING!!! Configuring for NetBSD 3.0" + ;; *) echo "Unknown NetBSD release: $LSOF_VSTR" echo Assuming NetBSD 1.6 @@@@ -2366,7 +2379,11 @@@@ return(0); } # Test for legal NetBSD version. d15 2 a16 10 case $LSOF_VERS in # { - 1002000|1003000|1004000|1005000|1006000|2000000|2099009|2099010|2099011) + 1002000|1003000|1004000|1005000|1006000) + ;; + 2000000|2099009|2099010) + ;; + 3000000|3099000) ;; *) echo "Unknown NetBSD version: $LSOF_VERS" @ 1.35 log @This should also fix the lsof build on 3.0_BETA. Similar changes will appear in the next release of lsof. This patch is adapted from a pre-release by the author. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.34 2005/03/19 19:47:33 atatat Exp $ @ 1.34 log @Fix lsof build on NetBSD 3.99.1 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Fix build on 3.99.x current. d7 12 a18 1 @@@@ -2355,6 +2355,10 @@@@ return(0); } d22 4 d30 5 d38 3 a40 1 @@@@ -2368,6 +2372,8 @@@@ return(0); } d42 6 a47 1 1002000|1003000|1004000|1005000|1006000|2000000|2099009|2099010|2099011) a48 2 + 3099000) + ;; a50 1 rm -f $LSOF_HLP @ 1.33 log @Upgrade to lsof version 4.74, thereby getting rid of most of the accumulated patches. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.74 January 17, 2005 ... Updated lsof for NetBSD 2.99.10 and tested it on a system provided by Andrew Brown . ... Added BSDI, FreeBSD, NetBSD and OpenBSD support for the *effnlink member of the inode structure. This makes the lsof LTnlink test run faster on all modified dialects and correctly on OpenBSD. Added ptyfs support for NetBSD, using modifications provided by Andrew Brown. Changed the netbsd Configure stanza to look by default for system header files in both /usr/include and /usr/src. (The NETBSD_SYS environment variable can still be used to select an alternate for /usr/src.) ... @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.32 2004/11/30 02:02:13 atatat Exp $ d3 1 a3 4 Incorporate a patch from the author that widens the NETBSDV definition to account for new current versioning system, properly handles the sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs support. d5 22 a26 129 --- dialects/n+obsd/dlsof.h.orig 2004-03-10 18:51:36.000000000 -0500 +++ dialects/n+obsd/dlsof.h @@@@ -98,9 +98,9 @@@@ struct uio; /* dummy for function protot #include #include -# if defined(NETBSDV) && NETBSDV>=1030 +# if defined(NETBSDV) && NETBSDV>=1003000 #define sockproto NETBSD_sockproto -# endif /* defined(NETBSDV) && NETBSDV>=1030 */ +# endif /* defined(NETBSDV) && NETBSDV>=1003000 */ #include @@@@ -145,9 +145,9 @@@@ struct nameidata; /* to satisfy a functi #include # endif /* defined(HASMSDOSFS) */ -# if defined(NETBSDV) && NETBSDV>=1030 +# if defined(NETBSDV) && NETBSDV>=1003000 #undef sockproto -# endif /* defined(NETBSDV) && NETBSDV>=1030 */ +# endif /* defined(NETBSDV) && NETBSDV>=1003000 */ #include #include @@@@ -202,7 +202,7 @@@@ struct nameidata; /* to satisfy a functi #include -# if defined(NETBSDV) && NETBSDV>=1030 +# if defined(NETBSDV) && NETBSDV>=1003000 /* * Because late in the 1.3I NetBSD development cycle the sockproto structure * was placed under _KERNEL in , and because defining _KERNEL @@@@ -217,7 +217,7 @@@@ struct sockproto { u_short sp_family; u_short sp_protocol; }; -# endif /* defined(NETBSDV) && NETBSDV>=1030 */ +# endif /* defined(NETBSDV) && NETBSDV>=1003000 */ #include #include @@@@ -245,6 +245,14 @@@@ struct sockproto { #undef DIRENT_DIRBLKSIZ # endif /*defined(DIRENT_BLKSIZ) */ +# if defined(HASBUFQ_H) +# if defined(NETBSDV) && NETBSDV>=2099010 +#define _KERNEL +#include +#undef _KERNEL +# endif /* defined(NETBSDV) && NETBSDV>=2099010 */ +#endif /* defined(HASBUFQ_H) */ + #undef KERNEL #include @@@@ -331,9 +339,9 @@@@ struct sockproto { # if defined(HASNULLFS) #define _KERNEL -# if defined(NETBSDV) && NETBSDV>=1050 && __NetBSD_Version__<106060000 +# if defined(NETBSDV) && NETBSDV>=1005000 && __NetBSD_Version__<106060000 #include "netexport.h" -# endif /* defined(NETBSDV) && NETBSDV>=1050 +# endif /* defined(NETBSDV) && NETBSDV>=1005000 && __NetBSD_Version__<106060000 */ #include #undef _KERNEL @@@@ -357,10 +365,26 @@@@ struct sockproto { #define Pstatus PFSstatus #define Pnote PFSnote #define Pnotepg PFSnotepg +# if defined(NetBSDV) +# if NETBSDV>=2000000 +#define Pfd PFSfd +# endif /* NETBSDV>=2000000 */ +# if NETBSDV>=1006000 +#define Pmap PFSmap +#define Pmaps PFSmaps +# endif /* NETBSDV>=1006000 */ +# endif /* defined(NetBSDV) */ # endif /* defined(HASPROCFS_PFSROOT) */ #include # endif /* defined(HASPROCFS) */ +# if defined(HASPTYFS) +#define _KERNEL +#include +#include +#undef _KERNEL +# endif /* defined(HASPTYFS) */ + #define KERNEL #define _KERNEL #include @@@@ -515,9 +539,9 @@@@ struct sfile { */ # if defined(HASNCACHE) -# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) +# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) #include -#endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */ +#endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */ #include #include @@@@ -527,15 +551,15 @@@@ struct sfile { #define NCACHE_NODEADDR nc_vp /* node address in NCACHE */ #define NCACHE_PARADDR nc_dvp /* parent node address in NCACHE */ -# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) +# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) #define NCACHE_NXT nc_hash.le_next /* link in NCACHE */ -# else /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */ +# else /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */ # if defined(NetBSD1_0) && NetBSD<1994101 #define NCACHE_NXT nc_nxt /* link in NCACHE */ # else /* !defined(NetBSD1_0) || NetBSD>=1994101 */ #define NCACHE_NXT nc_lru.tqe_next /* link in NCACHE */ # endif /* defined(NetBSD1_0) && NetBSD<1994101 */ -# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */ +# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */ # if defined(HASNCVPID) #define NCACHE_PARID nc_dvpid /* parent node ID in NCACHE */ @ 1.32 log @Redo three patches to address build failure on NetBSD <= 1.6ZC, to change the reported node number for the master side of ptyfs devices, and to deal more cleanly with some header files. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.31 2004/11/28 22:39:07 atatat Exp $ @ 1.31 log @Tweak the sys/bufq.h support (it disappeared again), enhance the procfs support a little, incorporate the author's patches to deal with netbsd-current version numbers getting longer, and add ptyfs support. These patches are adapted from an interim release the author made and will appear in the next full release. PKGREVISION bumped to 1 for the ptyfs support. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.30 2004/11/07 18:16:27 kim Exp $ d79 1 a79 1 @@@@ -357,10 +365,20 @@@@ struct sockproto { d83 2 d86 2 d90 2 d106 1 a106 1 @@@@ -515,9 +533,9 @@@@ struct sfile { d118 1 a118 1 @@@@ -527,15 +545,15 @@@@ struct sfile { @ 1.30 log @Needs on 2.99.10 @ text @d1 6 a6 1 $NetBSD$ d9 44 a52 2 +++ dialects/n+obsd/dlsof.h 2004-11-07 13:12:14.000000000 -0500 @@@@ -245,6 +245,11 @@@@ d56 2 a57 1 +# if defined(NETBSDV) && NETBSDV>=2991 d61 3 a63 1 +# endif /* defined(NETBSDV) && NETBSDV>=2991 */ d67 64 @ 1.29 log @Upgrade to lsof version 4.72. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.72 July 13, 2004 ... Added support for NetBSD 2.0 with patches supplied by Andrew Brown . Andrew also provided two test systems. ... @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.28 2004/04/29 04:19:22 atatat Exp $ d3 13 a15 23 Make lsof compile on and properly report 2.0. Make lsof use statvfs on NetBSD where available. --- Configure.orig 2004-03-10 18:41:04.000000000 -0500 +++ Configure @@@@ -2218,6 +2218,15 @@@@ return(0); } echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" echo "!!!WARNING!!! Configuring for NetBSD 1.6" ;; + 2.0*) + LSOF_TSTBIGF=" " + LSOF_VERS="2000" + ;; + 2*) + LSOF_VERS=2000 + echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" + echo "!!!WARNING!!! Configuring for NetBSD 2.0" + ;; *) echo "Unknown NetBSD release: $LSOF_VSTR" echo Assuming NetBSD 1.0 @@@@ -2229,7 +2238,7 @@@@ return(0); } # Test for legal NetBSD version. a16 21 case $LSOF_VERS in # { - 1000|1010|1020|1030|1040|1050|1060) + 1000|1010|1020|1030|1040|1050|1060|2000) ;; *) echo "Unknown NetBSD version: $LSOF_VERS" @@@@ -2505,6 +2514,14 @@@@ return(0); } then LSOF_CFGF="$LSOF_CFGF -DHAS_SYS_PIPEH" fi # } + if test -r ${LSOF_INCLUDE}/sys/statvfs.h # { + then + grep -q '^struct statvfs {' ${LSOF_INCLUDE}/sys/statvfs.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASSTATVFS" + fi # } + fi # } if test -r ${LSOF_INCLUDE}/kvm.h # { then grep -q kvm_getproc2 ${LSOF_INCLUDE}/kvm.h @ 1.28 log @Fix NetBSD 2.0 check in Configure, and check for and deal with the new statvfs() sysctl call which replaced statfs() around 2.0D. This pkg will now build on current again (addresses my PR pkg/25372). Bump PKGREVISION to 1. Changes adapted from changes adapted by lsof maintainer based on changes that made things work this morning. That means they'll all be in the next official lsof release. So there. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.27 2004/04/01 20:15:54 tron Exp $ @ 1.27 log @Use configuration for NetBSD 1.6* under 2.0* to fix build under NetBSD 2.0 and newer. @ text @d1 1 a1 1 $NetBSD$ d3 8 a10 9 --- Configure.orig 2004-03-11 00:41:04.000000000 +0100 +++ Configure 2004-04-01 22:12:30.000000000 +0200 @@@@ -2210,6 +2210,6 @@@@ LSOF_VERS="1050" ;; - 1.6*) + 1.6*|2.0*) LSOF_TSTBIGF=" " LSOF_VERS="1060" d12 36 @ 1.26 log @Upgrade to lsof version 4.70. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.70 January 16, 2004 ... Added bz2 compression. ... Improved handling of parameters after "-i@@". ... With help from Andrew Brown and John Heasley added log-structured file system (LFS) support for NetBSD and OpenBSD. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.25 2004/01/13 02:50:28 atatat Exp $ d3 4 a6 22 Support for LFS. --- Configure.orig 2003-10-15 16:30:40.000000000 -0400 +++ Configure @@@@ -2253,6 +2253,14 @@@@ kernel generation process. fi # } LSOF_TMP1=1 fi # } + if test -r ${LSOF_INCLUDE}/sys/vnode.h # { + then + grep -q VT_LFS ${LSOF_INCLUDE}/sys/vnode.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASLFS" + fi # } + fi # } if test -r ${LSOF_INCLUDE}/miscfs/nullfs/null.h # { then LSOF_CFGF="$LSOF_CFGF -DHASNULLFS" @@@@ -2619,11 +2627,15 @@@@ kernel generation process. LSOF_TSTBIGF=" " LSOF_VERS=3030 d8 2 a9 5 + 3.4*) + LSOF_TSTBIGF=" " + LSOF_VERS=3040 + ;; 3*) d11 1 a11 5 - LSOF_VERS=3020 + LSOF_VERS=3030 echo "!!!WARNING!!! Unsupported OpenBSD 3.x version: $LSOF_VSTR" - echo "!!!WARNING!!! Configuring for OpenBSD 3.2" + echo "!!!WARNING!!! Configuring for OpenBSD 3.3" a12 46 *) echo "Unknown OpenBSD release: $LSOF_VSTR" @@@@ -2636,7 +2648,7 @@@@ kernel generation process. # Test for legal OpenBSD version. case $LSOF_VERS in # { - 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030) + 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040) ;; *) echo "Unknown OpenBSD version: $LSOF_VERS" @@@@ -2680,6 +2692,14 @@@@ kernel generation process. fi # } LSOF_TMP1=1 fi # } + if test -r ${LSOF_INCLUDE}/sys/vnode.h # { + then + grep -q VT_LFS ${LSOF_INCLUDE}/sys/vnode.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASLFS" + fi # } + fi # } if test -r ${LSOF_INCLUDE}/miscfs/nullfs/null.h # { then LSOF_CFGF="$LSOF_CFGF -DHASNULLFS" @@@@ -2733,12 +2753,18 @@@@ kernel generation process. grep -q VT_EXT2FS ${LSOF_INCLUDE}/sys/vnode.h if test $? -eq 0 # { then - LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS" + LSOF_TMP1=1 grep -q "*e2fs_din" ${LSOF_INCLUDE}/ufs/ufs/inode.h if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR" fi # } + grep -q "^#define[ ]i_e2din" ${LSOF_INCLUDE}/ufs/ufs/inode.h + if test $? -eq 0 # { + then + LSOF_TMP1=2 + fi # } + LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS=$LSOF_TMP1" fi # } if test -r ${LSOF_INCLUDE}/sys/namei.h then @ 1.25 log @Add LFS support to lsof. Bump PKGREVISION to 1, making this 4.69nb1. This patch will be included in the next lsof release. @ text @d1 1 a1 1 $NetBSD$ @ 1.24 log @4.69 is out, 4.68 is gone. Approved by agc. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.23 2003/10/04 20:22:35 atatat Exp $ d3 1 a3 1 Patch for vnode/DNLC interface change courtesy of lsof maintainer. d5 1 a5 1 --- Configure.orig 2003-06-11 20:55:38.000000000 -0400 d7 1 a7 2 @@@@ -819,10 +819,13 @@@@ case $LSOF_TGT in # { LSOF_CFGF="$LSOF_CFGF -DHASFDLINK" d9 1 d11 1 a11 18 - grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h - if test $? -eq 0 # { + if test -r ${LSOF_INCLUDE}/sys/namei.h then - LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + fi # } fi # } if test $LSOF_VERS -ge 40000 # { then @@@@ -938,6 +941,14 @@@@ case $LSOF_TGT in # { exit 1 fi # } fi # } + if test -r ${LSOF_INCLUDE}/sys/namei.h d13 2 a14 2 + grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h + if test $? -eq 0 # { d16 1 a16 1 + LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" d19 23 a41 4 LSOF_DINC="$LSOF_DINC -I`pwd`/dialects/darwin/xnu/bsd" LSOF_DINC="$LSOF_DINC -I/usr/include" LSOF_DINC="$LSOF_DINC -I${DARWIN_SYSDIR}/System.framework/PrivateHeaders" @@@@ -1175,6 +1186,14 @@@@ kernel generation process. d43 9 a51 1 LSOF_CFGF="$LSOF_CFGF -DHASIPv6" d53 1 a53 1 + if test -r ${LSOF_INCLUDE}/sys/namei.h d55 2 a56 2 + grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h + if test $? -eq 0 # { d58 1 a58 1 + LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" d61 1 a61 10 LSOF_DIALECT_DIR=du ;; @@@@ -1526,10 +1545,13 @@@@ kernel generation process. fi # } LSOF_CFGF="$LSOF_CFGF -DHAS9660FS" fi # } - grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h - if test $? -eq 0 # { + if test -r ${LSOF_INCLUDE}/sys/namei.h d63 4 a66 39 - LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + fi # } fi # } if test $LSOF_DINC_ADD -eq 1 # { then @@@@ -2217,6 +2239,11 @@@@ kernel generation process. then LSOF_CFGF="$LSOF_CFGF -DHASPROCFS" LSOF_TMP1=1 + grep -q PFSroot ${NETBSD_SYS}/miscfs/procfs/procfs.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASPROCFS_PFSROOT" + fi # } fi # } if test -d ${NETBSD_SYS}/isofs/cd9660 # { then @@@@ -2235,16 +2262,24 @@@@ kernel generation process. then LSOF_CFGF="$LSOF_CFGF -DHASKERNFS" LSOF_TMP1=1 + grep -q "*kfs_kt;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASKERNFS_KFS_KT" + fi # } fi # } fi # } if test $LSOF_TMP1 -eq 1 # { then LSOF_DINC="-I$LSOF_INCLUDE -I$NETBSD_SYS" fi # } - grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h - if test $? -eq 0 # { + if test -r ${LSOF_INCLUDE}/sys/namei.h d68 5 a72 10 - LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + fi # } fi # } grep -q i_ffs_size ${LSOF_INCLUDE}/ufs/ufs/inode.h if test $? -eq 0 # { @@@@ -2645,10 +2680,13 @@@@ kernel generation process. d75 1 a75 7 fi # } - grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h - if test $? -eq 0 # { + if test -r ${LSOF_INCLUDE}/sys/namei.h then - LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h d78 1 a78 1 + LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" d80 1 d82 1 a82 1 if test "X$OPENBSD_UVM" = "X" # { @ 1.23 log @Refix build on -current now that procfs and kernfs have churned again. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.22 2003/08/13 13:24:16 atatat Exp $ @ 1.22 log @A patch (courtesy of the lsof maintainer) to make lsof build again on NetBSD-current, where the structure of the vnode has been altered. This patch will, as usual, be obsoleted by the next lsof release. PKGREVISION bumped accordingly. Install the lsof.8 man page in man8 instead of installing the preformatted copy in man1 (doing so used to slide by, by new groff really doesn't like formatting preformatted man pages, and besides, it was in the wrong place). Since the only thing left untouched was the DESCR file, I also added mention of kqueues as something lsof might note, meaning that this patch touches every file in the pkg. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -819,10 +819,13 @@@@ d24 1 a24 1 @@@@ -938,6 +941,14 @@@@ d39 1 a39 1 @@@@ -1175,6 +1186,14 @@@@ d54 1 a54 1 @@@@ -1526,10 +1545,13 @@@@ d71 24 a94 1 @@@@ -2241,10 +2263,13 @@@@ d111 1 a111 1 @@@@ -2645,10 +2670,13 @@@@ @ 1.21 log @Upgrade to lsof version 4.68. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.68 June 18, 2003 ... Upgraded EXT2FS and UFS support for NetBSD and OpenBSD to handle new inode information, and the fast UFS1 and UFS2 file systems. With the help of Andrew Brown determined the NetBSD snapshot (1.6F) at which could be included under _KERNEL, thus eliminating the lsof netexport.h hack. The same change applies to OpenBSD versions 3.3 and above. ... The former change obsoletes patches ab, ac, and ad. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.20 2003/05/03 16:55:29 atatat Exp $ d3 102 a104 243 --- dialects/n+obsd/dnode.c.orig 2003-03-23 14:26:47.000000000 -0500 +++ dialects/n+obsd/dnode.c @@@@ -200,6 +200,22 @@@@ process_node(va) #endif /* defined(HASFDESCFS) */ +#if defined(HASEXT2FS) +# if defined(HASI_E2FS_PTR) + struct ext2fs_dinode ed; +# endif /* defined(HASI_E2FS_PTR) */ + struct ext2fs_dinode *edp = (struct ext2fs_dinode *)NULL; +#endif /* defined(HASEXT2FS) */ + +#if defined(HASI_FFS1) + unsigned char ffs = 0; + unsigned char u1s = 0; + unsigned char u2s = 0; + struct ufs1_dinode u1; + struct ufs2_dinode u2; + struct ufsmount um; +#endif /* defined(HASI_FFS1) */ + #if defined(HASKERNFS) struct kernfs_node kn; struct stat ksb; @@@@ -262,6 +278,14 @@@@ process_overlaid_node: ksbs = 0; #endif /* defined(HASKERNFS) */ +#if defined(HASEXT2FS) + edp = (struct ext2fs_dinode *)NULL; +#endif /* defined(HASEXT2FS) */ + +#if defined(HASI_FFS1) + ffs = u1s = u2s = 0; +#endif /* defined(HASI_FFS1) */ + /* * Read the vnode. */ @@@@ -503,12 +527,51 @@@@ process_overlaid_node: } #if defined(HASEXT2FS) - if (v->v_tag == VT_EXT2FS) + if (v->v_tag == VT_EXT2FS) { nty = EXT2NODE; - else + +# if defined(HASI_E2FS_PTR) + if (i.i_din.e2fs_din + && !kread((KA_T)i.i_din.e2fs_din, (char *)&ed, sizeof(ed))) + edp = &ed; +# else /* !defined(HASI_E2FS_PTR) */ + edp = &i.i_din.e2fs_din; +# endif /* defined(HASI_E2FS_PTR) */ + + } else #endif /* defined(HASEXT2FS) */ + { nty = INODE; + +#if defined(HASI_FFS1) + /* + * If there are multiple FFS's, read the relevant structures. + */ + if (i.i_ump + && !kread((KA_T)i.i_ump, (char *)&um, sizeof(um))) { + if (um.um_fstype == UFS1) { + ffs = 1; + if (i.i_din.ffs1_din + && !kread((KA_T)i.i_din.ffs1_din, (char *)&u1, + sizeof(u1))) + { + u1s = 1; + } + } else if (um.um_fstype == UFS2) { + ffs = 2; + if (i.i_din.ffs2_din + && !kread((KA_T)i.i_din.ffs2_din, (char *)&u2, + sizeof(u2))) + { + u2s = 1; + } + } + } +#endif /* defined(HASI_FFS1) */ + + } + if ((lff = i.i_lockf)) { /* @@@@ -609,18 +672,21 @@@@ process_overlaid_node: #if defined(HASEXT2FS) case EXT2NODE: -# if defined(HASI_FFS) - dev = i.i_dev; - devs = 1; -# else /* !defined(HASI_FFS) */ dev = i.i_dev; devs = 1; if ((type == VCHR) || (type == VBLK)) { - rdev = i.i_rdev; + +# if defined(HASI_E2FS_PTR) + if (edp) { + rdev = edp->e2di_rdev; + rdevs = 1; + } +# else /* !defined(HASI_E2FS_PTR) */ + rdev = i.i_din.e2fs_din.e2di_rdev; rdevs = 1; - } -# endif /* defined(HASI_FFS) */ +# endif /* defined(HASI_E2FS_PTR) */ + } break; #endif /* defined(HASEXT2FS) */ @@@@ -631,11 +697,26 @@@@ process_overlaid_node: #if defined(HASI_FFS) rdev = i.i_ffs_rdev; + rdevs = 1; #else /* !defined(HASI_FFS) */ +# if defined(HASI_FFS1) + if (ffs == 1) { + if (u1s) { + rdev = u1.di_rdev; + rdevs = 1; + } + } else if (ffs == 2) { + if (u2s) { + rdev = u2.di_rdev; + rdevs = 1; + } + } +# else /* !defined(HASI_FFS1) */ rdev = i.i_rdev; + rdevs = 1; +# endif /* defined(HASI_FFS1) */ #endif /* defined(HASI_FFS) */ - rdevs = 1; } break; @@@@ -807,11 +888,26 @@@@ process_overlaid_node: #if defined(HASI_FFS) Lf->sz = (SZOFFTYPE)i.i_ffs_size; + Lf->sz_def = 1; #else /* !defined(HASI_FFS) */ +# if defined(HASI_FFS1) + if (ffs == 1) { + if (u1s) { + Lf->sz = (SZOFFTYPE)u1.di_size; + Lf->sz_def = 1; + } + } else if (ffs == 2) { + if (u2s) { + Lf->sz = (SZOFFTYPE)u2.di_size; + Lf->sz_def = 1; + } + } +# else /* !defined(HASI_FFS1) */ Lf->sz = (SZOFFTYPE)i.i_size; + Lf->sz_def = 1; +# endif /* defined(HASI_FFS1) */ #endif /* defined(HASI_FFS) */ - Lf->sz_def = 1; } #if defined(HASMSDOSFS) @@@@ -828,14 +924,15 @@@@ process_overlaid_node: #if defined(HASEXT2FS) else if (nty == EXT2NODE) { - -# if defined(HASI_E2FS) +# if defined(HASI_E2FS_PTR) + if (edp) { + Lf->sz = (SZOFFTYPE)edp->e2di_size; + Lf->sz_def = 1; + } +# else /* !defined(HASI_E2FS_PTR) */ Lf->sz = (SZOFFTYPE)i.i_e2fs_size; -# else /* !defined(HASI_E2FS) */ - Lf->sz = (SZOFFTYPE)i.i_size; -# endif /* defined(HASI_E2FS) */ - Lf->sz_def = 1; +# endif /* defined(HASI_E2FS_PTR) */ } #endif /* defined(HASEXT2FS) */ @@@@ -880,8 +977,24 @@@@ process_overlaid_node: # if defined(HASI_FFS) Lf->nlink = (long)i.i_ffs_nlink; + Lf->nlink_def = 1; # else /* !defined(HASI_FFS) */ +# if defined(HASI_FFS1) + if (ffs == 1) { + if (u1s) { + Lf->nlink = (long)u1.di_nlink; + Lf->nlink_def = 1; + } + } else if (ffs == 2) { + if (u2s) { + Lf->nlink = (long)u2.di_nlink; + Lf->nlink_def = 1; + } + } +# else /* !defined(HASI_FFS1) */ Lf->nlink = (long)i.i_nlink; + Lf->nlink_def = 1; +# endif /* defined(HASI_FFS1) */ # endif /* defined(HASI_FFS) */ Lf->nlink_def = 1; @@@@ -897,8 +1010,15 @@@@ process_overlaid_node: #if defined(HASEXT2FS) else if (nty == EXT2NODE) { - Lf->nlink - (long)i.i_e2fs_nlink; +# if defined(HASI_E2FS_PTR) + if (edp) { + Lf->nlink = (long)edp->e2di_nlink; + Lf->nlink_def = 1; + } +# else /* !defined(HASI_E2FS_PTR) */ + Lf->nlink = (long)i.i_e2fs_nlink; Lf->nlink_def = 1; +# endif /* defined(HASI_E2FS_PTR) */ } #endif /* defined(HASEXT2FS) */ @ 1.20 log @Re-patch lsof with patches from Vic Abell. Building should now work on all platforms, with ffs2 (and ext2fs) related bugs smoothed out. Bump to PKGREVISION 2. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.19 2003/04/19 02:09:09 christos Exp $ @ 1.19 log @make this compile again. No UFS2 support. @ text @d1 1 a1 1 $NetBSD$ d4 101 a104 2 +++ dialects/n+obsd/dnode.c 2003-04-18 22:02:42.000000000 -0400 @@@@ -616,8 +616,18 @@@@ d108 5 a112 5 +#ifdef i_e2fs_rdev + struct ext2fs_dinode din; + if (i.i_din.e2fs_din && + !kread((KA_T)i.i_din.e2fs_din, (char *)&din, sizeof(din))) { + rdev = din.e2di_rdev; d114 3 a116 4 + } else + rdevs = 0; +#else rdev = i.i_rdev; d118 9 a126 3 +#endif } # endif /* defined(HASI_FFS) */ a127 5 @@@@ -628,14 +638,22 @@@@ dev = i.i_dev; devs = 1; if ((type == VCHR) || (type == VBLK)) { - d129 2 a130 1 - rdev = i.i_ffs_rdev; d132 13 a144 9 +#ifdef i_ffs1_rdev + struct ufs1_dinode din; + if (i.i_din.ffs1_din && + !kread((KA_T)i.i_din.ffs1_din, (char *)&din, sizeof(din))) { + rdev = din.di_rdev; + rdevs = 1; + } else + rdevs = 0; +#else d147 1 a147 1 +#endif d153 92 @ 1.18 log @Upgrade to lsof version 4.67. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.67 March 27, 2003 Began the transition of the lsof ftp server host name from vic.cc.purdue.edu to lsof.itap.purdue.edu. That reflects Purdue organizational changes. This first step makes the new name an alias to the old one. The old name, vic.cc.purdue.edu, will remain usable for an extended period. ... At the request of Alek O. Komarnitsky added the "+c " option to enable optional changing of the COMMAND column output maximum width from the default to . The default maximum width remains CMDL, as defined in lsof.h. ... Added kernel event queue file support for FreeBSD, NetBSD and OpenBSD. Andrew Brown supplied the code. ... Augmented a lock ID test on NetBSD to check if the ID is an LWP pointer. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.17 2003/02/03 01:03:14 atatat Exp $ d3 46 a48 7 kqueue support, part 1 of 4 --- dialects/n+obsd/dlsof.h.orig 2002-10-08 16:21:56.000000000 -0400 +++ dialects/n+obsd/dlsof.h @@@@ -244,6 +244,12 @@@@ struct vop_advlock_args; #undef KERNEL #undef _KERNEL a49 9 +# if defined(NETBSDV) && \ + (__NetBSD_Version__ >= 106100000) && \ + defined(DTYPE_KQUEUE) +#define HASKQUEUE +# endif /* defined(NETBSDV) && ... */ + # if defined(UVM) # if defined(OPENBSDV) #define _UVM_UVM_FAULT_I_H_ 1 /* avoid OpenBSD's @ 1.17 log @Add kqueue support to lsof. Bump PKGREVISION to 1, making this 4.66nb1. This patch will be included in the next lsof release. @ text @d1 1 a1 1 $NetBSD$ @ 1.16 log @Upgrade lsof pkg to 4.65. Notable changes from 00DIST are: ... Enabled compiling of lsof for NetBSD 1.5 with the NULL file system, using a patch from Andrew Brown . ... Applied a patch, supplied by Andrew Brown , that updates lsof for NetBSD version 1.6.6. Corrected handling of the NetBSD nullfs. ... This obsoletes patch-ab. Again. :) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.15 2002/09/13 16:55:15 atatat Exp $ d3 1 a3 3 Make 4.64 build under 1.5 and handle the change to ufs/mfs/mfsnode.h that involves struct bufq_state not being exposed to userland any more. d5 1 a5 1 --- dialects/n+obsd/dlsof.h.orig Sun Jun 16 21:44:15 2002 d7 3 a9 14 @@@@ -54,7 +54,15 @@@@ #include # if defined(NETBSDV) +# if __NetBSD_Version__>=106060000 +#define _KERNEL +struct buf; /* to satisfy a function prototype in buf.h */ +# endif +#include #include +# if __NetBSD_Version__>=106060000 +#undef _KERNEL +# endif # endif /* defined(NETBSDV) */ d11 9 a19 13 #define NFS @@@@ -209,9 +216,9 @@@@ struct sockproto { # if defined(HASNULLFS) #define _KERNEL -# if defined(NETBSDV) && NETBSDV>=1060 +# if defined(NETBSDV) && NETBSDV>=1050 #include "netexport.h" -# endif /* defined(NETBSDV) && NETBSDV>=1060 */ +# endif /* defined(NETBSDV) && NETBSDV>=1050 */ #include #undef _KERNEL # endif /* defined(HASNULLFS) */ @ 1.15 log @Clean up the fix for the missing bufq_state so that builds on older current systems, on 1.6, and on previous releases should all work now. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14 2002/09/13 15:53:10 tron Exp $ @ 1.14 log @Restore "patch-aa" which got clobbered during the last commit by mistake. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18 2002/09/12 19:12:19 tron Exp $ d3 8 a10 5 --- dialects/n+obsd/dlsof.h.orig Mon Jun 17 03:44:15 2002 +++ dialects/n+obsd/dlsof.h Thu Sep 12 21:08:10 2002 @@@@ -46,6 +46,10 @@@@ #include #include d12 2 d15 11 a25 7 +#include +#undef _KERNEL + # if defined(HASGETBOOTFILE) #include # endif /* defined(HASGETBOOTFILE) */ @@@@ -209,9 +213,9 @@@@ @ 1.13 log @Fix build problem under NetBSD-current and combine two patches which modify the same file. @ text @d1 1 a1 3 $NetBSD: patch-ab,v 1.12 2002/08/19 22:52:25 atatat Exp $ Make 4.64 build under 1.5. d4 13 a16 2 +++ dialects/n+obsd/dlsof.h Wed Aug 14 18:47:38 2002 @@@@ -209,9 +209,9 @@@@ @ 1.12 log @Make lsof 4.64 build under 1.5 again. Once 4.65 comes out, this patch can be removed. @ text @d1 1 a1 1 $NetBSD$ @ 1.12.2.1 log @Pull up 1.12 of patches/patch-ab (new file) to the 1.6 branch, and regen distinfo (sync with 1.17 of that file). @ text @@ 1.11 log @Upgrade to lsof version 4.59, which obsoletes patch-ab. NetBSD releated changes from the release notes for 4.59 include: 4.59 October 20, 2001 ... Added an additional UVM test to the NetBSD Configure stanza. Andrew Brown supplied the test; it recognizes NetBSD 1.5Y UVM changes to the vnode structure recently committed by Chuck Silvers. ... Added an IP version selector to the -i option parameters. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2001/10/09 14:05:15 atatat Exp $ d3 1 a3 1 Tweak the UVM detection to deal with the work Chuck did on 9/15/2001. d5 14 a18 15 --- Configure.orig Tue Sep 11 14:22:21 2001 +++ Configure Sun Oct 7 17:02:48 2001 @@@@ -1881,6 +1881,12 @@@@ if test $? -eq 0 # { then NETBSD_UVM="Y" + else + grep -q "v_uobj;" ${LSOF_INCLUDE}/sys/vnode.h + if test $? -eq 0 # { + then + NETBSD_UVM="Y" + fi # } fi # } fi # } fi # } @ 1.10 log @Add RCS Id to patch. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update to lsof release 4.58 (no obvious NetBSD related changes) and add a patch to "detect" uvm after Chuck's recent work. @ text @d1 4 @ 1.8 log @Updated to lsof 4.49B pre-release. Changes since 4.46 are mainly bugfixes and better IPv6-support, as well as 1.4-current support. @ text @d1 15 a15 34 $NetBSD: patch-ab,v 1.7 1999/05/05 17:40:37 bad Exp $ --- dialects/n+obsd/dlsof.h.orig Mon Mar 29 14:15:29 1999 +++ dialects/n+obsd/dlsof.h Wed May 5 19:20:17 1999 @@@@ -176,16 +176,28 @@@@ #undef KERNEL #undef _KERNEL +#include + # if defined(UVM) +# +# ifndef FALSE #define FALSE 0 #define TRUE 1 +# endif #include # endif /* defined(UVM) */ -#include +# ifndef FALSE +#define FALSE 0 +#define TRUE 1 +# endif #include #include #include + +#undef TRUE +#undef FALSE +#include # if defined(OPENBSDV) #include @ 1.7 log @Update lsof to 4.42_W. Relevant changes in this version: improved file system search name reporting; updates Solaris 2.6 VxFS support; support for the latest NetBSD with default UVM support. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 1999/03/28 17:29:53 christos Exp $ @ 1.6 log @Update to lsof_4.41_W @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 13 --- dialects/n+obsd/dlsof.h.orig Sat Feb 27 15:10:54 1999 +++ dialects/n+obsd/dlsof.h Sun Mar 28 12:17:22 1999 @@@@ -141,9 +141,6 @@@@ #include #include #include -#undef TRUE -#undef FALSE -#include #define P_ADDR kp_eproc.e_paddr #define P_COMM kp_proc.p_comm #define P_FD kp_proc.p_fd @@@@ -178,16 +175,28 @@@@ @ 1.5 log @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 to get the sockprot definition. Needed to compile on current. @ text @d3 42 a44 12 --- 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 #include #include +#define _KERNEL #include +#undef _KERNEL #include #include #include @ 1.4 log @Update lsof to 4.40. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 1998/10/22 12:17:21 drochner Exp $ d3 12 a14 13 *** dialects/n+obsd/dproc.c.orig Thu Oct 22 13:57:22 1998 --- dialects/n+obsd/dproc.c Thu Oct 22 13:55:52 1998 *************** *** 411,416 **** --- 411,418 ---- * Read the vm_map structure. Search its vm_map_entry structure list. */ + #if !defined(UVM) if (!vmsp.vm_map.is_main_map) return; + #endif for (i = 0; i < vmsp.vm_map.nentries; i++) { @ 1.3 log @update for recent UVM change: vm maps are always main maps @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 1998/09/28 10:57:39 frueauf Exp $ @ 1.2 log @Update to lsof-4.33_W. @ text @d1 15 a15 29 --- dialects/n+obsd/dproc.c.orig Fri Mar 6 14:24:46 1998 +++ dialects/n+obsd/dproc.c Thu Apr 2 10:25:22 1998 @@@@ -37,6 +37,11 @@@@ #include "lsof.h" +#if defined(UVM) /* this is an ugly hack, but is not supposed */ + /* to get included by userland programms */ +#define UVM_ET_MAP 0x02 /* it is a vm_map */ +#define UVM_ET_SUBMAP 0x04 /* it is a submap (MAP must be 1 too) */ +#endif _PROTOTYPE(static void enter_vn_text,(KA_T va, int *n)); _PROTOTYPE(static void get_kernel_access,(void)); @@@@ -365,8 +370,14 @@@@ if (kread(ka, (char *)e, sizeof(vmme))) return; } +#if defined(UVM) /* part 2 of the ugly UVM hack */ + if ((e->etype & UVM_ET_MAP) != 0) + continue; +#else if (e->is_a_map || e->is_sub_map) continue; +#endif + /* * Read the map entry's object and the object's shadow. * Look for a PG_VNODE pager handle. @ 1.1 log @Add support for UVM. @ text @@