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
This commit is contained in:
Brad King
2024-01-31 13:59:46 +00:00
committed by Kitware Robot
2 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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