dmlb2000 pushed to rancid (el6). "Revert "add some upstream patches" (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 30 18:11:57 UTC 2015
From 38917ab165ea177cba220ffd8a3e5faeacfe39b1 Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Sat, 30 May 2015 10:38:30 -0700
Subject: Revert "add some upstream patches"
This reverts commit 537faf42b24d09c94932747e0006baa8c2c816bf.
diff --git a/rancid-3.2.p1 b/rancid-3.2.p1
deleted file mode 100644
index 2c140a7..0000000
--- a/rancid-3.2.p1
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: lib/rancid.pm.in
-===================================================================
---- lib/rancid.pm.in (revision 3066)
-+++ lib/rancid.pm.in (revision 3067)
-@@ -366,7 +366,9 @@
- $l = 128;
- }
- $norder = inet_pton(AF_INET6, $a);
-- return unpack("H*", $norder) . unpack("H*", pack("C", $l));
-+ if (defined($norder)) {
-+ return unpack("H*", $norder) . unpack("H*", pack("C", $l));
-+ }
- } else {
- my($l);
- if ($a =~ /\//) {
-@@ -375,7 +377,9 @@
- $l = 32;
- }
- $norder = inet_pton(AF_INET, $a);
-- return(unpack("H*", $norder) . unpack("H*", pack("C", $l)));
-+ if (defined($norder)) {
-+ return(unpack("H*", $norder) . unpack("H*", pack("C", $l)));
-+ }
- }
-
- # otherwise return the original key value, so as not to sort on null
diff --git a/rancid-3.2.p2 b/rancid-3.2.p2
deleted file mode 100644
index a42447b..0000000
--- a/rancid-3.2.p2
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: lib/junos.pm.in
-===================================================================
---- lib/junos.pm.in (revision 3067)
-+++ lib/junos.pm.in (revision 3068)
-@@ -439,13 +439,18 @@
-
- # licenses used changes constantly. distill it to a percentage.
- if (/^(\s+scale-subscriber)(\s+)(\d+)(\s+\d+)(.*$)/) {
-- my($a, $sp, $used, $avail, $rem) = ($1, $2, $3, $4, $');
-+ my($a, $sp, $used, $avail, $rem) = ($1, $2, $3, $4, $5);
- my($spl, $usedl) = (length($sp), length($used));
-- my($pcnt) = int(($used + 0.0) / ($avail + 0.0) * 100);
-+ my($pcnt);
-+ if ($avail < 1) {
-+ $pcnt = ">100";
-+ } else {
-+ $pcnt = int(($used + 0.0) / ($avail + 0.0) * 100);
-+ }
- my($pcntl) = length($pcnt) + 1;
- $spl = $spl + $usedl - $pcntl;
-
-- my($fmt) = "%s%-" . $spl . "s%d%%%s%s";
-+ my($fmt) = "%s%-" . $spl . "s%s%%%s%s\n";
- $_ = sprintf($fmt, $a, "", $pcnt, $avail, $rem);
- }
-
diff --git a/rancid-3.2.p3 b/rancid-3.2.p3
deleted file mode 100644
index 6627b74..0000000
--- a/rancid-3.2.p3
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac (revision 3070)
-+++ configure.ac (working copy)
-@@ -275,7 +275,7 @@
- else
- $PERLV_PATH -e 'require 5;'
- if test $? -ne 0 ; then
-- AC_MSG_ERROR([can't locate a suitable perl5.])
-+ AC_MSG_ERROR([can't locate a suitable perl5.])
- exit 1
- fi
- fi
-@@ -284,6 +284,14 @@
- PERLV=`basename $PERLV_PATH`
- AC_SUBST(PERLV)
-
-+# check Socket.pm version
-+AC_MSG_CHECKING([Socket.pm version])
-+$PERLV_PATH -e 'use 2.006 Socket qw(inet_pton);' 2>&1 >/dev/null
-+if test $? -ne 0 ; then
-+ AC_MSG_ERROR([Socket.pm is older than 2.006; upgrade from http://metacpan.org/pod/Socket])
-+ exit 1
-+fi
-+
- AC_PATH_PROG(EXPECT_PATH,expect,no)
- if test $EXPECT_PATH = no; then
- AC_MSG_ERROR([can't locate expect.])
-Index: lib/rancid.pm.in
-===================================================================
---- lib/rancid.pm.in (revision 3070)
-+++ lib/rancid.pm.in (working copy)
-@@ -48,7 +48,7 @@
- use 5.010;
- use strict 'vars';
- use warnings;
--use Socket qw(AF_INET AF_INET6 inet_pton);
-+use 2.006 Socket qw(AF_INET AF_INET6 inet_pton);
- require(Exporter);
- our @ISA = qw(Exporter);
-
-Index: configure
-===================================================================
---- configure (revision 3070)
-+++ configure (working copy)
-@@ -5307,7 +5307,7 @@
- else
- $PERLV_PATH -e 'require 5;'
- if test $? -ne 0 ; then
-- as_fn_error $? "can't locate a suitable perl5." "$LINENO" 5
-+ as_fn_error $? "can't locate a suitable perl5." "$LINENO" 5
- exit 1
- fi
- fi
-@@ -5316,6 +5316,15 @@
- PERLV=`basename $PERLV_PATH`
-
-
-+# check Socket.pm version
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Socket.pm version" >&5
-+$as_echo_n "checking Socket.pm version... " >&6; }
-+$PERLV_PATH -e 'use 2.006 Socket qw(inet_pton);' 2>&1 >/dev/null
-+if test $? -ne 0 ; then
-+ as_fn_error $? "Socket.pm is older than 2.006; upgrade from http://metacpan.org/pod/Socket" "$LINENO" 5
-+ exit 1
-+fi
-+
- # Extract the first word of "expect", so it can be a program name with args.
- set dummy expect; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/rancid-3.2.p4 b/rancid-3.2.p4
deleted file mode 100644
index b7cb5be..0000000
--- a/rancid-3.2.p4
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: etc/rancid.types.base
-===================================================================
---- etc/rancid.types.base (revision 3076)
-+++ etc/rancid.types.base (working copy)
-@@ -7,22 +7,23 @@
- #
- agm;script;agmrancid
- #
--adtran;script;rancid -t adtran
--adtran;module;adtran
--adtran;inloop;adtran::inloop
--adtran;login;clogin
-+# XXX This was the start of support for adtran, but it is incomplete.
-+#adtran;script;rancid -t adtran
-+#adtran;module;adtran
-+#adtran;inloop;adtran::inloop
-+#adtran;login;clogin
- # TA5000
--adtran;command;adtran::ShowVersion;show version
--adtran;command;adtran::ShowSystemInventory;show system inventory
--adtran;command;adtran::ShowTableInterfaces;show table interfaces
--adtran;command;adtran::ShowEvc;show evc
--adtran;command;adtran::ShowEvcmap;show evc-map
--adtran;command;adtran::ShowEfmgroup;show efm-group 1
--adtran;command;adtran::ShowInterfacesShdsl;show interfaces shdsl
--adtran;command;adtran::ShowInterfacesAdsl;show interfaces adsl
-+#adtran;command;adtran::ShowVersion;show version
-+#adtran;command;adtran::ShowSystemInventory;show system inventory
-+#adtran;command;adtran::ShowTableInterfaces;show table interfaces
-+#adtran;command;adtran::ShowEvc;show evc
-+#adtran;command;adtran::ShowEvcmap;show evc-map
-+#adtran;command;adtran::ShowEfmgroup;show efm-group 1
-+#adtran;command;adtran::ShowInterfacesShdsl;show interfaces shdsl
-+#adtran;command;adtran::ShowInterfacesAdsl;show interfaces adsl
- # EFM NTU
--adtran;command;adtran::ShowInterfaces;show interfaces
--adtran;command;adtran::WriteTerm;show running-config
-+#adtran;command;adtran::ShowInterfaces;show interfaces
-+#adtran;command;adtran::WriteTerm;show running-config
- #
- alteon;script;arancid
- alteon;login;alogin
diff --git a/rancid-3.2.p5 b/rancid-3.2.p5
deleted file mode 100644
index 9475e10..0000000
--- a/rancid-3.2.p5
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: lib/panos.pm.in
-===================================================================
---- lib/panos.pm.in (revision 3112)
-+++ lib/panos.pm.in (working copy)
-@@ -1,4 +1,4 @@
--package ios;
-+package panos;
- ##
- ## $Id: panos.pm.in 3019 2015-01-11 05:54:59Z heas $
- ##
diff --git a/rancid-3.2.p6 b/rancid-3.2.p6
deleted file mode 100644
index 6f47b61..0000000
--- a/rancid-3.2.p6
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: bin/control_rancid.in
-===================================================================
---- bin/control_rancid.in (revision 3116)
-+++ bin/control_rancid.in (working copy)
-@@ -206,13 +206,14 @@
- routers.down
- routers.up
- EOF
-+ fi
- if [ ! -f configs/.cvsignore ] ; then
- rm -rf configs/.cvsignore
-- cat > configs/.cvsignore <<EOF
-+ cat > configs/.cvsignore <<EOF2
- .old
- *.new
- *.raw
--EOF
-+EOF2
- fi
- if [ $RCSSYS = svn ] ; then
- svn propset svn:ignore -F .cvsignore .
-@@ -219,7 +220,6 @@
- svn propset svn:ignore -F configs/.cvsignore configs
- svn update .
- svn commit -m 'set svn:ignores' .
-- fi
- fi
- ;;
- esac
-Index: bin/control_rancid.in
-===================================================================
---- bin/control_rancid.in (revision 3123)
-+++ bin/control_rancid.in (working copy)
-@@ -449,7 +449,7 @@
- done
- echo
- # delete configs from RCS for routers not listed in routers.up.
--for router in `find . \( -name \*.new -prune -o -name CVS -prune -o -name .svn -prune -o -name .gitignore -prune \) -o -type f -print | sed -e 's/^.\///'` ; do
-+for router in `find . \( -name \*.new -prune -o -name CVS -prune -o -name .svn -prune -o -name .cvsignore -prune -o -name .gitignore -prune \) -o -type f -print | sed -e 's/^.\///'` ; do
- grep -i "^$router\;" ../router.db > /dev/null 2>&1
- if [ $? -eq 1 ] ; then
- rm -f $router
diff --git a/rancid-3.2.p7 b/rancid-3.2.p7
deleted file mode 100644
index ff66b86..0000000
--- a/rancid-3.2.p7
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: bin/control_rancid.in
-===================================================================
---- bin/control_rancid.in (revision 3119)
-+++ bin/control_rancid.in (working copy)
-@@ -236,6 +236,7 @@
- ;;
- git )
- git status -s rancid.conf | grep '^?'
-+ if [ $? -eq 0 ] ; then LN=1; else LN=0; fi
- ;;
- esac
- if [ $LN -eq 0 ] ; then
diff --git a/rancid.spec b/rancid.spec
index da19339..800286a 100644
--- a/rancid.spec
+++ b/rancid.spec
@@ -1,6 +1,6 @@
Name: rancid
Version: 3.2
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Really Awesome New Cisco confIg Differ
Group: Applications/Internet
@@ -11,14 +11,6 @@ Source1: %{name}.cron
Source2: %{name}.logrotate
Patch0: %{name}-conf.patch
Patch1: %{name}-Makefile.patch
-# Upstream Patches
-Patch20: %{name}-%{version}.p1
-Patch21: %{name}-%{version}.p2
-Patch22: %{name}-%{version}.p3
-Patch23: %{name}-%{version}.p4
-Patch24: %{name}-%{version}.p5
-Patch25: %{name}-%{version}.p6
-Patch26: %{name}-%{version}.p7
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,13 +42,6 @@ including software and hardware (cards, serial numbers, etc) and uses CVS
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
-%patch20 -p0
-%patch21 -p0
-%patch22 -p0
-%patch23 -p0
-%patch24 -p0
-%patch25 -p0
-%patch26 -p0
%build
%configure \
@@ -135,9 +120,6 @@ exit 0
%changelog
-* Sat May 30 2014 David Brown <david.brown at pnnl.gov> - 3.2-2
-- Add upstream patches
-
* Wed Nov 19 2014 David Brown <david.brown at pnnl.gov> - 3.2-1
- New Upstream Version
- Fix Bugzilla #1165738
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rancid.git/commit/?h=el6&id=38917ab165ea177cba220ffd8a3e5faeacfe39b1
More information about the scm-commits
mailing list