Attachment 210537 Details for Bug 243130 – Updated diff that actually applies to the current tree

[patch] Updated diff that actually applies to the current tree

rancid3.diff (text/plain), 5.26 KB, created by Joe Marcus Clarke on 2020-01-08 14:37:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Marcus Clarke

Created: 2020-01-08 14:37:02 UTC

Size: 5.26 KB

patch

obsolete

>diff -ruN rancid3.orig/Makefile rancid3/Makefile
>--- rancid3.orig/Makefile	2020-01-08 09:35:17.479921000 -0500
>+++ rancid3/Makefile	2020-01-06 12:22:42.972308000 -0500
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/net-mgmt/rancid3/Makefile 495188 2019-03-09 18:34:32Z feld $
> 
> PORTNAME=	rancid
>-PORTVERSION=	3.9
>+PORTVERSION=	3.10
> PORTREVISION=	0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
>@@ -11,6 +11,8 @@
> MAINTAINER=	feld@FreeBSD.org
> COMMENT=	Really Awesome New Cisco confIg Differ
> 
>+LICENSE=	BSD3CLAUSE
>+
> LIB_DEPENDS=	libexpect.so:lang/expect
> RUN_DEPENDS=	p5-LockFile-Simple>=0:devel/p5-LockFile-Simple
> 
>@@ -34,26 +36,33 @@
> NEWERCONFIG_FILE2=	etc/lg.conf
> NEWCONFIG_FILES=	rancid.conf lg.conf
> 
>-OPTIONS_DEFINE=		COMWARE SVN
>-OPTIONS_DEFAULT=
>+OPTIONS_SINGLE=		SCM
> 
>+OPTIONS_SINGLE_SCM=	CVS SVN GIT
>+
>+OPTIONS_DEFINE=		COMWARE
>+OPTIONS_DEFAULT=	CVS
>+
> COMWARE_DESC=		Add experimental support for Comware devices
>-SVN_DESC=		Use Subversion instead of CVS
>+CVS_DESC=		Use CVS as the means of version control
>+SVN_DESC=		Use Subversion as the means of version control
>+GIT_DESC=		Use Git as the means of version control
> 
>+CVS_RUN_DEPENDS=	cvs:devel/cvs
>+CVS_CONFIGURE_ON=	--without-svn
>+
>+SVN_RUN_DEPENDS=	svn:devel/subversion
>+SVN_CONFIGURE_ON=	--with-svn
>+
>+GIT_RUN_DEPENDS=	git:devel/git
>+GIT_CONFIGURE_ON=	--with-git
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MCOMWARE}
> PLIST_SUB+=	COMWARE=""
> .else
> PLIST_SUB+=	COMWARE="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MSVN}
>-CONFIGURE_ARGS+=	--with-svn
>-BUILD_DEPENDS+=		svn:devel/subversion
>-.else
>-CONFIGURE_ARGS+=	--without-svn
>-RUN_DEPENDS+=		cvs:devel/cvs
> .endif
> 
> pre-everything::
>diff -ruN rancid3.orig/distinfo rancid3/distinfo
>--- rancid3.orig/distinfo	2020-01-06 12:19:48.326048000 -0500
>+++ rancid3/distinfo	2020-01-06 11:59:38.106736000 -0500
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1550643496
>-SHA256 (rancid-3.9.tar.gz) = 9db9ba5026c2acae99713c6ee00f8186ea9d14eb2b902dabf40525025e0b1188
>-SIZE (rancid-3.9.tar.gz) = 515946
>+TIMESTAMP = 1578329978
>+SHA256 (rancid-3.10.tar.gz) = 7781af6df112fa45655485d178055b013cdce32523c6737dd593ca645898bafe
>+SIZE (rancid-3.10.tar.gz) = 533821
>diff -ruN rancid3.orig/pkg-plist rancid3/pkg-plist
>--- rancid3.orig/pkg-plist	2020-01-06 12:19:48.325008000 -0500
>+++ rancid3/pkg-plist	2020-01-06 12:03:53.210979000 -0500
>@@ -1,19 +1,24 @@
> 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/bigip.pm
> lib/rancid/ciscowlc.pm
> %%COMWARE%%lib/rancid/cmw.pm
>-lib/rancid/bigip.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/foundry.pm
> lib/rancid/fortigate.pm
>+lib/rancid/foundry.pm
> lib/rancid/fss2.pm
> lib/rancid/fxos.pm
> lib/rancid/ios.pm
>@@ -24,31 +29,31 @@
> lib/rancid/mrv.pm
> lib/rancid/nxos.pm
> lib/rancid/panos.pm
>-lib/rancid/rbt.pm
> lib/rancid/rancid.pm
>+lib/rancid/rbt.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/avorancid
>-libexec/rancid/agmrancid
> libexec/rancid/blogin
> libexec/rancid/brancid
> libexec/rancid/brlogin
> libexec/rancid/cat5rancid
> libexec/rancid/clogin
>-libexec/rancid/control_rancid
> %%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/f10rancid
> libexec/rancid/f5rancid
> libexec/rancid/flogin
> libexec/rancid/fnlogin
>@@ -71,8 +76,8 @@
> libexec/rancid/nrancid
> libexec/rancid/nslogin
> libexec/rancid/nsrancid
>-libexec/rancid/par
> libexec/rancid/panlogin
>+libexec/rancid/par
> libexec/rancid/plogin
> libexec/rancid/rancid
> libexec/rancid/rancid-cvs
>@@ -83,7 +88,6 @@
> libexec/rancid/rivrancid
> libexec/rancid/rrancid
> libexec/rancid/rtftpcopy
>-libexec/rancid/srancid
> libexec/rancid/tlogin
> libexec/rancid/trancid
> libexec/rancid/ulogin
>@@ -95,9 +99,7 @@
> man/man1/agmrancid.1.gz
> man/man1/alogin.1.gz
> man/man1/anlogin.1.gz
>-man/man1/anrancid.1.gz
> man/man1/arancid.1.gz
>-man/man1/arrancid.1.gz
> man/man1/avologin.1.gz
> man/man1/avorancid.1.gz
> man/man1/blogin.1.gz
>@@ -110,7 +112,6 @@
> man/man1/dllogin.1.gz
> man/man1/elogin.1.gz
> man/man1/erancid.1.gz
>-man/man1/f10rancid.1.gz
> man/man1/f5rancid.1.gz
> man/man1/flogin.1.gz
> man/man1/fnlogin.1.gz
>@@ -130,10 +131,8 @@
> man/man1/nrancid.1.gz
> man/man1/nslogin.1.gz
> man/man1/nsrancid.1.gz
>-man/man1/nxrancid.1.gz
> man/man1/panlogin.1.gz
> man/man1/plogin.1.gz
>-man/man1/prancid.1.gz
> man/man1/rancid-cvs.1.gz
> man/man1/rancid-par.1.gz
> man/man1/rancid-run.1.gz
>@@ -142,7 +141,6 @@
> man/man1/rivlogin.1.gz
> man/man1/rivrancid.1.gz
> man/man1/rrancid.1.gz
>-man/man1/srancid.1.gz
> man/man1/tlogin.1.gz
> man/man1/trancid.1.gz
> man/man1/ulogin.1.gz
>@@ -158,9 +156,6 @@
> man/man5/rancid.types.base.5.gz
> man/man5/rancid.types.conf.5.gz
> man/man5/router.db.5.gz
>-%%ETCDIR%%/rancid.types.base
>-@sample %%ETCDIR%%/lg.conf.sample
>-@sample %%ETCDIR%%/rancid.conf.sample
> %%DATADIR%%/CHANGES
> %%DATADIR%%/COPYING
> %%DATADIR%%/FAQ

Actions: View | Diff

Attachments on bug 243130: 210482 | 210537