From 38f5bf58791a706c0a1945183f7d109d7bd65ed8 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Mon, 6 Jan 2025 08:20:14 -0400
Subject: [PATCH 1/2] Update to v3.11.4.14
---
cross/fengoffice/Makefile | 2 +-
cross/fengoffice/digests | 6 +++---
spk/fengoffice/Makefile | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cross/fengoffice/Makefile b/cross/fengoffice/Makefile
index 46e3821636f..b56508af154 100644
--- a/cross/fengoffice/Makefile
+++ b/cross/fengoffice/Makefile
@@ -1,5 +1,5 @@
PKG_NAME = fengoffice
-PKG_VERS = 3.11.2.8
+PKG_VERS = 3.11.4.14
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/fengoffice/$(PKG_NAME)/archive/$(PKG_VERS)
diff --git a/cross/fengoffice/digests b/cross/fengoffice/digests
index 4e81cd978d0..e2303bb91b1 100644
--- a/cross/fengoffice/digests
+++ b/cross/fengoffice/digests
@@ -1,3 +1,3 @@
-fengoffice-3.11.2.8.tar.gz SHA1 b700ff65ec7bac41f27fc50866cd81dffca79f36
-fengoffice-3.11.2.8.tar.gz SHA256 b146bba574349d0480407a101b4f4924f876425ff5955470c515efbc953b8b6c
-fengoffice-3.11.2.8.tar.gz MD5 766ac490d2aeb1ca9a2868a35fcf1300
+fengoffice-3.11.4.14.tar.gz SHA1 ae42ef25997203cba7baf95151731e2a1fc42f22
+fengoffice-3.11.4.14.tar.gz SHA256 73e108a0417523e8aa5a206b383d83e3588e4e81dd83d8e02f4aa8e7a4059473
+fengoffice-3.11.4.14.tar.gz MD5 e74b3644df781252f9e5b8dd078854b7
diff --git a/spk/fengoffice/Makefile b/spk/fengoffice/Makefile
index ff342b3cb63..b353115d414 100644
--- a/spk/fengoffice/Makefile
+++ b/spk/fengoffice/Makefile
@@ -1,6 +1,6 @@
SPK_NAME = fengoffice
-SPK_VERS = 3.11.2.8
-SPK_REV = 4
+SPK_VERS = 3.11.4.14
+SPK_REV = 5
SPK_ICON = src/fengoffice.png
DEPENDS = cross/$(SPK_NAME)
@@ -14,7 +14,7 @@ SPK_DEPENDS = "WebStation:PHP7.4:MariaDB10:Apache2.4"
MAINTAINER = SynoCommunity
DESCRIPTION = Feng Office is a Collaboration Platform and Project Management System.
DISPLAY_NAME = Feng Office
-CHANGELOG = "1. Update to v3.11.2.8.
2. Add PHP profiles for DSM 6.
3. Add backup and restore functions."
+CHANGELOG = "1. Update to v3.11.4.14."
HOMEPAGE = https://www.fengoffice.com/
LICENSE = AGPL
From 61f966fb085e8426fbce0ac6f2413c15a6006232 Mon Sep 17 00:00:00 2001
From: Michael Reid
Date: Mon, 6 Jan 2025 08:31:33 -0400
Subject: [PATCH 2/2] Avoid makefile variables in DEPENDS for #6255
Co-authored-by: hgy59
---
spk/fengoffice/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spk/fengoffice/Makefile b/spk/fengoffice/Makefile
index b353115d414..ebc0237ccda 100644
--- a/spk/fengoffice/Makefile
+++ b/spk/fengoffice/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 3.11.4.14
SPK_REV = 5
SPK_ICON = src/fengoffice.png
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/fengoffice
# Pure PHP package, make sure ARCH is noarch
override ARCH=noarch