CVS commit: pkgsrc/security/tcp_wrappers

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Aug  8 20:34:11 UTC 2024

Modified Files:
        pkgsrc/security/tcp_wrappers: Makefile builtin.mk distinfo
        pkgsrc/security/tcp_wrappers/patches: patch-fakelog.c

Log Message:
tcp_wrappers: Fix build on Darwin

pkgsrc changes:
---------------
  * Define _DARWIN_C_SOURCE for u_{char,int,short} types.
  * Apply some pkglint suggestions.
  * Bump revison


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/tcp_wrappers/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/tcp_wrappers/builtin.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/tcp_wrappers/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/tcp_wrappers/patches/patch-fakelog.c

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.44 pkgsrc/security/tcp_wrappers/Makefile:1.45
--- pkgsrc/security/tcp_wrappers/Makefile:1.44  Mon Aug  5 14:15:10 2024
+++ pkgsrc/security/tcp_wrappers/Makefile       Thu Aug  8 20:34:11 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2024/08/05 14:15:10 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2024/08/08 20:34:11 triaxx Exp $
 
 DISTNAME=      tcp_wrappers_7.6-ipv6.4
 PKGNAME=       ${DISTNAME:S/_7.6-ipv6/-7.6/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security net
 MASTER_SITES=  ftp://ftp.porcupine.org/pub/security/
 
@@ -24,7 +24,7 @@ BUILD_TARGET.Darwin=  netbsd
 BUILD_TARGET.Interix=  netbsd
 BUILD_TARGET.Haiku=    netbsd
 BUILD_TARGET.Linux=    ${LOWER_OPSYS}
-.if !empty(OPSYS:M*BSD)
+.if ${OPSYS:M*BSD}
 BUILD_TARGET.${OPSYS}= netbsd
 .endif
 BUILD_TARGET.SunOS=    sunos5
@@ -36,7 +36,7 @@ LDFLAGS.SCO_SV+=      -lsocket
 BUILD_TARGET=          ${BUILD_TARGET.${OPSYS}}
 
 .if !empty(PKG_OPTIONS:Minet6)
-.  if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
+.  if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
 MAKE_ENV+=     IPV6="-DHAVE_IPV6 -DUSE_GETHOSTBYNAME2 -DUSE_STRERROR"
 .  elif ${OPSYS} != "Linux" && ${OPSYS} != "Interix"
 MAKE_ENV+=     IPV6=-DHAVE_IPV6
@@ -45,6 +45,7 @@ MAKE_ENV+=    IPV6=-DHAVE_IPV6
 
 CFLAGS+=       -D_POSIX_C_SOURCE=200809L       # popen(3)
 CFLAGS+=       -D_XOPEN_SOURCE=500             # endgrent(3)
+CFLAGS.Darwin+=        -D_DARWIN_C_SOURCE
 
 # Default to /etc/hosts.{allow,deny} for the configuration files to match
 # the historic location of these files.  This may be changed by setting
@@ -55,12 +56,11 @@ MAKE_ENV+=  PKGSYSCONFDIR=${PKG_SYSCONFDI
 
 INSTALLATION_DIRS=     bin include lib libexec ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
-post-build:
-       set -e; cd ${WRKSRC}; for file in *.[0-9]; do                   \
-               ${MV} -f $$file $$file.BAK;                             \
-               ${SED}  -e "s|/etc/hosts\.|${PKG_SYSCONFDIR}/hosts.|g"  \
-                       $$file.BAK > $$file;                            \
-       done
+SUBST_CLASSES+=                man
+SUBST_MESSAGE.man=     Fixing ${PKG_SYSCONFDIR} in manpages.
+SUBST_STAGE.man=       pre-configure
+SUBST_FILES.man=       *.[0-9]
+SUBST_SED.man=         -e 's|/etc/hosts\.|${PKG_SYSCONFDIR}/hosts.|g'
 
 DOCDIR=                        ${PREFIX}/share/doc/tcp_wrappers
 INSTALLATION_DIRS+=    ${DOCDIR}

Index: pkgsrc/security/tcp_wrappers/builtin.mk
diff -u pkgsrc/security/tcp_wrappers/builtin.mk:1.10 pkgsrc/security/tcp_wrappers/builtin.mk:1.11
--- pkgsrc/security/tcp_wrappers/builtin.mk:1.10        Mon Nov  4 21:13:03 2019
+++ pkgsrc/security/tcp_wrappers/builtin.mk     Thu Aug  8 20:34:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2019/11/04 21:13:03 rillig Exp $
+# $NetBSD: builtin.mk,v 1.11 2024/08/08 20:34:11 triaxx Exp $
 
 BUILTIN_PKG:=  tcp_wrappers
 
@@ -32,12 +32,12 @@ USE_BUILTIN.tcp_wrappers=   no
 .  else
 USE_BUILTIN.tcp_wrappers=      ${IS_BUILTIN.tcp_wrappers}
 .    if defined(BUILTIN_PKG.tcp_wrappers) && \
-        !empty(IS_BUILTIN.tcp_wrappers:M[yY][eE][sS])
+       ${IS_BUILTIN.tcp_wrappers:tl} == yes
 USE_BUILTIN.tcp_wrappers=      yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.tcp_wrappers}
-.        if !empty(USE_BUILTIN.tcp_wrappers:M[yY][eE][sS])
+.      for dep in ${BUILDLINK_API_DEPENDS.tcp_wrappers}
+.        if ${USE_BUILTIN.tcp_wrappers:tl} == yes
 USE_BUILTIN.tcp_wrappers!=                                             \
-       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.tcp_wrappers:Q}; then \
+       if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.tcp_wrappers:Q}; then \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \

