From owner-freebsd-isp@FreeBSD.ORG  Tue Sep 23 02:05:51 2003
Return-Path: <owner-freebsd-isp@FreeBSD.ORG>
Delivered-To: freebsd-isp@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7394716A4B3
	for <freebsd-isp@freebsd.org>; Tue, 23 Sep 2003 02:05:51 -0700 (PDT)
Received: from mail.arc.net.my (nagano.arc.net.my [203.115.225.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F012643FE5
	for <freebsd-isp@freebsd.org>; Tue, 23 Sep 2003 02:05:49 -0700 (PDT)
	(envelope-from nick@arc.net.my)
Received: from roponggi (roppongi.arc.net.my [203.115.225.83])
 by mail.arc.net.my (iPlanet Messaging Server 5.1 Patch 1 (built Jun  6 2002))
 with SMTP id <0HLN00292T8V15@mail.arc.net.my> for freebsd-isp@freebsd.org;
 Tue, 23 Sep 2003 17:05:19 +0800 (SGT)
Date: Tue, 23 Sep 2003 17:07:04 +0800
From: Nick Kraal <nick@arc.net.my>
To: freebsd-isp@freebsd.org
Message-id: <008d01c381b2$0e8d2a00$53e173cb@arc.net.my>
MIME-version: 1.0
X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
X-Mailer: Microsoft Outlook Express 6.00.2800.1158
Content-type: text/plain; charset=iso-8859-1
Content-transfer-encoding: 7BIT
X-Priority: 3
X-MSMail-priority: Normal
References: <1063258944.19647.5.camel@dreamboy.private.aros.net>
 <20030922120911.GG36591@dds.nl>
Subject: SSHD Patch
X-BeenThere: freebsd-isp@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Nick Kraal <nick@arc.net.my>
List-Id: Internet Services Providers <freebsd-isp.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-isp>,
	<mailto:freebsd-isp-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-isp>
List-Post: <mailto:freebsd-isp@freebsd.org>
List-Help: <mailto:freebsd-isp-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-isp>,
	<mailto:freebsd-isp-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Sep 2003 09:05:51 -0000

We were patching our 4.8 servers with the sshd patch. Not so experienced in
this, but get this output. How do we move on from this.

Best regards,

-nick/

aoto% patch < /root/patch/buffer46.patch
Hmm...  Looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|Index: crypto/openssh/buffer.c
|===================================================================
|RCS file: /home/ncvs/src/crypto/openssh/buffer.c,v
|retrieving revision 1.1.1.6
|retrieving revision 1.2
|diff -c -p -c -r1.1.1.6 -r1.2
|*** crypto/openssh/buffer.c    29 Jun 2002 11:33:59 -0000      1.1.1.6
|--- crypto/openssh/buffer.c    17 Sep 2003 00:58:33 -0000      1.2
--------------------------
File to patch: