CVS commit: pkgsrc/net/inetutils

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Feb  7 09:53:47 UTC 2026

Modified Files:
        pkgsrc/net/inetutils: Makefile distinfo
        pkgsrc/net/inetutils/patches: patch-ping_Makefile.in
            patch-src_Makefile.in patch-src_syslogd.c
Added Files:
        pkgsrc/net/inetutils/patches: patch-libinetutils_libinetutils.h

Log Message:
net/inetutils: update to 2.7

# Noteworthy changes in release 2.7 (2025-12-14) [stable]

* Systems without asprintf are now supported through the use of gnulib.

* Fix link errors on Solaris 11 OmniOS.

* ftpd: Expanded documentation of user authentication rules.
  Thanks to Benjamin Cathelineau, see
  <https://lists.gnu.org/archive/html/bug-inetutils/2025-10/msg00000.html>.

* syslogd: Fix a stack-based buffer overflow (CWE-121).

* syslogd: Log 'DEL' control characters as '^?'.

* Fix codespell typos.

* syslogd, talkd: Better compatibility with utmp-less GNU/Linux systems
  when configuring with --enable-systemd.
  Thanks to Valentin Haudiquet for reporting the issue and testing possible
  solutions.  For more info, see the thread starting at
  <https://lists.gnu.org/archive/html/bug-inetutils/2025-11/msg00000.html>.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/inetutils/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/inetutils/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/inetutils/patches/patch-libinetutils_libinetutils.h
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/inetutils/patches/patch-ping_Makefile.in \
    pkgsrc/net/inetutils/patches/patch-src_Makefile.in \
    pkgsrc/net/inetutils/patches/patch-src_syslogd.c

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

Modified files:

Index: pkgsrc/net/inetutils/Makefile
diff -u pkgsrc/net/inetutils/Makefile:1.10 pkgsrc/net/inetutils/Makefile:1.11
--- pkgsrc/net/inetutils/Makefile:1.10  Sun Dec 31 19:06:15 2023
+++ pkgsrc/net/inetutils/Makefile       Sat Feb  7 09:53:47 2026
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.10 2023/12/31 19:06:15 adam Exp $
+# $NetBSD: Makefile,v 1.11 2026/02/07 09:53:47 vins Exp $
 
-DISTNAME=      inetutils-2.5
+DISTNAME=      inetutils-2.7
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GNU:=inetutils/}
-EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.gnu.org/software/inetutils/
 COMMENT=       GNU network utilities
 LICENSE=       gnu-gpl-v3
 
-TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
+TOOL_DEPENDS+=         help2man-[0-9]*:../../converters/help2man
 
-AUTO_MKDIRS=           yes
+USE_TOOLS+=            makeinfo yacc
 INFO_FILES=            yes
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --program-prefix=g
 CONFIGURE_ENV+=                inetutils_cv_path_cp=${CP:Q}
 
+CFLAGS.NetBSD+=                -Wno-error=incompatible-pointer-types   # incompatible telopts definition
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
 .for prog in ping ping6 rcp rlogin rsh traceroute
