lists/foris: handle all Foris language packages centrally

This has various advantages such as that we do not have to care to
always set appropriate requests for language packages as well as for
core package. It also ensures that localization is installed even if
package is installed outside of package list it is mentioned in.

There is also improvement for reForis. Now when you install reForis its
plugins are going to be managed relative to those requested to be
installed for Foris.

lists/foris-utils.m4

-
-local function foris_plugin(...)
-	for _, plugin in pairs({...}) do
-		fplugin = "foris-" .. plugin .. "-plugin"
-		Install(fplugin, { priority = 40 })
-		if for_l10n then
-			for_l10n(fplugin .. "-l10n-")
-		end
-	end
-end
-
-local function reforis_plugin(...)
-	for _, plugin in pairs({...}) do
-		fplugin = "reforis-" .. plugin .. "-plugin"
-		Install(fplugin, { priority = 40 })
-		if for_l10n then
-			for_l10n(fplugin .. "-l10n-")
-		end
-	end
-end
-

lists/foris.lua.m4

 include(utils.m4)dnl
-include(foris-utils.m4)dnl
 _FEATURE_GUARD_
 
+local foris_plugins = {
+	"data_collect",
+	"diagnostics",
+	"netmetr",
+	"openvpn",
+	"pakon",
+	"plugins-distutils",
+	"ssbackups",
+	"storage",
+	"subordinates",
+}
+
+local reforis_plugins = {
+	"diagnostics",
+	"netboot",
+	"openvpn",
+	"remote-access",
+	"remote-devices",
+	"snapshots",
+}
+
+-- Conditional install requests for language packages
+if for_l10n and features.request_condition then
+	for _, lang in pairs(l10n or {}) do
+		for _, plugin in pairs(foris_plugins) do
+			local fplugin = "foris-" .. plugin .. "-plugin"
+			Install(fplugin .. "-l10n-" .. lang, {
+				priority = 40,
+				optional = true,
+				condition = fplugin
+			})
+		end
+		for _, plugin in pairs(reforis_plugins) do
+			local refplugin = "reforis-" .. plugin .. "-plugin"
+			Install(refplugin .. "-l10n-" .. lang, {
+				priority = 40,
+				optional = true,
+				condition = refplugin
+			})
+		end
+	end
+end
+
+----------------------------------------------------------------------------------
+
 Install("foris", { priority = 40 })
+Install("foris-diagnostics-plugin", "foris-storage-plugin", { priority = 40 })
+
 if for_l10n then
 	for_l10n("foris-l10n-")
 	for_l10n('pkglists-l10n-')
 end
 
-foris_plugin("diagnostics", "storage")
-
 Install("lighttpd-https-cert", { priority = 40 })
 
 _END_FEATURE_GUARD_

lists/pkglists/netboot.lua.m4

 include(utils.m4)dnl
-include(foris-utils.m4)dnl
 _FEATURE_GUARD_
 
-foris_plugin("subordinates")
+Install("foris-subordinates-plugin", { priority = 40 })
 
 _END_FEATURE_GUARD_

lists/pkglists/netmetr.lua.m4

 include(utils.m4)dnl
-include(foris-utils.m4)dnl
 _FEATURE_GUARD_
 
-foris_plugin("netmetr")
+Install("foris-netmetr-plugin", { priority = 40 })
 
 _END_FEATURE_GUARD_

lists/pkglists/openvpn.lua.m4

 include(utils.m4)dnl
-include(foris-utils.m4)dnl
 _FEATURE_GUARD_
 
-foris_plugin("openvpn")
+Install("foris-openvpn-plugin", { priority = 40 })
 Install("openvpn-openssl", "openvpn-hotplug", "dhparam", { priority = 40 })
 
 _END_FEATURE_GUARD_

lists/pkglists/pakon.lua.m4

 include(utils.m4)dnl
-include(foris-utils.m4)dnl
 _FEATURE_GUARD_
 
-foris_plugin("pakon")
+Install("foris-pakon-plugin", { priority = 40 })
 Install("pakon", "pakon-lists", "suricata-pakon", { priority = 40 })
 
 _END_FEATURE_GUARD_

lists/pkglists/reforis.lua.m4

 include(utils.m4)dnl
-include(foris-utils.m4)dnl
 _FEATURE_GUARD_
 
 Install("reforis", { priority = 40 })
+Install("reforis-diagnostics-plugin", { priority = 40 })
+Install("reforis-snapshots-plugin", { priority = 40 })
+
 if for_l10n then
 	for_l10n("reforis-l10n-")
 end
 
-reforis_plugin("diagnostics", "openvpn")
+
+-- Install reforis plugins if foris ones are installed
+if features.request_condition then
+	local mapping = {
+		["diagnostics"] = "diagnostics",
+		["openvpn"] = "openvpn",
+		["remote-access"] = "subordinates",
+		["remote-devices"] = "subordinates",
+	}
+	for reforis, foris in pairs(mapping) do
+		Install("reforis-" .. reforis .. "-plugin", {
+			priority = 40,
+			condition = "foris-" .. foris .. "-plugin"
+		})
+	end
+end
+
 
 _END_FEATURE_GUARD_