CVS commit: pkgsrc/security/tct

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 22 22:26:14 UTC 2025

Modified Files:
        pkgsrc/security/tct: distinfo
        pkgsrc/security/tct/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-ag patch-ah patch-aj patch-ak patch-al patch-an

Log Message:
tct: recognize NetBSD 10+

Fixes build on NetBSD 10+


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/tct/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/tct/patches/patch-aa \
    pkgsrc/security/tct/patches/patch-ab pkgsrc/security/tct/patches/patch-ac \
    pkgsrc/security/tct/patches/patch-ad pkgsrc/security/tct/patches/patch-ae \
    pkgsrc/security/tct/patches/patch-ag pkgsrc/security/tct/patches/patch-ah \
    pkgsrc/security/tct/patches/patch-aj pkgsrc/security/tct/patches/patch-ak \
    pkgsrc/security/tct/patches/patch-al pkgsrc/security/tct/patches/patch-an

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tct/distinfo
diff -u pkgsrc/security/tct/distinfo:1.12 pkgsrc/security/tct/distinfo:1.13
--- pkgsrc/security/tct/distinfo:1.12   Tue Oct 26 11:18:04 2021
+++ pkgsrc/security/tct/distinfo        Wed Jan 22 22:26:14 2025
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:18:04 nia Exp $
+$NetBSD: distinfo,v 1.13 2025/01/22 22:26:14 wiz Exp $
 
 BLAKE2s (tct-1.09.tar.gz) = a2c89f8100cb64d99bdbdbbcd89907c12c1da03786e2b75c8df10aefeac36460
 SHA512 (tct-1.09.tar.gz) = d37278f869adee853633dc555980188692b3bcd91c60851f19fe9b541846e5aa912436fb8951d826380861a9e1fe240248cd41a4820a1899725a7328ae38ed2c
 Size (tct-1.09.tar.gz) = 314134 bytes
-SHA1 (patch-aa) = a35aa034a081ff37ce56192f1f25d2cd2f15d46a
-SHA1 (patch-ab) = c58443c20afd70e00f61e76fc3f2a453b5508f7f
-SHA1 (patch-ac) = db01162b2394a086c6e878dc5587320448ccbe45
-SHA1 (patch-ad) = 12bad749062032c88b9ddcbb5c30aed0f4409e3b
-SHA1 (patch-ae) = bfecf9be7cdcc078f8c9ff5bd2141e43f46ede90
+SHA1 (patch-aa) = ee296a45865206f3da0c52dfd63267fb89c34bfd
+SHA1 (patch-ab) = 0b446566aa4139528f375116134756d17c0ecefd
+SHA1 (patch-ac) = c158ce0a2ddb03eba64112739bccc5582da2d1ac
+SHA1 (patch-ad) = 2e07d4b5824ed3258faf198c53510cb5ccbb08b8
+SHA1 (patch-ae) = c59b61676183838a8f0252a55122336ff1f5c5ce
 SHA1 (patch-af) = d5629a143ee190b64df298f22dfd2e8ba8928d52
-SHA1 (patch-ag) = 4f03bdc2ae7f1bf36a705a3543f9925fcc037c11
-SHA1 (patch-ah) = dedb464b3050b5c7dafe620d75743ef9525e7696
+SHA1 (patch-ag) = f4db488e06a79d4c46e306a65e9a29cbc3deb74c
+SHA1 (patch-ah) = 1d863d3702f0f5230774d73ec26bc8585a0c2f27
 SHA1 (patch-ai) = a706e9265552d4864b765c7700ee80cd61a19edf
-SHA1 (patch-aj) = 736eb7f1cb1c1a3eb7f7ce69019e8f4a61753b40
-SHA1 (patch-ak) = 03cb4b36878386c3200b37a0f9092f80f6813bcd
-SHA1 (patch-al) = e29ba1b2846f63c2847072f6e0c37b58a94a76e9
+SHA1 (patch-aj) = 3fb2101086c42ffe0a9a8f2f0a1463181248bf7a
+SHA1 (patch-ak) = ca5a1bc85e8ef8fd7b3368eef12104ad2c6a7639
+SHA1 (patch-al) = 2f8a194c1edcf5354aa303df0670673692167ba9
 SHA1 (patch-am) = 3c84ffe20ea0d180801b3286ded407a2045c6b48
-SHA1 (patch-an) = 27c7d503841bcb58ae141f594decc8aff3b72e7d
+SHA1 (patch-an) = 11aa5202d80dd3efb76054ba6ffab60aa2598d32
 SHA1 (patch-ao) = ba87c403613154a091cdbe91c8fa43335d2bfe50
 SHA1 (patch-ap) = 1587d7b4e4da1226a2943a4f98b9fa20bd83c79d

Index: pkgsrc/security/tct/patches/patch-aa
diff -u pkgsrc/security/tct/patches/patch-aa:1.4 pkgsrc/security/tct/patches/patch-aa:1.5
--- pkgsrc/security/tct/patches/patch-aa:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-aa        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-aa,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- src/aux/makedefs.orig      2001-10-04 12:34:08.000000000 -0700
 +++ src/aux/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-ab
