Sun Apr 28 01:24:08 2024 UTC (15d)
lsof: fix builds on NetBSD 8.x and 9.x

patch-ag r. 1.14 introduced incorrect patterns that broke builds.
(Formal releases since 8.x do not include a "patch level"/"teeny"
number, and the change also failed to match releases with "_STABLE"
or "_RCx".) Addresses PR 58199 from Stefan Schaeckeler.


(gutteridge)
diff -r1.105 -r1.106 pkgsrc/sysutils/lsof/distinfo
diff -r1.14 -r1.15 pkgsrc/sysutils/lsof/patches/patch-ag
cvs diff -r1.105 -r1.106 pkgsrc/sysutils/lsof/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/lsof/distinfo 2024/04/26 15:37:31 1.105
+++ pkgsrc/sysutils/lsof/distinfo 2024/04/28 01:24:08 1.106
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.105 2024/04/26 15:37:31 wiz Exp $ 1$NetBSD: distinfo,v 1.106 2024/04/28 01:24:08 gutteridge Exp $
2 2
3BLAKE2s (lsof_4.91.tar.bz2) = 77109e036c36f7d1483e69f2aae2314830dc4d2bdc3bf88a4031832f17e6afef 3BLAKE2s (lsof_4.91.tar.bz2) = 77109e036c36f7d1483e69f2aae2314830dc4d2bdc3bf88a4031832f17e6afef
4SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92 4SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
5Size (lsof_4.91.tar.bz2) = 791734 bytes 5Size (lsof_4.91.tar.bz2) = 791734 bytes
6SHA1 (patch-aa) = 76523a6d3bdff93a835dc442114f2bd4a018f95e 6SHA1 (patch-aa) = 76523a6d3bdff93a835dc442114f2bd4a018f95e
7SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4 7SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
8SHA1 (patch-ac) = ab1dc4540452f413493c58b729c7c6de83abfb6a 8SHA1 (patch-ac) = ab1dc4540452f413493c58b729c7c6de83abfb6a
9SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a 9SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
10SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a 10SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
11SHA1 (patch-af) = 88b3d2b42c05e20c189fa00fd65f1f412fe54038 11SHA1 (patch-af) = 88b3d2b42c05e20c189fa00fd65f1f412fe54038
12SHA1 (patch-ag) = 4936baec9e947a22f041457d3a217839fcf13522 12SHA1 (patch-ag) = 594f33af75d1f090e18b97173af75d844d4aecbf
13SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59 13SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
14SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09 14SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09
15SHA1 (patch-dialects_n+obsd_dsock.c) = dadbb0196024c12f59d77b838917036bf90a4e35 15SHA1 (patch-dialects_n+obsd_dsock.c) = dadbb0196024c12f59d77b838917036bf90a4e35
16SHA1 (patch-lib_Makefile.skel) = abfb9d50eef60c5d43cbf4978bf179de0ebe371e 16SHA1 (patch-lib_Makefile.skel) = abfb9d50eef60c5d43cbf4978bf179de0ebe371e
cvs diff -r1.14 -r1.15 pkgsrc/sysutils/lsof/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/sysutils/lsof/patches/patch-ag 2024/04/26 15:37:31 1.14
+++ pkgsrc/sysutils/lsof/patches/patch-ag 2024/04/28 01:24:08 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ag,v 1.14 2024/04/26 15:37:31 wiz Exp $ 1$NetBSD: patch-ag,v 1.15 2024/04/28 01:24:08 gutteridge Exp $
2 2
3Handle newer NetBSD versions. Default to NetBSD 10 if we can't guess, 3Handle newer NetBSD versions. Default to NetBSD 10 if we can't guess,
4not NetBSD 1.6. 4not NetBSD 1.6.
5 5
6--- Configure.orig 2018-02-14 06:18:55.000000000 -0800 6--- Configure.orig 2018-02-14 06:18:55.000000000 -0800
7+++ Configure 2023-01-12 15:52:55.813217146 -0800 7+++ Configure 2023-01-12 15:52:55.813217146 -0800
8@@ -3038,7 +3038,7 @@ 8@@ -3038,7 +3038,7 @@
9 LSOF_TSTBIGF=" " 9 LSOF_TSTBIGF=" "
10 LSOF_VERS="1006000" 10 LSOF_VERS="1006000"
11 ;; 11 ;;
12- 1*) 12- 1*)
13+ 1.*) 13+ 1.*)
14 LSOF_VERS="1006000" 14 LSOF_VERS="1006000"
@@ -66,35 +66,35 @@ not NetBSD 1.6. @@ -66,35 +66,35 @@ not NetBSD 1.6.
66+ ;; 66+ ;;
67+ 8.*.*) 67+ 8.*.*)
68+ LSOF_TSTBIGF=" " 68+ LSOF_TSTBIGF=" "
69+ LSOF_VERS="8000000" 69+ LSOF_VERS="8000000"
70+ ;; 70+ ;;
71+ 9.99.10[45678]) 71+ 9.99.10[45678])
72+ LSOF_TSTBIGF=" " 72+ LSOF_TSTBIGF=" "
73+ LSOF_VERS="9099104" 73+ LSOF_VERS="9099104"
74+ ;; 74+ ;;
75+ 9.99.*) 75+ 9.99.*)
76+ LSOF_TSTBIGF=" " 76+ LSOF_TSTBIGF=" "
77+ LSOF_VERS="9099000" 77+ LSOF_VERS="9099000"
78+ ;; 78+ ;;
79+ 9.*.*) 79+ 9.*)
80+ LSOF_TSTBIGF=" " 80+ LSOF_TSTBIGF=" "
81+ LSOF_VERS="9000000" 81+ LSOF_VERS="9000000"
82+ ;; 82+ ;;
83+ 10.99.*) 83+ 10.99.*)
84+ LSOF_TSTBIGF=" " 84+ LSOF_TSTBIGF=" "
85+ LSOF_VERS="10099000" 85+ LSOF_VERS="10099000"
86+ ;; 86+ ;;
87+ 10.*.*) 87+ 10.*)
88+ LSOF_TSTBIGF=" " 88+ LSOF_TSTBIGF=" "
89+ LSOF_VERS="10000000" 89+ LSOF_VERS="10000000"
90+ ;; 90+ ;;
91 *) 91 *)
92 echo "Unknown NetBSD release: $LSOF_VSTR" 92 echo "Unknown NetBSD release: $LSOF_VSTR"
93- echo Assuming NetBSD 1.6 93- echo Assuming NetBSD 1.6
94- LSOF_VERS="1006000" 94- LSOF_VERS="1006000"
95+ echo Assuming NetBSD 10.0 95+ echo Assuming NetBSD 10.0
96+ LSOF_VERS="10000000" 96+ LSOF_VERS="10000000"
97 ;; 97 ;;
98 esac # } 98 esac # }
99 fi # } 99 fi # }
100  100