diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-31 13:59:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-31 14:00:01 (GMT) |
| commit | 817e309af535dd9f58e1d0248ffb0b7cefc4cb49 (patch) | |
| tree | 35ceda957439f19af2ff02673d228629bf0cf591 | |
| parent | 1f25aa1a0ac61a0b3d5b0c4e2abc98c49cd159a5 (diff) | |
| parent | 22a52526e215b6c0c1dc36a2a7c6480791fbde09 (diff) | |
| download | CMake-817e309af535dd9f58e1d0248ffb0b7cefc4cb49.zip CMake-817e309af535dd9f58e1d0248ffb0b7cefc4cb49.tar.gz CMake-817e309af535dd9f58e1d0248ffb0b7cefc4cb49.tar.bz2 | |
Merge topic 'update-zlib' into release-3.28
22a52526e2 Merge branch 'upstream-zlib' into update-zlib
6c2bed54f6 zlib 2022-10-12 (04f42cec)
e868b19ed1 zlib: Fix 1.2.13 version and date notice
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9204
| -rwxr-xr-x | Utilities/Scripts/update-zlib.bash | 4 | ||||
| -rw-r--r-- | Utilities/cmzlib/Copyright.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/Scripts/update-zlib.bash b/Utilities/Scripts/update-zlib.bash index 5913150..c18f118 100755 --- a/Utilities/Scripts/update-zlib.bash +++ b/Utilities/Scripts/update-zlib.bash @@ -8,7 +8,7 @@ readonly name="zlib" readonly ownership="zlib upstream <kwrobot@kitware.com>" readonly subtree="Utilities/cmzlib" readonly repo="https://github.com/madler/zlib.git" -readonly tag="v1.2.13" +readonly tag="v1.2.13" # When updating, sync Copyright.txt below! readonly shortlog=false readonly paths=" README @@ -45,7 +45,7 @@ extract_source () { pushd "${extractdir}/${name}-reduced" echo "* -whitespace" > .gitattributes echo -n "'zlib' general purpose compression library -version 1.2.12, March 27th, 2022 +version 1.2.13, October 13th, 2022 Copyright " > Copyright.txt sed -n '/^ (C) 1995-/,+19 {s/^ \?//;p}' README >> Copyright.txt diff --git a/Utilities/cmzlib/Copyright.txt b/Utilities/cmzlib/Copyright.txt index 8f3d697..85de4a1 100644 --- a/Utilities/cmzlib/Copyright.txt +++ b/Utilities/cmzlib/Copyright.txt @@ -1,5 +1,5 @@ 'zlib' general purpose compression library -version 1.2.12, March 27th, 2022 +version 1.2.13, October 13th, 2022 Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler |