diff options
author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2022-01-05 17:25:02 +0100 |
---|---|---|
committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2022-01-06 10:37:49 +0100 |
commit | ce2f4b6b1705526b3862b2f137dfcac0ad2cb558 (patch) | |
tree | 6756863afc7082861fb199d03c1ecc41069b3e4f | |
parent | 7a30610902d6d19cfd1698498d3d4129f308e285 (diff) |
Fix copyright year issues
Fixes: #13765
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17427)
(cherry picked from commit fd84b9c3e94be1771d1b34ad857081f7693318aa)
-rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
-rw-r--r-- | crypto/asn1/charmap.h | 2 | ||||
-rw-r--r-- | crypto/bn/bn_prime.h | 2 | ||||
-rw-r--r-- | crypto/conf/conf_def.h | 2 | ||||
-rw-r--r-- | crypto/objects/obj_xref.h | 2 | ||||
-rw-r--r-- | include/openssl/obj_mac.h | 2 | ||||
-rw-r--r-- | util/perl/OpenSSL/copyright.pm | 4 |
7 files changed, 9 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b52b8c15f4..32edfe064d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,8 @@ jobs: sudo apt-get update sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install unifdef - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: config run: ./config --banner=Configured --strict-warnings enable-fips && perl configdata.pm --dump - name: make build_generated diff --git a/crypto/asn1/charmap.h b/crypto/asn1/charmap.h index 95928ca663..ac1eb076cc 100644 --- a/crypto/asn1/charmap.h +++ b/crypto/asn1/charmap.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/asn1/charmap.pl * - * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-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 diff --git a/crypto/bn/bn_prime.h b/crypto/bn/bn_prime.h index d92f6dfa69..8a859ac02e 100644 --- a/crypto/bn/bn_prime.h +++ b/crypto/bn/bn_prime.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/bn/bn_prime.pl * - * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-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 diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index e5321bd30d..1f66a58e09 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/conf/keysets.pl * - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h index c08b5fc2ab..21a193ee98 100644 --- a/crypto/objects/obj_xref.h +++ b/crypto/objects/obj_xref.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by objxref.pl * - * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-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 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index edbd98b152..0e86027667 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/objects/objects.pl * - * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-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/util/perl/OpenSSL/copyright.pm b/util/perl/OpenSSL/copyright.pm index 1fd9f353f7..b82b67a0e6 100644 --- a/util/perl/OpenSSL/copyright.pm +++ b/util/perl/OpenSSL/copyright.pm @@ -23,11 +23,11 @@ sub year_of { # See if git's available open my $FH, - "git log -1 --date=format:%Y --format=format:%ad $file 2>/dev/null|" + "git log -1 --date=short --format=format:%cd $file 2>/dev/null|" or return $YEAR; my $LINE = <$FH>; close $FH; - chomp($LINE); + $LINE =~ s/^([0-9]*)-.*/$1/; $YEAR = $LINE if $LINE; return $YEAR; } |