Update to the latest alpha version (recommended version by upstream)
ok okan@ ajacoutot@
This commit is contained in:
pea
parent
a7771d110d
commit
109937ff49
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2009/01/01 16:57:44 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2009/02/11 13:17:28 pea Exp $
|
||||
|
||||
COMMENT = Really Awesome New Cisco confIg Differ
|
||||
|
||||
DISTNAME = rancid-2.3.1
|
||||
PKGNAME = ${DISTNAME}p1
|
||||
DISTNAME = rancid-2.3.2a9
|
||||
CATEGORIES = sysutils
|
||||
|
||||
HOMEPAGE = http://www.shrubbery.net/rancid/
|
||||
@ -16,7 +15,7 @@ PERMIT_DISTFILES_CDROM ="not for commercial use"
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB = c
|
||||
WANTLIB = c util
|
||||
|
||||
MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (rancid-2.3.1.tar.gz) = sYhZXlKFFbT4cHj2OTbTVQ==
|
||||
RMD160 (rancid-2.3.1.tar.gz) = ScwbU9nkAotp0JwgjZwtTZtU48M=
|
||||
SHA1 (rancid-2.3.1.tar.gz) = Cac3m6+70t5r41GAR57tvTXNgCY=
|
||||
SHA256 (rancid-2.3.1.tar.gz) = Ms7KK77fkld/vngN0rbH16ASl0co5JMs5qGYl5B9wvo=
|
||||
SIZE (rancid-2.3.1.tar.gz) = 276562
|
||||
MD5 (rancid-2.3.2a9.tar.gz) = muKuqe+jrglJZKJeFyaaAg==
|
||||
RMD160 (rancid-2.3.2a9.tar.gz) = F0QzLIiRtvvIikvvYbQr4H4dJnk=
|
||||
SHA1 (rancid-2.3.2a9.tar.gz) = lAl2NM6twmZ0Un1oi41A+00POtk=
|
||||
SHA256 (rancid-2.3.2a9.tar.gz) = +8js0enujy2x/w5EChPKdj8F95EaHnK4EJnCA9yMZJQ=
|
||||
SIZE (rancid-2.3.2a9.tar.gz) = 344267
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
|
||||
--- Makefile.in.orig Sun Jun 6 06:12:08 2004
|
||||
+++ Makefile.in Tue Dec 9 16:18:57 2008
|
||||
@@ -17,7 +17,7 @@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2009/02/11 13:17:28 pea Exp $
|
||||
--- Makefile.in.orig Wed Nov 12 08:54:12 2008
|
||||
+++ Makefile.in Tue Feb 10 14:13:21 2009
|
||||
@@ -15,7 +15,7 @@
|
||||
@SET_MAKE@
|
||||
|
||||
VPATH = @srcdir@
|
||||
-pkgdatadir = $(datadir)/@PACKAGE@
|
||||
+pkgdatadir = $(datadir)/doc/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = .
|
||||
@@ -176,7 +176,7 @@ sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
@@ -195,7 +195,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = foreign no-dependencies
|
||||
-pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
|
||||
+pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
$OpenBSD: patch-bin_Makefile_in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
|
||||
--- bin/Makefile.in.orig Tue Dec 16 15:46:22 2008
|
||||
+++ bin/Makefile.in Tue Dec 16 15:47:56 2008
|
||||
@@ -55,7 +55,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile
|
||||
$(srcdir)/rivlogin.in $(srcdir)/rivrancid.in \
|
||||
$(srcdir)/rrancid.in $(srcdir)/tntlogin.in \
|
||||
$(srcdir)/tntrancid.in $(srcdir)/xrancid.in \
|
||||
- $(srcdir)/zrancid.in
|
||||
+ $(srcdir)/zrancid.in $(srcdir)/fnlogin.in
|
||||
$OpenBSD: patch-bin_Makefile_in,v 1.2 2009/02/11 13:17:28 pea Exp $
|
||||
--- bin/Makefile.in.orig Wed Nov 12 08:54:12 2008
|
||||
+++ bin/Makefile.in Tue Feb 10 14:15:35 2009
|
||||
@@ -60,7 +60,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile
|
||||
$(srcdir)/rivrancid.in $(srcdir)/rrancid.in \
|
||||
$(srcdir)/srancid.in $(srcdir)/tlogin.in $(srcdir)/tntlogin.in \
|
||||
$(srcdir)/tntrancid.in $(srcdir)/trancid.in \
|
||||
- $(srcdir)/xrancid.in $(srcdir)/zrancid.in
|
||||
+ $(srcdir)/xrancid.in $(srcdir)/zrancid.in $(srcdir)/fnlogin.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
@@ -68,7 +68,7 @@ CONFIG_CLEAN_FILES = control_rancid par rancid-fe alog
|
||||
erancid f10rancid flogin francid fnrancid jlogin jrancid \
|
||||
jerancid hlogin hrancid htlogin htrancid mrancid nlogin \
|
||||
nrancid nslogin nsrancid prancid rivlogin rivrancid rrancid \
|
||||
- tntlogin tntrancid xrancid zrancid
|
||||
+ tntlogin tntrancid xrancid zrancid fnlogin
|
||||
@@ -74,7 +74,7 @@ CONFIG_CLEAN_FILES = control_rancid par rancid-fe agmr
|
||||
francid fnrancid hlogin hrancid htlogin htrancid jlogin \
|
||||
jrancid jerancid mrancid mrvlogin mrvrancid nlogin nrancid \
|
||||
nslogin nsrancid nxrancid prancid rivlogin rivrancid rrancid \
|
||||
- srancid tlogin tntlogin tntrancid trancid xrancid zrancid
|
||||
+ srancid tlogin tntlogin tntrancid trancid xrancid zrancid fnlogin
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
@@ -205,7 +205,7 @@ bin_SCRIPTS = cat5rancid control_rancid \
|
||||
hlogin hrancid htlogin htrancid \
|
||||
mrancid nlogin nrancid nslogin nsrancid par prancid \
|
||||
rancid rancid-fe rivlogin rivrancid rrancid \
|
||||
- tntlogin tntrancid xrancid zrancid\
|
||||
+ tntlogin tntrancid xrancid zrancid fnlogin\
|
||||
lg.cgi lgform.cgi rancid-cvs rancid-run
|
||||
@@ -224,7 +224,7 @@ bin_SCRIPTS = agmrancid alogin arancid avologin avoran
|
||||
mrvrancid nlogin nrancid nslogin nsrancid nxrancid par prancid \
|
||||
rancid-fe rancid rivlogin rivrancid rrancid srancid tlogin \
|
||||
tntlogin tntrancid trancid xrancid zrancid lg.cgi lgform.cgi \
|
||||
- rancid-cvs rancid-run
|
||||
+ rancid-cvs rancid-run fnlogin
|
||||
EXTRA_DIST = lg.cgi.in lgform.cgi.in rancid-cvs.in rancid-run.in
|
||||
#dist_bin_SCRIPTS= $(bin_SCRIPTS:%=%.in)
|
||||
@@ -300,6 +300,8 @@ erancid: $(top_builddir)/config.status $(srcdir)/eranc
|
||||
CLEANFILES = lg.cgi lgform.cgi rancid-cvs rancid-run
|
||||
@@ -329,6 +329,8 @@ f5rancid: $(top_builddir)/config.status $(srcdir)/f5ra
|
||||
f10rancid: $(top_builddir)/config.status $(srcdir)/f10rancid.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
flogin: $(top_builddir)/config.status $(srcdir)/flogin.in
|
||||
|
||||
@ -1,136 +1,18 @@
|
||||
$OpenBSD: patch-bin_fnrancid_in,v 1.2 2008/12/19 12:57:53 pea Exp $
|
||||
--- bin/fnrancid.in.orig Sun Jan 11 04:49:13 2004
|
||||
+++ bin/fnrancid.in Fri Dec 19 11:46:52 2008
|
||||
@@ -4,3 +4,4 @@
|
||||
##
|
||||
-## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
|
||||
+## rancid 2.3.2a7
|
||||
+## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
|
||||
## All rights reserved.
|
||||
@@ -22,3 +23,3 @@
|
||||
# A library built on Stephen Gill's Netscreen stuff to accomodate
|
||||
-# the Fortinet product line. [d_pfleger@juniper.net]
|
||||
+# the Fortinet product line. [d_pfleger@juniper.net]
|
||||
#
|
||||
@@ -26,3 +27,3 @@
|
||||
#
|
||||
-# usage: rancid [-d] [-l] [-f filename | $host]
|
||||
+# usage: rancid [-dV] [-l] [-f filename | hostname]
|
||||
#
|
||||
@@ -36,5 +37,6 @@ $host = $ARGV[0];
|
||||
$found_end = 0;
|
||||
-$timeo = 90; # nlogin timeout in seconds
|
||||
+$timeo = 90; # fnlogin timeout in seconds
|
||||
$OpenBSD: patch-bin_fnrancid_in,v 1.3 2009/02/11 13:17:28 pea Exp $
|
||||
--- bin/fnrancid.in.orig Fri Feb 8 10:59:08 2008
|
||||
+++ bin/fnrancid.in Tue Feb 10 14:21:53 2009
|
||||
@@ -172,6 +172,7 @@ sub GetSystem {
|
||||
|
||||
-my(%filter_pwds); # password filtering mode
|
||||
+my(@commandtable, %commands, @commands);# command lists
|
||||
+my(%filter_pwds); # password filtering mode
|
||||
|
||||
@@ -42,5 +44,5 @@ my(%filter_pwds); # password filtering mode
|
||||
sub ProcessHistory {
|
||||
- my($new_hist_tag,$new_command,$command_string,@string)=(@_);
|
||||
- if((($new_hist_tag ne $hist_tag) || ($new_command ne $command))
|
||||
- && defined %history) {
|
||||
+ my($new_hist_tag,$new_command,$command_string,@string) = (@_);
|
||||
+ if ((($new_hist_tag ne $hist_tag) || ($new_command ne $command))
|
||||
+ && defined %history) {
|
||||
print eval "$command \%history";
|
||||
@@ -66,6 +68,6 @@ sub numerically { $a <=> $b; }
|
||||
|
||||
-# This is a sort routing that will sort numerically on the
|
||||
+# This is a sort routine that will sort numerically on the
|
||||
# keys of a hash as if it were a normal array.
|
||||
sub keynsort {
|
||||
- local(%lines)=@_;
|
||||
+ local(%lines) = @_;
|
||||
local($i) = 0;
|
||||
@@ -79,6 +81,6 @@ sub keynsort {
|
||||
|
||||
-# This is a sort routing that will sort on the
|
||||
+# This is a sort routine that will sort on the
|
||||
# keys of a hash as if it were a normal array.
|
||||
sub keysort {
|
||||
- local(%lines)=@_;
|
||||
+ local(%lines) = @_;
|
||||
local($i) = 0;
|
||||
@@ -92,6 +94,6 @@ sub keysort {
|
||||
|
||||
-# This is a sort routing that will sort on the
|
||||
+# This is a sort routine that will sort on the
|
||||
# values of a hash as if it were a normal array.
|
||||
sub valsort{
|
||||
- local(%lines)=@_;
|
||||
+ local(%lines) = @_;
|
||||
local($i) = 0;
|
||||
@@ -99,4 +101,4 @@ sub valsort{
|
||||
foreach $key (sort values %lines) {
|
||||
- $sorted_lines[$i] = $key;
|
||||
- $i++;
|
||||
+ $sorted_lines[$i] = $key;
|
||||
+ $i++;
|
||||
}
|
||||
@@ -105,5 +107,5 @@ sub valsort{
|
||||
|
||||
-# This is a numerical sort routing (ascending).
|
||||
+# This is a numerical sort routine (ascending).
|
||||
sub numsort {
|
||||
- local(%lines)=@_;
|
||||
+ local(%lines) = @_;
|
||||
local($i) = 0;
|
||||
@@ -121,3 +123,3 @@ sub numsort {
|
||||
sub ipsort {
|
||||
- local(%lines)=@_;
|
||||
+ local(%lines) = @_;
|
||||
local($i) = 0;
|
||||
@@ -134,3 +136,3 @@ sub ipaddrval {
|
||||
my(@a) = ($_[0] =~ m#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#);
|
||||
- $a[3]+256*($a[2]+256*($a[1]+256*$a[0]));
|
||||
+ $a[3] + 256 * ($a[2] + 256 * ($a[1] +256 * $a[0]));
|
||||
}
|
||||
@@ -146,5 +148,6 @@ sub GetSystem {
|
||||
while (<INPUT>) {
|
||||
tr/\015//d;
|
||||
+ s/exit//gi ;
|
||||
next if /^\s*$/;
|
||||
last if(/$prompt/);
|
||||
- ProcessHistory("","","","$_");
|
||||
+ ProcessHistory("","","","!$_");
|
||||
#print STDOUT "$_";
|
||||
@@ -169,2 +172,3 @@ sub GetConf {
|
||||
tr/\015//d;
|
||||
+ s/exit//gi ;
|
||||
next if /^\s*$/;
|
||||
@@ -172,5 +176,5 @@ sub GetConf {
|
||||
if (/(^set.*)('Enc .*')(.*)/) {
|
||||
- ProcessHistory("ENC","","","!$1 'Enc **encoding removed**' $3\n");
|
||||
- next;
|
||||
- }
|
||||
+ ProcessHistory("ENC","","","!$1 'Enc **encoding removed**' $3\n");
|
||||
+ next;
|
||||
+ }
|
||||
ProcessHistory("","","","$_");
|
||||
@@ -186,12 +190,11 @@ sub DoNothing {print STDOUT;}
|
||||
# Main
|
||||
-%commands=(
|
||||
- 'get system status' => "GetSystem",
|
||||
- 'get conf' => "GetConf"
|
||||
+@commandtable = (
|
||||
+ {'get system status' => 'GetSystem'},
|
||||
+ {'show' => 'GetConf'}
|
||||
);
|
||||
-# keys() doesnt return things in the order entered and the order of the
|
||||
-# cmds is important. pita
|
||||
-@commands=(
|
||||
- "get system status",
|
||||
- "get conf"
|
||||
-);
|
||||
+# Use an array to preserve the order of the commands and a hash for mapping
|
||||
+# commands to the subroutine and track commands that have been completed.
|
||||
+@commands = map(keys(%$_), @commandtable);
|
||||
+%commands = map(%$_, @commandtable);
|
||||
+
|
||||
$cisco_cmds=join(";",@commands);
|
||||
@@ -199,2 +202,11 @@ $cmds_regexp=join("|",@commands);
|
||||
|
||||
@@ -202,6 +203,15 @@ sub GetConf {
|
||||
next;
|
||||
}
|
||||
ProcessHistory("","","","$_");
|
||||
+if (length($host) == 0) {
|
||||
+ if ($file) {
|
||||
+ print(STDERR "Too few arguments: file name required\n");
|
||||
@ -140,8 +22,21 @@ $OpenBSD: patch-bin_fnrancid_in,v 1.2 2008/12/19 12:57:53 pea Exp $
|
||||
+ exit(1);
|
||||
+ }
|
||||
+}
|
||||
open(OUTPUT,">$host.new") || die "Can't open $host.new for writing: $!\n";
|
||||
@@ -208,9 +220,9 @@ if ($file) {
|
||||
#print STDOUT "$_";
|
||||
}
|
||||
$found_end=1;
|
||||
@@ -214,7 +224,7 @@ sub DoNothing {print STDOUT;}
|
||||
# Main
|
||||
@commandtable = (
|
||||
{'get system status' => 'GetSystem'},
|
||||
- {'get conf' => 'GetConf'}
|
||||
+ {'show' => 'GetConf'}
|
||||
);
|
||||
# Use an array to preserve the order of the commands and a hash for mapping
|
||||
# commands to the subroutine and track commands that have been completed.
|
||||
@@ -242,13 +252,13 @@ if ($file) {
|
||||
print STDERR "opening file $host\n" if ($debug);
|
||||
print STDOUT "opening file $host\n" if ($log);
|
||||
open(INPUT,"<$host") || die "open failed for $host: $!\n"; } else {
|
||||
- print STDERR "executing nlogin -t $timeo -c\"$cisco_cmds\" $host\n" if ($debug);
|
||||
- print STDOUT "executing nlogin -t $timeo -c\"$cisco_cmds\" $host\n" if ($log);
|
||||
@ -149,18 +44,18 @@ $OpenBSD: patch-bin_fnrancid_in,v 1.2 2008/12/19 12:57:53 pea Exp $
|
||||
+ print STDOUT "executing fnlogin -t $timeo -c\"$cisco_cmds\" $host\n" if ($log);
|
||||
if (defined($ENV{NOPIPE})) {
|
||||
- system "nlogin -t $timeo -c \"$cisco_cmds\" $host </dev/null > $host.raw 2>&1" || die "nlogin failed for $host: $!\n";
|
||||
+ system "fnlogin -t $timeo -c \"$cisco_cmds\" $host </dev/null > $host.raw 2>&1" || die "nlogin failed for $host: $!\n";
|
||||
open(INPUT, "< $host.raw") || die "nlogin failed for $host: $!\n";
|
||||
- open(INPUT, "< $host.raw") || die "nlogin failed for $host: $!\n";
|
||||
+ system "fnlogin -t $timeo -c \"$cisco_cmds\" $host </dev/null > $host.raw 2>&1" || die "fnlogin failed for $host: $!\n";
|
||||
+ open(INPUT, "< $host.raw") || die "fnlogin failed for $host: $!\n";
|
||||
} else {
|
||||
- open(INPUT,"nlogin -t $timeo -c \"$cisco_cmds\" $host </dev/null |") || die "nlogin failed for $host: $!\n";
|
||||
+ open(INPUT,"fnlogin -t $timeo -c \"$cisco_cmds\" $host </dev/null |") || die "nlogin failed for $host: $!\n";
|
||||
+ open(INPUT,"fnlogin -t $timeo -c \"$cisco_cmds\" $host </dev/null |") || die "fnlogin failed for $host: $!\n";
|
||||
}
|
||||
@@ -220,3 +232,3 @@ if ($file) {
|
||||
if ($ENV{"FILTER_PWDS"} =~ /no/i) {
|
||||
- $filter_pwds = 0;
|
||||
+ $filter_pwds = 0;
|
||||
} elsif ($ENV{"FILTER_PWDS"} =~ /all/i) {
|
||||
@@ -231,9 +243,28 @@ TOP: while(<INPUT>) {
|
||||
}
|
||||
|
||||
@@ -276,13 +286,32 @@ ProcessHistory("","","","!RANCID-CONTENT-TYPE: fortiga
|
||||
TOP: while(<INPUT>) {
|
||||
tr/\015//d;
|
||||
if (/^Error:/) {
|
||||
- print STDOUT ("$host nlogin error: $_");
|
||||
- print STDERR ("$host nlogin error: $_") if ($debug);
|
||||
@ -194,3 +89,5 @@ $OpenBSD: patch-bin_fnrancid_in,v 1.2 2008/12/19 12:57:53 pea Exp $
|
||||
+ }
|
||||
+ }
|
||||
print STDERR ("HIT COMMAND:$_") if ($debug);
|
||||
if (!defined($commands{$cmd})) {
|
||||
print STDERR "$host: found unexpected command - \"$cmd\"\n";
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-bin_rancid-fe_in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
|
||||
--- bin/rancid-fe.in.orig Tue Dec 16 14:16:01 2008
|
||||
+++ bin/rancid-fe.in Tue Dec 16 14:16:34 2008
|
||||
@@ -38,6 +38,7 @@ elsif ($vendor =~ /^erx$/i) { exec('jerancid', $route
|
||||
elsif ($vendor =~ /^extreme$/i) { exec('xrancid', $router); }
|
||||
elsif ($vendor =~ /^ezt3$/i) { exec('erancid', $router); }
|
||||
elsif ($vendor =~ /^force10$/i) { exec('f10rancid', $router); }
|
||||
+elsif ($vendor =~ /^fortinet$/i) { exec('fnrancid', $router); }
|
||||
elsif ($vendor =~ /^foundry$/i) { exec('francid', $router); }
|
||||
elsif ($vendor =~ /^hitachi$/i) { exec('htrancid', $router); }
|
||||
elsif ($vendor =~ /^hp$/i) { exec('hrancid', $router); }
|
||||
@ -1,28 +1,28 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
|
||||
--- configure.orig Tue Dec 16 15:51:41 2008
|
||||
+++ configure Tue Dec 16 15:53:47 2008
|
||||
@@ -6091,7 +6091,7 @@ ac_cv_env_path=$ENV_PATH
|
||||
$OpenBSD: patch-configure,v 1.2 2009/02/11 13:17:28 pea Exp $
|
||||
--- configure.orig Wed Nov 12 08:54:12 2008
|
||||
+++ configure Tue Feb 10 14:17:17 2009
|
||||
@@ -7259,7 +7259,7 @@ ac_config_files="$ac_config_files bin/nslogin bin/nsra
|
||||
|
||||
ac_config_files="$ac_config_files bin/nslogin bin/nsrancid"
|
||||
ac_config_files="$ac_config_files bin/nxrancid"
|
||||
|
||||
- ac_config_files="$ac_config_files bin/prancid"
|
||||
+ ac_config_files="$ac_config_files bin/prancid bin/fnlogin"
|
||||
-ac_config_files="$ac_config_files bin/prancid"
|
||||
+ac_config_files="$ac_config_files bin/prancid bin/fnlogin"
|
||||
|
||||
ac_config_files="$ac_config_files bin/rivlogin bin/rivrancid"
|
||||
ac_config_files="$ac_config_files bin/rivlogin bin/rivrancid"
|
||||
|
||||
@@ -6700,6 +6700,7 @@ do
|
||||
"bin/htrancid" ) CONFIG_FILES="$CONFIG_FILES bin/htrancid" ;;
|
||||
"bin/mrancid" ) CONFIG_FILES="$CONFIG_FILES bin/mrancid" ;;
|
||||
"bin/nlogin" ) CONFIG_FILES="$CONFIG_FILES bin/nlogin" ;;
|
||||
+ "bin/fnlogin" ) CONFIG_FILES="$CONFIG_FILES bin/fnlogin" ;;
|
||||
"bin/nrancid" ) CONFIG_FILES="$CONFIG_FILES bin/nrancid" ;;
|
||||
"bin/nslogin" ) CONFIG_FILES="$CONFIG_FILES bin/nslogin" ;;
|
||||
"bin/nsrancid" ) CONFIG_FILES="$CONFIG_FILES bin/nsrancid" ;;
|
||||
@@ -7134,6 +7135,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
|
||||
bin/htrancid ) chmod a+x $ac_file ;;
|
||||
bin/mrancid ) chmod a+x $ac_file ;;
|
||||
bin/nlogin ) chmod a+x $ac_file ;;
|
||||
+ bin/fnlogin ) chmod a+x $ac_file ;;
|
||||
bin/nrancid ) chmod a+x $ac_file ;;
|
||||
bin/nslogin ) chmod a+x $ac_file ;;
|
||||
bin/nsrancid ) chmod a+x $ac_file ;;
|
||||
@@ -7944,6 +7944,7 @@ do
|
||||
"bin/mrvlogin") CONFIG_FILES="$CONFIG_FILES bin/mrvlogin" ;;
|
||||
"bin/mrvrancid") CONFIG_FILES="$CONFIG_FILES bin/mrvrancid" ;;
|
||||
"bin/nlogin") CONFIG_FILES="$CONFIG_FILES bin/nlogin" ;;
|
||||
+ "bin/fnlogin") CONFIG_FILES="$CONFIG_FILES bin/fnlogin" ;;
|
||||
"bin/nrancid") CONFIG_FILES="$CONFIG_FILES bin/nrancid" ;;
|
||||
"bin/nslogin") CONFIG_FILES="$CONFIG_FILES bin/nslogin" ;;
|
||||
"bin/nsrancid") CONFIG_FILES="$CONFIG_FILES bin/nsrancid" ;;
|
||||
@@ -8769,6 +8770,7 @@ done
|
||||
"bin/mrvlogin":F) chmod a+x $ac_file ;;
|
||||
"bin/mrvrancid":F) chmod a+x $ac_file ;;
|
||||
"bin/nlogin":F) chmod a+x $ac_file ;;
|
||||
+ "bin/fnlogin":F) chmod a+x $ac_file ;;
|
||||
"bin/nrancid":F) chmod a+x $ac_file ;;
|
||||
"bin/nslogin":F) chmod a+x $ac_file ;;
|
||||
"bin/nsrancid":F) chmod a+x $ac_file ;;
|
||||
|
||||
@ -1,37 +1,37 @@
|
||||
$OpenBSD: patch-etc_Makefile_in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
|
||||
--- etc/Makefile.in.orig Sun Jun 6 06:12:09 2004
|
||||
+++ etc/Makefile.in Mon Dec 8 14:41:29 2008
|
||||
@@ -17,7 +17,7 @@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
$OpenBSD: patch-etc_Makefile_in,v 1.2 2009/02/11 13:17:28 pea Exp $
|
||||
--- etc/Makefile.in.orig Wed Nov 12 08:54:12 2008
|
||||
+++ etc/Makefile.in Tue Feb 10 14:18:14 2009
|
||||
@@ -21,7 +21,7 @@
|
||||
# permission and modified beyond recognition.
|
||||
|
||||
VPATH = @srcdir@
|
||||
-pkgdatadir = $(datadir)/@PACKAGE@
|
||||
+pkgdatadir = $(datadir)/examples/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ..
|
||||
@@ -349,26 +349,10 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
@@ -383,26 +383,10 @@ uninstall-am: uninstall-pkgdataDATA
|
||||
|
||||
|
||||
install-data-local: all
|
||||
- @if test "$(DO_CONF_INSTALL)" = "yes"; then \
|
||||
- if test -f $(sysconfdir)/rancid.conf ; then \
|
||||
- if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
|
||||
- echo ""; \
|
||||
- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \
|
||||
- echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \
|
||||
- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \
|
||||
- echo " *** examples."; \
|
||||
- echo ""; \
|
||||
- else \
|
||||
- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
|
||||
- $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
|
||||
- fi; \
|
||||
- if test -f $(sysconfdir)/lg.conf ; then \
|
||||
- if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
|
||||
- echo ""; \
|
||||
- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \
|
||||
- echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \
|
||||
- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \
|
||||
- echo " *** examples."; \
|
||||
- echo ""; \
|
||||
- else \
|
||||
- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
|
||||
- $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
|
||||
- fi; \
|
||||
- fi
|
||||
+ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2009/02/11 13:17:28 pea Exp $
|
||||
@newgroup _rancid:613
|
||||
@newuser _rancid:613:_rancid:daemon:Rancid user:/var/rancid:/bin/sh
|
||||
bin/agmrancid
|
||||
bin/alogin
|
||||
bin/arancid
|
||||
bin/avologin
|
||||
bin/avorancid
|
||||
bin/blogin
|
||||
bin/brancid
|
||||
bin/cat5rancid
|
||||
@ -27,10 +30,13 @@ bin/jrancid
|
||||
@comment bin/lg.cgi
|
||||
@comment bin/lgform.cgi
|
||||
bin/mrancid
|
||||
bin/mrvlogin
|
||||
bin/mrvrancid
|
||||
bin/nlogin
|
||||
bin/nrancid
|
||||
bin/nslogin
|
||||
bin/nsrancid
|
||||
bin/nxrancid
|
||||
bin/par
|
||||
bin/prancid
|
||||
bin/rancid
|
||||
@ -40,12 +46,20 @@ bin/rancid-run
|
||||
bin/rivlogin
|
||||
bin/rivrancid
|
||||
bin/rrancid
|
||||
bin/srancid
|
||||
bin/tlogin
|
||||
bin/tntlogin
|
||||
bin/tntrancid
|
||||
bin/trancid
|
||||
bin/xrancid
|
||||
bin/zrancid
|
||||
@man man/man1/agmrancid.1
|
||||
@man man/man1/alogin.1
|
||||
@man man/man1/arancid.1
|
||||
@man man/man1/avologin.1
|
||||
@man man/man1/avorancid.1
|
||||
@man man/man1/blogin.1
|
||||
@man man/man1/brancid.1
|
||||
@man man/man1/cat5rancid.1
|
||||
@man man/man1/clogin.1
|
||||
@man man/man1/control_rancid.1
|
||||
@ -69,6 +83,7 @@ bin/zrancid
|
||||
@man man/man1/nrancid.1
|
||||
@man man/man1/nslogin.1
|
||||
@man man/man1/nsrancid.1
|
||||
@man man/man1/nxrancid.1
|
||||
@man man/man1/par.1
|
||||
@man man/man1/prancid.1
|
||||
@man man/man1/rancid-cvs.1
|
||||
@ -77,8 +92,12 @@ bin/zrancid
|
||||
@man man/man1/rancid_intro.1
|
||||
@man man/man1/rivlogin.1
|
||||
@man man/man1/rivrancid.1
|
||||
@man man/man1/rrancid.1
|
||||
@man man/man1/srancid.1
|
||||
@man man/man1/tlogin.1
|
||||
@man man/man1/tntlogin.1
|
||||
@man man/man1/tntrancid.1
|
||||
@man man/man1/trancid.1
|
||||
@man man/man1/xrancid.1
|
||||
@man man/man1/zrancid.1
|
||||
@man man/man5/cloginrc.5
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user