Index: pkgsrc/security/tcp_wrappers/distinfo
diff -u pkgsrc/security/tcp_wrappers/distinfo:1.22 pkgsrc/security/tcp_wrappers/distinfo:1.23
--- pkgsrc/security/tcp_wrappers/distinfo:1.22  Mon Aug  5 14:15:10 2024
+++ pkgsrc/security/tcp_wrappers/distinfo       Thu Aug  8 20:34:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2024/08/05 14:15:10 tnn Exp $
+$NetBSD: distinfo,v 1.23 2024/08/08 20:34:11 triaxx Exp $
 
 BLAKE2s (tcp_wrappers_7.6-ipv6.4.tar.gz) = d05aa438c87a74553812522d91d4dc3c078ed3d176512fde8fe1094f11915ee7
 SHA512 (tcp_wrappers_7.6-ipv6.4.tar.gz) = b753b2e54fe243fbcb403470b19fa1b08a912a6a65981dc1bf20288379b903701d4b5a477350cb3470cb6d908cf51ef653f44dc17daff17f34e59b6aa1b41c95
@@ -13,7 +13,7 @@ SHA1 (patch-ai) = 8e27da22c3e52d75574996
 SHA1 (patch-aj) = 07f1d068d8e0173fe16ebef5430c0b5d257eac3f
 SHA1 (patch-clean__exit.c) = 6a61c97251c37c2f67d47cc31cd01b31de1a0d32
 SHA1 (patch-diag.c) = 370d7473e3d3bb29308903c1ee530cdd15978708
-SHA1 (patch-fakelog.c) = 68cd6578fd534d0ae72571d53c259638b691df4d
+SHA1 (patch-fakelog.c) = 29c34feb951df20a105b24bf6025ae4d68a5f587
 SHA1 (patch-fix_options.c) = ce49ff5b4b1e26eb7634e61fa33ad4697917fbcb
 SHA1 (patch-myvsyslog.c) = bda66de72825eadbf175ebe4ba47107317d7f820
 SHA1 (patch-options.c) = 3e33dc27a5b3e17889536124e4d5c5262758f2a0

Index: pkgsrc/security/tcp_wrappers/patches/patch-fakelog.c
diff -u pkgsrc/security/tcp_wrappers/patches/patch-fakelog.c:1.1 pkgsrc/security/tcp_wrappers/patches/patch-fakelog.c:1.2
--- pkgsrc/security/tcp_wrappers/patches/patch-fakelog.c:1.1    Mon Aug  5 12:48:18 2024
+++ pkgsrc/security/tcp_wrappers/patches/patch-fakelog.c        Thu Aug  8 20:34:11 2024
@@ -1,4 +1,6 @@
-$NetBSD: patch-fakelog.c,v 1.1 2024/08/05 12:48:18 tnn Exp $
+$NetBSD: patch-fakelog.c,v 1.2 2024/08/08 20:34:11 triaxx Exp $
+
+Add missing specifier to avoid implicit int return.
 
 --- fakelog.c.orig     1994-12-28 16:42:22.000000000 +0000
 +++ fakelog.c