diff options
Diffstat (limited to 'upstream-build/configdata.pm/x86_64-linux')
| -rw-r--r-- | upstream-build/configdata.pm/x86_64-linux | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/upstream-build/configdata.pm/x86_64-linux b/upstream-build/configdata.pm/x86_64-linux index bfc95f4..bc3fbe9 100644 --- a/upstream-build/configdata.pm/x86_64-linux +++ b/upstream-build/configdata.pm/x86_64-linux @@ -63,7 +63,7 @@ our %config = ( options => "--prefix=/home/karen/install enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic", perl_archname => "x86_64-linux-thread-multi", perl_cmd => "/usr/bin/perl", - perl_version => "5.28.2", + perl_version => "5.32.0", perlargv => [ "linux-x86_64", "--prefix=/home/karen/install", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ], perlenv => { "AR" => undef, @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -3209,8 +3209,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3240,6 +3238,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { @@ -10741,9 +10741,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17212,19 +17210,22 @@ _____ } print "\nEnabled features:\n\n"; foreach my $what (@disablables) { - print " $what\n" unless $disabled{$what}; + print " $what\n" + unless grep { $_ =~ /^${what}$/ } keys %disabled; } print "\nDisabled features:\n\n"; foreach my $what (@disablables) { - if ($disabled{$what}) { - print " $what", ' ' x ($longest - length($what) + 1), - "[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1); - print $disabled_info{$what}->{macro} - if $disabled_info{$what}->{macro}; + my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled; + my $what3 = $what2[0]; + if ($what3) { + print " $what3", ' ' x ($longest - length($what3) + 1), + "[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1); + print $disabled_info{$what3}->{macro} + if $disabled_info{$what3}->{macro}; print ' (skip ', - join(', ', @{$disabled_info{$what}->{skipped}}), + join(', ', @{$disabled_info{$what3}->{skipped}}), ')' - if $disabled_info{$what}->{skipped}; + if $disabled_info{$what3}->{skipped}; print "\n"; } } |