On Wed, Jun 17, 2015 at 9:14 PM, jungle Boogie <jungleboogie0 at
gmail.com> 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 at sip2sip.info
> xmpp: jungle-boogie at 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