From owner-freebsd-security@FreeBSD.ORG  Wed May 19 05:08:03 2004
Return-Path: <owner-freebsd-security@FreeBSD.ORG>
Delivered-To: freebsd-security@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 209D216A4CE
	for <freebsd-security@freebsd.org>;
	Wed, 19 May 2004 05:08:03 -0700 (PDT)
Received: from shadowplay.nu (248-219.customer.cloud9.net [168.100.248.219])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CD8A43D48
	for <freebsd-security@freebsd.org>;
	Wed, 19 May 2004 05:08:00 -0700 (PDT)
	(envelope-from amal@shadowplay.nu)
Received: by shadowplay.nu (Postfix, from userid 500)
	id A8AA512AB4C; Wed, 19 May 2004 08:07:48 -0400 (EDT)
From: amal <ajasen@spamcop.net>
To: freebsd-security@freebsd.org
Date: Wed, 19 May 2004 08:07:18 -0400
User-Agent: KMail/1.6.1
References: <20040519072516.5771133CAE@dwp.des.no>
	<xzpoeoksozd.fsf@dwp.des.no> <20040519113106.GB21714@droso.net>
In-Reply-To: <20040519113106.GB21714@droso.net>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Message-Id: <200405190807.47669.ajasen@spamcop.net>
Subject: Re: FreeBSD Security Advisory FreeBSD-SA-04:10.cvs
X-BeenThere: freebsd-security@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Security issues [members-only posting]
	<freebsd-security.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-security>,
	<mailto:freebsd-security-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-security>
List-Post: <mailto:freebsd-security@freebsd.org>
List-Help: <mailto:freebsd-security-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-security>,
	<mailto:freebsd-security-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 May 2004 12:08:03 -0000

=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

=46YI:
I found the patch on ftp5.freebsd.org

My source tree was previously cvsuped to=20
5.2.1-RELEASE-p6.  I found cvs=20
in /usr/src/contrib/cvs rather=20
than /usr/src/gnu/usr.bin/cvs, which is what the=20
advisory recommends.

The commands I used follow:

# cvs --version
Concurrent Versions System (CVS) 1.11.5-FreeBSD=20
(client/server)

# cd /usr/src
# patch < /path/to/patch

      /* patch did not find the file to patch.  */=20

# find /usr/src -name server.c | grep cvs
/usr/src/contrib/cvs/src/server.c

# cd /usr/src/contrib/cvs/src
# patch < /patch/to/patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
=2D --------------------------
|diff -Nur cvs-1.12.7.orig/src/server.c=20
cvs-1.12.7/src/server.c
|--- cvs-1.12.7.orig/src/server.c       Tue Apr  6=20
22:17:55 2004
|+++ cvs-1.12.7/src/server.c    Sun May  2=20
19:32:17 2004
=2D --------------------------
Patching file server.c using Plan A...
Hunk #1 succeeded at 1648 (offset 49 lines).
Hunk #2 succeeded at 1643 (offset 1 line).
done

=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAq04DEnb2ZreqxQQRAgrkAJ4mG3Davy6faZzBdaA6pvxol+oKPwCfdMP1
0Y0AGa0xZak9Jr91c+4H+Ek=3D
=3D1Mw0
=2D----END PGP SIGNATURE-----