From owner-freebsd-stable@FreeBSD.ORG Wed Jun 17 18:23:27 2015 Return-Path: Delivered-To: freebsd-stable@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 871078C8 for ; Wed, 17 Jun 2015 18:23:27 +0000 (UTC) (envelope-from kpaasial@gmail.com) Received: from mail-la0-x22a.google.com (mail-la0-x22a.google.com [IPv6:2a00:1450:4010:c03::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E401DB6 for ; Wed, 17 Jun 2015 18:23:27 +0000 (UTC) (envelope-from kpaasial@gmail.com) Received: by laka10 with SMTP id a10so39049823lak.0 for ; Wed, 17 Jun 2015 11:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ATamTNydjrPlLPcgVd7NlR5onAUxqHuK1BTT/2WXdUQ=; b=wVE3KgH2bBIqPTboLTaNZiNyrWaREbzpgIdyfeLnF/CU6aaNlffeQ8+kY026hpr9LT JgGCTS/fNVYRSY3wN0o7K/76tDTgCK1XDLuQGs25YYdjxUXYteDKd4t9SoT+aOxiRmFM WiMsaS1/ZYiDHBuhfakvF92z0UFsnLaCfEBBHtJCIIZc1Cr1/AsboUlhlrUNJh/sgSyu 9kmP69cvnmZfm+w8QTdDfIW6BRc8q4cNSO3YStK+y03eQ+5Y08Dz+BXpGmVafuA+EdOX Kgym52t+nDjZKaokgfivWPjA1VXCu39hdQ4lBM7+lwvJetJsTf5i4lUgTIqqSY6/Wd6X mn0Q== MIME-Version: 1.0 X-Received: by 10.152.2.38 with SMTP id 6mr9348641lar.80.1434565405149; Wed, 17 Jun 2015 11:23:25 -0700 (PDT) Received: by 10.152.219.35 with HTTP; Wed, 17 Jun 2015 11:23:25 -0700 (PDT) In-Reply-To: References: Date: Wed, 17 Jun 2015 21:23:25 +0300 Message-ID: Subject: Re: building -stable after FreeBSD-SA-15:10.openssl From: Kimmo Paasiala To: jungle Boogie Cc: freebsd-stable Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2015 18:23:27 -0000 On Wed, Jun 17, 2015 at 9:14 PM, jungle Boogie wrote: > Hello All, > > Trying to upgrade from r283863 to 284520 after I applied this patch: > https://www.freebsd.org/security/advisories/FreeBSD-SA-15:10.openssl.asc > > In the manner described: > > # fetch https://security.FreeBSD.org/patches/SA-15:10/openssl-10.1.patch > # cd /usr/src > # patch < /path/to/patch > > > I begin the build by doing: > cd /usr/src > svn update > make -j `sysctl -n hw.ncpu` buildworld -DNO_CLEAN > > But then this happened: > > Removing stale symlinks. > rm -f /usr/obj/usr/src/tmp/usr/include/des.h > rm -f /usr/obj/usr/src/tmp/usr/lib/libdes.a > rm -f /usr/obj/usr/src/tmp/usr/lib/libdes.so > rm -f /usr/obj/usr/src/tmp/usr/lib/libdes.so.3 > rm -f /usr/obj/usr/src/tmp/usr/lib/libdes_p.a > ===> lib/libldns (obj,depend,all,install) > sh /usr/src/tools/install.sh -C -o root -g wheel -m 444 libldns.a > /usr/obj/usr/src/tmp/usr/lib/private > sh /usr/src/tools/install.sh -s -o root -g wheel -m 444 > libldns.so.5 /usr/obj/usr/src/tmp/usr/lib/private > sh /usr/src/tools/install.sh -l s libldns.so.5 > /usr/obj/usr/src/tmp/usr/lib/private/libldns.so > ===> secure/lib/libssl (obj,depend,all,install) > cc -fpic -DPIC -O2 -pipe -DTERMIOS -DANSI_SOURCE > -I/usr/src/secure/lib/libssl/../../../crypto/openssl > -I/usr/src/secure/lib/libssl/../../../crypto/openssl/crypto > -I/usr/obj/usr/src/secure/lib/libssl -DOPENSSL_THREADS -DDSO_DLFCN > -DH$ > /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s3_clnt.c:3371:9: > error: redefinition of 'al' > int al = SSL_AD_HANDSHAKE_FAILURE; > ^ > /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s3_clnt.c:3276:9: > note: previous definition is here > int al = SSL_AD_HANDSHAKE_FAILURE; > ^ > 1 error generated. > *** [s3_clnt.So] Error code 1 > > make[4]: stopped in /usr/src/secure/lib/libssl > 1 error > > make[4]: stopped in /usr/src/secure/lib/libssl > A failure has been detected in another branch of the parallel make > > make[3]: stopped in /usr/src > *** [libraries] Error code 2 > > make[2]: stopped in /usr/src > 1 error > > make[2]: stopped in /usr/src > *** [_libraries] Error code 2 > > make[1]: stopped in /usr/src > 1 error > > make[1]: stopped in /usr/src > *** [buildworld] Error code 2 > > make: stopped in /usr/src > 1 error > > make: stopped in /usr/src > > > > My patch happened to be in /usr/src when I applied it. Is this what > caused the issue? > > Is there a way to revert the patch? > > > Thanks & Best, > jungle > > -- > ------- > inum: 883510009027723 > sip: jungleboogie@sip2sip.info > xmpp: jungle-boogie@jit.si Don't use the patch at all if you're following stable/10, the necessary security fixes are already included in updates you pull in from SVN. You can revert all local changes with 'svnlite revert -R .' in /usr/src, might take a while for it to finish though. -Kimmo