From 5aa54dd52cd47b774d9dcc19a07083c480c57529 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Wed, 11 Dec 2024 16:28:36 +0800
Subject: [PATCH] update 2024-12-11 16:28:36

---
 haproxy/Makefile                              |  8 ++---
 luci-app-bmtedge/Makefile                     |  4 +--
 luci-app-istoredup/Makefile                   |  8 ++++-
 .../root/usr/libexec/istorec/istoredup.sh     | 31 +++++++++----------
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/haproxy/Makefile b/haproxy/Makefile
index 6d20cea13..84142a257 100644
--- a/haproxy/Makefile
+++ b/haproxy/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
 PKG_VERSION:=3.0.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src
@@ -46,7 +46,7 @@ endef
 define Package/haproxy
   $(call Package/haproxy/Default)
   TITLE+=with SSL support
-  DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic
+  DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.4 +libopenssl +libncurses +libreadline +libatomic
   VARIANT:=ssl
 endef
 
@@ -59,7 +59,7 @@ define Package/haproxy-nossl
   $(call Package/haproxy/Default)
   TITLE+=without SSL support
   VARIANT:=nossl
-  DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libatomic
+  DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.4 +libatomic
   CONFLICTS:=haproxy
 endef
 
@@ -92,7 +92,7 @@ define Build/Compile
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		CC="$(TARGET_CC)" \
 		PCREDIR="$(STAGING_DIR)/usr/" \
-		USE_LUA=1 LUA_LIB_NAME="lua5.3" LUA_INC="$(STAGING_DIR)/usr/include/lua5.3" LUA_LIB="$(STAGING_DIR)/usr/lib" \
+		USE_LUA=1 LUA_LIB_NAME="lua5.4" LUA_INC="$(STAGING_DIR)/usr/include/lua5.4" LUA_LIB="$(STAGING_DIR)/usr/lib" \
 		SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530" \
 		USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PTHREAD_PSHARED=1 USE_LIBATOMIC=1 USE_PROMEX=1 \
 		VERSION="$(PKG_VERSION)" SUBVERS="-$(PKG_RELEASE)" \
diff --git a/luci-app-bmtedge/Makefile b/luci-app-bmtedge/Makefile
index 33e57654e..707c8bdc0 100644
--- a/luci-app-bmtedge/Makefile
+++ b/luci-app-bmtedge/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.2-20241208
+PKG_VERSION:=1.0.2-20241211
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for bmtedge
@@ -17,7 +17,7 @@ endef
 # postrm
 define Package/luci-app-bmtedge/prerm
 #!/bin/sh
-docker rm -f bmtedge
+/root/usr/libexec/istorec/bmtedge.sh rm
 exit 0
 endef
 
diff --git a/luci-app-istoredup/Makefile b/luci-app-istoredup/Makefile
index 454f73600..dee4b72a0 100644
--- a/luci-app-istoredup/Makefile
+++ b/luci-app-istoredup/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.1.5-20241129
+PKG_VERSION:=1.1.6-20241211
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for istoredup
@@ -13,6 +13,12 @@ define Package/luci-app-istoredup/conffiles
 /etc/config/istoredup
 endef
 
+define Package/luci-app-istoredup/prerm
+#!/bin/sh
+/root/usr/libexec/istorec/istoredup.sh stop
+exit 0
+endef
+
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-istoredup/root/usr/libexec/istorec/istoredup.sh b/luci-app-istoredup/root/usr/libexec/istorec/istoredup.sh
index 015fc8598..2a3d2ee58 100755
--- a/luci-app-istoredup/root/usr/libexec/istorec/istoredup.sh
+++ b/luci-app-istoredup/root/usr/libexec/istorec/istoredup.sh
@@ -5,23 +5,22 @@ shift 1
 
 do_install() {
   local IMAGE_NAME=`uci get istoredup.@istoredup[0].image_name 2>/dev/null`
-  source /etc/openwrt_release
-  case ${DISTRIB_TARGET} in
-  *x86*)
-    echo "${DISTRIB_TARGET} supported"
-    ;;
-  *rk35xx)
-    echo "${DISTRIB_TARGET} supported"
-    ;;
-  *rk33xx)
-    echo "Unsupported ${DISTRIB_TARGET} NOW"
+  local arch=`uname -m`
+  if [ "$arch" = "x86_64" -o "$arch" = "aarch64" ]; then 
+    echo "${arch} supported"
+  else
+    echo "Unsupported ${arch} NOW"
+    sleep 10
     exit 1
-    ;;
-  *)
-    echo "Unsupported ${DISTRIB_TARGET} NOW"
-    exit 1
-    ;;
-  esac
+  fi
+
+  if [ -z ${IMAGE_NAME} ]; then
+    if [ "$arch" = "x86_64" ]; then
+      IMAGE_NAME=linkease/istoredupx86_64:latest
+    else
+      IMAGE_NAME=linkease/istoreduprk35xx:latest
+    fi
+  fi
 
   echo "docker pull ${IMAGE_NAME}"
   docker pull ${IMAGE_NAME}