From 85d2658fb8fb65fb72298a4bfc177e12ac84a87f Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Sat, 27 May 2023 19:12:03 +0800
Subject: [PATCH] luci-app-argon-config: sync upstream

---
 luci-app-argon-config/Makefile                | 26 +++++++------------
 .../luasrc/controller/argon-config.lua        |  7 ++---
 .../luasrc/model/cbi/argon-config.lua         |  6 -----
 .../rpcd/acl.d/luci-app-argon-config.json     |  6 ++---
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/luci-app-argon-config/Makefile b/luci-app-argon-config/Makefile
index 70ae445..2a3ec6a 100644
--- a/luci-app-argon-config/Makefile
+++ b/luci-app-argon-config/Makefile
@@ -1,27 +1,19 @@
-#
-# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-argon-config
-LUCI_PKGARCH:=all
 PKG_VERSION:=0.9
-PKG_RELEASE:=20210309
+PKG_RELEASE:=20220424
 
-include $(INCLUDE_DIR)/package.mk
+PKG_MAINTAINER:=jerrykuku <jerrykuku@qq.com>
 
-define Package/luci-app-argon-config
- 	SECTION:=luci
-	CATEGORY:=LuCI
-	SUBMENU:=3. Applications
-	TITLE:=LuCI page for Argon Config
-	PKGARCH:=all
-	DEPENDS:=+luci-compat
+LUCI_TITLE:=LuCI page for Argon Config
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+luci-compat
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/argon
 endef
 
-$(eval $(call BuildPackage,luci-app-argon-config))
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-argon-config/luasrc/controller/argon-config.lua b/luci-app-argon-config/luasrc/controller/argon-config.lua
index 68bff28..5d7faf4 100644
--- a/luci-app-argon-config/luasrc/controller/argon-config.lua
+++ b/luci-app-argon-config/luasrc/controller/argon-config.lua
@@ -1,7 +1,3 @@
---[[
-luci-app-argon-config
-]]--
-
 module("luci.controller.argon-config", package.seeall)
 
 function index()
@@ -9,5 +5,6 @@ function index()
 		return
 	end
 
-	entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90)
+	local page = entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90)
+	page.acl_depends = { "luci-app-argon-config" }
 end
diff --git a/luci-app-argon-config/luasrc/model/cbi/argon-config.lua b/luci-app-argon-config/luasrc/model/cbi/argon-config.lua
index 37278a3..f415f71 100644
--- a/luci-app-argon-config/luasrc/model/cbi/argon-config.lua
+++ b/luci-app-argon-config/luasrc/model/cbi/argon-config.lua
@@ -207,10 +207,4 @@ btnrm.write = function(self, section)
     return v
 end
 
-function IsIpkFile(name)
-    name = name or ''
-    local ext = string.lower(string.sub(name, -4, -1))
-    return ext == '.ipk'
-end
-
 return br, ful, form
diff --git a/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json b/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json
index b237aff..f0a3137 100644
--- a/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json
+++ b/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json
@@ -1,6 +1,6 @@
 {
-    "luci-argon-config": {
-        "description": "Luci Argon theme config ",
+    "luci-app-argon-config": {
+        "description": "Grant UCI access for luci-app-argon-config",
         "read": {
             "uci": [ "argon" ]
         },
@@ -8,4 +8,4 @@
             "uci": [ "argon" ]
         }
     }
-}
\ No newline at end of file
+}