@@ -26,6 +27,8 @@ SPECIAL_PERMS+=               bin/g${prog} ${SETUID_R
 
 TEST_TARGET=           check
 
+AUTO_MKDIRS=           yes
+
 post-install:
 .for f in dnsdomainname ftp hostname ifconfig logger ping ping6 \
        rcp rexec rlogin rsh talk telnet tftp traceroute whois

Index: pkgsrc/net/inetutils/distinfo
diff -u pkgsrc/net/inetutils/distinfo:1.6 pkgsrc/net/inetutils/distinfo:1.7
--- pkgsrc/net/inetutils/distinfo:1.6   Sun Dec 31 19:06:15 2023
+++ pkgsrc/net/inetutils/distinfo       Sat Feb  7 09:53:47 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2023/12/31 19:06:15 adam Exp $
+$NetBSD: distinfo,v 1.7 2026/02/07 09:53:47 vins Exp $
 
-BLAKE2s (inetutils-2.5.tar.xz) = 6a2d57a6e3b36a6b72b232fe7aa6c61aedb4e2b9d574aae9c1bc9e92f3fe340a
-SHA512 (inetutils-2.5.tar.xz) = dc11ad6eeb5ea2c85edddbfc77630b5b09e4e1ac643629edf13b0ac0828c13cdb0885275153c072ae13a798427c96bc461037822ad646f7210369192c35bb04c
-Size (inetutils-2.5.tar.xz) = 1670424 bytes
-SHA1 (patch-ping_Makefile.in) = b27c71e45b94baa954859f83c890f4f819a4651d
-SHA1 (patch-src_Makefile.in) = 752148dbd9657291a7b20a667a002c535169e7ba
-SHA1 (patch-src_syslogd.c) = df4a9a8a30964d336b16d00589d0eca5252b680c
+BLAKE2s (inetutils-2.7.tar.gz) = 537183861935001f209af6f8a4a1d9e223bb879aedc4ec0f180a98aaeda2feee
+SHA512 (inetutils-2.7.tar.gz) = 8f36bea126108e8f48f2c436c9ff11684f3bd51c4e48090f0ab8626b8c5878b6dc8c64b84cd7a6220913f68c8602b37c8ac632fe9ef530bf5018c6e51ee1a90b
+Size (inetutils-2.7.tar.gz) = 3157952 bytes
+SHA1 (patch-libinetutils_libinetutils.h) = 4fd40c71340a90cbe606b71655555d98dfc7e2c6
+SHA1 (patch-ping_Makefile.in) = bfc193800d353496ce2dc639803c356eef7a655a
+SHA1 (patch-src_Makefile.in) = a8321822fdd68db4ec86ad232b59aaad92583297
+SHA1 (patch-src_syslogd.c) = 608579f47456d85b29520e7021c86cf80f6faa1c

Index: pkgsrc/net/inetutils/patches/patch-ping_Makefile.in
diff -u pkgsrc/net/inetutils/patches/patch-ping_Makefile.in:1.1 pkgsrc/net/inetutils/patches/patch-ping_Makefile.in:1.2
--- pkgsrc/net/inetutils/patches/patch-ping_Makefile.in:1.1     Mon Jan  9 15:43:33 2023
+++ pkgsrc/net/inetutils/patches/patch-ping_Makefile.in Sat Feb  7 09:53:47 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-ping_Makefile.in,v 1.1 2023/01/09 15:43:33 vins Exp $
+$NetBSD: patch-ping_Makefile.in,v 1.2 2026/02/07 09:53:47 vins Exp $
 
-Let pkgsrc set SUID_PERMS
+Let pkgsrc handle special perms.
 
 --- ping/Makefile.in.orig      2022-10-25 21:16:11.000000000 +0000
 +++ ping/Makefile.in
Index: pkgsrc/net/inetutils/patches/patch-src_Makefile.in
diff -u pkgsrc/net/inetutils/patches/patch-src_Makefile.in:1.1 pkgsrc/net/inetutils/patches/patch-src_Makefile.in:1.2
--- pkgsrc/net/inetutils/patches/patch-src_Makefile.in:1.1      Mon Jan  9 15:43:33 2023
+++ pkgsrc/net/inetutils/patches/patch-src_Makefile.in  Sat Feb  7 09:53:47 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2023/01/09 15:43:33 vins Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2026/02/07 09:53:47 vins Exp $
 
-Let pkgsrc set SUID_PERMS
+Let pkgsrc handle special perms. 
 
 --- src/Makefile.in.orig       2022-10-25 21:16:11.000000000 +0000
 +++ src/Makefile.in
Index: pkgsrc/net/inetutils/patches/patch-src_syslogd.c
diff -u pkgsrc/net/inetutils/patches/patch-src_syslogd.c:1.1 pkgsrc/net/inetutils/patches/patch-src_syslogd.c:1.2
--- pkgsrc/net/inetutils/patches/patch-src_syslogd.c:1.1        Sun Dec 31 19:06:15 2023
+++ pkgsrc/net/inetutils/patches/patch-src_syslogd.c    Sat Feb  7 09:53:47 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_syslogd.c,v 1.1 2023/12/31 19:06:15 adam Exp $
+$NetBSD: patch-src_syslogd.c,v 1.2 2026/02/07 09:53:47 vins Exp $
 
-Fix conflicting types error.
+This is only relevant to glibc.
 
---- src/syslogd.c.orig 2023-12-31 19:00:12.282997217 +0000
+--- src/syslogd.c.orig 2026-02-03 17:15:08.433185757 +0000
 +++ src/syslogd.c
-@@ -278,7 +278,7 @@ void logerror (const char *);
- void logmsg (int, const char *, const char *, int);
- void printline (const char *, const char *);
- void printsys (const char *);
--char *ttymsg (struct iovec *, int, char *, int);
-+char *ttymsg (struct iovec *, int, const char *, int);
- void wallmsg (struct filed *, struct iovec *);
- char **crunch_list (char **oldlist, char *list);
- char *textpri (int pri);
+@@ -120,7 +120,7 @@
+  * the definition LOG_USER = (1 << 3).  Avoid this
+  * harmful mistake.
+  */
+-#ifdef LOG_MAKEPRI
++#if defined (LOG_MAKEPRI) && defined(__GLIBC__)
+ # if LOG_MAKEPRI (1, 0) > LOG_PRIMASK
+ #  warning Discarding faulty LOG_MAKEPRI defined in system header file.
+ #  undef LOG_MAKEPRI

Added files:

Index: pkgsrc/net/inetutils/patches/patch-libinetutils_libinetutils.h
diff -u /dev/null pkgsrc/net/inetutils/patches/patch-libinetutils_libinetutils.h:1.1
--- /dev/null   Sat Feb  7 09:53:47 2026
+++ pkgsrc/net/inetutils/patches/patch-libinetutils_libinetutils.h      Sat Feb  7 09:53:47 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-libinetutils_libinetutils.h,v 1.1 2026/02/07 09:53:47 vins Exp $
+
+Add missing function prototypes for orcmd.
+
+--- libinetutils/libinetutils.h.orig   2026-02-03 16:56:28.553375955 +0000
++++ libinetutils/libinetutils.h
+@@ -42,6 +42,12 @@ struct if_nameindex *if_nameindex (void)
+ void if_freenameindex (struct if_nameindex *ptr);
+ #endif
+ 
++#ifdef WITH_ORCMD_AF
++ int orcmd(char **, u_int, const char *, const char *, const char *, int *);
++ int orcmd_af(char **, u_int, const char *, const char *, const char *,
++     int *, int);
++#endif
++
+ extern const char *default_program_authors[];
+ 
+ #define iu_argp_init(name, authors)                           \