SynoCommunity · dotysan · Apr 15, 2024 · Apr 15, 2024 · Apr 16, 2024 · Apr 16, 2024
diff --git a/.github/actions/build.sh b/.github/actions/build.sh
@@ -79,8 +79,14 @@ do
         else
             TCVERSION=${GH_ARCH##*-}
         fi
-        echo "$ make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-}" >>build.log
-        make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-} |& tee >(tail -15 >>build.log)
+        # noarch package must be first built then published
+        echo "$ make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package}" >>build.log
+        make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} |& tee >(tail -15 >>build.log)
+
+        if [ "${package}" == "${PACKAGE_TO_PUBLISH}" ]; then
+            echo "$ make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-}" >>build.log
+            make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-} |& tee >(tail -15 >>build.log)
+        fi
     fi
     result=$?
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -91,9 +91,11 @@ jobs:
 
       - name: Cache toolchains
         uses: actions/cache@v4
+        # Do not cache qoriq toolchain. It must be built every time to install custom rust toolchain
+        if: ${{ contains(matrix.arch,'qoriq') == false }}
         with:
           path: toolchain/*/work
-          key: toolchain-${{ matrix.arch }}-v3-${{ hashFiles('toolchain/*/digests') }}
+          key: toolchain-${{ matrix.arch }}-v3-${{ hashFiles(format('toolchain/syno-{0}/digests',matrix.arch)) }}
 
       - name: Use cache of downloaded files
         uses: actions/cache@v4

diff --git a/cross/autoconf/Makefile b/cross/autoconf/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = autoconf
-PKG_VERS = 2.71
+PKG_VERS = 2.72
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/autoconf/
@@ -12,5 +12,12 @@ COMMENT  = Autoconf is an extensible package of M4 macros that produce shell scr
 LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
+POST_INSTALL_TARGET = autoconf_post_install
 
 include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: autoconf_post_install
+autoconf_post_install:
+	@$(MSG) Patch scripts to use installed m4 as default
+	@sed -i.bak -e 's|/usr/bin/m4|$(INSTALL_PREFIX)/bin/m4|g' $(STAGING_INSTALL_PREFIX)/bin/autom4te
+	@sed -i.bak -e 's|/usr/bin/m4|$(INSTALL_PREFIX)/bin/m4|g' $(STAGING_INSTALL_PREFIX)/bin/autoupdate
diff --git a/cross/autoconf/digests b/cross/autoconf/digests
@@ -1,3 +1,3 @@
-autoconf-2.71.tar.xz SHA1 1b5b1dbed849c6653be47c56d28d26fcf3f7238a
-autoconf-2.71.tar.xz SHA256 f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4
-autoconf-2.71.tar.xz MD5 12cfa1687ffa2606337efe1a64416106
+autoconf-2.72.tar.xz SHA1 1d082d999ff4506ec8f92c6ecb9732546f5204fb
+autoconf-2.72.tar.xz SHA256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a
+autoconf-2.72.tar.xz MD5 1be79f7106ab6767f18391c5e22be701
diff --git a/cross/bandwhich/Makefile b/cross/bandwhich/Makefile
@@ -1,7 +1,7 @@
 PKG_NAME = bandwhich
-PKG_VERS = 0.20.0
+PKG_VERS = 0.22.2
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/imsnif/bandwhich/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

