Update zlib (#6052)

* update zlib
- update zlib to v1.3.1
- update zlib-ng to v2.1.6
- use zlib (not zlib-ng) for cross/bat (linker bug is fixed since 0c60c7e)
- revert zlib workaround in synocli-file/Makefile

* lsd: define OLD_PPC_ARCHS as unsupported
- the package synocli-file already excludes lsd for OLD_PPC_ARCHS

* mc: adjust file list for v4.8.31
- latest update dropped support of native FISH server and protocol.

cross/bat/Makefile

@@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/sharkdp/bat/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/zlib-ng
+DEPENDS = cross/zlib
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

cross/lsd/Makefile

@@ -8,6 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
+# even it compiles with native/rust-qoriq, the tool does not run
+# on other PPC archs than qoriq (fails with "Segmentation fault (core dumped)")
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 HOMEPAGE = https://github.com/lsd-rs/lsd
 COMMENT  = The next gen ls command.
 LICENSE  = Apache 2.0

cross/mc/PLIST

@@ -6,7 +6,6 @@ rsc:etc/mc/
 rsc:libexec/mc/cons.saver
 rsc:libexec/mc/ext.d/
 rsc:libexec/mc/extfs.d/
-rsc:libexec/mc/fish/
 rsc:libexec/mc/mc.csh
 rsc:libexec/mc/mc.sh
 rsc:libexec/mc/mc-wrapper.csh

cross/zlib-ng/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = zlib-ng
-PKG_VERS = 2.1.4
+PKG_VERS = 2.1.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/zlib-ng/zlib-ng/archive
@@ -10,7 +10,6 @@ DEPENDS =
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
-
 CMAKE_ARGS += -DZLIB_ENABLE_TESTS=OFF
 CMAKE_ARGS += -DZLIBNG_ENABLE_TESTS=OFF
 CMAKE_ARGS += -DWITH_GTEST=OFF

cross/zlib-ng/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libz-ng.so
 lnk:lib/libz-ng.so.2
-lib:lib/libz-ng.so.2.1.4
+lib:lib/libz-ng.so.2.1.6

cross/zlib-ng/digests

@@ -1,3 +1,3 @@
-zlib-ng-2.1.4.tar.gz SHA1 c28b365ff6e12acd92eb9d11244a96c6225a43df
-zlib-ng-2.1.4.tar.gz SHA256 a0293475e6a44a3f6c045229fe50f69dc0eebc62a42405a51f19d46a5541e77a
-zlib-ng-2.1.4.tar.gz MD5 d2ac0866850e3f80d5e4e509aab62438
+zlib-ng-2.1.6.tar.gz SHA1 e457ebf2d8aa6d59407fef848ca9b6df5f7a74e2
+zlib-ng-2.1.6.tar.gz SHA256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2
+zlib-ng-2.1.6.tar.gz MD5 4854ab6a98d4b3d817b3e69ddbb148ce

cross/zlib/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = zlib
-PKG_VERS = 1.2.13
+PKG_VERS = 1.3.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://zlib.net/fossils
@@ -13,9 +13,8 @@ LICENSE  = zlib-license
 
 ADDITIONAL_CFLAGS = -Os -fPIC
 
-# fix pkgconfig file
-# build with cross-cc creates wrong pkgconfig file (prefix without missing package name)
-# build with cross-cmake creates correct pkgconfig file, but default folder is share not lib
+# create pkgconfig file in lib/pkgconfig (instead of share/pkgconfig)
 CMAKE_ARGS += -DINSTALL_PKGCONFIG_DIR=$(INSTALL_PREFIX)/lib/pkgconfig
+CMAKE_ARGS += -DZLIB_BUILD_EXAMPLES=OFF
 
 include ../../mk/spksrc.cross-cmake.mk

cross/zlib/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libz.so
 lnk:lib/libz.so.1
-lib:lib/libz.so.1.2.13
+lib:lib/libz.so.1.3.1

cross/zlib/digests

@@ -1,3 +1,3 @@
-zlib-1.2.13.tar.gz SHA1 55eaa84906f31ac20d725aa26cd20839196b6ba6
-zlib-1.2.13.tar.gz SHA256 b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
-zlib-1.2.13.tar.gz MD5 9b8aa094c4e5765dabf4da391f00d15c
+zlib-1.3.1.tar.gz SHA1 f535367b1a11e2f9ac3bec723fb007fbc0d189e5
+zlib-1.3.1.tar.gz SHA256 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
+zlib-1.3.1.tar.gz MD5 9855b6d802d7fe5b7bd5b196a2271655

diyspk/lsd/Makefile

@@ -4,6 +4,8 @@ SPK_REV = 1
 
 DEPENDS = cross/lsd
 
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 MAINTAINER = SynoCommunity
 DESCRIPTION = The next gen ls command.
 STARTABLE = no

spk/synocli-file/Makefile

@@ -3,7 +3,7 @@ SPK_VERS = 3.3
 SPK_REV = 23
 SPK_ICON = src/synocli-file.png
 
-# packages depending on cross/zlib must be defined later, see below
+# some package dependencies are defined later, see below (after rmlint)
 DEPENDS = cross/less cross/tree cross/ncdu cross/jdupes cross/rhash cross/nano cross/file
 DEPENDS += cross/detox
 DEPENDS += cross/lzip cross/plzip
@@ -35,13 +35,6 @@ OPTIONAL_DESC =
 
 include ../../mk/spksrc.common.mk
 
-ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
-# build rust tools before packages depending on cross/zlib
-# These tools must use cross/zlib-ng instead of cross/zlib, otherwise will fail to find zlib (x64 only)
-DEPENDS += cross/bat cross/eza
-OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, eza"
-endif
-
 # PPC archs except QorIQ
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 # rmlint must be built before "cross/mc cross/pcre2 cross/fdupes cross/zstd"
@@ -50,7 +43,7 @@ DEPENDS += cross/rmlint
 OPTIONAL_DESC := $(OPTIONAL_DESC)", rmlint"
 endif
 
-# packages depending on cross/zlib
+# Dependencies to be built after rmlint
 DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd
 
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
@@ -78,6 +71,8 @@ endif
 
 # OLD_PPC archs are not supported with rust
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+DEPENDS += cross/bat cross/eza
+OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, eza"
 DEPENDS += cross/ripgrep
 OPTIONAL_DESC := $(OPTIONAL_DESC)", rg (ripgrep)"
 ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))