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,124 +1,123 @@ PORTNAME= rancid -PORTVERSION= 3.13 -PORTREVISION= 3 +PORTVERSION= 3.14 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= Really Awesome New Cisco confIg Differ WWW= https://www.shrubbery.net/rancid/ LICENSE= BSD3CLAUSE LIB_DEPENDS= libexpect.so:lang/expect RUN_DEPENDS= p5-LockFile-Simple>=0:devel/p5-LockFile-Simple USES= gmake perl5 shebangfix perl_OLD_CMD= @PERLV_PATH@ SHEBANG_FILES= bin/* USERS= rancid GROUPS= rancid SUB_FILES= pkg-message 200.rancid GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --localstatedir=${LOCALBASE}/var/${PORTNAME}/ \ --bindir=${LOCALBASE}/libexec/${PORTNAME}/ \ --sysconfdir=${LOCALBASE}/etc/${PORTNAME}/ OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE2= util/lg/lg.conf NEWERCONFIG_FILE1= etc/rancid.conf NEWERCONFIG_FILE2= etc/lg.conf NEWCONFIG_FILES= rancid.conf lg.conf OPTIONS_SINGLE= SCM OPTIONS_SINGLE_SCM= CVS GIT SUBVERSION OPTIONS_DEFINE= COMWARE OPTIONS_DEFAULT= CVS COMWARE_DESC= Add experimental support for Comware devices CVS_RUN_DEPENDS= cvs:devel/cvs CVS_CONFIGURE_ON= --without-svn .if ${WITH_SUBVERSION_VER:U} == LTS SUBVERSION_RUN_DEPENDS= svn:devel/subversion-lts .else SUBVERSION_RUN_DEPENDS= svn:devel/subversion .endif SUBVERSION_CONFIGURE_ON= --with-svn GIT_RUN_DEPENDS= git:devel/git GIT_CONFIGURE_ON= --with-git .include .if ${PORT_OPTIONS:MCOMWARE} PLIST_SUB+= COMWARE="" .else PLIST_SUB+= COMWARE="@comment " .endif pre-everything:: @ ${ECHO} "Make sure your rancid repository is quiet before upgrading; disable rancid cron jobs" post-patch: .if ${PORT_OPTIONS:MCOMWARE} ${CAT} ${FILESDIR}/comware_types.conf >> ${WRKSRC}/etc/rancid.types.base ${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmwlogin.in > ${WRKDIR}/cmwlogin ${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmw.pm.in > ${WRKDIR}/cmw.pm .endif ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 ${REINPLACE_CMD} 's|uid=`perl|uid=`${PERL}|' ${WRKSRC}/etc/rancid.conf.sample.in post-install: ${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly ${INSTALL_SCRIPT} ${WRKDIR}/200.rancid ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${LOCALBASE}/bin ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${LOCALBASE}/bin .if ${PORT_OPTIONS:MCOMWARE} ${INSTALL_DATA} ${WRKDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid ${INSTALL_SCRIPT} ${WRKDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid .endif .for file in ${NEWCONFIG_FILES} @ if [ -f ${LOCALBASE}/etc/${PORTNAME}/${file} ] ; then \ ${ECHO} "WARNING: *** new ${file} file is installed as ${LOCALBASE}/rancid/${file}.sample"; \ ${ECHO} " : *** review ${file}.sample for new/deprecated switches or install in place ${file}"; \ fi .endfor @ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} ] ; then \ ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ fi @ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ fi @ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} -o \ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** New CVS Repository will be stored ${LOCALBASE}/var/${PORTNAME}/ "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi @ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} ] ; then \ ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ fi @ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ fi @ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} -o \ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** New VCS Repository will be stored ${LOCALBASE}/rancid/var "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi .include 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 @@ -1,179 +1,181 @@ bin/rancid-cvs bin/rancid-run etc/periodic/hourly/200.rancid @sample %%ETCDIR%%/lg.conf.sample @sample %%ETCDIR%%/rancid.conf.sample %%ETCDIR%%/rancid.types.base lib/rancid/acos.pm lib/rancid/aeos.pm lib/rancid/arbor.pm lib/rancid/arcos.pm lib/rancid/avocent.pm lib/rancid/bigip.pm lib/rancid/ciscowlc.pm %%COMWARE%%lib/rancid/cmw.pm lib/rancid/dell.pm lib/rancid/dnos10.pm lib/rancid/dnos9.pm lib/rancid/edgemax.pm lib/rancid/edgerouter.pm lib/rancid/exos.pm lib/rancid/fortigate.pm lib/rancid/foundry.pm lib/rancid/frr.pm lib/rancid/fss2.pm lib/rancid/fxos.pm lib/rancid/ios.pm lib/rancid/iossb.pm lib/rancid/iosshtech.pm lib/rancid/iosxr.pm lib/rancid/junos.pm 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 lib/rancid/sros.pm lib/rancid/vrp.pm lib/rancid/wavesvros.pm libexec/rancid/a10login libexec/rancid/agmrancid libexec/rancid/alogin libexec/rancid/anlogin libexec/rancid/arancid libexec/rancid/avologin libexec/rancid/blogin libexec/rancid/brancid libexec/rancid/brlogin libexec/rancid/cat5rancid libexec/rancid/clogin %%COMWARE%%libexec/rancid/cmwlogin libexec/rancid/control_rancid libexec/rancid/csblogin libexec/rancid/cssrancid libexec/rancid/dllogin libexec/rancid/elogin libexec/rancid/erancid libexec/rancid/f5rancid libexec/rancid/flogin libexec/rancid/fnlogin libexec/rancid/fxlogin libexec/rancid/hlogin libexec/rancid/hpuifilter libexec/rancid/hrancid libexec/rancid/htlogin libexec/rancid/htrancid libexec/rancid/jerancid libexec/rancid/jlogin libexec/rancid/lg.cgi libexec/rancid/lgform.cgi libexec/rancid/mrancid libexec/rancid/mrvlogin libexec/rancid/mtlogin libexec/rancid/nlogin libexec/rancid/noklogin libexec/rancid/nrancid libexec/rancid/nslogin libexec/rancid/nsrancid libexec/rancid/panlogin libexec/rancid/par libexec/rancid/plogin libexec/rancid/rancid libexec/rancid/rancid-cvs libexec/rancid/rancid-fe libexec/rancid/rancid-run libexec/rancid/rblogin libexec/rancid/rivlogin libexec/rancid/rivrancid libexec/rancid/rrancid libexec/rancid/rtftpcopy libexec/rancid/tlogin libexec/rancid/trancid libexec/rancid/ulogin libexec/rancid/wlogin libexec/rancid/xilogin libexec/rancid/xirancid libexec/rancid/xlogin %%DATADIR%%/CHANGES %%DATADIR%%/COPYING %%DATADIR%%/FAQ %%DATADIR%%/README %%DATADIR%%/README.lg %%DATADIR%%/README.misc %%DATADIR%%/UPGRADING %%DATADIR%%/cisco-load.exp %%DATADIR%%/cisco-reload.exp %%DATADIR%%/cloginrc.sample %%DATADIR%%/downreport %%DATADIR%%/getipacctg %%DATADIR%%/index.html %%DATADIR%%/lg.conf.sample %%DATADIR%%/lgnotes.html %%DATADIR%%/rancid-cvspurge %%DATADIR%%/rancid.conf.sample %%DATADIR%%/rancid.types.conf %%DATADIR%%/rtrfilter share/man/man1/a10login.1.gz share/man/man1/agmrancid.1.gz share/man/man1/alogin.1.gz share/man/man1/anlogin.1.gz share/man/man1/arancid.1.gz share/man/man1/avologin.1.gz share/man/man1/blogin.1.gz share/man/man1/brancid.1.gz share/man/man1/brlogin.1.gz share/man/man1/cat5rancid.1.gz share/man/man1/clogin.1.gz share/man/man1/control_rancid.1.gz share/man/man1/csblogin.1.gz share/man/man1/cssrancid.1.gz share/man/man1/dllogin.1.gz share/man/man1/elogin.1.gz share/man/man1/erancid.1.gz share/man/man1/f5rancid.1.gz share/man/man1/flogin.1.gz share/man/man1/fnlogin.1.gz share/man/man1/fxlogin.1.gz share/man/man1/hlogin.1.gz share/man/man1/hrancid.1.gz share/man/man1/htlogin.1.gz share/man/man1/htrancid.1.gz share/man/man1/jerancid.1.gz share/man/man1/jlogin.1.gz share/man/man1/mrancid.1.gz share/man/man1/mrvlogin.1.gz share/man/man1/mtlogin.1.gz share/man/man1/nlogin.1.gz share/man/man1/noklogin.1.gz share/man/man1/nrancid.1.gz share/man/man1/nslogin.1.gz share/man/man1/nsrancid.1.gz share/man/man1/panlogin.1.gz share/man/man1/plogin.1.gz share/man/man1/rancid-cvs.1.gz share/man/man1/rancid-par.1.gz share/man/man1/rancid-run.1.gz share/man/man1/rancid.1.gz share/man/man1/rblogin.1.gz share/man/man1/rivlogin.1.gz share/man/man1/rivrancid.1.gz share/man/man1/rrancid.1.gz share/man/man1/tlogin.1.gz share/man/man1/trancid.1.gz share/man/man1/ulogin.1.gz share/man/man1/wlogin.1.gz 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 share/man/man5/rancid.types.base.5.gz share/man/man5/rancid.types.conf.5.gz share/man/man5/router.db.5.gz share/man/man7/lg_intro.7.gz share/man/man7/rancid_intro.7.gz @dir(rancid,rancid,755) var/rancid