From e7a24e9d24fa84c0d1eb23828af1c0a4054a4564 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 15 Jan 2024 07:29:17 +0100
Subject: [PATCH 1/8] update go to v1.21.6

---
 native/go/Makefile | 2 +-
 native/go/digests  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/go/Makefile b/native/go/Makefile
index 6e0558a7500..14fd4b7b061 100644
--- a/native/go/Makefile
+++ b/native/go/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = go
-PKG_VERS = 1.20.7
+PKG_VERS = 1.21.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT)
 PKG_DIST_SITE = https://go.dev/dl
diff --git a/native/go/digests b/native/go/digests
index e3616a9c176..de77c7c6b95 100644
--- a/native/go/digests
+++ b/native/go/digests
@@ -1,3 +1,3 @@
-go1.20.7.linux-amd64.tar.gz SHA1 3abc6accf764ae9f31376ee5c9f39e124b546b90
-go1.20.7.linux-amd64.tar.gz SHA256 f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44
-go1.20.7.linux-amd64.tar.gz MD5 d31ba705aeeb9248d675fe4e21ea6bf9
+go1.21.6.linux-amd64.tar.gz SHA1 86b00641d1b4431bce79236db0160065179c4fc4
+go1.21.6.linux-amd64.tar.gz SHA256 3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4
+go1.21.6.linux-amd64.tar.gz MD5 21bbd4a2700e58f04f080d8858191b7c

From 3d82a0355a859170bd056b66a82bb83f84fc8821 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 15 Jan 2024 07:40:27 +0100
Subject: [PATCH 2/8] syncthing: update to v1.27.2

- update syncthing to be compatible with go 1.21
---
 cross/syncthing/Makefile | 2 +-
 cross/syncthing/digests  | 6 +++---
 spk/syncthing/Makefile   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cross/syncthing/Makefile b/cross/syncthing/Makefile
index ec3d6ce3240..b9ed4652177 100644
--- a/cross/syncthing/Makefile
+++ b/cross/syncthing/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = syncthing
-PKG_VERS = 1.23.4
+PKG_VERS = 1.27.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-source-v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERS)
diff --git a/cross/syncthing/digests b/cross/syncthing/digests
index eaf819b4367..dc8523d19e6 100644
--- a/cross/syncthing/digests
+++ b/cross/syncthing/digests
@@ -1,3 +1,3 @@
-syncthing-source-v1.23.4.tar.gz SHA1 e4aead28fa927acc618d69d702a75703faa37bc0
-syncthing-source-v1.23.4.tar.gz SHA256 06a2882f8ac49e15faf96025b01d0edcd4cc190a419d5de98fbe8271695329fa
-syncthing-source-v1.23.4.tar.gz MD5 59280b2e551a8001ce84867c27398aa3
+syncthing-source-v1.27.2.tar.gz SHA1 2c7f46b51657e21b6d6d962bb7c125914699afc5
+syncthing-source-v1.27.2.tar.gz SHA256 2a621655e09fdce8a5784ea0f65c5e9773b844ad966686916e68468cbd44813c
+syncthing-source-v1.27.2.tar.gz MD5 e0fc0ad6ecf51da56b48f19a7afa23f0
diff --git a/spk/syncthing/Makefile b/spk/syncthing/Makefile
index b547ee2946a..76d789f0ed2 100644
--- a/spk/syncthing/Makefile
+++ b/spk/syncthing/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = syncthing
-SPK_VERS = 1.23.4
-SPK_REV = 29
+SPK_VERS = 1.27.2
+SPK_REV = 30
 SPK_ICON = src/syncthing.png
 DSM_UI_DIR = app
 
@@ -14,7 +14,7 @@ MAINTAINER = acolomb
 DESCRIPTION = Automatically sync files via secure, distributed technology.
 DESCRIPTION_FRE = Synchronisation automatique de fichiers via une technologie sécurisée et distribuée.
 DISPLAY_NAME = Syncthing
-CHANGELOG = "1. Update syncthing to v1.23.4.<br/>2. Include next gen gui (path: /tech-ui)."
+CHANGELOG = "Update syncthing to v1.27.2."
 HOMEPAGE = https://www.syncthing.net
 LICENSE = MPLv2.0
 STARTABLE = yes

From 653fca206763fefcb8740ec80a7aa0d257720c56 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 15 Jan 2024 19:49:16 +0100
Subject: [PATCH 3/8] use alternate url to download cross/tree

---
 cross/tree/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cross/tree/Makefile b/cross/tree/Makefile
index 1c576521fc7..1727be6d4bc 100644
--- a/cross/tree/Makefile
+++ b/cross/tree/Makefile
@@ -2,7 +2,7 @@ PKG_NAME = tree
 PKG_VERS = 2.1.1
 PKG_EXT = tgz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://mama.indstate.edu/users/ice/tree/src
+PKG_DIST_SITE = https://fossies.org/linux/misc
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =

From 7770558731729626ed40d810551f44f5fbf11a4b Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 15 Jan 2024 19:49:51 +0100
Subject: [PATCH 4/8] update cross/libewf

- former version is not available for download anymore
---
 cross/libewf/Makefile | 3 +--
 cross/libewf/digests  | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cross/libewf/Makefile b/cross/libewf/Makefile
index ebf579303cd..56e5d497cef 100644
--- a/cross/libewf/Makefile
+++ b/cross/libewf/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = libewf
-PKG_VERS = 20201230
+PKG_VERS = 20231119
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-experimental-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/libyal/libewf/releases/download/$(PKG_VERS)
@@ -13,5 +13,4 @@ LICENSE  = LGPLv3
 
 GNU_CONFIGURE = 1
 
