ports/61586: Maintainer update to net/rancid to version 2.3.rc1
Janos Mohacsi
mohacsi at niif.hu
Mon Jan 19 18:00:38 UTC 2004
>Number: 61586
>Category: ports
>Synopsis: Maintainer update to net/rancid to version 2.3.rc1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 19 10:00:31 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 5.2-BETA i386
>Organization:
NIIF
>Environment:
System: FreeBSD norfolk.ki.iif.hu 5.2-BETA FreeBSD 5.2-BETA #5: Sun Nov 30 05:47:34 CET 2003 root at norfolk.ki.iif.hu:/usr/obj/usr/src/sys/NORFOLK i386
>Description:
Maintainer update to net/rancid to version 2.3.rc1
Original software changes:
bin/env has been moved to etc/rancid.conf
bin/hpfilter has been renamed hpuifilter
util/lg/lg.conf has been moved to etc/lg.conf
util/lg/lg*.cgi have been moved to bin/lg*cgi
rancid.conf: add LOGDIR variable
support for Hitachi, Procket Networks, Juniper ERX, lucent tnt,
riverstone, zebra router
and lots of things
port changes:
warning of old configuration found - will be removed in the next release
Question: should we move rancid to the general local tree?
>How-To-Repeat:
Apply this diff.
>Fix:
diff -ruN rancid.bak/Makefile rancid/Makefile
--- rancid.bak/Makefile Thu Nov 6 16:46:09 2003
+++ rancid/Makefile Sun Jan 18 03:52:14 2004
@@ -6,8 +6,7 @@
#
PORTNAME= rancid
-PORTVERSION= 2.2.2
-PORTREVISION= 4
+PORTVERSION= 2.3.rc1
CATEGORIES= net
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/
@@ -28,14 +27,22 @@
MANPREFIX= ${PREFIX}/rancid
-MAN1= lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
- control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
- elogin.1 f10rancid.1 flogin.1 hlogin.1 hrancid.1 jlogin.1 \
- jrancid.1 francid.1 cat5rancid.1 erancid.1 mrancid.1 xrancid.1
+MAN1= alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
+ cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \
+ francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \
+ jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \
+ nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \
+ rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \
+ tntrancid.1 xrancid.1 zrancid.1
+
+MAN5= lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5
+
+OLDCONFIG_FILE1= bin/env
+OLDCONFIG_FILE2= util/lg/lg.conf
+NEWCONFIG_FILES= etc/rancid.conf etc/lg.conf
-MAN5= env.5 lg.conf.5 cloginrc.5 router.db.5
-
-CONFIG_FILES= bin/env util/lg/lg.conf
+pre-everything::
+ @ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs"
post-install:
@ ${SED} -e "s:%%INSTDIR%%:${PREFIX}/rancid:g" pkg-message >${PKGMESSAGE}
@@ -44,11 +51,24 @@
@ ${CAT} ${PKGMESSAGE}
@ ${ECHO}
.endif
-.for file in ${CONFIG_FILES}
- @ if [ -f ${PREFIX}/rancid/${file}.dist ] ; then \
- ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.dist"; \
- ${ECHO} " : *** review ${file}.dist for new/deprecated switches or install in place ${file}"; \
+.for file in ${NEWCONFIG_FILES}
+ @ if [ -f ${PREFIX}/rancid/${file} ] ; then \
+ ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \
+ ${ECHO} " : *** review ${file}.sample for new/deprecated switches or install in place ${file}"; \
fi
.endfor
+ @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \
+ ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \
+ ${ECHO} " : *** ${PREFIX}/rancid/etc/rancid.conf. Merge from sample and old file "; \
+ fi
+ @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+ ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \
+ ${ECHO} " : *** ${PREFIX}/rancid/etc/lg.conf. Merge from sample and old file "; \
+ fi
+ @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \
+ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+ ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \
+ ${ECHO} " : *** Copy the repository if you want to keep the history "; \
+ fi
.include <bsd.port.mk>
diff -ruN rancid.bak/distinfo rancid/distinfo
--- rancid.bak/distinfo Tue Sep 10 05:06:30 2002
+++ rancid/distinfo Thu Jan 15 22:55:05 2004
@@ -1 +1 @@
-MD5 (rancid-2.2.2.tar.gz) = bd77b33ca00cc954737c8097ffa74220
+MD5 (rancid-2.3.rc1.tar.gz) = fb98161366fee76c879b4400805ec5bb
diff -ruN rancid.bak/files/patch-Makefile.am rancid/files/patch-Makefile.am
--- rancid.bak/files/patch-Makefile.am Sun Jun 23 10:17:32 2002
+++ rancid/files/patch-Makefile.am Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
-*** Makefile.am.orig Mon Jun 3 14:01:32 2002
---- Makefile.am Mon Jun 3 14:02:03 2002
-***************
-*** 22,28 ****
- $(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-
- install:
-! for file in CHANGES README cloginrc.sample ; do \
- $(INSTALL_DATA) $$file $(prefix); \
- done
-
---- 22,28 ----
- $(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-
- install:
-! for file in CHANGES FAQ README cloginrc.sample ; do \
- $(INSTALL_DATA) $$file $(prefix); \
- done
-
diff -ruN rancid.bak/files/patch-Makefile.in rancid/files/patch-Makefile.in
--- rancid.bak/files/patch-Makefile.in Sun Jun 23 10:17:32 2002
+++ rancid/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
-*** Makefile.in.orig Mon Jun 3 14:01:40 2002
---- Makefile.in Mon Jun 3 14:02:40 2002
-***************
-*** 354,360 ****
- $(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-
- install:
-! for file in CHANGES README cloginrc.sample ; do \
- $(INSTALL_DATA) $$file $(prefix); \
- done
-
---- 354,360 ----
- $(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-
- install:
-! for file in CHANGES FAQ README cloginrc.sample ; do \
- $(INSTALL_DATA) $$file $(prefix); \
- done
-
diff -ruN rancid.bak/files/patch-bin::Makefile.in rancid/files/patch-bin::Makefile.in
--- rancid.bak/files/patch-bin::Makefile.in Wed May 7 19:28:14 2003
+++ rancid/files/patch-bin::Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
---- bin/Makefile.in.orig Fri Aug 9 23:59:06 2002
-+++ bin/Makefile.in Mon Mar 17 15:46:42 2003
-@@ -375,13 +375,7 @@
- for prog in $(BIN_PROGS) ; do \
- $(INSTALL) $$prog $(bindir); \
- done; \
-- if test -f $(bindir)/env ; then \
-- echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
-- echo " *** review env.new for new/deprecated switches"; \
-- $(INSTALL_DATA) env $(bindir)/env.new; \
-- else \
-- $(INSTALL_DATA) env $(bindir); \
-- fi
-+ $(INSTALL_DATA) env $(bindir)/env.dist
- # BIN_DATAS are empty at the moment.
- # for prog in $(BIN_DATAS) ; do \
- # $(INSTALL_DATA) $$prog $(PREFIX)/bin; \
diff -ruN rancid.bak/files/patch-bin::hpfilter.c rancid/files/patch-bin::hpfilter.c
--- rancid.bak/files/patch-bin::hpfilter.c Thu Oct 16 00:54:23 2003
+++ rancid/files/patch-bin::hpfilter.c Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- bin/hpfilter.c.orig Wed Oct 15 15:52:48 2003
-+++ bin/hpfilter.c Wed Oct 15 15:53:08 2003
-@@ -382,7 +382,7 @@
- usage(void)
- {
- fprintf(stderr,
--"usage: %s [-hv] <telnet|ssh> <hostname>
-+"usage: %s [-hv] <telnet|ssh> <hostname>\n\
- ", progname);
- return;
- }
-@@ -391,7 +391,7 @@
- vers(void)
- {
- fprintf(stderr,
--"%s: %s version %s
-+"%s: %s version %s\n\
- ", progname, package, version);
- return;
- }
diff -ruN rancid.bak/files/patch-etc::Makefile.am rancid/files/patch-etc::Makefile.am
--- rancid.bak/files/patch-etc::Makefile.am Thu Jan 1 01:00:00 1970
+++ rancid/files/patch-etc::Makefile.am Sun Jan 18 02:34:15 2004
@@ -0,0 +1,29 @@
+--- etc/Makefile.am.orig Sun Jan 18 02:30:29 2004
++++ etc/Makefile.am Sun Jan 18 02:32:16 2004
+@@ -29,24 +29,8 @@
+ CLEANFILES= $(pkgdata_DATA)
+
+ install-data-local: all
+- @if test -f $(sysconfdir)/rancid.conf ; then \
+- echo ""; \
+- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \
+- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \
+- echo " *** examples."; \
+- echo ""; \
+- else \
+- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+- fi; \
+- if test -f $(sysconfdir)/lg.conf ; then \
+- echo ""; \
+- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \
+- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \
+- echo " *** examples."; \
+- echo ""; \
+- else \
+- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+- fi;
++ $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ \
++ $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
+
+ #clean:
+ # rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff -ruN rancid.bak/files/patch-etc::Makefile.in rancid/files/patch-etc::Makefile.in
--- rancid.bak/files/patch-etc::Makefile.in Thu Jan 1 01:00:00 1970
+++ rancid/files/patch-etc::Makefile.in Sun Jan 18 02:41:22 2004
@@ -0,0 +1,29 @@
+--- etc/Makefile.in.orig Sun Jan 18 02:37:08 2004
++++ etc/Makefile.in Sun Jan 18 02:38:03 2004
+@@ -342,24 +342,8 @@
+
+
+ install-data-local: all
+- @if test -f $(sysconfdir)/rancid.conf ; then \
+- echo ""; \
+- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \
+- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \
+- echo " *** examples."; \
+- echo ""; \
+- else \
+- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+- fi; \
+- if test -f $(sysconfdir)/lg.conf ; then \
+- echo ""; \
+- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \
+- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \
+- echo " *** examples."; \
+- echo ""; \
+- else \
+- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+- fi;
++ $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
++ $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
+
+ lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
+ rm -f lg.conf.sample lg.conf.sample.tmp; \
diff -ruN rancid.bak/files/patch-util::Makefile.in rancid/files/patch-util::Makefile.in
--- rancid.bak/files/patch-util::Makefile.in Sun Jun 23 10:17:32 2002
+++ rancid/files/patch-util::Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
-*** util/Makefile.in.orig Mon Jun 3 14:21:54 2002
---- util/Makefile.in Mon Jun 3 14:23:55 2002
-***************
-*** 1,6 ****
- PREFIX = @prefix@
-
-! INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
- UTIL_PROGS = @RD_UTIL_PROGS@
---- 1,6 ----
- PREFIX = @prefix@
-
-! INSTALL = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
-
- UTIL_PROGS = @RD_UTIL_PROGS@
diff -ruN rancid.bak/files/patch-util::lg::Makefile.in rancid/files/patch-util::lg::Makefile.in
--- rancid.bak/files/patch-util::lg::Makefile.in Wed May 7 19:28:14 2003
+++ rancid/files/patch-util::lg::Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,25 +0,0 @@
---- util/lg/Makefile.in.orig Fri Aug 9 23:59:06 2002
-+++ util//lg/Makefile.in Mon Mar 17 15:48:24 2003
-@@ -1,6 +1,6 @@
- PREFIX = @prefix@
-
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
-
- UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
-@@ -13,13 +13,7 @@
- for file in $(UTIL_LG_PROGS) ; do \
- $(INSTALL) $$file $(PREFIX)/util/lg; \
- done; \
-- if test -f $(PREFIX)/util/lg/lg.conf ; then \
-- echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
-- echo " *** review lg.conf.new for new/deprecated switches"; \
-- $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
-- else \
-- $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
-- fi; \
-+ $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.dist; \
- for file in *README* *.html; do \
- $(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
- done
diff -ruN rancid.bak/pkg-descr rancid/pkg-descr
--- rancid.bak/pkg-descr Sun Jun 23 10:17:31 2002
+++ rancid/pkg-descr Thu Jan 15 22:53:58 2004
@@ -2,7 +2,7 @@
and hardware (cards, serial numbers, etc), using CVS. Rancid currently
supports Bay routers, Cisco routers, Juniper routers, Catalyst switches,
Foundry switches, Redback NASs, ADC EZT3 muxes, MRTd (and thus likely IRRd),
-Alteon switches, and HP procurve switches.
+Alteon switches, HP procurve switches, Hitachi routers.
Rancid logs into each of the devices in a router table file, runs various
commands, chomps the output, and emails any differences ( sample) from
diff -ruN rancid.bak/pkg-message rancid/pkg-message
--- rancid.bak/pkg-message Sun Jun 23 10:17:31 2002
+++ rancid/pkg-message Sun Jan 18 03:34:12 2004
@@ -1,8 +1,11 @@
For further configuration information please look at
-%%INSTDIR%%/README.
+%%INSTDIR%%/share/rancid/README.
+
+If you are upgrading from the previous version of rancid look at
+%%INSTDIR%%/share/rancid/UPGRADING.
If you would like to set up Rancid to be browseable from Web,
you need to install devel/cvsweb or devel/viewcvs.
For rancid looking-glass copy the actual CGIs (located at
-%%INSTDIR%%/util/lg/{lg.cgi lgform.cgi}) to your cgi-bin.
+%%INSTDIR%%/bin/{lg.cgi lgform.cgi}) to your cgi-bin.
diff -ruN rancid.bak/pkg-plist rancid/pkg-plist
--- rancid.bak/pkg-plist Wed May 7 19:28:14 2003
+++ rancid/pkg-plist Sun Jan 18 03:48:59 2004
@@ -1,49 +1,70 @@
-rancid/util/lg/lg.cgi
-rancid/util/lg/lgform.cgi
-rancid/util/lg/lg.conf.dist
-rancid/util/lg/README
-rancid/util/lg/index.html
-rancid/util/lg/lgnotes.html
-rancid/util/README
-rancid/util/rtrfilter
-rancid/util/rtrfilter.README
-rancid/util/cisco-load.exp
-rancid/util/cisco-reload.exp
-rancid/util/downreport
-rancid/util/getipacctg
-rancid/bin/hpfilter
-rancid/bin/cat5rancid
-rancid/bin/control_rancid
+ at exec mkdir -p %D/rancid/var
+ at exec chmod 775 %D/rancid/var
rancid/bin/alogin
rancid/bin/arancid
-rancid/bin/clogin
-rancid/bin/create_cvs
rancid/bin/blogin
rancid/bin/brancid
-rancid/bin/do-diffs
+rancid/bin/cat5rancid
+rancid/bin/clogin
+rancid/bin/control_rancid
+rancid/bin/cssrancid
rancid/bin/elogin
rancid/bin/erancid
rancid/bin/f10rancid
rancid/bin/flogin
+rancid/bin/fnrancid
rancid/bin/francid
-rancid/bin/jlogin
-rancid/bin/jrancid
rancid/bin/hlogin
+rancid/bin/hpuifilter
rancid/bin/hrancid
+rancid/bin/htlogin
+rancid/bin/htrancid
+rancid/bin/jerancid
+rancid/bin/jlogin
+rancid/bin/jrancid
+rancid/bin/lg.cgi
+rancid/bin/lgform.cgi
rancid/bin/mrancid
+rancid/bin/nlogin
+rancid/bin/nrancid
+rancid/bin/nslogin
+rancid/bin/nsrancid
rancid/bin/par
-rancid/bin/rancid-fe
+rancid/bin/prancid
rancid/bin/rancid
-rancid/bin/rename
+rancid/bin/rancid-cvs
+rancid/bin/rancid-fe
+rancid/bin/rancid-run
+rancid/bin/rivlogin
+rancid/bin/rivrancid
rancid/bin/rrancid
+rancid/bin/tntlogin
+rancid/bin/tntrancid
rancid/bin/xrancid
-rancid/bin/env.dist
-rancid/CHANGES
-rancid/README
-rancid/FAQ
-rancid/cloginrc.sample
- at dirrm rancid/util/lg
- at dirrm rancid/util
+rancid/bin/zrancid
+rancid/etc/lg.conf.sample
+rancid/etc/rancid.conf.sample
+rancid/share/rancid/CHANGES
+rancid/share/rancid/COPYING
+rancid/share/rancid/FAQ
+rancid/share/rancid/README
+rancid/share/rancid/README.lg
+rancid/share/rancid/README.misc
+rancid/share/rancid/UPGRADING
+rancid/share/rancid/cisco-load.exp
+rancid/share/rancid/cisco-reload.exp
+rancid/share/rancid/cloginrc.sample
+rancid/share/rancid/downreport
+rancid/share/rancid/getipacctg
+rancid/share/rancid/index.html
+rancid/share/rancid/lg.conf.sample
+rancid/share/rancid/lgnotes.html
+rancid/share/rancid/rancid.conf.sample
+rancid/share/rancid/rtrfilter
+ at dirrm rancid/share/rancid
+ at dirrm rancid/share
+ at dirrm rancid/var
+ at dirrm rancid/etc
@dirrm rancid/bin
@dirrm rancid/man/man1
@dirrm rancid/man/man5
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list