From 2c6cc0d1d7f5792f3f7d8ac077a18c96ff2fe928 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 8 Aug 2023 09:50:52 +0200
Subject: [PATCH] luci: remove dependency on ancient commit

Signed-off-by: John Crispin <john@phrozen.org>
---
 .../share/luci/menu.d/luci-mod-ucentral.json  |  2 +-
 feeds/tip/luci/luci-theme-ucentral/Makefile   |  2 +-
 .../0004-feeds.conf.default-drop-luci.patch   | 24 -------------------
 profiles/webui.yml                            |  5 +---
 4 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 patches/0004-feeds.conf.default-drop-luci.patch

diff --git a/feeds/tip/luci/luci-mod-ucentral/root/usr/share/luci/menu.d/luci-mod-ucentral.json b/feeds/tip/luci/luci-mod-ucentral/root/usr/share/luci/menu.d/luci-mod-ucentral.json
index b37150dd3..39acbd63d 100644
--- a/feeds/tip/luci/luci-mod-ucentral/root/usr/share/luci/menu.d/luci-mod-ucentral.json
+++ b/feeds/tip/luci/luci-mod-ucentral/root/usr/share/luci/menu.d/luci-mod-ucentral.json
@@ -7,7 +7,7 @@
 			"recurse": true
 		},
 		"auth": {
-			"methods": [ "cookie:sysauth" ],
+			"methods": [ "cookie:sysauth", "cookie:sysauth_http", "cookie:sysauth_https" ],
 			"login": true
 		}
 	},
diff --git a/feeds/tip/luci/luci-theme-ucentral/Makefile b/feeds/tip/luci/luci-theme-ucentral/Makefile
index 5609b5d34..e7a8638e1 100644
--- a/feeds/tip/luci/luci-theme-ucentral/Makefile
+++ b/feeds/tip/luci/luci-theme-ucentral/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI theme for uCentral
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=+luci-lua-runtime
 
 include ../luci.mk
 
diff --git a/patches/0004-feeds.conf.default-drop-luci.patch b/patches/0004-feeds.conf.default-drop-luci.patch
deleted file mode 100644
index 1bc129d3e..000000000
--- a/patches/0004-feeds.conf.default-drop-luci.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 72d075fc52486aed50b107907999eab5a9be19ef Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 15 Jul 2023 10:48:09 +0200
-Subject: [PATCH 04/43] feeds.conf.default: drop luci
-
-we require luci-trunk for the gateway images.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- feeds.conf.default | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/feeds.conf.default b/feeds.conf.default
-index d467db5627..6fb7a14535 100644
---- a/feeds.conf.default
-+++ b/feeds.conf.default
-@@ -1,4 +1,3 @@
- src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
--src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
- src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
- src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05
--- 
-2.34.1
-
diff --git a/profiles/webui.yml b/profiles/webui.yml
index 04ec66c12..ebbd02fac 100644
--- a/profiles/webui.yml
+++ b/profiles/webui.yml
@@ -1,14 +1,11 @@
 ---
 description: Add the webui dependencies
-feeds:
-  - name: luci
-    uri: https://github.com/openwrt/luci.git
-    revision: 69231a7d62a3b809fc5972071e691fb02730a10e
 packages:
   - cgi-io
   - liblucihttp
   - lua
   - luci-base
+  - luci-lua-runtime
   - luci-mod-ucentral
   - luci-theme-ucentral
   - rpcd