-
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libewf/digests b/cross/libewf/digests
index 2d8f739eaf8..7efb0a5f50c 100644
--- a/cross/libewf/digests
+++ b/cross/libewf/digests
@@ -1,3 +1,3 @@
-libewf-experimental-20201230.tar.gz SHA1 b97acf4abdd470178027807d7b97b8d0e71b5b98
-libewf-experimental-20201230.tar.gz SHA256 d74af88cfcec037d271d0ce3760fd59304c6d4fc0eb24c2ff01adadf864f3207
-libewf-experimental-20201230.tar.gz MD5 5a170c2aae3a060233a2b25bfcb5b231
+libewf-experimental-20231119.tar.gz SHA1 ffbd86f0792d3e72eb773590db8b8448ee06592c
+libewf-experimental-20231119.tar.gz SHA256 ec08d411a5dab0ecc957d12b64ad9ae073136aa85c05b2ca77c33e03949b2ab7
+libewf-experimental-20231119.tar.gz MD5 9a8a2dc9fa7023e3c7144dcf3cdb256f

From 53c2a8dcea96e642a0830d79165f052764dd9a65 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 15 Jan 2024 20:21:16 +0100
Subject: [PATCH 5/8] adjust checksums of cross/jdupes

---
 cross/jdupes/digests | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cross/jdupes/digests b/cross/jdupes/digests
index c01ceb7ab36..79a08de30d9 100644
--- a/cross/jdupes/digests
+++ b/cross/jdupes/digests
@@ -1,3 +1,3 @@
-jdupes-1.27.3.tar.gz SHA1 5d15790075ab39cf6ab19152de75941dd443ac50
-jdupes-1.27.3.tar.gz SHA256 13bbe43d7386d76c2aff4fdff105e7545977789b9eea64e7c2f36b8d426c262e
-jdupes-1.27.3.tar.gz MD5 aa5df5d44c838b3d8c66594294647800
+jdupes-1.27.3.tar.gz SHA1 65bc047c08b83a8fd650a0a856152449053c0f3e
+jdupes-1.27.3.tar.gz SHA256 1c75ed30dc95b3b5024019ab2ba3f78a14835c11d5b71249aa94374fde650c16
+jdupes-1.27.3.tar.gz MD5 b6eff10eb70604f77e8de98c59d2e8bb

From 6d615f917b7e82458b708eec6ce4c65a26321f2e Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 15 Jan 2024 23:26:14 +0100
Subject: [PATCH 6/8] fix ripgrep build for DSM 6

---
 cross/ripgrep/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cross/ripgrep/Makefile b/cross/ripgrep/Makefile
index 01a6bfff249..b199510863c 100644
--- a/cross/ripgrep/Makefile
+++ b/cross/ripgrep/Makefile
@@ -19,4 +19,10 @@ LICENSE  = public domain/Unlicense
 ENV += PCRE2_SYS_STATIC=1
 CARGO_BUILD_ARGS += --features 'pcre2'
 
+include ../../mk/spksrc.common.mk
+ifeq ($(call version_lt, $(TCVERSION), 7),1)
+# upstream/src/pcre2_script_run.c - error: .... only allowed in C99 or C11 mode
+ADDITIONAL_CFLAGS = -std=c99
+endif
+
 include ../../mk/spksrc.cross-rust.mk

From ce1547f4b4e9eb20ccfbdca825a219469e49c119 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Tue, 16 Jan 2024 00:39:52 +0100
Subject: [PATCH 7/8] fix synocli-file (ripgrep) for comcerto2k-7.1

---
 cross/ripgrep/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cross/ripgrep/Makefile b/cross/ripgrep/Makefile
index b199510863c..9b27f181df6 100644
--- a/cross/ripgrep/Makefile
+++ b/cross/ripgrep/Makefile
@@ -20,9 +20,9 @@ ENV += PCRE2_SYS_STATIC=1
 CARGO_BUILD_ARGS += --features 'pcre2'
 
 include ../../mk/spksrc.common.mk
-ifeq ($(call version_lt, $(TCVERSION), 7),1)
+ifeq ($(call version_le, $(TC_GCC), 5.0),1) 
 # upstream/src/pcre2_script_run.c - error: .... only allowed in C99 or C11 mode
-ADDITIONAL_CFLAGS = -std=c99
+ADDITIONAL_CFLAGS = -std=c11
 endif
 
 include ../../mk/spksrc.cross-rust.mk

From eb46198e88c95c90764589e3bb4655eaa25945e3 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Tue, 16 Jan 2024 07:47:07 +0100
Subject: [PATCH 8/8] fix ripgrep build for ARMv5

---
 cross/ripgrep/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cross/ripgrep/Makefile b/cross/ripgrep/Makefile
index 9b27f181df6..e0ea3adb7c0 100644
--- a/cross/ripgrep/Makefile
+++ b/cross/ripgrep/Makefile
@@ -20,9 +20,13 @@ ENV += PCRE2_SYS_STATIC=1
 CARGO_BUILD_ARGS += --features 'pcre2'
 
 include ../../mk/spksrc.common.mk
-ifeq ($(call version_le, $(TC_GCC), 5.0),1) 
+ifeq ($(call version_le, $(TC_GCC), 5.0),1)
 # upstream/src/pcre2_script_run.c - error: .... only allowed in C99 or C11 mode
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+ADDITIONAL_CFLAGS = -std=c99
+else
 ADDITIONAL_CFLAGS = -std=c11
 endif
+endif
 
 include ../../mk/spksrc.cross-rust.mk