[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d4037cea3c26b7cfdc8cc518a31ba7a89081e931 (commit)
       via  da1f2104c71a6c4bbb695f3b74a6bde750d5a910 (commit)
      from  bec5e4ae0dbacfc29595e5eb007d73180f305cc6 (commit)


- Log -----------------------------------------------------------------
commit d4037cea3c26b7cfdc8cc518a31ba7a89081e931
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 19 01:31:48 2016 +0100

    Correct the export list when writing configdata.pm
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit da1f2104c71a6c4bbb695f3b74a6bde750d5a910
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 19 01:29:01 2016 +0100

    Correct the check of files to depend on against known generated ones
    
    The check was erroneously inversed
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index 060df73..557ea22 100755
--- a/Configure
+++ b/Configure
@@ -1596,9 +1596,9 @@ EOF
                 # and that there are lines to build it in a BEGINRAW..ENDRAW
                 # section or in the Makefile template.
                 if (! -f $d
-                    || !(grep { $d eq $_ }
-                         map { cleanfile($srcdir, $_, $blddir) }
-                         (@generated_headers, @generated_by_make_headers))) {
+                    || (grep { $d eq $_ }
+                        map { cleanfile($srcdir, $_, $blddir) }
+                        (@generated_headers, @generated_by_make_headers))) {
                     $d = cleanfile($buildd, $_, $blddir);
                 }
                 # Take note if the file to depend on is being renamed
@@ -1664,7 +1664,7 @@ use warnings;
 use Exporter;
 #use vars qw(\@ISA \@EXPORT);
 our \@ISA = qw(Exporter);
-our \@EXPORT = qw(\%config \%target %disabled %withargs %unified_info);
+our \@EXPORT = qw(\%config \%target \%disabled \%withargs \%unified_info);
 
 EOF
 print OUT "our %config = (\n";