From owner-rancid-discuss-outgoing@shrubbery.net Mon Nov 1 23:00:20 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id F010711CE2D for ; Mon, 1 Nov 2004 23:00:19 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id 529151113C; Mon, 1 Nov 2004 23:00:18 +0000 (UTC) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id 48B1511146; Mon, 1 Nov 2004 23:00:18 +0000 (UTC) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 7053) id DCA5411142; Mon, 1 Nov 2004 23:00:17 +0000 (UTC) Received: from pfleger.org (willow.he.net [216.218.240.18]) by guelah.shrubbery.net (Postfix) with SMTP id 47CDF1113C for ; Mon, 1 Nov 2004 22:44:08 +0000 (UTC) Received: from mini-pfleger.pfleger.org ([209.204.154.4]) by pfleger.org for ; Mon, 1 Nov 2004 14:44:06 -0800 Message-Id: <5.1.1.5.2.20041101141419.033dc6d8@mail.pfleger.org> X-Sender: (Unverified) X-Mailer: QUALCOMM Windows Eudora Version 5.1.1 Date: Mon, 01 Nov 2004 14:44:00 -0800 To: Michael =?iso-8859-1?Q?Lyngb=F8l?= From: Dan Pfleger Subject: Re: Bug when using SSH on CatOS devices Cc: rancid-discuss@shrubbery.net In-Reply-To: <20041031200449.GN81532@freesbee.wheel.dk> References: <20041028232051.GS26832@shrubbery.net> <20041026113333.GO66193@freesbee.wheel.dk> <20041027234953.GW19776@shrubbery.net> <20041028071326.GI66193@freesbee.wheel.dk> <20041028232051.GS26832@shrubbery.net> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="=====================_18149798==.ALT" Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk --=====================_18149798==.ALT Content-Type: text/plain; charset="iso-8859-1"; format=flowed Content-Transfer-Encoding: quoted-printable Hi Michael, Don't know if anyone responded, but I've seen similar problems on older=20 Extremes when it would omit EOL(s) at random places. In this case, it looks like CatOS or the SSH client is omitting/munging the= =20 terminal's last \r\n based on your line: Switch> (enable) exitConnection to switch.foo.bar closed by remote host. My solution for Extreme's was a bit of a hack, but it went something like=20 the additional lines below. Don't think it is worth putting in a patch=20 unless this is a more common problem, but rather just a one off=20 solution. I forget if you need to put in a \n to make the file diff=20 correctly or not, but you might need to re-output the line too if it is not= =20 100% consistent. Hope this helps... TOP: while() { tr/\015//d; if (/> \(enable\) ?exit$/) { $clean_run=3D1; last; } # Check and see if it was a "less clean" run. elsif (/> \(enable\) ?exitConnection to (\S+) closed by remote= host\./){ $clean_run=3D1; last; } } At 12:04 PM 10/31/2004, Michael Lyngb=F8l wrote: >On 28.10.2004 16:20:51 +0000, john heasley wrote: > > > > > > I'm using RANCID 2.3.1 to get config from a bunch of Cisco 6500=20 > running > > > > > CatOS 6.4. > > > > > > > > > > Login is via SSH (on FreeBSD 5.3 w/ OpenSSH 3.8.1p1). > > > > > > > > > > cat5rancid has the following code at around line 1062: > > > > > > > > > > TOP: while() { > > > > > tr/\015//d; > > > > > if (/> \(enable\) ?exit$/) { > > > > > $clean_run=3D1; > > > > > last; > > > > > } > > > > > > > > > > where $clean_run would be set to true if the prompt matches= 'exit'. > > > > > However when using SSH the exit becomes: > > > > > > > > > > Switch> (enable)Connection to switch.foo.bar closed by remote= =20 > host. > > > > > Connection to switch.foo.bar closed. > > > > > > > > does it do this when you ssh in manually? > > > > > > Yes, eg. when I do: > > > > > > clogin -c 'sh ver' switch.foo.bar > > > > I meant "ssh switch.foo.bar" > >Oh, sorry. No: > >Switch> (enable) exitConnection to switch.foo.bar closed by remote host. >Connection to switch.foo.bar closed. From owner-rancid-discuss-outgoing@shrubbery.net Thu Nov 4 18:21:12 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id 71A4811CE4B for ; Thu, 4 Nov 2004 18:21:12 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id B69E81113C; Thu, 4 Nov 2004 10:21:11 -0800 (PST) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id A868811146; Thu, 4 Nov 2004 10:21:11 -0800 (PST) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from mta03-svc.ntlworld.com (mta03-svc.ntlworld.com [62.253.162.43]) by guelah.shrubbery.net (Postfix) with ESMTP id E54F41113C for ; Thu, 4 Nov 2004 10:21:10 -0800 (PST) Received: from [192.168.250.128] ([80.6.200.48]) by mta03-svc.ntlworld.com (InterMail vM.4.01.03.37 201-229-121-137-20020806) with ESMTP id <20041104181908.LCVZ25095.mta03-svc.ntlworld.com@[192.168.250.128]>; Thu, 4 Nov 2004 18:19:08 +0000 Message-ID: <418A730D.90202@blueyonder.co.uk> Date: Thu, 04 Nov 2004 18:21:01 +0000 From: Mark Cooper User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.3) Gecko/20040910 X-Accept-Language: en, en-us MIME-Version: 1.0 To: "Williamson, Todd" Cc: Andrew Partan , rancid-discuss@shrubbery.net Subject: Re: jerancid for ERX's with "service manual-commit"? References: <20040903191014.GC78196@partan.com> In-Reply-To: <20040903191014.GC78196@partan.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk Andrew Partan wrote: > On Fri, Sep 03, 2004 at 12:04:50PM -0700, Williamson, Todd wrote: > >>I altered bin/jerancid to issue "show running-configuration exclude >>interface atm" instead of "show configuration". I also tried it without >>the "exclude interface atm" piece and with a 1200 second timeout (there >>are *a lot* of pre-provisioned atm sub-interfaces in our configs). >> >>but jerancid's debug output always indicates the following: Think this is related to the same problem I'm seeing which is jerancid b0rking when coming across things not 'in sync' I commented out the following lines in jerancid and everything works fine:- # fail if the RP is amid the auto-sync process # return(-1) if (/auto-sync enabled/ && !/in sync/); # fail if the RP is amid the auto-sync process # return(-1) if (/active\/standby/ && !/not sync/); I haven't supplied a patch as yet as I saw this as a kludge until I could find out from Juniper what its all about ;) HTH -- Mark Cooper http://pvrhw.goldfish.org/ - Open Source PVR Hardware Database From owner-rancid-discuss-outgoing@shrubbery.net Thu Nov 4 19:33:32 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id 72A0611CE4B for ; Thu, 4 Nov 2004 19:33:32 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id BF85811142; Thu, 4 Nov 2004 11:33:31 -0800 (PST) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id B485C11149; Thu, 4 Nov 2004 11:33:31 -0800 (PST) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from panorama.Covad.COM (panorama.covad.com [66.134.72.15]) by guelah.shrubbery.net (Postfix) with ESMTP id E579C11142 for ; Thu, 4 Nov 2004 11:33:30 -0800 (PST) Received: from zanxmb00.cc-ntd1.covad.com (zanxmb00.corp.covad.com [172.16.2.119]) by panorama.Covad.COM (8.9.3/8.8.7) with ESMTP id LAA21817; Thu, 4 Nov 2004 11:33:29 -0800 (PST) Received: from ZANEVS03.cc-ntd1.covad.com ([172.16.2.84]) by zanxmb00.cc-ntd1.covad.com with Microsoft SMTPSVC(5.0.2195.5329); Thu, 4 Nov 2004 11:33:29 -0800 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Subject: RE: jerancid for ERX's with "service manual-commit"? Date: Thu, 4 Nov 2004 11:33:29 -0800 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: jerancid for ERX's with "service manual-commit"? Thread-Index: AcTCmw5YKQiMH/aZR/ag43COMZPF5QABitbw From: "Williamson, Todd" To: "Mark Cooper" Cc: "Andrew Partan" , X-OriginalArrivalTime: 04 Nov 2004 19:33:29.0593 (UTC) FILETIME=[29904690:01C4C2A5] Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk > -----Original Message----- > From: Mark Cooper=20 > Subject: Re: jerancid for ERX's with "service manual-commit"? >=20 > Think this is related to the same problem I'm seeing which is=20 > jerancid=20 > b0rking when coming across things not 'in sync' >=20 > I commented out the following lines in jerancid and=20 > everything works fine:- > # fail if the RP is amid the auto-sync process > # return(-1) if (/auto-sync enabled/ && !/in sync/); > # fail if the RP is amid the auto-sync process > # return(-1) if (/active\/standby/ && !/not sync/); >=20 > I haven't supplied a patch as yet as I saw this as a kludge until I=20 > could find out from Juniper what its all about ;) that's just about what i changed to get it working. i altered the sync test case and changed the configuration command a bit for use with "service manual-commit" ("show config" doesn't work in this case); the "exclude interface atm" piece is there to keep the clogin sessions from timing out and cull the cruft from the config (lots of pre-prov'ed ATM subinterfaces): prodeng01:rancid$ diff jerancid.old jerancid 266c266 < return(-1) if (/active\/standby/ && !/not sync/); --- > return(-1) if (/active\/standby/ && /not sync/); 545c545 < 'show configuration' =3D> "WriteTerm" --- > 'show running-configuration exclude interface atm' =3D> "WriteTerm" 556c556 < "show configuration" --- > "show running-configuration exclude interface atm" everything has been working fine since removing the negation of the negative ;) =20 i'd love to help out (rancid makes my life so much easier :) if there's any assistance i can offer with respect to e-series testing, please contact me off-list. thanks, todd >=20 > HTH >=20 > --=20 >=20 > Mark Cooper > http://pvrhw.goldfish.org/ - Open Source PVR Hardware Database >=20 todd From owner-rancid-discuss-outgoing@shrubbery.net Mon Nov 8 04:15:54 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id 2747C11CE31 for ; Mon, 8 Nov 2004 04:15:54 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id 7F7D711142; Sun, 7 Nov 2004 20:15:53 -0800 (PST) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id 6FB0011149; Sun, 7 Nov 2004 20:15:53 -0800 (PST) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from S4.cableone.net (smtp4.cableone.net [24.116.0.230]) by guelah.shrubbery.net (Postfix) with ESMTP id 891BE11142 for ; Sun, 7 Nov 2004 20:15:52 -0800 (PST) Received: from TINYGOD (unverified [24.117.243.179]) by S4.cableone.net (CableOne SMTP Service S4) with ESMTP id 828537 for ; Sun, 07 Nov 2004 21:16:20 -0700 Date: Sun, 7 Nov 2004 21:15:21 -0700 From: Justin Grote Organization: JWG Networks X-Priority: 3 (Normal) Message-ID: <5310441839.20041107211521@grote.name> To: rancid-discuss@shrubbery.net Subject: Rancid Subversion 2.3.1 Patch MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="----------1141A711930CF3BAB" X-Abuse-Info: Send abuse complaints to abuse@cableone.net Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk This is a cryptographically signed message in MIME format. ------------1141A711930CF3BAB Content-Type: multipart/mixed; boundary="----------10CEEE65204E17" ------------10CEEE65204E17 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Greetings, As promised, here is a patch to rancid 2.3.1 to enable Subversion support. = It is a drop-in replacement for rancid, meaning it functions exactly the sa= me, all the configuration files/procedures are exactly the same as well. Th= e only thing that has been modified is that the backend has just been conve= rted from CVS to Subversion.=20 This is just a proof of concept and is NOT SUPPORTED BY THE RANCID TEAM. I'= ve been running this in place of 2.3.1 for about a month now and it has fun= ctioned flawlessly, including diffs, updates mailouts, and every other fun= ctionality I could test. (I made this version a few hours after I posted ab= out it on this list, took no time at all). RANCID devs, please see my final note at the bottom and let me know what yo= u think. This patch is also available temporarily at http://myweb.cableone.net/rasta= n/rancidSVN.diff (I'm in the middle of switching hosting providers so my pr= imary site is down) You, of course, need to have Subversion on your system to run this. Most of= the major Linux distributions come with subversion (it's almost as ubiquit= ous as CVS in new distributions!), including SuSE 9.1, Fedora (Red Hat) Cor= e 2, Mandrake 10, Gentoo, Debian, etc. To apply the patch, extract the rancid-2.3.1.tar.gz source package, place t= he patch incide the rancid-2.3.1 directory that is created, and then from i= nside the rancid-2.3.1 directory type: # patch -p1 < rancidSVN.diff (# is your prompt, do not include it) Then install as normal. Some notes: - If you want to use your existing rancid CVS history with this tool, you c= an use the excellent cvs2svn tool to convert your existing history over to = subversion: http://cvs2svn.tigris.org/ - Thanks to subversion, you can move and/or rename router entries and still= preserve their history. You can even move them between groups safely! To d= o this, check out a separate copy of the repository, then svn mv <= newconfiglocation>. Edit your router.db files as necessary, then do an svn = commit. Rancid will be none the wiser. - Since I coded it as a drop-in replacement, your repository has to be on t= he same server. I do have a working version that allows your repository to = be hosted anywhere subversion lets it. I've set up a test environment with = multiple rancid's collecting config info for different sets of routers and = then committing to a central repository. It is quite cool and opens up a lo= t of possibilities for making rancid more scalable. *************** Note to Devs: *************** I hope this proof of concept gives you an example that you can play with an= d see how subversion works. I think that it's improvements over CVS are hig= hly compelling to be used in rancid. The next version I plan to work on wou= ld be a non-intrusive patch that would add subversion support as a configur= able option. It would be a simple switch in rancid.conf such as USESUBVERSI= ON=3Dyes. Let me know if you are interested and I'll publish my development= repository if you want to keep tabs on it (my repository is in Subversion,= naturally) ;).=20 ______________________________ Justin Grote Network Architect, CCNA JWG Networks Email: nospam-justin@grote.name (remove nospam-) SMS: nospam-rastan@vtext.com (remove nospam-) Phone: (208) 631-5440 ------------10CEEE65204E17 Content-Type: application/octet-stream; name="rancidSVN.diff" Content-transfer-encoding: base64 Content-Disposition: attachment; filename="rancidSVN.diff" ZGlmZiAtY3IgY3VycmVudC9iaW4vY29udHJvbF9yYW5jaWQuaW4gcmFuY2lkU1ZOL2Jpbi9j b250cm9sX3JhbmNpZC5pbg0KKioqIGN1cnJlbnQvYmluL2NvbnRyb2xfcmFuY2lkLmluCVR1 ZSBOb3YgIDIgMTE6NDM6MDkgMjAwNA0KLS0tIHJhbmNpZFNWTi9iaW4vY29udHJvbF9yYW5j aWQuaW4JU3VuIE5vdiAgNyAxOTozNDowOSAyMDA0DQoqKioqKioqKioqKioqKioNCioqKiAx MDcsMTEzICoqKioNCiAgDQogICMgZG8gY3ZzIHVwZGF0ZSBvZiByb3V0ZXIuZGIgaW4gY2Fz ZSBhbnlvbmUgaGFzIGZpZGRsZWQuDQogIGNkICRESVINCiEgY3ZzIHVwZGF0ZSByb3V0ZXIu ZGIgPiAkVE1QIDI+JjENCiAgZ3JlcCAiXkMiICRUTVAgPiAvZGV2L251bGwNCiAgaWYgWyAk PyAtZXEgMCBdIDsgdGhlbg0KICAgICAgZWNobyAiVGhlcmUgd2VyZSBDVlMgY29uZmxpY3Rz IGR1cmluZyB1cGRhdGUuIg0KLS0tIDEwNywxMTMgLS0tLQ0KICANCiAgIyBkbyBjdnMgdXBk YXRlIG9mIHJvdXRlci5kYiBpbiBjYXNlIGFueW9uZSBoYXMgZmlkZGxlZC4NCiAgY2QgJERJ Ug0KISBzdm4gdXBkYXRlIHJvdXRlci5kYiA+ICRUTVAgMj4mMQ0KICBncmVwICJeQyIgJFRN UCA+IC9kZXYvbnVsbA0KICBpZiBbICQ/IC1lcSAwIF0gOyB0aGVuDQogICAgICBlY2hvICJU aGVyZSB3ZXJlIENWUyBjb25mbGljdHMgZHVyaW5nIHVwZGF0ZS4iDQoqKioqKioqKioqKioq KioNCioqKiAyMzEsMjM4ICoqKioNCiAgCXJvdXRlcj0kMQ0KICANCiAgCXRvdWNoICRyb3V0 ZXINCiEgCWN2cyBhZGQgLWtvICRyb3V0ZXINCiEgCWN2cyBjb21taXQgLW0gJ25ldyByb3V0 ZXInICRyb3V0ZXINCiAgCWVjaG8gIkFkZGVkICRyb3V0ZXIiDQogICAgICBkb25lDQogICAg ICBlY2hvDQotLS0gMjMxLDIzOCAtLS0tDQogIAlyb3V0ZXI9JDENCiAgDQogIAl0b3VjaCAk cm91dGVyDQohIAlzdm4gYWRkICRyb3V0ZXINCiEgCXN2biBjb21taXQgLW0gJ25ldyByb3V0 ZXInICRyb3V0ZXINCiAgCWVjaG8gIkFkZGVkICRyb3V0ZXIiDQogICAgICBkb25lDQogICAg ICBlY2hvDQoqKioqKioqKioqKioqKioNCioqKiAyNTcsMjc3ICoqKioNCiAgY2QgJERJUi9j b25maWdzDQogICMgY2hlY2sgZm9yICd1cCcgcm91dGVycyBtaXNzaW5nIGluIGN2cy4gIG5v IGlkZWEgaG93IHRoaXMgaGFwcGVucyB0byBzb21lIGZvbGtzDQogIGZvciByb3V0ZXIgaW4g YGN1dCAtZDogLWYxIC4uL3JvdXRlcnMudXBgIDsgZG8NCiEgICAgIGN2cyBzdGF0dXMgJHJv dXRlciB8IGdyZXAgLWkgJ3N0YXR1czogdW5rbm93bicgPiAvZGV2L251bGwgMj4mMQ0KICAg ICAgaWYgWyAkPyAtZXEgMCBdOyB0aGVuDQogIAl0b3VjaCAkcm91dGVyDQohIAljdnMgYWRk IC1rbyAkcm91dGVyDQogIAllY2hvICJDVlMgYWRkZWQgbWlzc2luZyByb3V0ZXIgJHJvdXRl ciINCiAgICAgIGZpDQogIGRvbmUNCiAgZWNobw0KICAjIGN2cyBkZWxldGUgY29uZmlncyBm b3Igcm91dGVycyBub3QgbGlzdGVkIGluIHJvdXRlcnMudXAuDQohIGZvciByb3V0ZXIgaW4g YGZpbmQgLiBcKCAtbmFtZSBcKi5uZXcgLXBydW5lIC1vIC1uYW1lIENWUyAtcHJ1bmUgXCkg LW8gLXR5cGUgZiAtcHJpbnQgfCBzZWQgLWUgJ3MvXi5cLy8vJ2AgOyBkbw0KICAgICAgZ3Jl cCAtaSAiXiRyb3V0ZXI6IiAuLi9yb3V0ZXIuZGIgPiAvZGV2L251bGwgMj4mMQ0KICAgICAg aWYgWyAkPyAtZXEgMSBdOyB0aGVuDQogIAlybSAtZiAkcm91dGVyDQohIAljdnMgZGVsZXRl ICRyb3V0ZXINCiEgCWN2cyBjb21taXQgLW0gJ2RlbGV0ZWQgcm91dGVyJyAkcm91dGVyDQog IAllY2hvICJEZWxldGVkICRyb3V0ZXIiDQogICAgICBmaQ0KICBkb25lDQotLS0gMjU3LDI3 NyAtLS0tDQogIGNkICRESVIvY29uZmlncw0KICAjIGNoZWNrIGZvciAndXAnIHJvdXRlcnMg bWlzc2luZyBpbiBjdnMuICBubyBpZGVhIGhvdyB0aGlzIGhhcHBlbnMgdG8gc29tZSBmb2xr cw0KICBmb3Igcm91dGVyIGluIGBjdXQgLWQ6IC1mMSAuLi9yb3V0ZXJzLnVwYCA7IGRvDQoh ICAgICBzdm4gc3RhdHVzICRyb3V0ZXIgfCBncmVwIC1pICdzdGF0dXM6IHVua25vd24nID4g L2Rldi9udWxsIDI+JjENCiAgICAgIGlmIFsgJD8gLWVxIDAgXTsgdGhlbg0KICAJdG91Y2gg JHJvdXRlcg0KISAJc3ZuIGFkZCAkcm91dGVyDQogIAllY2hvICJDVlMgYWRkZWQgbWlzc2lu ZyByb3V0ZXIgJHJvdXRlciINCiAgICAgIGZpDQogIGRvbmUNCiAgZWNobw0KICAjIGN2cyBk ZWxldGUgY29uZmlncyBmb3Igcm91dGVycyBub3QgbGlzdGVkIGluIHJvdXRlcnMudXAuDQoh IGZvciByb3V0ZXIgaW4gYGZpbmQgLiBcKCAtbmFtZSBcKi5uZXcgLXBydW5lIC1vIC1uYW1l IC5zdm4gLXBydW5lIFwpIC1vIC10eXBlIGYgLXByaW50IHwgc2VkIC1lICdzL14uXC8vLydg IDsgZG8NCiAgICAgIGdyZXAgLWkgIl4kcm91dGVyOiIgLi4vcm91dGVyLmRiID4gL2Rldi9u dWxsIDI+JjENCiAgICAgIGlmIFsgJD8gLWVxIDEgXTsgdGhlbg0KICAJcm0gLWYgJHJvdXRl cg0KISAJc3ZuIHJtICRyb3V0ZXINCiEgCXN2biBjb21taXQgLW0gJ2RlbGV0ZWQgcm91dGVy JyAkcm91dGVyDQogIAllY2hvICJEZWxldGVkICRyb3V0ZXIiDQogICAgICBmaQ0KICBkb25l DQoqKioqKioqKioqKioqKioNCioqKiAyODEsMjg3ICoqKioNCiAgaWYgWyAhIC1zIHJvdXRl cnMudXAgXQ0KICB0aGVuDQogICAgICAjIGNvbW1pdCByb3V0ZXIuZGINCiEgICAgIGN2cyBj b21taXQgLW0gdXBkYXRlcyByb3V0ZXIuZGIgPiAvZGV2L251bGwNCiAgICAgIGV4aXQ7DQog IGZpDQogIA0KLS0tIDI4MSwyODcgLS0tLQ0KICBpZiBbICEgLXMgcm91dGVycy51cCBdDQog IHRoZW4NCiAgICAgICMgY29tbWl0IHJvdXRlci5kYg0KISAgICAgc3ZuIGNvbW1pdCAtbSB1 cGRhdGVzIHJvdXRlci5kYiA+IC9kZXYvbnVsbA0KICAgICAgZXhpdDsNCiAgZmkNCiAgDQoq KioqKioqKioqKioqKioNCioqKiAzNjksMzc1ICoqKioNCiAgIyBEaWZmIHRoZSBkaXJlY3Rv cnkgYW5kIHRoZW4gY2hlY2tpbi4NCiAgdHJhcCAncm0gLWZyICRUTVAgJFRNUC5kaWZmICRE SVIvcm91dGVycy5zaW5nbGU7JyAxIDIgMTUNCiAgY2QgJERJUg0KISBjdnMgLWYgQERJRkZf Q01EQCB8IHNlZCAtZSAnL15SQ1MgZmlsZTogL2QnIC1lICcvXi0tLSAvZCcgXA0KICAJLWUg Jy9eKysrIC9kJyAtZSAncy9eXChbLSsgXVwpL1wxIC8nID4kVE1QLmRpZmYNCiAgDQogIGlm IFsgJGFsdF9tYWlscmNwdCAtZXEgMSBdIDsgdGhlbg0KLS0tIDM2OSwzNzUgLS0tLQ0KICAj IERpZmYgdGhlIGRpcmVjdG9yeSBhbmQgdGhlbiBjaGVja2luLg0KICB0cmFwICdybSAtZnIg JFRNUCAkVE1QLmRpZmYgJERJUi9yb3V0ZXJzLnNpbmdsZTsnIDEgMiAxNQ0KICBjZCAkRElS DQohIHN2biBkaWZmIHwgc2VkIC1lICcvXlJDUyBmaWxlOiAvZCcgLWUgJy9eLS0tIC9kJyBc DQogIAktZSAnL14rKysgL2QnIC1lICdzL15cKFstKyBdXCkvXDEgLycgPiRUTVAuZGlmZg0K ICANCiAgaWYgWyAkYWx0X21haWxyY3B0IC1lcSAxIF0gOyB0aGVuDQoqKioqKioqKioqKioq KioNCioqKiAzNzgsMzg3ICoqKioNCiAgICAgIHN1YmplY3Q9InJvdXRlciBjb25maWcgZGlm ZnMiDQogIGZpDQogIGlmIFsgIlgkZGV2aWNlIiAhPSAiWCIgXSA7IHRoZW4NCiEgICAgIGN2 cyBjb21taXQgLW0gInVwZGF0ZXMgLSBjb3VydGVzeSBvZiAkbWFpbHJjcHQiDQogICAgICBz dWJqZWN0PSIkR1JPVVAvJGRldmljZSAkc3ViamVjdCINCiAgZWxzZQ0KISAgICAgY3ZzIGNv bW1pdCAtbSB1cGRhdGVzDQogICAgICBzdWJqZWN0PSIkR1JPVVAgJHN1YmplY3QiDQogIGZp DQogIA0KLS0tIDM3OCwzODcgLS0tLQ0KICAgICAgc3ViamVjdD0icm91dGVyIGNvbmZpZyBk aWZmcyINCiAgZmkNCiAgaWYgWyAiWCRkZXZpY2UiICE9ICJYIiBdIDsgdGhlbg0KISAgICAg c3ZuIGNvbW1pdCAtbSAidXBkYXRlcyAtIGNvdXJ0ZXN5IG9mICRtYWlscmNwdCINCiAgICAg IHN1YmplY3Q9IiRHUk9VUC8kZGV2aWNlICRzdWJqZWN0Ig0KICBlbHNlDQohICAgICBzdm4g Y29tbWl0IC1tIHVwZGF0ZXMNCiAgICAgIHN1YmplY3Q9IiRHUk9VUCAkc3ViamVjdCINCiAg ZmkNCiAgDQpkaWZmIC1jciBjdXJyZW50L2Jpbi9yYW5jaWQtY3ZzLmluIHJhbmNpZFNWTi9i aW4vcmFuY2lkLWN2cy5pbg0KKioqIGN1cnJlbnQvYmluL3JhbmNpZC1jdnMuaW4JVHVlIE5v diAgMiAxMTo0MzowOSAyMDA0DQotLS0gcmFuY2lkU1ZOL2Jpbi9yYW5jaWQtY3ZzLmluCVN1 biBOb3YgIDcgMTg6NDQ6MzEgMjAwNA0KKioqKioqKioqKioqKioqDQoqKiogNDAsNDYgKioq Kg0KICANCiAgIyBUb3AgbGV2ZWwgQ1ZTIHN0dWZmDQogIGlmIFsgISAtZCAkQ1ZTUk9PVCBd OyB0aGVuDQohICAgICBjdnMgaW5pdA0KICBmaQ0KICANCiAgIyBMb2cgZGlyDQotLS0gNDAs NDYgLS0tLQ0KICANCiAgIyBUb3AgbGV2ZWwgQ1ZTIHN0dWZmDQogIGlmIFsgISAtZCAkQ1ZT Uk9PVCBdOyB0aGVuDQohICAgICBzdm5hZG1pbiBjcmVhdGUgJENWU1JPT1QNCiAgZmkNCiAg DQogICMgTG9nIGRpcg0KKioqKioqKioqKioqKioqDQoqKiogNjUsNzkgKioqKg0KICAgICAg aWYgWyAhIC1kICRESVIgXTsgdGhlbg0KICAJbWtkaXIgLXAgJERJUg0KICAJY2QgJERJUg0K ISAJY3ZzIGltcG9ydCAtbSAiJEdST1VQIiAkR1JPVVAgbmV3IHJhbmNpZA0KICAJY2QgJEJB U0VESVINCiEgCWN2cyBjbyAkR1JPVVANCiAgICAgIGZpDQogICAgICBjZCAkRElSDQogICAg ICBpZiBbICEgLWQgY29uZmlncyBdOyB0aGVuDQogIAlta2RpciBjb25maWdzDQohIAljdnMg YWRkIGNvbmZpZ3MNCiEgCWN2cyBjb21taXQgLW0gJ25ldycgY29uZmlncw0KICAgICAgZmkN CiAgDQogICAgICAjIG1haW4gZmlsZXMNCi0tLSA2NSw3OSAtLS0tDQogICAgICBpZiBbICEg LWQgJERJUiBdOyB0aGVuDQogIAlta2RpciAtcCAkRElSDQogIAljZCAkRElSDQohIAlzdm4g aW1wb3J0IC1tICIkR1JPVVAiIC4gZmlsZTovLyRDVlNST09ULyRHUk9VUA0KICAJY2QgJEJB U0VESVINCiEgCXN2biBjbyBmaWxlOi8vJENWU1JPT1QvJEdST1VQDQogICAgICBmaQ0KICAg ICAgY2QgJERJUg0KICAgICAgaWYgWyAhIC1kIGNvbmZpZ3MgXTsgdGhlbg0KICAJbWtkaXIg Y29uZmlncw0KISAJc3ZuIGFkZCBjb25maWdzDQohIAlzdm4gY29tbWl0IC1tICduZXcnIGNv bmZpZ3MNCiAgICAgIGZpDQogIA0KICAgICAgIyBtYWluIGZpbGVzDQoqKioqKioqKioqKioq KioNCioqKiA4OCw5NCAqKioqDQogICAgICBmaQ0KICAgICAgaWYgWyAhIC1mIHJvdXRlci5k YiBdOyB0aGVuDQogIAl0b3VjaCByb3V0ZXIuZGINCiEgCWN2cyBhZGQgcm91dGVyLmRiDQoh IAljdnMgY29tbWl0IC1tICduZXcnIHJvdXRlci5kYg0KICAgICAgZmkNCiAgZG9uZQ0KLS0t IDg4LDk0IC0tLS0NCiAgICAgIGZpDQogICAgICBpZiBbICEgLWYgcm91dGVyLmRiIF07IHRo ZW4NCiAgCXRvdWNoIHJvdXRlci5kYg0KISAJc3ZuIGFkZCByb3V0ZXIuZGINCiEgCXN2biBj b21taXQgLW0gJ25ldycgcm91dGVyLmRiDQogICAgICBmaQ0KICBkb25lDQo= ------------10CEEE65204E17-- ------------1141A711930CF3BAB Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 oNvrnu3+/HoJkBBxwMR3NQ== ------------1141A711930CF3BAB-- From owner-rancid-discuss-outgoing@shrubbery.net Mon Nov 8 08:37:35 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id 9170511CE31 for ; Mon, 8 Nov 2004 08:37:35 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id 0023B1113C; Mon, 8 Nov 2004 00:37:35 -0800 (PST) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id E7C8611146; Mon, 8 Nov 2004 00:37:34 -0800 (PST) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from amsfep14-int.chello.nl (amsfep14-int.chello.nl [213.46.243.21]) by guelah.shrubbery.net (Postfix) with ESMTP id 9C1CF1113C for ; Mon, 8 Nov 2004 00:37:33 -0800 (PST) Received: from pebbles ([213.46.232.216]) by amsfep14-int.chello.nl (InterMail vM.6.01.03.04 201-2131-111-106-20040729) with ESMTP id <20041108083724.PTID2038.amsfep14-int.chello.nl@pebbles>; Mon, 8 Nov 2004 09:37:24 +0100 From: "r.oliver" To: "'Justin Grote'" , Subject: RE: Rancid Subversion 2.3.1 Patch Date: Mon, 8 Nov 2004 09:37:28 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook, Build 11.0.6353 In-Reply-To: <5310441839.20041107211521@grote.name> X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180 Thread-Index: AcTFSaS3ZH4DRxA0Qty7jgfAe8pzIQAJE0xg Message-Id: <20041108083724.PTID2038.amsfep14-int.chello.nl@pebbles> Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk Hi Justin, Is there an app similar to cvsweb or viewcvs for view a subversion tree? Cheers Rod Oliver > -----Original Message----- > From: owner-rancid-discuss@shrubbery.net > [mailto:owner-rancid-discuss@shrubbery.net] On Behalf Of Justin Grote > Sent: Monday, November 08, 2004 5:15 AM > To: rancid-discuss@shrubbery.net > Subject: Rancid Subversion 2.3.1 Patch > > Greetings, > > As promised, here is a patch to rancid 2.3.1 to enable > Subversion support. It is a drop-in replacement for rancid, > meaning it functions exactly the same, all the configuration > files/procedures are exactly the same as well. The only thing > that has been modified is that the backend has just been > converted from CVS to Subversion. > > This is just a proof of concept and is NOT SUPPORTED BY THE > RANCID TEAM. I've been running this in place of 2.3.1 for > about a month now and it has functioned flawlessly, including > diffs, updates mailouts, and every other functionality I > could test. (I made this version a few hours after I posted > about it on this list, took no time at all). > > RANCID devs, please see my final note at the bottom and let > me know what you think. > > This patch is also available temporarily at > http://myweb.cableone.net/rastan/rancidSVN.diff (I'm in the > middle of switching hosting providers so my primary site is down) > > > > You, of course, need to have Subversion on your system to run > this. Most of the major Linux distributions come with > subversion (it's almost as ubiquitous as CVS in new > distributions!), including SuSE 9.1, Fedora (Red Hat) Core 2, > Mandrake 10, Gentoo, Debian, etc. > > To apply the patch, extract the rancid-2.3.1.tar.gz source > package, place the patch incide the rancid-2.3.1 directory > that is created, and then from inside the rancid-2.3.1 directory type: > > # patch -p1 < rancidSVN.diff > (# is your prompt, do not include it) > > Then install as normal. > > Some notes: > > - If you want to use your existing rancid CVS history with > this tool, you can use the excellent cvs2svn tool to convert > your existing history over to subversion: http://cvs2svn.tigris.org/ > > - Thanks to subversion, you can move and/or rename router > entries and still preserve their history. You can even move > them between groups safely! To do this, check out a separate > copy of the repository, then svn mv > . Edit your router.db files as necessary, > then do an svn commit. Rancid will be none the wiser. > > - Since I coded it as a drop-in replacement, your repository > has to be on the same server. I do have a working version > that allows your repository to be hosted anywhere subversion > lets it. I've set up a test environment with multiple > rancid's collecting config info for different sets of routers > and then committing to a central repository. It is quite cool > and opens up a lot of possibilities for making rancid more scalable. > > *************** > Note to Devs: > *************** > I hope this proof of concept gives you an example that you > can play with and see how subversion works. I think that it's > improvements over CVS are highly compelling to be used in > rancid. The next version I plan to work on would be a > non-intrusive patch that would add subversion support as a > configurable option. It would be a simple switch in > rancid.conf such as USESUBVERSION=yes. Let me know if you are > interested and I'll publish my development repository if you > want to keep tabs on it (my repository is in Subversion, > naturally) ;). > > ______________________________ > Justin Grote > Network Architect, CCNA > JWG Networks > Email: nospam-justin@grote.name (remove nospam-) > SMS: nospam-rastan@vtext.com (remove nospam-) > Phone: (208) 631-5440 > From owner-rancid-discuss-outgoing@shrubbery.net Mon Nov 8 17:08:29 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id 0B84111CE39 for ; Mon, 8 Nov 2004 17:08:28 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id 4CF631113C; Mon, 8 Nov 2004 09:08:28 -0800 (PST) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id 23CDD11146; Mon, 8 Nov 2004 09:08:28 -0800 (PST) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from S3.cableone.net (smtp3.cableone.net [24.116.0.229]) by guelah.shrubbery.net (Postfix) with ESMTP id 3B1EA1113C for ; Mon, 8 Nov 2004 09:08:26 -0800 (PST) Received: from TINYGOD (unverified [24.117.243.179]) by S3.cableone.net (CableOne SMTP Service S3) with ESMTP id 886278 for multiple; Mon, 08 Nov 2004 10:12:02 -0700 Date: Mon, 8 Nov 2004 10:07:56 -0700 From: Justin Grote Organization: JWG Networks X-Priority: 3 (Normal) Message-ID: <1412231716.20041108100756@grote.name> To: "r.oliver" Cc: rancid-discuss@shrubbery.net Subject: Re[2]: Rancid Subversion 2.3.1 Patch In-Reply-To: <20041108083724.PTID2038.amsfep14-int.chello.nl@pebbles> References: <5310441839.20041107211521@grote.name> <20041108083724.PTID2038.amsfep14-int.chello.nl@pebbles> MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="----------D6CA20B34BFFC81" X-Abuse-Info: Send abuse complaints to abuse@cableone.net Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk This is a cryptographically signed message in MIME format. ------------D6CA20B34BFFC81 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable ViewCVS does work with a subversion tree. My personal favorite is Chora (pa= rt of the Horde framwork) at http://www.horde.org/chora ______________________________ Justin Grote Network Architect, CCNA JWG Networks Email: nospam-justin@grote.name (remove nospam-) SMS: nospam-rastan@vtext.com (remove nospam-) Phone: (208) 631-5440 ------------------------------ Original Message Follows ------------------------------ ro> Hi Justin, ro> Is there an app similar to cvsweb or viewcvs for view a subversion tree? ro> Cheers ro> Rod Oliver=20 >> -----Original Message----- >> From: owner-rancid-discuss@shrubbery.net=20 >> [mailto:owner-rancid-discuss@shrubbery.net] On Behalf Of Justin Grote >> Sent: Monday, November 08, 2004 5:15 AM >> To: rancid-discuss@shrubbery.net >> Subject: Rancid Subversion 2.3.1 Patch >>=20 >> Greetings, >>=20 >> As promised, here is a patch to rancid 2.3.1 to enable=20 >> Subversion support. It is a drop-in replacement for rancid,=20 >> meaning it functions exactly the same, all the configuration=20 >> files/procedures are exactly the same as well. The only thing=20 >> that has been modified is that the backend has just been=20 >> converted from CVS to Subversion.=20 >>=20 >> This is just a proof of concept and is NOT SUPPORTED BY THE=20 >> RANCID TEAM. I've been running this in place of 2.3.1 for=20 >> about a month now and it has functioned flawlessly, including=20 >> diffs, updates mailouts, and every other functionality I=20 >> could test. (I made this version a few hours after I posted=20 >> about it on this list, took no time at all). >>=20 >> RANCID devs, please see my final note at the bottom and let=20 >> me know what you think. >>=20 >> This patch is also available temporarily at=20 >> http://myweb.cableone.net/rastan/rancidSVN.diff (I'm in the=20 >> middle of switching hosting providers so my primary site is down) >>=20 >>=20 >>=20 >> You, of course, need to have Subversion on your system to run=20 >> this. Most of the major Linux distributions come with=20 >> subversion (it's almost as ubiquitous as CVS in new=20 >> distributions!), including SuSE 9.1, Fedora (Red Hat) Core 2,=20 >> Mandrake 10, Gentoo, Debian, etc. >>=20 >> To apply the patch, extract the rancid-2.3.1.tar.gz source=20 >> package, place the patch incide the rancid-2.3.1 directory=20 >> that is created, and then from inside the rancid-2.3.1 directory type: >>=20 >> # patch -p1 < rancidSVN.diff >> (# is your prompt, do not include it) >>=20 >> Then install as normal. >>=20 >> Some notes: >>=20 >> - If you want to use your existing rancid CVS history with=20 >> this tool, you can use the excellent cvs2svn tool to convert=20 >> your existing history over to subversion: http://cvs2svn.tigris.org/ >>=20 >> - Thanks to subversion, you can move and/or rename router=20 >> entries and still preserve their history. You can even move=20 >> them between groups safely! To do this, check out a separate=20 >> copy of the repository, then svn mv =20 >> . Edit your router.db files as necessary,=20 >> then do an svn commit. Rancid will be none the wiser. >>=20 >> - Since I coded it as a drop-in replacement, your repository=20 >> has to be on the same server. I do have a working version=20 >> that allows your repository to be hosted anywhere subversion=20 >> lets it. I've set up a test environment with multiple=20 >> rancid's collecting config info for different sets of routers=20 >> and then committing to a central repository. It is quite cool=20 >> and opens up a lot of possibilities for making rancid more scalable. >>=20 >> *************** >> Note to Devs: >> *************** >> I hope this proof of concept gives you an example that you=20 >> can play with and see how subversion works. I think that it's=20 >> improvements over CVS are highly compelling to be used in=20 >> rancid. The next version I plan to work on would be a=20 >> non-intrusive patch that would add subversion support as a=20 >> configurable option. It would be a simple switch in=20 >> rancid.conf such as USESUBVERSION=3Dyes. Let me know if you are=20 >> interested and I'll publish my development repository if you=20 >> want to keep tabs on it (my repository is in Subversion,=20 >> naturally) ;).=20 >>=20 >> ______________________________ >> Justin Grote >> Network Architect, CCNA >> JWG Networks >> Email: nospam-justin@grote.name (remove nospam-) >> SMS: nospam-rastan@vtext.com (remove nospam-) >> Phone: (208) 631-5440 >>=20 ------------D6CA20B34BFFC81 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 suVDGMHIoaFobrZnSgGBEg== ------------D6CA20B34BFFC81-- From owner-rancid-discuss-outgoing@shrubbery.net Thu Nov 11 16:07:02 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id 8DB2C11CE2D for ; Thu, 11 Nov 2004 16:07:02 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id D58161113C; Thu, 11 Nov 2004 08:07:01 -0800 (PST) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id C7C3911146; Thu, 11 Nov 2004 08:07:01 -0800 (PST) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from S1.cableone.net (smtp1.cableone.net [24.116.0.227]) by guelah.shrubbery.net (Postfix) with ESMTP id 11F6C1113C for ; Thu, 11 Nov 2004 08:07:00 -0800 (PST) Received: from TINYGOD (unverified [24.117.243.179]) by S1.cableone.net (CableOne SMTP Service S1) with ESMTP id 1182413 for ; Thu, 11 Nov 2004 09:10:27 -0700 Date: Thu, 11 Nov 2004 09:06:50 -0700 From: Justin Grote Organization: JWG Networks X-Priority: 3 (Normal) Message-ID: <1026716361.20041111090650@grote.name> To: rancid-discuss@shrubbery.net Subject: Rancid Subversion 2.3.1 Patch (Minor Bugfix) MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="----------485A21427AF8A87" X-Abuse-Info: Send abuse complaints to abuse@cableone.net Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk This is a cryptographically signed message in MIME format. ------------485A21427AF8A87 Content-Type: multipart/mixed; boundary="----------CCB31F4638E143" ------------CCB31F4638E143 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable I received a couple reports that the diff function wasn't working for them.= I guess some systems have their GCC diff set to "diff -U 4" instead of jus= t "diff". I fixed this so SVN uses it's internal diff function instead of r= elying on an external one (although an external one can be used with subver= sion if necessary. Here's the updated patch. Use this patch against the ran= cid-2.3.1 sources in exactly the same manner as the previous patch. Thanks for the positive response! ______________________________ Justin Grote Network Architect, CCNA JWG Networks Email: nospam-justin@grote.name (remove nospam-) SMS: nospam-rastan@vtext.com (remove nospam-) Phone: (208) 631-5440 ------------CCB31F4638E143 Content-Type: application/octet-stream; name="rancid-2.3.1-SVN.diff" Content-transfer-encoding: base64 Content-Disposition: attachment; filename="rancid-2.3.1-SVN.diff" ZGlmZiAtY3IgMi4zLjEvYmluL2NvbnRyb2xfcmFuY2lkLmluIHJhbmNpZFNWTi9iaW4vY29u dHJvbF9yYW5jaWQuaW4KKioqIDIuMy4xL2Jpbi9jb250cm9sX3JhbmNpZC5pbglUdWUgTm92 ICAyIDExOjQzOjA5IDIwMDQKLS0tIHJhbmNpZFNWTi9iaW4vY29udHJvbF9yYW5jaWQuaW4J U3VuIE5vdiAgNyAyMDozODoyMCAyMDA0CioqKioqKioqKioqKioqKgoqKiogMTA3LDExMyAq KioqCiAgCiAgIyBkbyBjdnMgdXBkYXRlIG9mIHJvdXRlci5kYiBpbiBjYXNlIGFueW9uZSBo YXMgZmlkZGxlZC4KICBjZCAkRElSCiEgY3ZzIHVwZGF0ZSByb3V0ZXIuZGIgPiAkVE1QIDI+ JjEKICBncmVwICJeQyIgJFRNUCA+IC9kZXYvbnVsbAogIGlmIFsgJD8gLWVxIDAgXSA7IHRo ZW4KICAgICAgZWNobyAiVGhlcmUgd2VyZSBDVlMgY29uZmxpY3RzIGR1cmluZyB1cGRhdGUu IgotLS0gMTA3LDExMyAtLS0tCiAgCiAgIyBkbyBjdnMgdXBkYXRlIG9mIHJvdXRlci5kYiBp biBjYXNlIGFueW9uZSBoYXMgZmlkZGxlZC4KICBjZCAkRElSCiEgc3ZuIHVwZGF0ZSByb3V0 ZXIuZGIgPiAkVE1QIDI+JjEKICBncmVwICJeQyIgJFRNUCA+IC9kZXYvbnVsbAogIGlmIFsg JD8gLWVxIDAgXSA7IHRoZW4KICAgICAgZWNobyAiVGhlcmUgd2VyZSBDVlMgY29uZmxpY3Rz IGR1cmluZyB1cGRhdGUuIgoqKioqKioqKioqKioqKioKKioqIDIzMSwyMzggKioqKgogIAly b3V0ZXI9JDEKICAKICAJdG91Y2ggJHJvdXRlcgohIAljdnMgYWRkIC1rbyAkcm91dGVyCiEg CWN2cyBjb21taXQgLW0gJ25ldyByb3V0ZXInICRyb3V0ZXIKICAJZWNobyAiQWRkZWQgJHJv dXRlciIKICAgICAgZG9uZQogICAgICBlY2hvCi0tLSAyMzEsMjM4IC0tLS0KICAJcm91dGVy PSQxCiAgCiAgCXRvdWNoICRyb3V0ZXIKISAJc3ZuIGFkZCAkcm91dGVyCiEgCXN2biBjb21t aXQgLW0gJ25ldyByb3V0ZXInICRyb3V0ZXIKICAJZWNobyAiQWRkZWQgJHJvdXRlciIKICAg ICAgZG9uZQogICAgICBlY2hvCioqKioqKioqKioqKioqKgoqKiogMjU3LDI3NyAqKioqCiAg Y2QgJERJUi9jb25maWdzCiAgIyBjaGVjayBmb3IgJ3VwJyByb3V0ZXJzIG1pc3NpbmcgaW4g Y3ZzLiAgbm8gaWRlYSBob3cgdGhpcyBoYXBwZW5zIHRvIHNvbWUgZm9sa3MKICBmb3Igcm91 dGVyIGluIGBjdXQgLWQ6IC1mMSAuLi9yb3V0ZXJzLnVwYCA7IGRvCiEgICAgIGN2cyBzdGF0 dXMgJHJvdXRlciB8IGdyZXAgLWkgJ3N0YXR1czogdW5rbm93bicgPiAvZGV2L251bGwgMj4m MQogICAgICBpZiBbICQ/IC1lcSAwIF07IHRoZW4KICAJdG91Y2ggJHJvdXRlcgohIAljdnMg YWRkIC1rbyAkcm91dGVyCiAgCWVjaG8gIkNWUyBhZGRlZCBtaXNzaW5nIHJvdXRlciAkcm91 dGVyIgogICAgICBmaQogIGRvbmUKICBlY2hvCiAgIyBjdnMgZGVsZXRlIGNvbmZpZ3MgZm9y IHJvdXRlcnMgbm90IGxpc3RlZCBpbiByb3V0ZXJzLnVwLgohIGZvciByb3V0ZXIgaW4gYGZp bmQgLiBcKCAtbmFtZSBcKi5uZXcgLXBydW5lIC1vIC1uYW1lIENWUyAtcHJ1bmUgXCkgLW8g LXR5cGUgZiAtcHJpbnQgfCBzZWQgLWUgJ3MvXi5cLy8vJ2AgOyBkbwogICAgICBncmVwIC1p ICJeJHJvdXRlcjoiIC4uL3JvdXRlci5kYiA+IC9kZXYvbnVsbCAyPiYxCiAgICAgIGlmIFsg JD8gLWVxIDEgXTsgdGhlbgogIAlybSAtZiAkcm91dGVyCiEgCWN2cyBkZWxldGUgJHJvdXRl cgohIAljdnMgY29tbWl0IC1tICdkZWxldGVkIHJvdXRlcicgJHJvdXRlcgogIAllY2hvICJE ZWxldGVkICRyb3V0ZXIiCiAgICAgIGZpCiAgZG9uZQotLS0gMjU3LDI3NyAtLS0tCiAgY2Qg JERJUi9jb25maWdzCiAgIyBjaGVjayBmb3IgJ3VwJyByb3V0ZXJzIG1pc3NpbmcgaW4gY3Zz LiAgbm8gaWRlYSBob3cgdGhpcyBoYXBwZW5zIHRvIHNvbWUgZm9sa3MKICBmb3Igcm91dGVy IGluIGBjdXQgLWQ6IC1mMSAuLi9yb3V0ZXJzLnVwYCA7IGRvCiEgICAgIHN2biBzdGF0dXMg JHJvdXRlciB8IGdyZXAgLWkgJ3N0YXR1czogdW5rbm93bicgPiAvZGV2L251bGwgMj4mMQog ICAgICBpZiBbICQ/IC1lcSAwIF07IHRoZW4KICAJdG91Y2ggJHJvdXRlcgohIAlzdm4gYWRk ICRyb3V0ZXIKICAJZWNobyAiQ1ZTIGFkZGVkIG1pc3Npbmcgcm91dGVyICRyb3V0ZXIiCiAg ICAgIGZpCiAgZG9uZQogIGVjaG8KICAjIGN2cyBkZWxldGUgY29uZmlncyBmb3Igcm91dGVy cyBub3QgbGlzdGVkIGluIHJvdXRlcnMudXAuCiEgZm9yIHJvdXRlciBpbiBgZmluZCAuIFwo IC1uYW1lIFwqLm5ldyAtcHJ1bmUgLW8gLW5hbWUgLnN2biAtcHJ1bmUgXCkgLW8gLXR5cGUg ZiAtcHJpbnQgfCBzZWQgLWUgJ3MvXi5cLy8vJ2AgOyBkbwogICAgICBncmVwIC1pICJeJHJv dXRlcjoiIC4uL3JvdXRlci5kYiA+IC9kZXYvbnVsbCAyPiYxCiAgICAgIGlmIFsgJD8gLWVx IDEgXTsgdGhlbgogIAlybSAtZiAkcm91dGVyCiEgCXN2biBybSAkcm91dGVyCiEgCXN2biBj b21taXQgLW0gJ2RlbGV0ZWQgcm91dGVyJyAkcm91dGVyCiAgCWVjaG8gIkRlbGV0ZWQgJHJv dXRlciIKICAgICAgZmkKICBkb25lCioqKioqKioqKioqKioqKgoqKiogMjgxLDI4NyAqKioq CiAgaWYgWyAhIC1zIHJvdXRlcnMudXAgXQogIHRoZW4KICAgICAgIyBjb21taXQgcm91dGVy LmRiCiEgICAgIGN2cyBjb21taXQgLW0gdXBkYXRlcyByb3V0ZXIuZGIgPiAvZGV2L251bGwK ICAgICAgZXhpdDsKICBmaQogIAotLS0gMjgxLDI4NyAtLS0tCiAgaWYgWyAhIC1zIHJvdXRl cnMudXAgXQogIHRoZW4KICAgICAgIyBjb21taXQgcm91dGVyLmRiCiEgICAgIHN2biBjb21t aXQgLW0gdXBkYXRlcyByb3V0ZXIuZGIgPiAvZGV2L251bGwKICAgICAgZXhpdDsKICBmaQog IAoqKioqKioqKioqKioqKioKKioqIDM2OSwzNzUgKioqKgogICMgRGlmZiB0aGUgZGlyZWN0 b3J5IGFuZCB0aGVuIGNoZWNraW4uCiAgdHJhcCAncm0gLWZyICRUTVAgJFRNUC5kaWZmICRE SVIvcm91dGVycy5zaW5nbGU7JyAxIDIgMTUKICBjZCAkRElSCiEgY3ZzIC1mIEBESUZGX0NN REAgfCBzZWQgLWUgJy9eUkNTIGZpbGU6IC9kJyAtZSAnL14tLS0gL2QnIFwKICAJLWUgJy9e KysrIC9kJyAtZSAncy9eXChbLSsgXVwpL1wxIC8nID4kVE1QLmRpZmYKICAKICBpZiBbICRh bHRfbWFpbHJjcHQgLWVxIDEgXSA7IHRoZW4KLS0tIDM2OSwzNzUgLS0tLQogICMgRGlmZiB0 aGUgZGlyZWN0b3J5IGFuZCB0aGVuIGNoZWNraW4uCiAgdHJhcCAncm0gLWZyICRUTVAgJFRN UC5kaWZmICRESVIvcm91dGVycy5zaW5nbGU7JyAxIDIgMTUKICBjZCAkRElSCiEgc3ZuIGRp ZmYgfCBzZWQgLWUgJy9eUkNTIGZpbGU6IC9kJyAtZSAnL14tLS0gL2QnIFwKICAJLWUgJy9e KysrIC9kJyAtZSAncy9eXChbLSsgXVwpL1wxIC8nID4kVE1QLmRpZmYKICAKICBpZiBbICRh bHRfbWFpbHJjcHQgLWVxIDEgXSA7IHRoZW4KKioqKioqKioqKioqKioqCioqKiAzNzgsMzg3 ICoqKioKICAgICAgc3ViamVjdD0icm91dGVyIGNvbmZpZyBkaWZmcyIKICBmaQogIGlmIFsg IlgkZGV2aWNlIiAhPSAiWCIgXSA7IHRoZW4KISAgICAgY3ZzIGNvbW1pdCAtbSAidXBkYXRl cyAtIGNvdXJ0ZXN5IG9mICRtYWlscmNwdCIKICAgICAgc3ViamVjdD0iJEdST1VQLyRkZXZp Y2UgJHN1YmplY3QiCiAgZWxzZQohICAgICBjdnMgY29tbWl0IC1tIHVwZGF0ZXMKICAgICAg c3ViamVjdD0iJEdST1VQICRzdWJqZWN0IgogIGZpCiAgCi0tLSAzNzgsMzg3IC0tLS0KICAg ICAgc3ViamVjdD0icm91dGVyIGNvbmZpZyBkaWZmcyIKICBmaQogIGlmIFsgIlgkZGV2aWNl IiAhPSAiWCIgXSA7IHRoZW4KISAgICAgc3ZuIGNvbW1pdCAtbSAidXBkYXRlcyAtIGNvdXJ0 ZXN5IG9mICRtYWlscmNwdCIKICAgICAgc3ViamVjdD0iJEdST1VQLyRkZXZpY2UgJHN1Ympl Y3QiCiAgZWxzZQohICAgICBzdm4gY29tbWl0IC1tIHVwZGF0ZXMKICAgICAgc3ViamVjdD0i JEdST1VQICRzdWJqZWN0IgogIGZpCiAgCmRpZmYgLWNyIDIuMy4xL2Jpbi9yYW5jaWQtY3Zz LmluIHJhbmNpZFNWTi9iaW4vcmFuY2lkLWN2cy5pbgoqKiogMi4zLjEvYmluL3JhbmNpZC1j dnMuaW4JVHVlIE5vdiAgMiAxMTo0MzowOSAyMDA0Ci0tLSByYW5jaWRTVk4vYmluL3JhbmNp ZC1jdnMuaW4JU3VuIE5vdiAgNyAxODo0NDozMSAyMDA0CioqKioqKioqKioqKioqKgoqKiog NDAsNDYgKioqKgogIAogICMgVG9wIGxldmVsIENWUyBzdHVmZgogIGlmIFsgISAtZCAkQ1ZT Uk9PVCBdOyB0aGVuCiEgICAgIGN2cyBpbml0CiAgZmkKICAKICAjIExvZyBkaXIKLS0tIDQw LDQ2IC0tLS0KICAKICAjIFRvcCBsZXZlbCBDVlMgc3R1ZmYKICBpZiBbICEgLWQgJENWU1JP T1QgXTsgdGhlbgohICAgICBzdm5hZG1pbiBjcmVhdGUgJENWU1JPT1QKICBmaQogIAogICMg TG9nIGRpcgoqKioqKioqKioqKioqKioKKioqIDY1LDc5ICoqKioKICAgICAgaWYgWyAhIC1k ICRESVIgXTsgdGhlbgogIAlta2RpciAtcCAkRElSCiAgCWNkICRESVIKISAJY3ZzIGltcG9y dCAtbSAiJEdST1VQIiAkR1JPVVAgbmV3IHJhbmNpZAogIAljZCAkQkFTRURJUgohIAljdnMg Y28gJEdST1VQCiAgICAgIGZpCiAgICAgIGNkICRESVIKICAgICAgaWYgWyAhIC1kIGNvbmZp Z3MgXTsgdGhlbgogIAlta2RpciBjb25maWdzCiEgCWN2cyBhZGQgY29uZmlncwohIAljdnMg Y29tbWl0IC1tICduZXcnIGNvbmZpZ3MKICAgICAgZmkKICAKICAgICAgIyBtYWluIGZpbGVz Ci0tLSA2NSw3OSAtLS0tCiAgICAgIGlmIFsgISAtZCAkRElSIF07IHRoZW4KICAJbWtkaXIg LXAgJERJUgogIAljZCAkRElSCiEgCXN2biBpbXBvcnQgLW0gIiRHUk9VUCIgLiBmaWxlOi8v JENWU1JPT1QvJEdST1VQCiAgCWNkICRCQVNFRElSCiEgCXN2biBjbyBmaWxlOi8vJENWU1JP T1QvJEdST1VQCiAgICAgIGZpCiAgICAgIGNkICRESVIKICAgICAgaWYgWyAhIC1kIGNvbmZp Z3MgXTsgdGhlbgogIAlta2RpciBjb25maWdzCiEgCXN2biBhZGQgY29uZmlncwohIAlzdm4g Y29tbWl0IC1tICduZXcnIGNvbmZpZ3MKICAgICAgZmkKICAKICAgICAgIyBtYWluIGZpbGVz CioqKioqKioqKioqKioqKgoqKiogODgsOTQgKioqKgogICAgICBmaQogICAgICBpZiBbICEg LWYgcm91dGVyLmRiIF07IHRoZW4KICAJdG91Y2ggcm91dGVyLmRiCiEgCWN2cyBhZGQgcm91 dGVyLmRiCiEgCWN2cyBjb21taXQgLW0gJ25ldycgcm91dGVyLmRiCiAgICAgIGZpCiAgZG9u ZQotLS0gODgsOTQgLS0tLQogICAgICBmaQogICAgICBpZiBbICEgLWYgcm91dGVyLmRiIF07 IHRoZW4KICAJdG91Y2ggcm91dGVyLmRiCiEgCXN2biBhZGQgcm91dGVyLmRiCiEgCXN2biBj b21taXQgLW0gJ25ldycgcm91dGVyLmRiCiAgICAgIGZpCiAgZG9uZQo= ------------CCB31F4638E143-- ------------485A21427AF8A87 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 t59i9gwJGT5uF+NdMZpofg== ------------485A21427AF8A87-- From owner-rancid-discuss-outgoing@shrubbery.net Wed Nov 24 19:05:47 2004 Return-Path: X-Original-To: rancid-discuss-archive@ni.shrubbery.net Delivered-To: rancid-discuss-archive@ni.shrubbery.net Received: from guelah.shrubbery.net (guelah.shrubbery.net [198.58.5.1]) by ni.shrubbery.net (Postfix) with ESMTP id CAD9611CE2D for ; Wed, 24 Nov 2004 19:05:47 +0000 (UTC) Received: by guelah.shrubbery.net (Postfix) id 19CE811139; Wed, 24 Nov 2004 19:05:47 +0000 (UTC) Delivered-To: rancid-discuss-outgoing@shrubbery.net Received: by guelah.shrubbery.net (Postfix, from userid 10007) id 0F6F611142; Wed, 24 Nov 2004 19:05:47 +0000 (UTC) X-Original-To: rancid-discuss@shrubbery.net Delivered-To: rancid-discuss@shrubbery.net Received: from zed.netsurf.net (www.Business-Knowledge.Com [209.5.34.90]) by guelah.shrubbery.net (Postfix) with ESMTP id 4263211139 for ; Wed, 24 Nov 2004 19:05:43 +0000 (UTC) Received: by zed.netsurf.net (Postfix, from userid 1000) id 67ED611BDFD; Wed, 24 Nov 2004 14:05:25 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by zed.netsurf.net (Postfix) with ESMTP id 5F8F320AFB7; Wed, 24 Nov 2004 14:05:25 -0500 (EST) Date: Wed, 24 Nov 2004 14:05:25 -0500 (EST) From: Bob Bosiljevac X-X-Sender: bob@zed To: rancid-discuss@shrubbery.net Cc: Tony Tauber Subject: Re: Using rancid to hop from router to router In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-rancid-discuss@shrubbery.net Precedence: bulk Here's what I was able to do leveraging off of Krzysztof's dssh method idea..... in .clogin: add method 10.10.10.10 dssh:intermediate.router.net add password 10.10.10.10 cisco cisco and where intermediate.router.net has its own .clogin entries and works perfectly fine in the original way. Then mods to clogin as follows: - some global variables needed to tell if were two hopping - adding the dssh connection method code which will spawn clogin to the intermediate router and return control to the rest of this clogin instance (recursion! :-) - using the two hop variable to log off two times, once for each router This assumes that you will use telnet to get from the first router to the second. Also, IP address clashes can be resolved by using different DNS names for the same second (internal) IP or by creating unique hostname entries in the config of the first hop router. This seems to solve the initial problem. It just needs more error handling. Bob. This is for # $Id: clogin.in,v 1.72 2004/01/11 05:39:15 heas Exp $ $ diff -U3 clogin.orig clogin --- clogin.orig Fri Feb 20 12:54:39 2004 +++ clogin Fri Nov 12 12:59:52 2004 @@ -58,6 +58,8 @@ # attempt at platform switching. set platform "" +set two_hop 0 + # Find the user in the ENV, or use the unix userid. if {[ info exists env(CISCO_USER) ] } { set default_user $env(CISCO_USER) @@ -289,6 +291,7 @@ proc login { router user userpswd passwd enapasswd cmethod cyphertype } { global spawn_id in_proc do_command do_script platform global prompt u_prompt p_prompt e_prompt sshcmd + global two_hop env set in_proc 1 set uprompt_seen 0 @@ -316,6 +320,22 @@ send_user "\nError: rsh failed: $reason\n" exit 1 } + } elseif [string match "dssh*" $prog] { + send_user "\ntrying dssh method \n" + regexp {dssh(:([^[:space:]]+))*} $prog command suffix hophost + if {"$hophost" == ""} { +### set retval [ catch {spawn telnet $router} reason ] + } else { + set retval [ catch {spawn $env(HOME)/bin/clogin $hophost} reason ] + expect "*#" + send "telnet $router\r" + set two_hop 1 + } + if { $retval } { + send_user "\nError: dssh failed: $reason\n" + exit 1 + } + } else { puts "\nError: unknown connection method: $prog" return 1 @@ -476,6 +496,7 @@ # Run commands given on the command line. proc run_commands { prompt command } { global in_proc platform + global two_hop set in_proc 1 # If the prompt is (enable), then we are on a switch and the @@ -571,6 +592,10 @@ if { [ string compare "extreme" "$platform" ] } { send "exit\r" + if { $two_hop } { + expect "*#" + send "exit\r" + } } else { send "quit\r" } On Thu, 14 Oct 2004, Krzysztof Adamski wrote: > From: Krzysztof Adamski > To: Tony Tauber > Cc: rancid-discuss@shrubbery.net > Date: Thu, 14 Oct 2004 14:05:15 -0400 (EDT) > Subject: Re: Using rancid to hop from router to router > > I started hacking the code a bit, but stopped when I run out of knowledge of tcl > :-) > > Here is what I did for the auth part to the .clogin: > > add method 128.1.253.33 dssh:abc.example.com > add user 128.1.253.33 testuser > add password 128.1.253.33 testpass enablepass > add hoppassword 128.1.253.33 2ndenablepass > > and in clogin (this code will login to abc.example.com router: > } elseif [string match "dssh*" $prog] { > send_user "\ntrying dssh method $hoppassword\n" > regexp {dssh(:([^[:space:]]+))*} $prog command suffix hophost > if {"$hophost" == ""} { > ### set retval [ catch {spawn telnet $router} reason ] > } else { > set retval [ catch {spawn $sshcmd -c $cyphertype -x -l $user $hophost} reason ] > } > if { $retval } { > send_user "\nError: dssh failed: $reason\n" > exit 1 > } > > This is where my knowledge of tcl stopped me from getting any further. > > K > > On Thu, 14 Oct 2004, Tony Tauber wrote: > > > On Wed, 13 Oct 2004, Krzysztof Adamski wrote: > > > > > I need to collect the config from routers that are not directly > > > reachable by the host that rancid runs on. I can ssh to the first > > > router, then telnet to the ones that I need the config from. Since > > > my knowledge of expect and TCL is nonexistent and before I try to > > > reinvent the wheel I was wondering if anybody has modified > > > the clogin script to to this extra hop? > > > > > > K > > > > I have a similar need. In some cases CLI access to the routers is > > only available via term server and in some cases routers beyond the > > ones that are connected to the term server can be reached via telnet > > or SSH from that first router. > > > > >From reviewing the archives, some similar threads have come up over > > the years related to the term server case and your case seems pretty > > related. I started hacking away but never finished. > > > > The problem seems to me to be that the __login scripts are responsible > > for the connection *and* the authentication. Furthermore, the > > hostname passed to __rancid and thus to __login is taken as the DNS > > name of the thing you want to connect to. This results in ambiguity > > down the line if, say, you want to telnet to a device and then telnet > > to different down-stream devices or connect via different async ports > > on a term server. > > > > I think what needs to happen is to allow an override of the > > devicename/connection linkage by passing a switch with this info. > > As it is, the devicename is overloaded. Also, it'd be nice/necessary > > to allow one to run the authentication bits separately from the > > connection bits so one could pass different username/password for > > these different devices. > > > > That's the general idea as I see it. If people want to discuss or try > > and flesh out further the change, it'd be welcome since it does seem > > to be useful functionality to add. > > > > Tony > > >