Date: Wed, 19 May 2004 14:31:45 +0200 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) To: amal <ajasen@spamcop.net> Cc: freebsd-security@freebsd.org Subject: Re: FreeBSD Security Advisory FreeBSD-SA-04:10.cvs Message-ID: <xzpr7tgr426.fsf@dwp.des.no> In-Reply-To: <200405190807.47669.ajasen@spamcop.net> (ajasen@spamcop.net's message of "Wed, 19 May 2004 08:07:18 -0400") References: <20040519072516.5771133CAE@dwp.des.no> <xzpoeoksozd.fsf@dwp.des.no> <20040519113106.GB21714@droso.net> <200405190807.47669.ajasen@spamcop.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
amal <ajasen@spamcop.net> writes:
> My source tree was previously cvsuped to 5.2.1-RELEASE-p6.
It's probably easier and safer for you to cvsup than to apply the
patch manually.
> I found cvs in /usr/src/contrib/cvs rather
> than /usr/src/gnu/usr.bin/cvs, which is what the
> advisory recommends.
The sources are in contrib, but the build infrastructure is in gnu.
Building and installing from /usr/src/contrib/cvs instead of
/usr/src/gnu/usr.bin/cvs will *not* produce the correct results.
> # cd /usr/src
> # patch < /path/to/patch
>
> /* patch did not find the file to patch. */
Argh! I forgot to make sure the patch was relative to /usr/src. I'll
upload a new patch (attached) ASAP.
DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=cvs.patch
Index: contrib/cvs/src/server.c
===================================================================
RCS file: /home/ncvs/src/contrib/cvs/src/server.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- contrib/cvs/src/server.c 15 Apr 2004 01:17:27 -0000 1.21
+++ contrib/cvs/src/server.c 19 May 2004 06:17:52 -0000 1.22
@@ -1645,7 +1645,7 @@
&& strncmp (arg, name, cp - name) == 0)
{
timefield = strchr (cp + 1, '/') + 1;
- if (*timefield != '=')
+ if (*timefield == '/')
{
cp = timefield + strlen (timefield);
cp[1] = '\0';
@@ -1689,7 +1689,7 @@
&& strncmp (arg, name, cp - name) == 0)
{
timefield = strchr (cp + 1, '/') + 1;
- if (!(timefield[0] == 'M' && timefield[1] == '/'))
+ if (*timefield == '/')
{
cp = timefield + strlen (timefield);
cp[1] = '\0';
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpr7tgr426.fsf>