treewide: move templates and libraries not used by the core to luci-compat
authorJo-Philipp Wich <redacted>
Sun, 3 Nov 2019 16:49:58 +0000 (17:49 +0100)
committerJo-Philipp Wich <redacted>
Sun, 3 Nov 2019 16:56:58 +0000 (17:56 +0100)
Signed-off-by: Jo-Philipp Wich <redacted>
39 files changed:
applications/luci-app-adblock/Makefile
applications/luci-app-ahcp/Makefile
applications/luci-app-banip/Makefile
applications/luci-app-bcp38/Makefile
applications/luci-app-dcwapd/Makefile
applications/luci-app-minidlna/Makefile
applications/luci-app-mwan3/Makefile
applications/luci-app-nlbwmon/Makefile
applications/luci-app-ocserv/Makefile
applications/luci-app-olsr/Makefile
applications/luci-app-p910nd/Makefile
applications/luci-app-rp-pppoe-server/Makefile
applications/luci-app-shadowsocks-libev/Makefile
applications/luci-app-statistics/Makefile
applications/luci-app-travelmate/Makefile
applications/luci-app-unbound/Makefile
applications/luci-app-vnstat/Makefile
modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm [deleted file]
modules/luci-compat/Makefile [new file with mode: 0644]
modules/luci-compat/luasrc/model/network.lua [moved from modules/luci-base/luasrc/model/network.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_3g.lua [moved from protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_4x6.lua [moved from protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_6x4.lua [moved from protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_dhcpv6.lua [moved from protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_hnet.lua [moved from protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_ipip.lua [moved from protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_modemmanager.lua [moved from protocols/luci-proto-modemmanager/luasrc/model/network/proto_modemmanager.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_ncm.lua [moved from protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_openconnect.lua [moved from protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_ppp.lua [moved from protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_pppossh.lua [moved from protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_qmi.lua [moved from protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_relay.lua [moved from protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_vpnc.lua [moved from protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua with 100% similarity]
modules/luci-compat/luasrc/model/network/proto_wireguard.lua [moved from protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua with 100% similarity]
modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm [moved from modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm with 100% similarity]
modules/luci-compat/luasrc/view/cbi/network_ifacelist.htm [moved from modules/luci-base/luasrc/view/cbi/network_ifacelist.htm with 100% similarity]
modules/luci-compat/luasrc/view/cbi/network_netinfo.htm [moved from modules/luci-base/luasrc/view/cbi/network_netinfo.htm with 100% similarity]
modules/luci-compat/luasrc/view/cbi/network_netlist.htm [moved from modules/luci-base/luasrc/view/cbi/network_netlist.htm with 100% similarity]

index 2de2ed8627f77b8e98d963abfebdbea56b723e30..c51b9d8eda8e588f6d57be7e96a119fa1a5d8da9 100644 (file)
@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for Adblock
-LUCI_DEPENDS:=+adblock +luci-lib-jsonc
+LUCI_DEPENDS:=+luci-compat +adblock +luci-lib-jsonc
 LUCI_PKGARCH:=all
 
 include ../../luci.mk
index bb4d4158d0cf6ed7509bf1713176c36e457f7b1d..10859345e658acfed81cf2990cd711b8a160e350 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for AHCPd
-LUCI_DEPENDS:=+ahcpd
+LUCI_DEPENDS:=+luci-compat +ahcpd
 
 include ../../luci.mk
 
index 1936bc36b26cc7810755a115d2a89badf3d53be6..39712708be35361e8c5dce09b63843b88ba985a8 100644 (file)
@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for banIP
-LUCI_DEPENDS:=+banip +luci-lib-jsonc
+LUCI_DEPENDS:=+luci-compat +banip +luci-lib-jsonc
 LUCI_PKGARCH:=all
 
 include ../../luci.mk
index 9ab5a6701db4a7716d2ab65c274fe7ec91241f89..a8a6e7402edb9b748d281774b5ec99dc23dacab4 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=BCP38 LuCI interface
-LUCI_DEPENDS:=+luci-mod-admin-full +bcp38
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +bcp38
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=Apache-2.0
index 3396bcd2964c2f0c1dce46d33b9913caf9c726e1..3def090a76215eb0323cb100266fa0ed21472014 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Dual Channel Wi-Fi AP Daemon configuration module
-LUCI_DEPENDS:=+dcwapd
+LUCI_DEPENDS:=+luci-compat +dcwapd
 
 include ../../luci.mk
 
index 4790aa32ced30fa14cbd216bc09879e9554006e7..3d3ec4d52eebf431e7673d405cf7fa2fd2cd7e8f 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for miniDLNA
-LUCI_DEPENDS:=+minidlna
+LUCI_DEPENDS:=+luci-compat +minidlna
 
 include ../../luci.mk
 
index c719cb134c5e57390a6a9be6c0e0fae2e6cff6dd..50f87cd84632f47c251d327c5ac9c5fb1574a0aa 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for the MWAN3 multiwan hotplug script
-LUCI_DEPENDS:=+mwan3 +libuci-lua +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio
+LUCI_DEPENDS:=+luci-compat +mwan3 +libuci-lua +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio
 LUCI_PKGARCH:=all
 PKG_LICENSE:=GPLv2
 
index a00177f2ca3b682d0d917867073832c4b49c8d5a..c4b83e807c37d1473bc40d7014b81adefe84028a 100644 (file)
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Netlink based bandwidth accounting
-LUCI_DEPENDS:=+nlbwmon
+LUCI_DEPENDS:=+luci-compat +nlbwmon
 
 include ../../luci.mk
 
index 3fbf4d2c1be49f7519451a87eafadd1f8eae2e23..2f2ea788ebbe942adb5df702f569c7d4152b0e56 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for OpenConnect VPN
-LUCI_DEPENDS:=+ocserv +certtool
+LUCI_DEPENDS:=+luci-compat +ocserv +certtool
 
 include ../../luci.mk
 
index 6ce1ac2556d33e7df1d9545506393aaaa3d09c46..b6432e6acbd8bca97f144c79be6918ad4ff7bdd7 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=OLSR configuration and status module
-LUCI_DEPENDS:=+olsrd +olsrd-mod-jsoninfo +luci-lib-json
+LUCI_DEPENDS:=+luci-compat +olsrd +olsrd-mod-jsoninfo +luci-lib-json
 
 include ../../luci.mk
 
index adb35bd47f71a8102937459d6085df53e518f630..8c73f372f472b7a4e39cfaa04c764fbe352659e8 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=p910nd - Printer server module
-LUCI_DEPENDS:=+p910nd
+LUCI_DEPENDS:=+luci-compat +p910nd
 
 include ../../luci.mk
 
index aa3ae538cde3e4fbf03862bb48b4734cca012694..b4edfc9499a5d978046090b0651646e08caa4cbd 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Roaring Penguin PPPoE Server
-LUCI_DEPENDS:=+rp-pppoe-server
+LUCI_DEPENDS:=+luci-compat +rp-pppoe-server
 
 include ../../luci.mk
 
index d0923e07a47140774e3f61c63ab0c2c461e4c854..72195a71101fd763a73cb73a1f52e8c04833c358 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for shadowsocks-libev
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=+luci-compat
 
 PKG_LICENSE:=Apache-2.0
 
index b552400fed90db1510361d5649764724ac3dbffb..b38146c2c25ff3df0e4b326fed71158017a416a6 100644 (file)
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Statistics Application
 LUCI_DEPENDS:= \
-       +luci-lib-iptparser \
+       +luci-compat +luci-lib-iptparser \
        +collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \
        +collectd-mod-cpu +collectd-mod-memory \
        +collectd-mod-interface +collectd-mod-load +collectd-mod-network
index 58d9bf37d45e521e0389ed7f680e4b43e36067da..4115dadbef230f750f0db22b28b3fe5858b072f2 100644 (file)
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for Travelmate
-LUCI_DEPENDS:=+travelmate +luci-lib-jsonc
+LUCI_DEPENDS:=+luci-compat +travelmate +luci-lib-jsonc
 LUCI_PKGARCH:=all
 
 include ../../luci.mk
index 6b43adab3f0a167754ab2a6fc02f60246e8818ec..9dd01ffed6b70357eeacd68679e7640be3fc76bd 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Unbound Recursive DNS Resolver Configuration
-LUCI_DEPENDS:=+unbound-daemon
+LUCI_DEPENDS:=+luci-compat +unbound-daemon
 
 include ../../luci.mk
 
index 6d98610d6d140b27f33036829653648a54d8ead8..c2e930632e1d0822a660332c612e5b5b33aa99a3 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for VnStat
-LUCI_DEPENDS:=+vnstat +vnstati
+LUCI_DEPENDS:=+luci-compat +vnstat +vnstati
 
 include ../../luci.mk
 
diff --git a/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
deleted file mode 100644 (file)
index dc251db..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<%+cbi/valueheader%>
-
-<%-
-       local utl = require "luci.util"
-       local fwm = require "luci.model.firewall".init()
-       local nwm = require "luci.model.network".init()
-
-       local zone, fwd, fz
-       local value = self:formvalue(section)
-       if not value or value == "-" then
-               value = self:cfgvalue(section) or self.default
-       end
-
-       local def  = fwm:get_defaults()
-       local zone = fwm:get_zone(value)
-       local empty = true
-
-       local function render_zone(zone)
--%>
-               <label class="zonebadge" style="background-color:<%=zone:get_color()%>">
-                       <strong><%=zone:name()%></strong>
-                       <div class="cbi-tooltip">
-                       <%-
-                               local zempty = true
-                               for _, net in ipairs(zone:get_networks()) do
-                                       net = nwm:get_network(net)
-                                       if net then
-                                               zempty = false
-                       -%>
-                               <span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:&#160;
-                               <%
-                                       local nempty = true
-                                       for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
-                                               nempty = false
-                                %>
-                                       <img<%=attr("title", iface:get_i18n())%> src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
-                               <% end %>
-                               <% if nempty then %><em><%:(empty)%></em><% end %>
-                               </span>
-                       <%- end end -%>
-                       <% if zempty then %><span class="ifacebadge"><em><%:(empty)%></em></span><% end %>
-                       </div>
-               </label>
-<%-
-       end
--%>
-
-<% if zone then %>
-<div class="zone-forwards">
-       <div class="zone-src">
-               <%=render_zone(zone)%>
-       </div>
-       <span>&#8658;</span>
-       <div class="zone-dest">
-       <%
-               for _, fwd in ipairs(zone:get_forwardings_by("src")) do
-                       fz = fwd:dest_zone()
-                       if fz then
-                               empty = false
-                               render_zone(fz)
-                       end
-               end
-               if empty then
-       %>
-               <label class="zonebadge zonebadge-empty">
-                       <strong><%=def:forward():upper()%></strong>
-               </label>
-       <% end %>
-       </div>
-</div>
-<% end %>
-
-<%+cbi/valuefooter%>
diff --git a/modules/luci-compat/Makefile b/modules/luci-compat/Makefile
new file mode 100644 (file)
index 0000000..d73ca07
--- /dev/null
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2019 Jo-Philipp Wich <jo@mein.io>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-compat
+
+LUCI_TYPE:=mod
+LUCI_BASENAME:=compat
+
+LUCI_TITLE:=LuCI compatibility libraries
+LUCI_DEPENDS:=+luci-base
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
git clone https://git.99rst.org/PROJECT