From 4e30f721b7c2e5497b78cdb54916445268164f0e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 4 Nov 2022 08:53:20 -0400 Subject: [PATCH 1/5] Add zlib-ng 2.0.6, remove zlib --- .gitmodules | 6 +++--- CHANGELOG.md | 5 +++++ GNUmakefile | 18 +++++++++--------- README.md | 2 +- VERSION | 2 +- make_versions.sh | 8 ++++---- zlib | 1 - zlib-ng | 1 + 8 files changed, 24 insertions(+), 19 deletions(-) delete mode 160000 zlib create mode 160000 zlib-ng diff --git a/.gitmodules b/.gitmodules index 28ba972..5b207c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "zlib"] - path = zlib - url = https://github.com/madler/zlib.git [submodule "jpeg"] path = jpeg url = https://github.com/libjpeg-turbo/ijg.git @@ -46,3 +43,6 @@ [submodule "xgboost"] path = xgboost url = https://github.com/dmlc/xgboost.git +[submodule "zlib-ng"] + path = zlib-ng + url = https://github.com/zlib-ng/zlib-ng.git diff --git a/CHANGELOG.md b/CHANGELOG.md index a2546d4..ca5d173 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,13 @@ ### Fixed ### Changed ### Removed + +* Remove unmaintained zlib library + ### Added +* zlib-ng 2.0.6 + ## [7.6.0] - 2022-11-04 ### Updates diff --git a/GNUmakefile b/GNUmakefile index 9798065..98e4b1e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -241,7 +241,7 @@ RELEASE_FILE = $(MKFILE_DIRNAME)-$(DATE) # Recurse Make in Sub-directories # -------------------------------- -ALLDIRS = antlr2 gsl jpeg zlib szlib curl hdf4 hdf5 netcdf netcdf-fortran netcdf-cxx4 \ +ALLDIRS = antlr2 gsl jpeg zlib-ng szlib curl hdf4 hdf5 netcdf netcdf-fortran netcdf-cxx4 \ udunits2 nco cdo nccmp esmf xgboost \ GFE \ FLAP hdfeos hdfeos5 SDPToolkit @@ -266,7 +266,7 @@ endif GFE_DIRS = GFE -ESSENTIAL_DIRS = jpeg zlib szlib hdf5 netcdf netcdf-fortran esmf xgboost \ +ESSENTIAL_DIRS = jpeg zlib-ng szlib hdf5 netcdf netcdf-fortran esmf xgboost \ $(GFE_DIRS) FLAP ifeq ($(MACH),aarch64) @@ -487,7 +487,7 @@ jpeg.config: jpeg/configure CFLAGS="$(CFLAGS)" CC=$(CC) CXX=$(CXX) FC=$(FC) ) @touch $@ -hdf4.config: hdf4/README.txt jpeg.install zlib.install szlib.install +hdf4.config: hdf4/README.txt jpeg.install zlib-ng.install szlib.install @echo Configuring hdf4 @(cd hdf4; \ export PATH="$(prefix)/bin:$(PATH)" ;\ @@ -503,7 +503,7 @@ hdf4.config: hdf4/README.txt jpeg.install zlib.install szlib.install CFLAGS="$(CFLAGS) $(NO_IMPLICIT_FUNCTION_ERROR)" FFLAGS="$(NAG_FCFLAGS) $(NAG_DUSTY) $(ALLOW_ARGUMENT_MISMATCH)" CC=$(CC) FC=$(FC) CXX=$(CXX) ) touch $@ -hdf5.config :: hdf5/README.md szlib.install zlib.install +hdf5.config :: hdf5/README.md szlib.install zlib-ng.install echo Configuring hdf5 (cd hdf5; \ export PATH="$(prefix)/bin:$(PATH)" ;\ @@ -643,17 +643,17 @@ szlib.config : szlib.download szlib/configure CFLAGS="$(CFLAGS)" CC=$(CC) CXX=$(CXX) FC=$(FC) ) @touch $@ -zlib.config : zlib/configure - @echo Configuring zlib - @(cd zlib; \ +zlib-ng.config : zlib-ng/configure + @echo Configuring zlib-ng + @(cd zlib-ng; \ export PATH="$(prefix)/bin:$(PATH)" ;\ - ./configure --prefix=$(prefix) \ + ./configure --zlib-compat --prefix=$(prefix) \ --includedir=$(prefix)/include/zlib \ --libdir=$(prefix)/lib ) touch $@ -curl.config : curl/configure.ac zlib.install +curl.config : curl/configure.ac zlib-ng.install @echo "Configuring curl" @(cd curl; \ export PATH="$(prefix)/bin:$(PATH)" ;\ diff --git a/README.md b/README.md index 028151f..dffc0a6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ NASA/GSFC. | [antlr2](https://www.antlr2.org/) | 2.7.7 | | [GSL](https://www.gnu.org/software/gsl/) | 2.7 | | [jpeg](http://www.ijg.org/) | 9e | -| [zlib](http://www.zlib.net/) | 1.2.13 | +| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.0.6 | | [szip](https://support.hdfgroup.org/doc_resource/SZIP/) | 2.1.1 | | [cURL](https://curl.haxx.se/) | 7.86.0 | | [UDUNITS2](https://github.com/Unidata/UDUNITS-2) | 2.2.26 | diff --git a/VERSION b/VERSION index 93c8dda..1985849 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.6.0 +7.7.0 diff --git a/make_versions.sh b/make_versions.sh index 3dea3d6..2afbefc 100755 --- a/make_versions.sh +++ b/make_versions.sh @@ -51,11 +51,11 @@ then echo_version jpeg "$JPEG_VERSION" "$JPEG_VERSION_LOC" fi -ZLIB_VERSION_LOC="zlib/zlib.h" -if [[ -e $ZLIB_VERSION_LOC ]] +ZLIBNG_VERSION_LOC="zlib-ng/zlib.h" +if [[ -e $ZLIBNG_VERSION_LOC ]] then - ZLIB_VERSION=$(awk '/#define ZLIB_VERSION/ {print $3}' $ZLIB_VERSION_LOC | sed 's/"//g') - echo_version zlib "$ZLIB_VERSION" "$ZLIB_VERSION_LOC" + ZLIBNG_VERSION=$(awk '/#define ZLIBNG_VERSION/ {print $3}' $ZLIBNG_VERSION_LOC | sed 's/"//g') + echo_version zlib-ng "$ZLIBNG_VERSION" "$ZLIBNG_VERSION_LOC" fi SZLIB_VERSION_LOC="szlib/src/szlib.h" diff --git a/zlib b/zlib deleted file mode 160000 index 04f42ce..0000000 --- a/zlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc diff --git a/zlib-ng b/zlib-ng new file mode 160000 index 0000000..b56a2fd --- /dev/null +++ b/zlib-ng @@ -0,0 +1 @@ +Subproject commit b56a2fd0b126cfe5f13e68ab9090cd4f6a773286 From d86c198e683702745659f970c733115ebeff220b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 4 Nov 2022 08:54:56 -0400 Subject: [PATCH 2/5] Clean up CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca5d173..cbf2633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ ### Changed ### Removed -* Remove unmaintained zlib library +* Remove zlib library ### Added From 8daa18e43742ba2a07acbe6efbbf678024e9d96f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 17 Nov 2022 09:43:35 -0500 Subject: [PATCH 3/5] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1985849..09a6d30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.7.0 +7.8.0 From 1173860a3b7589ee705b7598ea6c0598c5e2a9e5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Jul 2023 12:55:30 -0400 Subject: [PATCH 4/5] Update to zlib-ng 2.1.3 --- CHANGELOG.md | 2 +- README.md | 2 +- zlib-ng | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48cc579..cfc3ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ ### Added -* zlib-ng 2.0.6 +* zlib-ng 2.1.3 ## [7.13.0] - 2023-05-24 diff --git a/README.md b/README.md index 06d4407..70d2987 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ NASA/GSFC. | [antlr2](https://www.antlr2.org/) | 2.7.7 | | [GSL](https://www.gnu.org/software/gsl/) | 2.7 | | [jpeg](http://www.ijg.org/) | 9e | -| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.0.6 | +| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.1.3 | | [szip](https://support.hdfgroup.org/doc_resource/SZIP/) | 2.1.1 | | [cURL](https://curl.haxx.se/) | 8.1.1 | | [UDUNITS2](https://github.com/Unidata/UDUNITS-2) | 2.2.26 | diff --git a/zlib-ng b/zlib-ng index b56a2fd..cf89cf3 160000 --- a/zlib-ng +++ b/zlib-ng @@ -1 +1 @@ -Subproject commit b56a2fd0b126cfe5f13e68ab9090cd4f6a773286 +Subproject commit cf89cf35037f152ce7adfeca864656de5d33ea1e From f7e956800f0d8a4483ac6fe45bb19a5be57744ca Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 22 Feb 2024 14:29:26 -0500 Subject: [PATCH 5/5] Update to zlib-ng 2.1.6 --- CHANGELOG.md | 4 ++-- README.md | 2 +- zlib-ng | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2c38cc..0720c50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,11 @@ ### Changed ### Removed -* Remove zlib library +- Remove zlib library ### Added -* zlib-ng 2.1.3 +- zlib-ng 2.1.6 ## [7.18.1] - 2024-02-08 diff --git a/README.md b/README.md index d4d6d84..2a5a21a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ NASA/GSFC. | [antlr2](https://www.antlr2.org/) | 2.7.7 | | [GSL](https://www.gnu.org/software/gsl/) | 2.7 | | [jpeg](http://www.ijg.org/) | 9e | -| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.1.3 | +| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.1.6 | | [szip](https://support.hdfgroup.org/doc_resource/SZIP/) | 2.1.1 | | [cURL](https://curl.haxx.se/) | 8.6.0 | | [UDUNITS2](https://github.com/GMAO-SI-Team/UDUNITS-2.git) | 2.2.28 | diff --git a/zlib-ng b/zlib-ng index cf89cf3..7425372 160000 --- a/zlib-ng +++ b/zlib-ng @@ -1 +1 @@ -Subproject commit cf89cf35037f152ce7adfeca864656de5d33ea1e +Subproject commit 74253725f884e2424a0dd8ae3f69896d5377f325