intel · busykai · Oct 15, 2022 · Nov 8, 2022 · Dec 15, 2022 · Dec 27, 2022
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -54,7 +54,7 @@ jobs:
 
           - name: macOS GCC
             os: macos-latest
-            compiler: gcc-9
+            compiler: gcc-11
 
     steps:
     - name: Checkout repository

diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
@@ -21,71 +21,71 @@ jobs:
             build-dir: ../build
             src-dir: ../zlib
 
-          - name: Ubuntu GCC ARM SF
-            os: ubuntu-latest
-            compiler: arm-linux-gnueabi-gcc
-            configure-args: --warn
-            chost: arm-linux-gnueabi
-            packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
-            qemu-run: qemu-arm -L /usr/arm-linux-gnueabi
-
-          - name: Ubuntu GCC ARM HF
-            os: ubuntu-latest
-            compiler: arm-linux-gnueabihf-gcc
-            configure-args: --warn
-            chost: arm-linux-gnueabihf
-            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armhf-cross
-            qemu-run: qemu-arm -L /usr/arm-linux-gnueabihf
-
-          - name: Ubuntu GCC AARCH64
-            os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
-            configure-args: --warn
-            chost: aarch64-linux-gnu
-            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64 -L /usr/aarch64-linux-gnu
-
-          - name: Ubuntu GCC PPC
-            os: ubuntu-latest
-            compiler: powerpc-linux-gnu-gcc
-            configure-args: --warn --static
-            chost: powerpc-linux-gnu
-            packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
-            qemu-run: qemu-ppc -L /usr/powerpc-linux-gnu
-            cflags: -static
-            ldflags: -static
-
-          - name: Ubuntu GCC PPC64
-            os: ubuntu-latest
-            compiler: powerpc64-linux-gnu-gcc
-            configure-args: --warn --static
-            chost: powerpc-linux-gnu
-            packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
-            qemu-run: qemu-ppc64 -L /usr/powerpc64-linux-gnu
-            cflags: -static
-            ldflags: -static
-
-          - name: Ubuntu GCC PPC64LE
-            os: ubuntu-latest
-            compiler: powerpc64le-linux-gnu-gcc
-            configure-args: --warn
-            chost: powerpc64le-linux-gnu
-            packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
-            qemu-run: qemu-ppc64le -L /usr/powerpc64le-linux-gnu
-
-          - name: Ubuntu GCC S390X
-            os: ubuntu-latest
-            compiler: s390x-linux-gnu-gcc
-            configure-args: --warn --static
-            chost: s390x-linux-gnu
-            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x -L /usr/s390x-linux-gnu
-            cflags: -static
-            ldflags: -static
+#          - name: Ubuntu GCC ARM SF
+#            os: ubuntu-latest
+#            compiler: arm-linux-gnueabi-gcc
+#            configure-args: --warn
+#            chost: arm-linux-gnueabi
+#            packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
+#            qemu-run: qemu-arm -L /usr/arm-linux-gnueabi
+#
+#          - name: Ubuntu GCC ARM HF
+#            os: ubuntu-latest
+#            compiler: arm-linux-gnueabihf-gcc
+#            configure-args: --warn
+#            chost: arm-linux-gnueabihf
+#            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armhf-cross
+#            qemu-run: qemu-arm -L /usr/arm-linux-gnueabihf
+#
+#          - name: Ubuntu GCC AARCH64
+#            os: ubuntu-latest
+#            compiler: aarch64-linux-gnu-gcc
+#            configure-args: --warn
+#            chost: aarch64-linux-gnu
+#            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
+#            qemu-run: qemu-aarch64 -L /usr/aarch64-linux-gnu
+#
+#          - name: Ubuntu GCC PPC
+#            os: ubuntu-latest
+#            compiler: powerpc-linux-gnu-gcc
+#            configure-args: --warn --static
+#            chost: powerpc-linux-gnu
+#            packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
+#            qemu-run: qemu-ppc -L /usr/powerpc-linux-gnu
+#            cflags: -static
+#            ldflags: -static
+#
+#          - name: Ubuntu GCC PPC64
+#            os: ubuntu-latest
+#            compiler: powerpc64-linux-gnu-gcc
+#            configure-args: --warn --static
+#            chost: powerpc-linux-gnu
+#            packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
+#            qemu-run: qemu-ppc64 -L /usr/powerpc64-linux-gnu
+#            cflags: -static
+#            ldflags: -static
+#
+#          - name: Ubuntu GCC PPC64LE
+#            os: ubuntu-latest
+#            compiler: powerpc64le-linux-gnu-gcc
+#            configure-args: --warn
+#            chost: powerpc64le-linux-gnu
+#            packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
+#            qemu-run: qemu-ppc64le -L /usr/powerpc64le-linux-gnu
+#
+#          - name: Ubuntu GCC S390X
+#            os: ubuntu-latest
+#            compiler: s390x-linux-gnu-gcc
+#            configure-args: --warn --static
+#            chost: s390x-linux-gnu
+#            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
+#            qemu-run: qemu-s390x -L /usr/s390x-linux-gnu
+#            cflags: -static
+#            ldflags: -static
 
           - name: macOS GCC
             os: macos-latest
