From: a1346054 <36859588+a1346054@users.noreply.github.com>
Date: Thu, 19 Aug 2021 11:05:15 +0000 (+0000)
Subject: always use the same perl in $PATH
X-Git-Tag: openssl-3.2.0-alpha1~3617
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=473664aafdff1f60db99929bdd43c2a9b26d14cd;p=thirdparty%2Fopenssl.git

always use the same perl in $PATH

Different tests may use unexpectedly different versions of perl,
depending on whether they hardcode the path to the perl executable or if
they resolve the path from the environment. This fixes it so that the
same perl is always used.

Fix some trailing whitespace and spelling mistakes as well.

CLA: trivial

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16362)
---

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7a89c4ef130..942a8fc5c61 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 NOTE:
 
-    If you're asking about how to use OpenSSL, this isn't the right 
+    If you're asking about how to use OpenSSL, this isn't the right
     forum.  Please see our User Support resources:
     https://github.com/openssl/openssl/blob/master/SUPPORT.md
 
@@ -18,7 +18,7 @@ output and code, like this:
 
     ```
     #include <stdio.h>
-    
+
     int main() {
         int foo = 1;
         printf("%d\n", foo);
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5cc780b6def..4245a14b809 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ please take the time to read the following lines before posting it.
 
 NOTE:
 
-    If you're asking about how to use OpenSSL, this isn't the right 
+    If you're asking about how to use OpenSSL, this isn't the right
     forum.  Please see our User Support resources:
     https://github.com/openssl/openssl/blob/master/SUPPORT.md
 
@@ -44,7 +44,7 @@ output and code, like this:
 
     ```
     #include <stdio.h>
