Move from zlib to zlib-ng

.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

CHANGELOG.md

@@ -6,6 +6,13 @@
 ### Fixed
 ### Changed
 ### Removed
+
+* Remove unmaintained zlib library
+
+### Added
+
+* zlib-ng 2.0.6
+
 ### Added
 
 ## [7.5.1] - 2022-08-22

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)" ;\

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.11       |
+| [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.83.1       |
 | [UDUNITS2](https://github.com/Unidata/UDUNITS-2)                        | 2.2.26       |

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"