From owner-freebsd-stable@FreeBSD.ORG Wed Jun 17 18:15:00 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 394E5544 for ; Wed, 17 Jun 2015 18:15:00 +0000 (UTC) (envelope-from jungleboogie0@gmail.com) Received: from mail-ig0-x22d.google.com (mail-ig0-x22d.google.com [IPv6:2607:f8b0:4001:c05::22d]) (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 0708FB25 for ; Wed, 17 Jun 2015 18:15:00 +0000 (UTC) (envelope-from jungleboogie0@gmail.com) Received: by igbiq7 with SMTP id iq7so73613106igb.1 for ; Wed, 17 Jun 2015 11:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=EXfCHTXn8eGjZXmeUQmXRMTe/uKO0S8iod8d5e673wc=; b=c0QUdrEKbCm3IVFvOq04vCMUmji2Lyg+hEnyXSoZgoYptQBEeNWenBSjz8BPemdfS1 xzJU5dj//BeXKPJMYupqZPscIcr8BPdq1TPCgBa3HHVy+y2epzPNkWGrvoQLjh2FhE1+ HE70Zp2iNhljCXuXVfDTfrrO816VzJ9tj5YmMWCFFNz2gNduZWbiyhaEmluFl3M/YzCL jq80EO/fqphuAmJay2Dr0amM+csYT5EA4p8N6WG90htAMJ2bilD55WVrhkhjfOzf/SDn aBYVwHzzWuDq+fr0rkkdD8p9MeyeS3fqTRi9KTHbOld+6EeKx7kuIl8DlWVE99VYLUJy +l1g== MIME-Version: 1.0 X-Received: by 10.43.140.5 with SMTP id iy5mr1660688icc.77.1434564899273; Wed, 17 Jun 2015 11:14:59 -0700 (PDT) Received: by 10.79.111.18 with HTTP; Wed, 17 Jun 2015 11:14:59 -0700 (PDT) Date: Wed, 17 Jun 2015 11:14:59 -0700 Message-ID: Subject: building -stable after FreeBSD-SA-15:10.openssl From: jungle Boogie To: 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:15:00 -0000 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