-    
+
     int main() {
         int foo = 1;
         printf("%d\n", foo);
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4e4ed54cf2f..f94c5dc4063 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,7 +11,7 @@ please take the time to read the following lines before posting it.
 
 NOTE:
 
-    If you're asking about how to use OpenSSL, this isn't the right 
+    If you're asking about how to use OpenSSL, this isn't the right
     forum.  Please see our User Support resources:
     https://github.com/openssl/openssl/blob/master/SUPPORT.md
 
@@ -25,7 +25,7 @@ output and code, like this:
 
     ```
     #include <stdio.h>
-    
+
     int main() {
         int foo = 1;
         printf("%d\n", foo);
diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml
index 514a4fbabe3..576a9d3b183 100644
--- a/.github/workflows/cross-compiles.yml
+++ b/.github/workflows/cross-compiles.yml
@@ -17,8 +17,8 @@ jobs:
         #   fips:   set to "no" to disable building FIPS, leave unset to
         #           build the FIPS provider.
         #   tests: omit this to run all the tests using QEMU, set it to "none"
-        #          to never run the tests, otherwise it's value is passed to
-        #          the "make test" command to allow selectiving disabling of
+        #          to never run the tests, otherwise its value is passed to
+        #          the "make test" command to allow selective disabling of
         #          tests.
         platform: [
           {
diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 3c09194d0c7..5a6dd4dc85c 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -1,4 +1,3 @@
-
 # Jobs run per pull request submission
 name: Run-checker CI
 on: [pull_request, push]
diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index dae83457db2..a4dab0c4fff 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -4,4 +4,3 @@ Acknowlegements
 Please see our [Thanks!][] page for the current acknowledgements.
 
 [Thanks!]: https://www.openssl.org/community/thanks.html
-
diff --git a/Configurations/unix-checker.pm b/Configurations/unix-checker.pm
index b39b0eb7cbd..d0f05a0d350 100644
--- a/Configurations/unix-checker.pm
+++ b/Configurations/unix-checker.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use Config;
 
diff --git a/Configurations/windows-checker.pm b/Configurations/windows-checker.pm
index 4b7105df33c..97303ed7d7c 100644
--- a/Configurations/windows-checker.pm
+++ b/Configurations/windows-checker.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use Config;
 
diff --git a/INSTALL.md b/INSTALL.md
index 722a88bf04e..5d53cef1aa5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -296,7 +296,7 @@ API Level
 Build the OpenSSL libraries to support the API for the specified version.
 If [no-deprecated](#no-deprecated) is also given, don't build with support
 for deprecated APIs in or below the specified version number.  For example,
-addding
+adding
 
     --api=1.1.0 no-deprecated
 
diff --git a/dev/release-aux/fix-title.pl b/dev/release-aux/fix-title.pl
index d3f00b984bd..6fe256ebc44 100644
--- a/dev/release-aux/fix-title.pl
+++ b/dev/release-aux/fix-title.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 BEGIN { my $prev }
 ($_ = $prev) =~ s|^( *)(.*)$|"$1" . '=' x length($2)|e
diff --git a/dev/release-aux/release-state-fn.sh b/dev/release-aux/release-state-fn.sh
index f495cb85360..635b82a8b9d 100644
--- a/dev/release-aux/release-state-fn.sh
+++ b/dev/release-aux/release-state-fn.sh
@@ -64,7 +64,7 @@ next_release_state () {
 
         case "$before+$next" in
             # MAKING ALPHA RELEASES ##################################
-            
+
             # Alpha releases can't be made from beta versions or real versions
             beta*+alpha | +alpha )
                 echo >&2 "Invalid state for an alpha release"
@@ -199,4 +199,3 @@ next_release_state () {
         $DEBUG >&2 "DEBUG[next_release_state]: END: \$RELEASE_DATE=$RELEASE_DATE"
     done
 }
-
diff --git a/dev/release.sh b/dev/release.sh
index 351ddc55283..4b778f3b751 100755
--- a/dev/release.sh
+++ b/dev/release.sh
@@ -471,7 +471,7 @@ for fixup in "$HERE/dev/release-aux"/fixup-*-postrelease.pl; do
         perl -pi $fixup $file
 done
 
-$VERBOSE "== Comitting updates"
+$VERBOSE "== Committing updates"
 git add -u
 git commit $git_quiet -m "Prepare for $release_text"
 if [ -n "$reviewers" ]; then
@@ -502,7 +502,7 @@ if $do_branch; then
             perl -pi $fixup $file
     done
 
-    $VERBOSE "== Comitting updates"
+    $VERBOSE "== Committing updates"
     git add -u
     git commit $git_quiet -m "Prepare for $release_text"
     if [ -n "$reviewers" ]; then
diff --git a/test/README-dev.md b/test/README-dev.md
index 56114fdc347..d015bcf5bfb 100644
--- a/test/README-dev.md
+++ b/test/README-dev.md
@@ -44,7 +44,7 @@ A recipe that just runs a test executable
 
 A script that just runs a program looks like this:
 
-    #! /usr/bin/perl
+    #! /usr/bin/env perl
 
     use OpenSSL::Test::Simple;
 
@@ -67,7 +67,7 @@ documentation.  For OpenSSL::Test, do `perldoc util/perl/OpenSSL/Test.pm`.
 
 A script to start from could be this:
 
-    #! /usr/bin/perl
+    #! /usr/bin/env perl
 
     use strict;
     use warnings;
diff --git a/test/recipes/06-test_algorithmid.t b/test/recipes/06-test_algorithmid.t
index f70c1d2a231..8b98efe9096 100644
--- a/test/recipes/06-test_algorithmid.t
+++ b/test/recipes/06-test_algorithmid.t
@@ -1,7 +1,7 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 # Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License 2.0 (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
diff --git a/test/recipes/06-test_rdrand_sanity.t b/test/recipes/06-test_rdrand_sanity.t
index 8a33b8ded80..a20e09e7780 100644
--- a/test/recipes/06-test_rdrand_sanity.t
+++ b/test/recipes/06-test_rdrand_sanity.t
@@ -1,7 +1,7 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 # Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License 2.0 (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
diff --git a/test/recipes/80-test_cipherbytes.t b/test/recipes/80-test_cipherbytes.t
index 0e99f102165..dc576fdcbda 100644
--- a/test/recipes/80-test_cipherbytes.t
+++ b/test/recipes/80-test_cipherbytes.t
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 #
 # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 #
diff --git a/test/recipes/80-test_cipherlist.t b/test/recipes/80-test_cipherlist.t
index cf821ad6321..2deda30eecc 100644
--- a/test/recipes/80-test_cipherlist.t
+++ b/test/recipes/80-test_cipherlist.t
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 #
 # Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
diff --git a/test/recipes/80-test_ciphername.t b/test/recipes/80-test_ciphername.t
index 72a96cbcd62..a3227cee4db 100644
--- a/test/recipes/80-test_ciphername.t
+++ b/test/recipes/80-test_ciphername.t
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 #
 # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright 2017 BaishanCloud. All rights reserved.
diff --git a/test/recipes/90-test_includes.t b/test/recipes/90-test_includes.t
index 13c5c842024..b931d4ec4a0 100644
--- a/test/recipes/90-test_includes.t
+++ b/test/recipes/90-test_includes.t
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/util/check-format.pl b/util/check-format.pl
index 72cf53d1897..62471e3c680 100755
--- a/util/check-format.pl
+++ b/util/check-format.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /usr/bin/env perl
 #
 # Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright Siemens AG 2019-2020
diff --git a/util/echo.pl b/util/echo.pl
index d90e52129ba..8c2616a3bcb 100644
--- a/util/echo.pl
+++ b/util/echo.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/util/fips-checksums.sh b/util/fips-checksums.sh
index aff8d0ccce6..be0453e3228 100755
--- a/util/fips-checksums.sh
+++ b/util/fips-checksums.sh
@@ -15,13 +15,13 @@ for f in "$@"; do
                 | openssl sha256 -r \
                 | sed -e "s| \\*stdin|  $f|"
             ;;
-        *.pl ) 
+        *.pl )
             cat "$f" \
                 | $HERE/lang-compress.pl 'perl' \
                 | openssl sha256 -r \
                 | sed -e "s| \\*stdin|  $f|"
             ;;
-        *.S ) 
+        *.S )
             cat "$f" \
                 | $HERE/lang-compress.pl 'S' \
                 | openssl sha256 -r \
diff --git a/util/fix-deprecation b/util/fix-deprecation
index a87d4fb9d18..59439eda6dd 100644
--- a/util/fix-deprecation
+++ b/util/fix-deprecation
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;