Merge branch 'master' of https://github.com/hgy59/spksrc into redesig…

…n_dependency_list

cross/libexpat/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libexpat
-PKG_VERS = 2.6.2
+PKG_VERS = 2.6.4
 PKG_EXT = tar.xz
 PKG_DIST_NAME = expat-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERS))

cross/libexpat/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libexpat.so
 lnk:lib/libexpat.so.1
-lib:lib/libexpat.so.1.9.2
+lib:lib/libexpat.so.1.10.0

cross/libexpat/digests

@@ -1,3 +1,3 @@
-libexpat-2.6.2.tar.xz SHA1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd
-libexpat-2.6.2.tar.xz SHA256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
-libexpat-2.6.2.tar.xz MD5 0cb75c8feb842c0794ba89666b762a2d
+libexpat-2.6.4.tar.xz SHA1 97d653e8f5a30dfdec7d6e525151efeac7890942
+libexpat-2.6.4.tar.xz SHA256 a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee
+libexpat-2.6.4.tar.xz MD5 101fe3e320a2800f36af8cf4045b45c7

cross/libssh2/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME = libssh2
-PKG_VERS = 1.11.0
-PKG_EXT = tar.gz
+PKG_VERS = 1.11.1
+PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.libssh2.org/download
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

cross/libssh2/digests

@@ -1,3 +1,3 @@
-libssh2-1.11.0.tar.gz SHA1 fbdb4751a4bc93e895e9c3426f7f80b437d250fe
-libssh2-1.11.0.tar.gz SHA256 3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
-libssh2-1.11.0.tar.gz MD5 a01d543fd891ca48fe47726540d50b17
+libssh2-1.11.1.tar.xz SHA1 31d6c93e981fe259d679a21afd9098821c869483
+libssh2-1.11.1.tar.xz SHA256 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769
+libssh2-1.11.1.tar.xz MD5 54111b78a406f8a23e603d342de90056

cross/libssh2/patches/001-remove-warning-not-supported-with-old-gcc.patch

@@ -0,0 +1,12 @@
+# remove -Wtrampolines not supported by gcc v4.3.2 of ppc853x-5.2
+# 
+--- cmake/PickyWarnings.cmake.orig	2024-10-16 08:03:21.000000000 +0000
++++ cmake/PickyWarnings.cmake	2025-01-05 19:21:34.842788054 +0000
+@@ -176,7 +176,6 @@
+           -Wmissing-parameter-type         #             gcc  4.3
+           -Wold-style-declaration          #             gcc  4.3
+           -Wstrict-aliasing=3              #             gcc  4.0
+-          -Wtrampolines                    #             gcc  4.3
+         )
+       endif()
+       if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5 AND MINGW)

cross/monit/Makefile

@@ -1,11 +1,11 @@
 PKG_NAME = monit
-PKG_VERS = 5.29.0
+PKG_VERS = 5.34.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://mmonit.com/monit/dist
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/openssl
+DEPENDS = cross/openssl3
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 

cross/monit/digests

@@ -1,3 +1,3 @@
-monit-5.29.0.tar.gz SHA1 818517cdd9bb010bfcdf093c2eb9753f825035ac
-monit-5.29.0.tar.gz SHA256 f665e6dd1f26a74b5682899a877934167de2b2582e048652ecf036318477885f
-monit-5.29.0.tar.gz MD5 8a0546d0d52216b22ebd57acc0bb1e03
+monit-5.34.4.tar.gz SHA1 eb276acba53a71fe73661f72963761bcce583384
+monit-5.34.4.tar.gz SHA256 ef607cfaabfd3767d40b9b9e32032f748beebc4d686831f6111e0e68fbd1b469
+monit-5.34.4.tar.gz MD5 0a4980f1c1d9da55bc39afae2a49f9e2

native/go/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = go
-PKG_VERS = 1.23.4
+PKG_VERS = 1.23.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT)
 PKG_DIST_SITE = https://go.dev/dl

native/go/digests

@@ -1,3 +1,3 @@
-go1.23.4.linux-amd64.tar.gz SHA1 ae3632905be8af89aa9ca41614aec8554ca1b527
-go1.23.4.linux-amd64.tar.gz SHA256 6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971
-go1.23.4.linux-amd64.tar.gz MD5 8e8e23e5ca5d7d8841616414dd0ff890
+go1.23.5.linux-amd64.tar.gz SHA1 6b3cf71f432a81a74054e06995eead4b20db24cf
+go1.23.5.linux-amd64.tar.gz SHA256 cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
+go1.23.5.linux-amd64.tar.gz MD5 d820828a2428ec5e02986b4b28d53851

spk/monit/Makefile

@@ -1,19 +1,19 @@
 SPK_NAME = monit
-SPK_VERS = 5.29.0
-SPK_REV = 10
+SPK_VERS = 5.34.4
+SPK_REV = 11
 SPK_ICON = src/monit.png
 DSM_UI_DIR = app
 
-DEPENDS =  cross/monit
+DEPENDS = cross/monit
 
-UNSUPPORTED_ARCHS = PPC_ARCHS
+UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 
 BETA = 1
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Monit is a small Open Source utility for managing and monitoring Unix systems. Monit conducts automatic maintenance and repair and can execute meaningful causal actions in error situations.
 DISPLAY_NAME = Monit
-CHANGELOG = "1. Update monit to v5.29.0<br/>2. Update OpenSSL to v1.1.1l"
+CHANGELOG = "1. Update monit to v5.34.4 <br/>2. Update OpenSSL to v3.1.7."
 
 HOMEPAGE = https://mmonit.com/monit
 LICENSE  = AGPLv3
@@ -32,9 +32,7 @@ include ../../mk/spksrc.spk.mk
 
 .PHONY: monit_extra_install
 monit_extra_install:
-	install -m 755 -d $(STAGING_DIR)/var/monit.d
-	install -m 755 -d $(STAGING_DIR)/var/events
-	install -m 700 src/monitrc $(STAGING_DIR)/var/monitrc
-	install -m 700 src/monit.d/monit $(STAGING_DIR)/var/monit.d/monit
-	install -m 755 -d $(STAGING_DIR)/share/examples
-	install -m 644 src/examples/* $(STAGING_DIR)/share/examples/
+	@install -m 755 -d $(STAGING_DIR)/var/monit.d $(STAGING_DIR)/var/events $(STAGING_DIR)/share/examples
+	@install -m 700 src/monitrc $(STAGING_DIR)/var/monitrc
+	@install -m 700 src/monit.d/monit $(STAGING_DIR)/var/monit.d/monit
+	@install -m 644 src/examples/* $(STAGING_DIR)/share/examples/