pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/inetutils net/inetutils: update to inetutils-2.4



details:   https://anonhg.NetBSD.org/pkgsrc/rev/61c70fb2ae45
branches:  trunk
changeset: 391531:61c70fb2ae45
user:      vins <vins%pkgsrc.org@localhost>
date:      Mon Jan 09 15:43:33 2023 +0000

description:
net/inetutils: update to inetutils-2.4

Former patches dropped (fixes merged upstream).
Noteworthy changes since version 1.9.4:
 * release 2.4 (2022-10-25):
   https://lists.gnu.org/archive/html/info-gnu/2022-10/msg00006.html
 * release 2.3 (2022-07-08):
   https://lists.gnu.org/archive/html/info-gnu/2022-07/msg00001.html
 * release 2.2 (2021-09-01):
   https://lists.gnu.org/archive/html/info-gnu/2021-09/msg00000.html
 * release 2.1 (2021-07-24):
   https://lists.gnu.org/archive/html/info-gnu/2021-07/msg00011.html
 * release 2.0 (2021-02-05):
   https://lists.gnu.org/archive/html/info-gnu/2021-02/msg00001.html

diffstat:

 net/inetutils/Makefile                         |   5 +-
 net/inetutils/distinfo                         |  12 +++---
 net/inetutils/patches/patch-ping_Makefile.in   |  18 +++++++++++
 net/inetutils/patches/patch-src_Makefile.in    |  42 ++++++++++++++++++++++++++
 net/inetutils/patches/patch-telnet_telnet.c    |  33 --------------------
 net/inetutils/patches/patch-telnet_utilities.c |  14 --------
 6 files changed, 68 insertions(+), 56 deletions(-)

diffs (153 lines):

diff -r 59ea7a550835 -r 61c70fb2ae45 net/inetutils/Makefile
--- a/net/inetutils/Makefile    Mon Jan 09 14:24:49 2023 +0000
+++ b/net/inetutils/Makefile    Mon Jan 09 15:43:33 2023 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2020/11/11 16:50:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/09 15:43:33 vins Exp $
 
-DISTNAME=      inetutils-1.9.4
-PKGREVISION=   3
+DISTNAME=      inetutils-2.4
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GNU:=inetutils/}
 EXTRACT_SUFX=  .tar.xz
diff -r 59ea7a550835 -r 61c70fb2ae45 net/inetutils/distinfo
--- a/net/inetutils/distinfo    Mon Jan 09 14:24:49 2023 +0000
+++ b/net/inetutils/distinfo    Mon Jan 09 15:43:33 2023 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:05:47 nia Exp $
+$NetBSD: distinfo,v 1.5 2023/01/09 15:43:33 vins Exp $
 
