diff options
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | apps/CA.pl.in | 4 | ||||
| -rw-r--r-- | apps/Makefile.in | 2 | ||||
| -rw-r--r-- | crypto/include/internal/bf_conf.h.in | 1 | ||||
| -rw-r--r-- | crypto/include/internal/bn_conf.h.in | 1 | ||||
| -rw-r--r-- | crypto/include/internal/des_conf.h.in | 1 | ||||
| -rw-r--r-- | crypto/include/internal/rc4_conf.h.in | 1 | ||||
| -rw-r--r-- | include/openssl/opensslconf.h.in | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/c_rehash.in | 2 | ||||
| -rw-r--r-- | util/dofile.pl | 16 |
12 files changed, 29 insertions, 6 deletions
@@ -1752,7 +1752,7 @@ sub run_dofile() my $out = shift; # should we remove $out ? - system("$config{perl} -I. -Mconfigdata util/dofile.pl <$in >$out.new"); + system("$config{perl} -I. -Mconfigdata util/dofile.pl -o\"Configure\" $in > $out.new"); exit 1 if $? != 0; rename("$out.new", $out) || die "Can't rename $out.new, $!"; } diff --git a/Makefile.in b/Makefile.in index e875f43bdc..7db430d4be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ ## ## Makefile for OpenSSL ## +## {- join("\n## ", @autowarntext) -} VERSION={- $config{version} -} MAJOR={- $config{major} -} diff --git a/apps/CA.pl.in b/apps/CA.pl.in index b54df5efa9..52a97d7345 100644 --- a/apps/CA.pl.in +++ b/apps/CA.pl.in @@ -1,8 +1,8 @@ #!{- $config{perl} -} # # Wrapper around the ca to make it easier to use -# Edit CA.pl.in not CA.pl! - +# +# {- join("\n# ", @autowarntext) -} use strict; use warnings; diff --git a/apps/Makefile.in b/apps/Makefile.in index 290dff6ba5..8d2433b5c3 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -140,7 +140,7 @@ progs.h: progs.pl Makefile $(RM) openssl.o CA.pl: CA.pl.in - $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl < CA.pl.in > CA.pl.new + $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl -oapps/Makefile CA.pl.in > CA.pl.new mv CA.pl.new CA.pl diff --git a/crypto/include/internal/bf_conf.h.in b/crypto/include/internal/bf_conf.h.in index 5b6e5e7190..552faae98e 100644 --- a/crypto/include/internal/bf_conf.h.in +++ b/crypto/include/internal/bf_conf.h.in @@ -1,3 +1,4 @@ +{- join("\n",map { "/* $_ */" } @autowarntext) -} /* ==================================================================== * Copyright (c) 2016 The OpenSSL Project. All rights reserved. * diff --git a/crypto/include/internal/bn_conf.h.in b/crypto/include/internal/bn_conf.h.in index a75e964300..5ebd55d522 100644 --- a/crypto/include/internal/bn_conf.h.in +++ b/crypto/include/internal/bn_conf.h.in @@ -1,3 +1,4 @@ +{- join("\n",map { "/* $_ */" } @autowarntext) -} /* ==================================================================== * Copyright (c) 2016 The OpenSSL Project. All rights reserved. * diff --git a/crypto/include/internal/des_conf.h.in b/crypto/include/internal/des_conf.h.in index 43ab5eb99c..2c4369bd78 100644 --- a/crypto/include/internal/des_conf.h.in +++ b/crypto/include/internal/des_conf.h.in @@ -1,3 +1,4 @@ +{- join("\n",map { "/* $_ */" } @autowarntext) -} /* ==================================================================== * Copyright (c) 2016 The OpenSSL Project. All rights reserved. * diff --git a/crypto/include/internal/rc4_conf.h.in b/crypto/include/internal/rc4_conf.h.in index 5f23357fbf..b5b2bd3fc0 100644 --- a/crypto/include/internal/rc4_conf.h.in +++ b/crypto/include/internal/rc4_conf.h.in @@ -1,3 +1,4 @@ +{- join("\n",map { "/* $_ */" } @autowarntext) -} /* ==================================================================== * Copyright (c) 2016 The OpenSSL Project. All rights reserved. * diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index 3d7137e8f6..f54043acdd 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -1,5 +1,5 @@ /* opensslconf.h */ -/* WARNING: Generated automatically from opensslconf.h.in by Configure. */ +{- join("\n",map { "/* $_ */" } @autowarntext) -} #ifdef __cplusplus extern "C" { diff --git a/tools/Makefile.in b/tools/Makefile.in index b52b45f7d3..d0c5ca2662 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -59,7 +59,7 @@ clean: errors: c_rehash: c_rehash.in - $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl < c_rehash.in > c_rehash.new + $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl -otools/Makefile c_rehash.in > c_rehash.new mv c_rehash.new c_rehash # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/tools/c_rehash.in b/tools/c_rehash.in index 912618c230..dc66a9d962 100644 --- a/tools/c_rehash.in +++ b/tools/c_rehash.in @@ -1,5 +1,7 @@ #!{- $config{perl} -} +# {- join("\n# ", @autowarntext) -} + # Perl c_rehash script, scan all files in a directory # and add symbolic links to their hash values. diff --git a/util/dofile.pl b/util/dofile.pl index a6b0905a58..780759b97c 100644 --- a/util/dofile.pl +++ b/util/dofile.pl @@ -8,6 +8,8 @@ use strict; use warnings; +use Getopt::Std; + # Because we know that Text::Template isn't a core Perl module, we use # a fallback in case it's not installed on the system use File::Basename; @@ -74,6 +76,19 @@ sub broken { undef; } +# Check options ###################################################### + +my %opts = (); + +# -o ORIGINATOR +# declares ORIGINATOR as the originating script. +getopt('o', \%opts); + +my @autowarntext = ("WARNING: do not edit!", + "Generated" + . (defined($opts{o}) ? " by ".$opts{o} : "") + . (scalar(@ARGV) > 0 ? " from ".join(", ",@ARGV) : "")); + # Template reading ################################################### # Read in all the templates into $text, while keeping track of each @@ -100,6 +115,7 @@ $template->fill_in(OUTPUT => \*STDOUT, HASH => { config => \%config, target => \%target, withargs => \%withargs, + autowarntext => \@autowarntext, quotify1 => \"ify1, quotify_l => \"ify_l }, DELIMITERS => [ "{-", "-}" ], |