[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e8b7c0c4726fbd15d2b23da075c5b4a35d6c7790 (commit)
      from  c3d93da03b3588bbb7ed459a360fba37f7be1e0b (commit)


- Log -----------------------------------------------------------------
commit e8b7c0c4726fbd15d2b23da075c5b4a35d6c7790
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun May 1 08:47:43 2016 -0400

    Tweak generated warning lines.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 util/mkerr.pl | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index fd5e774..b754a45 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -16,6 +16,8 @@ my $recurse = 0;
 my $reindex = 0;
 my $dowrite = 0;
 my $staticloader = "";
+my @t = localtime();
+my $YEAR = @t[5] + 1900;
 
 my $pack_errcode;
 my $load_errcode;
@@ -417,7 +419,7 @@ foreach $lib (keys %csrc)
 	} else {
 	    push @out,
 "/*\n",
-" * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.\n",
+" * Copyright 1995-$YEAR The OpenSSL Project Authors. All Rights Reserved.\n",
 " *\n",
 " * Licensed under the OpenSSL license (the \"License\").  You may not use\n",
 " * this file except in compliance with the License.  You can obtain a copy\n",
@@ -439,15 +441,15 @@ foreach $lib (keys %csrc)
 	print OUT @out;
 	undef @out;
 	print OUT <<"EOF";
+
 /*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
+ * Content after this point is generated by util/mkerr.pl
+ * DO NOT EDIT!
  */
 EOF
 	if($static) {
 		print OUT <<"EOF";
 ${staticloader}void ERR_load_${lib}_strings(void);
-
 EOF
 	} else {
 		print OUT <<"EOF";
@@ -564,18 +566,13 @@ EOF
 
 	print OUT <<"EOF";
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 1995-$YEAR The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
-*/
-
-/*
- * NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
  */
 
 #include <stdio.h>