diff -u pkgsrc/security/tct/patches/patch-ab:1.4 pkgsrc/security/tct/patches/patch-ab:1.5
--- pkgsrc/security/tct/patches/patch-ab:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ab        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ab,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- extras/entropy/makedefs.orig       2001-10-04 12:59:35.000000000 -0700
 +++ extras/entropy/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-ac
diff -u pkgsrc/security/tct/patches/patch-ac:1.4 pkgsrc/security/tct/patches/patch-ac:1.5
--- pkgsrc/security/tct/patches/patch-ac:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ac        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ac,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- extras/findkey/makedefs.orig       2001-10-04 12:32:54.000000000 -0700
 +++ extras/findkey/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-ad
diff -u pkgsrc/security/tct/patches/patch-ad:1.4 pkgsrc/security/tct/patches/patch-ad:1.5
--- pkgsrc/security/tct/patches/patch-ad:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ad        Wed Jan 22 22:26:14 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ad,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- lib/ostype.pl.orig 2000-07-30 16:39:20.000000000 -0700
 +++ lib/ostype.pl
-@@ -9,6 +9,15 @@ print "Determining OS (in determine_os()
+@@ -9,6 +9,16 @@ print "Determining OS (in determine_os()
  
  # Order does not matter, table is sorted.
  %OS_INFO = (
@@ -17,6 +17,7 @@ Recognize NetBSD versions.
 +    "NETBSD7", "NetBSD.7",
 +    "NETBSD8", "NetBSD.8",
 +    "NETBSD9", "NetBSD.9",
++    "NETBSD10", "NetBSD.10",
      "FREEBSD2", "FreeBSD.2",
      "FREEBSD3", "FreeBSD.3",
      "FREEBSD4", "FreeBSD.4",
Index: pkgsrc/security/tct/patches/patch-ae
diff -u pkgsrc/security/tct/patches/patch-ae:1.4 pkgsrc/security/tct/patches/patch-ae:1.5
--- pkgsrc/security/tct/patches/patch-ae:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ae        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ae,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- src/file/makedefs.orig     2001-10-04 12:42:22.000000000 -0700
 +++ src/file/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-ag
diff -u pkgsrc/security/tct/patches/patch-ag:1.4 pkgsrc/security/tct/patches/patch-ag:1.5
--- pkgsrc/security/tct/patches/patch-ag:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ag        Wed Jan 22 22:26:14 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ag,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Fix Linux off_t handling.
 Add NetBSD support.
@@ -27,7 +27,7 @@ Add NetBSD support.
  #define STRTOUL               strtoul
  #define DADDR_T               __u32
  #define EXT2FS_TYPE   "ext2fs"
-@@ -203,6 +203,26 @@ extern int optind;
+@@ -203,6 +209,26 @@ extern int optind;
  #endif
  #endif
  
Index: pkgsrc/security/tct/patches/patch-ah
diff -u pkgsrc/security/tct/patches/patch-ah:1.4 pkgsrc/security/tct/patches/patch-ah:1.5
--- pkgsrc/security/tct/patches/patch-ah:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ah        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-ah,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ah,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- src/lastcomm/makedefs.orig 2001-10-04 12:45:44.000000000 -0700
 +++ src/lastcomm/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-aj
diff -u pkgsrc/security/tct/patches/patch-aj:1.4 pkgsrc/security/tct/patches/patch-aj:1.5
--- pkgsrc/security/tct/patches/patch-aj:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-aj        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-aj,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-aj,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- src/major_minor/makedefs.orig      2001-10-04 12:46:24.000000000 -0700
 +++ src/major_minor/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-ak
diff -u pkgsrc/security/tct/patches/patch-ak:1.4 pkgsrc/security/tct/patches/patch-ak:1.5
--- pkgsrc/security/tct/patches/patch-ak:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-ak        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-ak,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-ak,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions. 
 
 --- src/misc/makedefs.orig     2001-10-04 12:47:05.000000000 -0700
 +++ src/misc/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-al
diff -u pkgsrc/security/tct/patches/patch-al:1.4 pkgsrc/security/tct/patches/patch-al:1.5
--- pkgsrc/security/tct/patches/patch-al:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-al        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-al,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-al,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- src/pcat/makedefs.orig     2001-10-04 12:31:47.000000000 -0700
 +++ src/pcat/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD2"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.2*) DEFS="-DNETBSD2"
Index: pkgsrc/security/tct/patches/patch-an
diff -u pkgsrc/security/tct/patches/patch-an:1.4 pkgsrc/security/tct/patches/patch-an:1.5
--- pkgsrc/security/tct/patches/patch-an:1.4    Thu Mar 19 08:34:53 2015
+++ pkgsrc/security/tct/patches/patch-an        Wed Jan 22 22:26:14 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-an,v 1.4 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-an,v 1.5 2025/01/22 22:26:14 wiz Exp $
 
 Recognize NetBSD versions.
 
 --- src/fstools/makedefs.orig  2001-10-04 19:44:26.000000000 +0000
 +++ src/fstools/makedefs
-@@ -2,6 +2,12 @@ SYSTEM=`(uname -s) 2>/dev/null`
+@@ -2,6 +2,14 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
++   NetBSD.1[0-9]*)    DEFS="-DNETBSD7"
++              ;;
 +   NetBSD.1*) DEFS="-DNETBSD1"
 +              ;;
 +   NetBSD.[2-6]*)     DEFS="-DNETBSD2"