-BLAKE2s (inetutils-1.9.4.tar.xz) = a783520e49b0b2ed619710b0b5de37c19d3b5ba960934d01008b039de1f4959f
-SHA512 (inetutils-1.9.4.tar.xz) = 020d1cab6659da63b26445b29820ad6769b8cf992496bece3dcbfba73804e29cc5c496d59f36046d432f9cc7fadefa3170f6d8faa855e59435aff4ecef724e66
-Size (inetutils-1.9.4.tar.xz) = 1364408 bytes
-SHA1 (patch-telnet_telnet.c) = a3fe07b5d00bae8d9a9f69d0c2996d88e84c8cd9
-SHA1 (patch-telnet_utilities.c) = ddd301b000d73eff9da8ded700ee374aa0798c12
+BLAKE2s (inetutils-2.4.tar.xz) = fc055367451f5c2747d37babad23d3c445d7180f65ec57568cc628920ac9f584
+SHA512 (inetutils-2.4.tar.xz) = e7e6a5d7e2e02f07a2a6cfc09694e3c0a4e4a8ef8a435eed41902eba13caeed329ae6d6ba94b0de8f789e307f04656d12c48c1c0217b69d162bc5efb0ff6adee
+Size (inetutils-2.4.tar.xz) = 1558308 bytes
+SHA1 (patch-ping_Makefile.in) = b27c71e45b94baa954859f83c890f4f819a4651d
+SHA1 (patch-src_Makefile.in) = 752148dbd9657291a7b20a667a002c535169e7ba
diff -r 59ea7a550835 -r 61c70fb2ae45 net/inetutils/patches/patch-ping_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/inetutils/patches/patch-ping_Makefile.in      Mon Jan 09 15:43:33 2023 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ping_Makefile.in,v 1.1 2023/01/09 15:43:33 vins Exp $
+
+Let pkgsrc set SUID_PERMS
+
+--- ping/Makefile.in.orig      2022-10-25 21:16:11.000000000 +0000
++++ ping/Makefile.in
+@@ -1991,10 +1991,9 @@ uninstall-am: uninstall-binPROGRAMS
+ 
+ install-ping-hook:
+       -@for x in $(bin_PROGRAMS); do \
+-      $(INSTALL_PROGRAM) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $$x $(DESTDIR)$(bindir)/`echo $$x|sed '$(transform)'` ; OUTCOME=$$?; \
++      $(INSTALL_PROGRAM) $(AM_INSTALL_PROGRAM_FLAGS) $$x $(DESTDIR)$(bindir)/`echo $$x|sed '$(transform)'` ; OUTCOME=$$?; \
+       if test $$OUTCOME -ne 0; then \
+         echo "WARNING: Failed to install $$x (exit code $$OUTCOME)"; \
+-        echo "NOTE: This program often needs to be owned by root."; \
+       fi \
+       done
+ 
diff -r 59ea7a550835 -r 61c70fb2ae45 net/inetutils/patches/patch-src_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/inetutils/patches/patch-src_Makefile.in       Mon Jan 09 15:43:33 2023 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2023/01/09 15:43:33 vins Exp $
+
+Let pkgsrc set SUID_PERMS
+
+--- src/Makefile.in.orig       2022-10-25 21:16:11.000000000 +0000
++++ src/Makefile.in
+@@ -2226,31 +2226,27 @@ uninstall-am: uninstall-binPROGRAMS unin
+ install-exec-hook: $(traceroute_INSTALL_HOOK) $(rsh_INSTALL_HOOK) $(rlogin_INSTALL_HOOK) $(rcp_INSTALL_HOOK)
+ 
+ install-traceroute-hook:
+-      -@$(INSTALL_PROGRAM) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) traceroute $(DESTDIR)$(bindir)/`echo traceroute|sed '$(transform)'` ; OUTCOME=$$?; \
++      -@$(INSTALL_PROGRAM) $(AM_INSTALL_PROGRAM_FLAGS) traceroute $(DESTDIR)$(bindir)/`echo traceroute|sed '$(transform)'` ; OUTCOME=$$?; \
+       if test $$OUTCOME -ne 0; then \
+         echo "WARNING: Failed to install traceroute (exit code $$OUTCOME)"; \
+-        echo "NOTE: This program often needs to be owned by root."; \
+       fi
+ 
+ install-rsh-hook:
+-      -@$(INSTALL_PROGRAM) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) rsh $(DESTDIR)$(bindir)/`echo rsh|sed '$(transform)'` ; OUTCOME=$$?; \
++      -@$(INSTALL_PROGRAM) $(AM_INSTALL_PROGRAM_FLAGS) rsh $(DESTDIR)$(bindir)/`echo rsh|sed '$(transform)'` ; OUTCOME=$$?; \
+       if test $$OUTCOME -ne 0; then \
+         echo "WARNING: Failed to install rsh (exit code $$OUTCOME)"; \
+-        echo "NOTE: This program often needs to be owned by root."; \
+       fi
+ 
+ install-rlogin-hook:
+-      -@$(INSTALL_PROGRAM) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) rlogin $(DESTDIR)$(bindir)/`echo rlogin|sed '$(transform)'` ; OUTCOME=$$?; \
++      -@$(INSTALL_PROGRAM) $(AM_INSTALL_PROGRAM_FLAGS) rlogin $(DESTDIR)$(bindir)/`echo rlogin|sed '$(transform)'` ; OUTCOME=$$?; \
+       if test $$OUTCOME -ne 0; then \
+         echo "WARNING: Failed to install rlogin (exit code $$OUTCOME)"; \
+-        echo "NOTE: This program often needs to be owned by root."; \
+       fi
+ 
+ install-rcp-hook:
+-      -@$(INSTALL_PROGRAM) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) rcp $(DESTDIR)$(bindir)/`echo rcp|sed '$(transform)'` ; OUTCOME=$$?; \
++      -@$(INSTALL_PROGRAM) $(AM_INSTALL_PROGRAM_FLAGS) rcp $(DESTDIR)$(bindir)/`echo rcp|sed '$(transform)'` ; OUTCOME=$$?; \
+       if test $$OUTCOME -ne 0; then \
+         echo "WARNING: Failed to install rcp (exit code $$OUTCOME)"; \
+-        echo "NOTE: This program often needs to be owned by root."; \
+       fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -r 59ea7a550835 -r 61c70fb2ae45 net/inetutils/patches/patch-telnet_telnet.c
--- a/net/inetutils/patches/patch-telnet_telnet.c       Mon Jan 09 14:24:49 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-telnet_telnet.c,v 1.1 2018/12/13 05:34:38 maya Exp $
-
-Avoid easy buffer overflow.
-
---- telnet/telnet.c.orig       2015-03-31 15:40:50.000000000 +0000
-+++ telnet/telnet.c
-@@ -861,7 +861,7 @@ suboption (void)
-         len = strlen (name) + 4 + 2;
-         if (len < NETROOM ())
-           {
--            sprintf ((char *) temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
-+            snprintf ((char *) temp, sizeof(temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
-                      TELQUAL_IS, name, IAC, SE);
-             ring_supply_data (&netoring, temp, len);
-             printsub ('>', &temp[2], len - 2);
-@@ -885,7 +885,7 @@ suboption (void)
- 
-         TerminalSpeeds (&ispeed, &ospeed);
- 
--        sprintf ((char *) temp, "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED,
-+        snprintf ((char *) temp, sizeof(temp), "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED,
-                  TELQUAL_IS, (int) ospeed, (int) ispeed, IAC, SE);
-         len = strlen ((char *) temp + 4) + 4; /* temp[3] is 0 ... */
- 
-@@ -999,7 +999,7 @@ suboption (void)
-             send_wont (TELOPT_XDISPLOC, 1);
-             break;
-           }
--        sprintf ((char *) temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
-+        snprintf ((char *) temp, sizeof(temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
-                  TELQUAL_IS, dp, IAC, SE);
-         len = strlen ((char *) temp + 4) + 4; /* temp[3] is 0 ... */
- 
diff -r 59ea7a550835 -r 61c70fb2ae45 net/inetutils/patches/patch-telnet_utilities.c
--- a/net/inetutils/patches/patch-telnet_utilities.c    Mon Jan 09 14:24:49 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-telnet_utilities.c,v 1.1 2018/12/13 05:34:38 maya Exp $
-
-Avoid infinite loop. This is an error exit.
-
---- telnet/utilities.c.orig    2015-03-31 15:40:50.000000000 +0000
-+++ telnet/utilities.c
-@@ -1062,7 +1062,6 @@ Exit (int returnCode)
- void
- ExitString (char *string, int returnCode)
- {
--  SetForExit ();
-   fwrite (string, 1, strlen (string), stderr);
-   exit (returnCode);
- }



Home | Main Index | Thread Index | Old Index