CVS commit: pkgsrc/security/tcp_wrappers

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Apr 30 11:58:05 UTC 2025

Modified Files:
        pkgsrc/security/tcp_wrappers: Makefile distinfo
        pkgsrc/security/tcp_wrappers/patches: patch-ab

Log Message:
tcp_wrappers: include <stdio.h> in tcpd.h for FILE

Fixes net-snmp on macOS that became broken by the previous change. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/security/tcp_wrappers/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/tcp_wrappers/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/tcp_wrappers/patches/patch-ab

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

Modified files:

Index: pkgsrc/security/tcp_wrappers/Makefile
diff -u pkgsrc/security/tcp_wrappers/Makefile:1.47 pkgsrc/security/tcp_wrappers/Makefile:1.48
--- pkgsrc/security/tcp_wrappers/Makefile:1.47  Mon Apr 21 21:15:27 2025
+++ pkgsrc/security/tcp_wrappers/Makefile       Wed Apr 30 11:58:04 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2025/04/21 21:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/04/30 11:58:04 tnn Exp $
 
 DISTNAME=      tcp_wrappers_7.6-ipv6.4
 PKGNAME=       ${DISTNAME:S/_7.6-ipv6/-7.6/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security net
 MASTER_SITES=  ftp://ftp.porcupine.org/pub/security/
 

Index: pkgsrc/security/tcp_wrappers/distinfo
diff -u pkgsrc/security/tcp_wrappers/distinfo:1.25 pkgsrc/security/tcp_wrappers/distinfo:1.26
--- pkgsrc/security/tcp_wrappers/distinfo:1.25  Tue Apr 29 14:18:00 2025
+++ pkgsrc/security/tcp_wrappers/distinfo       Wed Apr 30 11:58:04 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2025/04/29 14:18:00 tnn Exp $
+$NetBSD: distinfo,v 1.26 2025/04/30 11:58:04 tnn Exp $
 
 BLAKE2s (tcp_wrappers_7.6-ipv6.4.tar.gz) = d05aa438c87a74553812522d91d4dc3c078ed3d176512fde8fe1094f11915ee7
 SHA512 (tcp_wrappers_7.6-ipv6.4.tar.gz) = b753b2e54fe243fbcb403470b19fa1b08a912a6a65981dc1bf20288379b903701d4b5a477350cb3470cb6d908cf51ef653f44dc17daff17f34e59b6aa1b41c95
 Size (tcp_wrappers_7.6-ipv6.4.tar.gz) = 138700 bytes
 SHA1 (patch-aa) = 6bc6f0523b4e8c31a4b02af948f285e800d5c59b
-SHA1 (patch-ab) = 9efde2313af9719872badc73a89f3191a1f28ab3
+SHA1 (patch-ab) = 33108697405e6a699c4736768f1cc66016c2b89e
 SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0
 SHA1 (patch-af) = a0222173c06bd5cfc16d7b0bb702d379f5204b1b
 SHA1 (patch-ag) = 873ca7a9b1ce3fb46b6d533a20577d3a43b3e7bc

Index: pkgsrc/security/tcp_wrappers/patches/patch-ab
diff -u pkgsrc/security/tcp_wrappers/patches/patch-ab:1.6 pkgsrc/security/tcp_wrappers/patches/patch-ab:1.7
--- pkgsrc/security/tcp_wrappers/patches/patch-ab:1.6   Tue Apr 29 14:18:00 2025
+++ pkgsrc/security/tcp_wrappers/patches/patch-ab       Wed Apr 30 11:58:04 2025
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2025/04/29 14:18:00 tnn Exp $
+$NetBSD: patch-ab,v 1.7 2025/04/30 11:58:04 tnn Exp $
 
 --- tcpd.h.orig        2003-04-16 14:27:11.000000000 +0000
 +++ tcpd.h
-@@ -11,6 +11,7 @@
+@@ -11,6 +11,8 @@
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
 +#include <strings.h>
++#include <stdio.h>
  
  typedef struct sockaddr_gen {
      union {
-@@ -29,7 +30,7 @@ typedef union gen_addr {
+@@ -29,7 +31,7 @@ typedef union gen_addr {
  #endif
  } gen_addr;
  
@@ -19,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
  
  #define sg_sa         sg_addr._sg_sa
  #define sg_sin                sg_addr._sg_sin
-@@ -92,9 +93,9 @@ struct request_info {
+@@ -92,9 +94,9 @@ struct request_info {
      char    pid[10];                  /* access via eval_pid(request) */
      struct host_info client[1];               /* client endpoint info */
      struct host_info server[1];               /* server endpoint info */
@@ -32,7 +33,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
      void  (*cleanup) ();              /* cleanup function or 0 */
      struct netconfig *config;         /* netdir handle */
  };
-@@ -137,17 +138,23 @@ extern void fromhost();                  /* get/validat
+@@ -137,17 +139,23 @@ extern void fromhost();                  /* get/validat
  #define fromhost sock_host            /* no TLI support needed */
  #endif
  
@@ -66,7 +67,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
                                        /* IP4/IP6 gethostbyname */
  #ifdef HAVE_IPV6
  extern char *skip_ipv6_addrs();               /* skip over colons in IPv6 addrs */
-@@ -196,20 +203,35 @@ extern struct request_info *request_set(
+@@ -196,20 +204,35 @@ extern struct request_info *request_set(
    * host_info structures serve as caches for the lookup results.
    */
  
@@ -102,7 +103,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
  #define sock_methods(r) \
        { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
  
-@@ -257,7 +279,7 @@ extern struct tcpd_context tcpd_context;
+@@ -257,7 +280,7 @@ extern struct tcpd_context tcpd_context;
    * behavior.
    */
  
@@ -111,7 +112,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
  extern int dry_run;                   /* verification flag */
  
  /* Bug workarounds. */
-@@ -269,7 +291,7 @@ extern long fix_inet_addr();
+@@ -269,7 +292,7 @@ extern long fix_inet_addr();
  
  #ifdef BROKEN_FGETS                   /* partial reads from sockets */
  #define fgets fix_fgets
@@ -120,7 +121,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
  #endif
  
  #ifdef RECVFROM_BUG                   /* no address family info */
-@@ -279,7 +301,7 @@ extern int fix_recvfrom();
+@@ -279,7 +302,7 @@ extern int fix_recvfrom();
  
  #ifdef GETPEERNAME_BUG                        /* claims success with UDP */
  #define getpeername fix_getpeername
@@ -129,7 +130,7 @@ $NetBSD: patch-ab,v 1.6 2025/04/29 14:18
  #endif
  
  #ifdef SOLARIS_24_GETHOSTBYNAME_BUG   /* lists addresses as aliases */
-@@ -294,5 +316,5 @@ extern char *fix_strtok();
+@@ -294,5 +317,5 @@ extern char *fix_strtok();
  
  #ifdef LIBC_CALLS_STRTOK              /* libc calls strtok() */
  #define strtok        my_strtok