diff --git a/cross/bandwhich/digests b/cross/bandwhich/digests
@@ -1,3 +1,3 @@
-bandwhich-0.20.0.tar.gz SHA1 357c691219831a68524f009f58efc6011e8c0d68
-bandwhich-0.20.0.tar.gz SHA256 4bbf05be32439049edd50bd1e4d5a2a95b0be8d36782e4100732f0cc9f19ba12
-bandwhich-0.20.0.tar.gz MD5 ade13a9a94e0c9667b8dd5e55425091a
+bandwhich-0.22.2.tar.gz SHA1 0c9a1cebd2db2562bf52bfbeee13c03770a8014b
+bandwhich-0.22.2.tar.gz SHA256 4c41719549e05dbaac1bc84828269e59b2f2032e76ae646da9b9e3b87e5a5fd1
+bandwhich-0.22.2.tar.gz MD5 9389c4eb67ca86dc86ce550f40f93586
diff --git a/cross/binutils-2.41/Makefile b/cross/binutils-2.41/Makefile
@@ -0,0 +1,39 @@
+PKG_NAME = binutils
+PKG_VERS = 2.41
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/zlib cross/mpfr
+
+HOMEPAGE = https://www.gnu.org/software/binutils/
+COMMENT  = GNU Binutils
+LICENSE  = GPLv2/LGPLv2
+
+GNU_CONFIGURE = 1
+
+CONFIGURE_ARGS  = --disable-static
+CONFIGURE_ARGS += --enable-host-shared
+CONFIGURE_ARGS += --with-system-zlib
+CONFIGURE_ARGS += --enable-gold=yes
+
+include ../../mk/spksrc.archs.mk
+
+# embedspu is a tool to "Embed an SPU ELF executable into a PowerPC object file"
+# and hence built only for PPC_ARCHS.
+# gprofng fails to build on i686 and does not build on other 32-bit archs.
+ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH))
+PLIST_TRANSFORM = sed -e '/bin\/embedspu/d'
+else
+CONFIGURE_ARGS += --disable-gprofng
+PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d'
+ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+PLIST_TRANSFORM += -e '/bin\/embedspu/d'
+endif
+endif
+
+# Avoid conflicts with gdb
+CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/binutils-2.41/PLIST b/cross/binutils-2.41/PLIST
@@ -0,0 +1,27 @@
+bin:bin/addr2line
+bin:bin/ar
+bin:bin/as
+bin:bin/c++filt
+bin:bin/dwp
+bin:bin/elfedit
+bin:bin/embedspu
+bin:bin/gp-archive
+bin:bin/gp-collect-app
+rsc:bin/gp-display-html
+bin:bin/gp-display-src
+bin:bin/gp-display-text
+bin:bin/gprof
+bin:bin/gprofng
+bin:bin/ld
+bin:bin/ld.bfd
+bin:bin/ld.gold
+bin:bin/nm
+bin:bin/objcopy
+bin:bin/objdump
+bin:bin/ranlib
+bin:bin/readelf
+bin:bin/size
+bin:bin/strings
+bin:bin/strip
+lib:lib/bfd-plugins/libdep.so
+lib:lib/gprofng/*.so
diff --git a/cross/binutils-2.41/digests b/cross/binutils-2.41/digests
@@ -0,0 +1,3 @@
+binutils-2.41.tar.xz SHA1 0e008260a958bbd10182ee3384672ae0a310eece
+binutils-2.41.tar.xz SHA256 ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+binutils-2.41.tar.xz MD5 256d7e0ad998e423030c84483a7c1e30
diff --git a/cross/binutils-latest/Makefile b/cross/binutils-latest/Makefile
@@ -1,38 +1,39 @@
 PKG_NAME = binutils
-PKG_VERS = 2.40
+PKG_VERS = 2.42
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/zlib cross/mpfr
 
+# c++11 compiler is required (the real check is in cross/binutils/Makefile)
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
+
 HOMEPAGE = https://www.gnu.org/software/binutils/
 COMMENT  = GNU Binutils
 LICENSE  = GPLv2/LGPLv2
 
 GNU_CONFIGURE = 1
 
+CONFIGURE_ARGS  = --disable-static
 CONFIGURE_ARGS += --enable-host-shared
 CONFIGURE_ARGS += --with-system-zlib
 CONFIGURE_ARGS += --enable-gold=yes
 
 include ../../mk/spksrc.archs.mk
 
-# embedspu is a tool to "Embed an SPU ELF executable into a PowerPC object file"
-# and hence built only for PPC_ARCHS.
-# gprofng fails to build on i686 and does not build on other 32-bit archs.
-ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH))
-PLIST_TRANSFORM = sed -e '/bin\/embedspu/d'
-else
+# gprofng fails to build for i686 
+# ./../common/core_pcbe.c:2698:33: error: ‘PERF_COUNT_HW_REF_CPU_CYCLES’ undeclared here
+# gprofng is not built for other 32-bit archs
+ifeq ($(findstring $(ARCH),$(32bit_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --disable-gprofng
 PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d'
-ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-PLIST_TRANSFORM += -e '/bin\/embedspu/d'
-endif
 endif
 
 # Avoid conflicts with gdb
 CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils
 
+ADDITIONAL_CXXFLAGS = -std=c++11
+
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/binutils-latest/PLIST b/cross/binutils-latest/PLIST
@@ -4,7 +4,6 @@ bin:bin/as
 bin:bin/c++filt
 bin:bin/dwp
 bin:bin/elfedit
-bin:bin/embedspu
 bin:bin/gp-archive
 bin:bin/gp-collect-app
 rsc:bin/gp-display-html

diff --git a/cross/binutils-latest/digests b/cross/binutils-latest/digests
@@ -1,3 +1,3 @@
-binutils-2.40.tar.xz SHA1 fee4fbef9d632afc1988dd631d7f75d4394b7f8d
-binutils-2.40.tar.xz SHA256 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
-binutils-2.40.tar.xz MD5 007b59bd908a737c06e5a8d3d2c737eb
+binutils-2.42.tar.xz SHA1 44da41792c60419863d7e13fa1deaf6b24dd69b8
+binutils-2.42.tar.xz SHA256 f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
+binutils-2.42.tar.xz MD5 a075178a9646551379bfb64040487715
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
@@ -1,12 +1,15 @@
 PKG_NAME = binutils-main
 
 OPTIONAL_DEPENDS  = cross/binutils-latest
+OPTIONAL_DEPENDS += cross/binutils-2.41
 OPTIONAL_DEPENDS += cross/binutils-2.32
 
 include ../../mk/spksrc.main-depends.mk
 
-ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+ifeq ($(call version_lt, $(TC_GCC), 4.4),1)
 DEPENDS = cross/binutils-2.32
+else ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
+DEPENDS = cross/binutils-2.41
 else
 DEPENDS = cross/binutils-latest
 endif
diff --git a/cross/bottom/Makefile b/cross/bottom/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = bottom
-PKG_VERS = 0.9.2
+PKG_VERS = 0.9.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/ClementTsang/bottom/archive

diff --git a/cross/bottom/digests b/cross/bottom/digests
@@ -1,3 +1,3 @@
-bottom-0.9.2.tar.gz SHA1 af17bcaea5c86bfeaddbc1405160db9b7a0a21e0
-bottom-0.9.2.tar.gz SHA256 c6b1f6eefa814607cbc6f1ebf6358a070293413d09583963970d650b724a3b3a
-bottom-0.9.2.tar.gz MD5 75c7f75cc1a9be6a078b292a63d22dd4
+bottom-0.9.6.tar.gz SHA1 034d0b70aa1eb5da9eda9b1611f9ab329d1135fb
+bottom-0.9.6.tar.gz SHA256 202130e0d7c362d0d0cf211f6a13e31be3a02f13f998f88571e59a7735d60667
+bottom-0.9.6.tar.gz MD5 7a0b000bbf1e3db4ab78ca45d2ba8cbf
diff --git a/cross/busybox/configs/procutils b/cross/busybox/configs/procutils
@@ -1,6 +1,5 @@
 CONFIG_LONG_OPTS=y
 CONFIG_IOSTAT=y
-CONFIG_LSOF=y
 CONFIG_PGREP=y
 CONFIG_FEATURE_PIDOF_SINGLE=y
 CONFIG_FEATURE_PIDOF_OMIT=y

diff --git a/cross/busybox/configs/procutils.dsm5 b/cross/busybox/configs/procutils.dsm5
@@ -1,6 +1,5 @@
 CONFIG_LONG_OPTS=y
 CONFIG_IOSTAT=y
-CONFIG_LSOF=y
 CONFIG_PGREP=y
 CONFIG_FEATURE_PIDOF_SINGLE=y
 CONFIG_FEATURE_PIDOF_OMIT=y

diff --git a/cross/c-ares-1.28/Makefile b/cross/c-ares-1.28/Makefile
@@ -0,0 +1,23 @@
+PKG_NAME = c-ares
+PKG_VERS = 1.28.1
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/c-ares/c-ares/releases/download/cares-$(subst .,_,$(PKG_VERS))
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+HOMEPAGE = https://c-ares.org/
+COMMENT  = c-ares is a C library for asynchronous DNS requests (including name resolves).
+LICENSE  = MIT
+
+POST_CONFIGURE_TARGET = cares_post_configure
+
+CMAKE_ARGS += -DCARES_BUILD_TOOLS=OFF
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: cares_post_configure
+cares_post_configure:
+	@$(MSG) Create target include folder to suppress ignorable error logs
+	@$(RUN) install -d $(INSTALL_DIR)$(INSTALL_PREFIX)/include
diff --git a/cross/c-ares/PLIST → cross/c-ares-1.28/PLIST b/cross/c-ares/PLIST → cross/c-ares-1.28/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/libcares.so
 lnk:lib/libcares.so.2
-lib:lib/libcares.so.2.12.0
+lib:lib/libcares.so.2.13.1
diff --git a/cross/c-ares-1.28/digests b/cross/c-ares-1.28/digests
@@ -0,0 +1,3 @@
+c-ares-1.28.1.tar.gz SHA1 3a55cc7d21a4eff683bfb03c12067c44c0c43698
+c-ares-1.28.1.tar.gz SHA256 675a69fc54ddbf42e6830bc671eeb6cd89eeca43828eb413243fd2c0a760809d
+c-ares-1.28.1.tar.gz MD5 2b0f0df7491538a0d10f3310e13d4b5f
diff --git a/cross/c-ares-latest/Makefile b/cross/c-ares-latest/Makefile
@@ -0,0 +1,26 @@
+PKG_NAME = c-ares
+PKG_VERS = 1.29.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/c-ares/c-ares/releases/download/cares-$(subst .,_,$(PKG_VERS))
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+# ares_event_configchg.c:140: error: 'IN_NONBLOCK' undeclared (first use in this function)
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
+HOMEPAGE = https://c-ares.org/
+COMMENT  = c-ares is a C library for asynchronous DNS requests (including name resolves).
+LICENSE  = MIT
+
+POST_CONFIGURE_TARGET = cares_post_configure
+
+CMAKE_ARGS += -DCARES_BUILD_TOOLS=OFF
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: cares_post_configure
+cares_post_configure:
+	@$(MSG) Create target include folder to suppress ignorable error logs
+	@$(RUN) install -d $(INSTALL_DIR)$(INSTALL_PREFIX)/include
diff --git a/cross/c-ares-latest/PLIST b/cross/c-ares-latest/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libcares.so
+lnk:lib/libcares.so.2
+lib:lib/libcares.so.2.14.0
diff --git a/cross/c-ares-latest/digests b/cross/c-ares-latest/digests
@@ -0,0 +1,3 @@
+c-ares-1.29.0.tar.gz SHA1 69d14a6ea7e414a290e3e3f058210ef02d469c0b
+c-ares-1.29.0.tar.gz SHA256 0b89fa425b825c4c7bc708494f374ae69340e4d1fdc64523bdbb2750bfc02ea7
+c-ares-1.29.0.tar.gz MD5 0768b7b8a7318be4576a68a7c31db6fb
diff --git a/cross/c-ares/Makefile b/cross/c-ares/Makefile
@@ -1,16 +1,12 @@
-PKG_NAME = c-ares
-PKG_VERS = 1.27.0
-PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://c-ares.org/download
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_NAME = c-ares-main
 
-DEPENDS =
+OPTIONAL_DEPENDS  = cross/c-ares-latest
+OPTIONAL_DEPENDS += cross/c-ares-1.28
 
-HOMEPAGE = https://c-ares.org/
-COMMENT  = c-ares is a C library for asynchronous DNS requests (including name resolves).
-LICENSE  = MIT
+include ../../mk/spksrc.main-depends.mk
 
-CMAKE_ARGS += -DCARES_BUILD_TOOLS=OFF
-
-include ../../mk/spksrc.cross-cmake.mk
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+DEPENDS = cross/c-ares-1.28
+else
+DEPENDS = cross/c-ares-latest
+endif
diff --git a/cross/c-ares/digests b/cross/c-ares/digests
diff --git a/cross/cloudflared/Makefile b/cross/cloudflared/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = cloudflared
-PKG_VERS = 2024.3.0
+PKG_VERS = 2024.6.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/cloudflare/cloudflared/archive
@@ -9,7 +9,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 BUILD_DEPENDS = native/go
 
 HOMEPAGE = https://github.com/cloudflare/cloudflared
-COMMENT  = Cloudflare Tunnel client (formerly Argo Tunnel)
+COMMENT  = Cloudflare Tunnel provides you with a secure way to connect your resources to Cloudflare without a publicly routable IP address.
 LICENSE  = Apache-2.0
 
 GO_SRC_DIR = $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)
@@ -18,12 +18,13 @@ COMPILE_TARGET = cloudflared_compile
 
 include ../../mk/spksrc.cross-go.mk
 
+GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/
+
 .PHONY: cloudflared_compile
 cloudflared_compile:
 ifeq (,$(wildcard /tmp/go))
-	@$(MSG) "   Call install-cloudflare-go.sh"
-	@$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/  \
-        .teamcity/install-cloudflare-go.sh
+	@$(MSG) "- Call install-cloudflare-go.sh"
+	@$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(GOROOT_BOOTSTRAP) .teamcity/install-cloudflare-go.sh
 endif
-	@$(MSG) "   Build cloudflared"
+	@$(MSG) "- Build cloudflared"
 	@$(RUN) $(MAKE) PATH="/tmp/go/bin:${PATH}" VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
diff --git a/cross/cloudflared/digests b/cross/cloudflared/digests
@@ -1,3 +1,3 @@
-cloudflared-2024.3.0.tar.gz SHA1 419a6b21baf89b6e15eab654e4228de48419a5c7
-cloudflared-2024.3.0.tar.gz SHA256 6e5fda072d81b2d40208a0d244b44aaf607f26709711e157e23f44f812594e93
-cloudflared-2024.3.0.tar.gz MD5 7c3f1d60d1d9b4471ac6d93019095102
+cloudflared-2024.6.0.tar.gz SHA1 ea76a4a5df9198fde1a879fdabd44ebc623b9762
+cloudflared-2024.6.0.tar.gz SHA256 e75eec7eaf61320f7b5f9f6abc0891285bd3eeebad46b4a5cb53765281a8d88e
+cloudflared-2024.6.0.tar.gz MD5 5942d076798577ab687786986598990a