-            compiler: gcc-9
+            compiler: gcc-11
             configure-args: --warn
 
           - name: macOS Clang

diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 2.4.4...3.15.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.13")
+set(VERSION "1.3")
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -100,26 +100,40 @@ set(ZLIB_PRIVATE_HDRS
     inflate.h
     inftrees.h
     trees.h
+    x86.h
     zutil.h
 )
 set(ZLIB_SRCS
     adler32.c
     compress.c
     crc32.c
+    crc_folding.c
     deflate.c
+    deflate_medium.c
+    deflate_quick.c
     gzclose.c
     gzlib.c
     gzread.c
     gzwrite.c
-    inflate.c
     infback.c
-    inftrees.c
     inffast.c
+    inflate.c
+    inftrees.c
+    match.c
+    slide_sse.c
     trees.c
     uncompr.c
+    x86.c
     zutil.c
 )
 
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
+        OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    set_source_files_properties(crc_folding.c PROPERTIES COMPILE_OPTIONS "-mpclmul;-msse4")
+    set_source_files_properties(slide_sse.c PROPERTIES COMPILE_OPTIONS -msse2)
+    set_source_files_properties(deflate_quick.c PROPERTIES COMPILE_OPTIONS -msse4)
+endif()
+
 if(NOT MINGW)
     set(ZLIB_DLL_SRCS
         win32/zlib1.rc # If present will override custom build rule below.

diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,24 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.3 (18 Aug 2023)
+- Remove K&R function definitions and zlib2ansi
+- Fix bug in deflateBound() for level 0 and memLevel 9
+- Fix bug when gzungetc() is used immediately after gzopen()
+- Fix bug when using gzflush() with a very small buffer
+- Fix crash when gzsetparams() attempted for transparent write
+- Fix test/example.c to work with FORCE_STORED
+- Rewrite of zran in examples (see zran.c version history)
+- Fix minizip to allow it to open an empty zip file
+- Fix reading disk number start on zip64 files in minizip
+- Fix logic error in minizip argument processing
+- Add minizip testing to Makefile
+- Read multiple bytes instead of byte-by-byte in minizip unzip.c
+- Add memory sanitizer to configure (--memory)
+- Various portability improvements
+- Various documentation improvements
+- Various spelling and typo corrections
+
 Changes in 1.2.13 (13 Oct 2022)
 - Fix configure issue that discarded provided CC definition
 - Correct incorrect inputs provided to the CRC functions
@@ -1445,7 +1463,7 @@ Changes in 0.99 (27 Jan 96)
 - fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
 - in fcalloc, normalize pointer if size > 65520 bytes
 - don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc.
 - use Z_BINARY instead of BINARY
 - document that gzclose after gzdopen will close the file
 - allow "a" as mode in gzopen

diff --git a/FAQ b/FAQ
@@ -4,7 +4,7 @@
 
 If your question is not there, please check the zlib home page
 http://zlib.net/ which may have more recent information.
-The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
+The latest zlib FAQ is at http://zlib.net/zlib_faq.html
 
 
  1. Is zlib Y2K-compliant?

diff --git a/Makefile.in b/Makefile.in
@@ -28,7 +28,7 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.13
+SHAREDLIBV=libz.so.1.3
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
@@ -53,11 +53,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -127,18 +127,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -197,6 +185,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -273,6 +278,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -359,8 +393,14 @@ zconf.h.cmakein: $(SRCDIR)zconf.h.in
 zconf: $(SRCDIR)zconf.h.in
 	cp -p $(SRCDIR)zconf.h.in zconf.h
 
+minizip-test: static
+	cd contrib/minizip && { CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
+
+minizip-clean:
+	cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
+
 mostlyclean: clean
-clean:
+clean: minizip-clean
 	rm -f *.o *.lo *~ \
 	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
 	   example64$(EXE) minigzip64$(EXE) \
@@ -392,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -402,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h