Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Feb 2003 15:59:01 -0800
From:      "Crist J. Clark" <crist.clark@attbi.com>
To:        KIMURA Yasuhiro <yasu@utahime.org>
Cc:        nectar@FreeBSD.org, freebsd-security@FreeBSD.org
Subject:   Re: Updated OpenSSL patches
Message-ID:  <20030227235901.GA84362@blossom.cjclark.org>
In-Reply-To: <20030228.014901.81279435.yasu@utahime.org>
References:  <20030227005035.GA99420@madman.celabo.org> <20030228.010621.58864322.yasu@utahime.org> <20030227160944.GA3238@madman.celabo.org> <20030228.014901.81279435.yasu@utahime.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Feb 28, 2003 at 01:49:01AM +0900, KIMURA Yasuhiro wrote:
> >>>>> "Jacques A. Vidrine" <nectar@FreeBSD.org> wrote:
> 
> > I'm sorry, but I cannot reproduce the failure. :-(
> 
> Since nobody else seems to be in trouble, I can't help concluding that
> something is wrong with my environment. So I'm going to re-install OS
> this weekend, to check what will happen on the vanilla 4.7R
> environment, and to report it here.

I can reproduce the error. Something weird is going on with patch(1).

First, this DOES NOT produce the error,

  $ uname -r
  4.7-RELEASE-p2
  $ cd /var/tmp
  $ [ -d src ] && rm -rf src
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/crypto/openssl
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/secure/lib/libcrypto
  $ cd src
  $ fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/patches/SA-03:02/openssl47.patch.gz
  $ zcat openssl47.patch.gz | patch -s

However, try,

  $ cd /var/tmp
  $ [ -d src ] && rm -rf src
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/crypto/openssl
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/secure/lib/libcrypto
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/Makefile
  $ cd src
  $ fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/patches/SA-03:02/openssl47.patch.gz
  $ zcat openssl47.patch.gz | patch -s
  1 out of 1 hunks failed--saving rejects to Makefile.rej

It looks like patch(1) is confused where to look for "Makefile." It
tries to patch the one in pwd. However, if I do,

  $ cd /var/tmp
  $ [ -d src ] && rm -rf src
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/crypto/openssl
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/secure/lib/libcrypto
  $ cvs -Q co -rRELENG_4_7_0_RELEASE src/Makefile
  $ cd src
  $ fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/patches/SA-03:02/openssl47.patch.gz
  $ zcat openssl47.patch.gz | sed 's-../RELENG_4_7/--' | patch -s

-- 
Crist J. Clark                     |     cjclark@alum.mit.edu
                                   |     cjclark@jhu.edu
http://people.freebsd.org/~cjc/    |     cjc@freebsd.org

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-security" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030227235901.GA84362>