Hello community, here is the log from the commit of package openssl-1_1_0 for openSUSE:Factory checked in at 2017-07-22 02:32:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl-1_1_0 (Old) and /work/SRC/openSUSE:Factory/.openssl-1_1_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssl-1_1_0" Sat Jul 22 02:32:19 2017 rev:4 rq:511204 version:1.1.0f Changes: -------- --- /work/SRC/openSUSE:Factory/openssl-1_1_0/openssl-1_1_0.changes 2017-07-01 14:05:26.237004563 +0200 +++ /work/SRC/openSUSE:Factory/.openssl-1_1_0.new/openssl-1_1_0.changes 2017-07-22 02:32:20.700357134 +0200 @@ -1,0 +2,12 @@ +Tue Jul 18 11:06:41 UTC 2017 - [email protected] + +- Fix a race condition in tests to make the package build reliably + * https://github.com/openssl/openssl/issues/3562 + * 0001-Fix-a-TLSProxy-race-condition.patch + +------------------------------------------------------------------- +Tue Jul 18 05:50:05 UTC 2017 - [email protected] + +- Add Provides and Conflicts for -devel package in baselibs.conf. + +------------------------------------------------------------------- New: ---- 0001-Fix-a-TLSProxy-race-condition.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl-1_1_0.spec ++++++ --- /var/tmp/diff_new_pack.iO8gyG/_old 2017-07-22 02:32:21.588231627 +0200 +++ /var/tmp/diff_new_pack.iO8gyG/_new 2017-07-22 02:32:21.592231061 +0200 @@ -66,6 +66,7 @@ Patch59: openssl-fips-clearerror.patch Patch60: openssl-fips-dont-fall-back-to-default-digest.patch Patch61: openssl-disable_rsa_keygen_tests_with_small_modulus.patch +Patch62: 0001-Fix-a-TLSProxy-race-condition.patch BuildRequires: bc BuildRequires: ed BuildRequires: pkgconfig @@ -200,7 +201,6 @@ %check export MALLOC_CHECK_=3 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) -#2017-04-26: Tests fail on SLE-12 because of glibc bug bsc#1035445 LD_LIBRARY_PATH=`pwd` make test -j1 HARNESS_VERBOSE=yes # show cyphers gcc -o showciphers %{optflags} -I%{buildroot}%{_includedir} %{SOURCE99} -L%{buildroot}%{_libdir} -lssl -lcrypto ++++++ 0001-Fix-a-TLSProxy-race-condition.patch ++++++ >From b72668a0d3586ee2560f0536c43e18991a4cfc6f Mon Sep 17 00:00:00 2001 From: Matt Caswell <[email protected]> Date: Fri, 26 May 2017 13:06:08 +0100 Subject: [PATCH] Fix a Proxy race condition Issue #3562 describes a problem where a race condition can occur in the Proxy such that a test "ok" line can appear in the middle of other text causing the test harness to miss it. The issue is that we do not wait for the client process to finish after the test is complete, so that process may continue to write data to stdout/stderr at the same time that the test harness does. This commit fixes TLSProxy so that we always wait for the client process to finish before continuing. Fixes #3562 Reviewed-by: Richard Levitte <[email protected]> (Merged from https://github.com/openssl/openssl/pull/3567) --- util/TLSProxy/Proxy.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: openssl-1.1.0f/util/TLSProxy/Proxy.pm =================================================================== --- openssl-1.1.0f.orig/util/TLSProxy/Proxy.pm 2017-07-18 13:48:24.282938212 +0200 +++ openssl-1.1.0f/util/TLSProxy/Proxy.pm 2017-07-18 13:49:22.999903552 +0200 @@ -42,6 +42,7 @@ sub new clientflags => "", serverconnects => 1, serverpid => 0, + clientpid => 0, reneg => 0, #Public read @@ -104,6 +105,7 @@ sub clearClient $self->{record_list} = []; $self->{message_list} = []; $self->{clientflags} = ""; + $self->{clientpid} = 0; TLSProxy::Message->clear(); TLSProxy::Record->clear(); @@ -225,6 +227,7 @@ sub clientstart } exec($execcmd); } + $self->clientpid($pid); } # Wait for incoming connection from client @@ -315,6 +318,10 @@ sub clientstart waitpid( $self->serverpid, 0); die "exit code $? from server process\n" if $? != 0; } + die "clientpid is zero\n" if $self->clientpid == 0; + print "Waiting for client process to close: ".$self->clientpid."\n"; + waitpid($self->clientpid, 0); + return 1; } @@ -508,6 +515,14 @@ sub serverpid } return $self->{serverpid}; } +sub clientpid +{ + my $self = shift; + if (@_) { + $self->{clientpid} = shift; + } + return $self->{clientpid}; +} sub fill_known_data { ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.iO8gyG/_old 2017-07-22 02:32:21.660221451 +0200 +++ /var/tmp/diff_new_pack.iO8gyG/_new 2017-07-22 02:32:21.660221451 +0200 @@ -1,6 +1,8 @@ openssl-1_1_0 libopenssl1_1_0 libopenssl-1_1_0-devel + provides "libopenssl-devel-<targettype> = <version>" + conflicts "otherproviders(libopenssl-devel-<targettype>)" requires "openssl-1_1_0-<targettype>" requires "libopenssl1_1_0-<targettype> = <version>" libopenssl1_1_0-hmac
