Update rancid 3.7 -> 3.8

ok rsadowski@
This commit is contained in:
pvk 2018-08-18 21:05:48 +00:00
parent 4e66ddf89c
commit bba0f471d6
8 changed files with 38 additions and 29 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.21 2017/11/10 21:53:25 pvk Exp $
# $OpenBSD: Makefile,v 1.22 2018/08/18 21:05:48 pvk Exp $
COMMENT = Really Awesome New Cisco confIg Differ
DISTNAME = rancid-3.7
DISTNAME = rancid-3.8
EPOCH = 0
CATEGORIES = sysutils
HOMEPAGE = http://www.shrubbery.net/rancid/
HOMEPAGE = https://www.shrubbery.net/rancid/
MAINTAINER = Pavel Korovin <p@tristero.se>
@ -23,7 +23,7 @@ BUILD_DEPENDS = ${RUN_DEPENDS}
LOCALSTATEDIR = ${BASELOCALSTATEDIR}/rancid
CONFIGURE_STYLE = gnu
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --prefix=${PREFIX} \
--disable-mk-localstatedir

View File

@ -1,2 +1,2 @@
SHA256 (rancid-3.7.tar.gz) = nGvv/3jUnY0HV6K1e2z9/vVcrcvB+m++GrlCQzXVH3s=
SIZE (rancid-3.7.tar.gz) = 503424
SHA256 (rancid-3.8.tar.gz) = zs3u0jecgy+1mI9NyMRfu7s4JyOIKp/+pXflT1q4zF8=
SIZE (rancid-3.8.tar.gz) = 523950

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2016/11/23 12:27:47 sthen Exp $
--- Makefile.in.orig Tue Sep 6 17:12:39 2016
+++ Makefile.in Wed Nov 16 02:34:44 2016
$OpenBSD: patch-Makefile_in,v 1.6 2018/08/18 21:05:48 pvk Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -70,7 +70,7 @@ am__make_running_with_option = \
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
@ -10,7 +11,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2016/11/23 12:27:47 sthen Exp $
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -351,7 +351,7 @@ top_build_prefix = @top_build_prefix@
@@ -352,7 +352,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.7 2016/11/23 12:27:47 sthen Exp $
--- configure.orig Tue Nov 8 10:16:39 2016
+++ configure Tue Nov 8 10:17:17 2016
@@ -5471,7 +5471,7 @@ fi
$OpenBSD: patch-configure,v 1.8 2018/08/18 21:05:48 pvk Exp $
Index: configure
--- configure.orig
+++ configure
@@ -5495,7 +5495,7 @@ fi
# ping seems to take one of two formats for count (N)
# BSD: ping -c N host
# SVR: ping host N

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-etc_Makefile_in,v 1.5 2016/11/23 12:27:47 sthen Exp $
--- etc/Makefile.in.orig Tue Sep 6 17:12:39 2016
+++ etc/Makefile.in Wed Nov 16 03:51:28 2016
$OpenBSD: patch-etc_Makefile_in,v 1.6 2018/08/18 21:05:48 pvk Exp $
Index: etc/Makefile.in
--- etc/Makefile.in.orig
+++ etc/Makefile.in
@@ -70,7 +70,7 @@ am__make_running_with_option = \
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
@ -10,7 +11,7 @@ $OpenBSD: patch-etc_Makefile_in,v 1.5 2016/11/23 12:27:47 sthen Exp $
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -534,30 +534,10 @@ uninstall-am: uninstall-pkgdataDATA uninstall-sysconfD
@@ -538,30 +538,10 @@ uninstall-am: uninstall-pkgdataDATA uninstall-sysconfD
install-data-local: all

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-etc_rancid_conf_sample_in,v 1.1 2016/11/23 12:27:47 sthen Exp $
--- etc/rancid.conf.sample.in.orig Tue Nov 8 10:22:04 2016
+++ etc/rancid.conf.sample.in Tue Nov 8 10:22:57 2016
@@ -32,7 +32,7 @@ TMPDIR=/tmp; export TMPDIR
$OpenBSD: patch-etc_rancid_conf_sample_in,v 1.2 2018/08/18 21:05:48 pvk Exp $
Index: etc/rancid.conf.sample.in
--- etc/rancid.conf.sample.in.orig
+++ etc/rancid.conf.sample.in
@@ -26,7 +26,7 @@ TMPDIR=/tmp; export TMPDIR
# Be careful changing this, it affects CVSROOT below. It should be a FQPN, not
# relative.
BASEDIR=@localstatedir@; export BASEDIR
-PATH=@bindir@:@ENV_PATH@; export PATH
+PATH=/usr/bin:/bin:@prefix@/bin; export PATH
#
# Set to the name of the sendmail executable (or script) that will accept the
# -t option to take its rcpt and other headers from std-in and $MAILOPTS (see
# Check that the effective UID is not root, which could lead to permissions
# problems for user who is supposed to be running rancid. If you know what

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-share_Makefile_in,v 1.1 2016/11/23 12:27:47 sthen Exp $
--- share/Makefile.in.orig Tue Sep 6 17:12:39 2016
+++ share/Makefile.in Wed Nov 16 04:10:43 2016
$OpenBSD: patch-share_Makefile_in,v 1.2 2018/08/18 21:05:48 pvk Exp $
Index: share/Makefile.in
--- share/Makefile.in.orig
+++ share/Makefile.in
@@ -71,7 +71,7 @@ am__make_running_with_option = \
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
@ -10,7 +11,7 @@ $OpenBSD: patch-share_Makefile_in,v 1.1 2016/11/23 12:27:47 sthen Exp $
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -276,8 +276,7 @@ top_srcdir = @top_srcdir@
@@ -277,8 +277,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
pkgdata_SCRIPTS = rancid-cvspurge rtrfilter downreport
dist_pkgdata_SCRIPTS = getipacctg

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2017/11/10 21:53:25 pvk Exp $
@comment $OpenBSD: PLIST,v 1.12 2018/08/18 21:05:48 pvk Exp $
@conflict par-*
@newgroup _rancid:613
@newuser _rancid:613:_rancid:daemon:Rancid user:/var/rancid:/bin/sh
@ -25,6 +25,7 @@ bin/f5rancid
bin/flogin
bin/fnlogin
bin/fnrancid
bin/fxlogin
bin/hlogin
@bin bin/hpuifilter
bin/hrancid
@ -75,6 +76,8 @@ lib/rancid/edgemax.pm
lib/rancid/edgerouter.pm
lib/rancid/exos.pm
lib/rancid/foundry.pm
lib/rancid/fss2.pm
lib/rancid/fxos.pm
lib/rancid/ios.pm
lib/rancid/iossb.pm
lib/rancid/iosshtech.pm
@ -86,6 +89,7 @@ lib/rancid/panos.pm
lib/rancid/rancid.pm
lib/rancid/rbt.pm
lib/rancid/sros.pm
lib/rancid/vrp.pm
lib/rancid/wavesvros.pm
@man man/man1/agmrancid.1
@man man/man1/alogin.1