git: 3cffe50dc03c - main - net-mgmt/rancid3: Update to 3.1.4

From: Joe Marcus Clarke <marcus_at_FreeBSD.org>
Date: Thu, 01 May 2025 13:07:53 UTC
The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3cffe50dc03c8d6ed9b4628011c251e2b7086331

commit 3cffe50dc03c8d6ed9b4628011c251e2b7086331
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2025-05-01 13:05:41 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2025-05-01 13:07:25 +0000

    net-mgmt/rancid3: Update to 3.1.4
    
    * See https://shrubbery.net/rancid/CHANGES for a list of changes in this
      release. [1]
    * Add a local patch to ignore honor license warnings on NX-OS
    
    PR:             286472
    Submitted by:   Jordan Ostreff (based on) [1]
---
 net-mgmt/rancid3/Makefile                     |  3 +--
 net-mgmt/rancid3/distinfo                     |  6 ++---
 net-mgmt/rancid3/files/patch-bin_hpuifilter.c | 33 ---------------------------
 net-mgmt/rancid3/files/patch-lib_nxos.pm.in   | 10 ++++++++
 net-mgmt/rancid3/pkg-plist                    |  2 ++
 5 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile
index 706a1eb113f3..aeaf5e9509cb 100644
--- a/net-mgmt/rancid3/Makefile
+++ b/net-mgmt/rancid3/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rancid
-PORTVERSION=	3.13
-PORTREVISION=	3
+PORTVERSION=	3.14
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 PKGNAMESUFFIX=	3
diff --git a/net-mgmt/rancid3/distinfo b/net-mgmt/rancid3/distinfo
index b2620415d8ed..ca169a183a78 100644
--- a/net-mgmt/rancid3/distinfo
+++ b/net-mgmt/rancid3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601757055
-SHA256 (rancid-3.13.tar.gz) = 7241d2972b1f6f76a28bdaa0e7942b1257e08b404a15d121c9dee568178f8bf5
-SIZE (rancid-3.13.tar.gz) = 506297
+TIMESTAMP = 1746104058
+SHA256 (rancid-3.14.tar.gz) = cbf608d8508b55dffb6b30c7a1c45c16ea53af7611a466e0cc47a863252f6e49
+SIZE (rancid-3.14.tar.gz) = 534205
diff --git a/net-mgmt/rancid3/files/patch-bin_hpuifilter.c b/net-mgmt/rancid3/files/patch-bin_hpuifilter.c
deleted file mode 100644
index 8702ff5cba0d..000000000000
--- a/net-mgmt/rancid3/files/patch-bin_hpuifilter.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- bin/hpuifilter.c.orig	2020-08-20 10:37:10 UTC
-+++ bin/hpuifilter.c
-@@ -119,7 +119,7 @@
- #define	BUFSZ	(LINE_MAX * 2)
- #define	ESC	0x1b
- 
--char		**environ,
-+char		**enviro,
- 		*progname;
- int		debug,
- 		sigrx,
-@@ -162,7 +162,7 @@ main(int argc, char **argv, char **ev)
-     struct pollfd	pfds[3];
-     struct termios	tios;
- 
--    environ = ev;
-+    enviro = ev;
- 
-     /* get just the basename() of our exec() name and strip a .* off the end */
-     if ((progname = strrchr(argv[0], '/')) != NULL)
-@@ -695,10 +695,10 @@ unsetenv(const char *name)
-    char	**victim,
- 	**end;
-    int	len;
--   if (environ == NULL)
-+   if (enviro == NULL)
- 	return(0);
-    len = strlen(name);
--   victim = environ;
-+   victim = enviro;
-    while (*victim != NULL) {
- 	if (strncmp(name, *victim, len) == 0 && victim[0][len] == '=')
- 	    break;
diff --git a/net-mgmt/rancid3/files/patch-lib_nxos.pm.in b/net-mgmt/rancid3/files/patch-lib_nxos.pm.in
new file mode 100644
index 000000000000..325ee3153774
--- /dev/null
+++ b/net-mgmt/rancid3/files/patch-lib_nxos.pm.in
@@ -0,0 +1,10 @@
+--- lib/nxos.pm.in.orig	2025-05-01 12:58:51 UTC
++++ lib/nxos.pm.in
+@@ -247,6 +247,7 @@ sub ShowLicense {
+ 	return(-1) if (/command authorization failed/i);
+ 
+ 	/^-+$/ && next;		# Skip lines of all dashes.
++	/Honor Start/ && next;  # Skip incrementing honor licenses.
+ 	s/ Grace .+$/ Grace/;	# Drop anything after Grace.
+ 	ProcessHistory("COMMENTS","","", "!LIC: $_");
+     }
diff --git a/net-mgmt/rancid3/pkg-plist b/net-mgmt/rancid3/pkg-plist
index b2485967cb2d..63a2f54747c2 100644
--- a/net-mgmt/rancid3/pkg-plist
+++ b/net-mgmt/rancid3/pkg-plist
@@ -32,6 +32,7 @@ lib/rancid/mrv.pm
 lib/rancid/nxos.pm
 lib/rancid/panos.pm
 lib/rancid/rancid.pm
+lib/rancid/rancidcontrib.pm
 lib/rancid/rbt.pm
 lib/rancid/routeros.pm
 lib/rancid/smc.pm
@@ -168,6 +169,7 @@ share/man/man1/xilogin.1.gz
 share/man/man1/xirancid.1.gz
 share/man/man1/xlogin.1.gz
 share/man/man3/rancid.3.gz
+share/man/man3/rancidcontrib.3.gz
 share/man/man5/cloginrc.5.gz
 share/man/man5/lg.conf.5.gz
 share/man/man5/rancid.conf.5.gz