package/gluon-mesh-batman-adv/files/lib/gluon/ebtables/250-next-node

 local site = require 'gluon.site_config'
 local next_node = site.next_node
 
+rule('FORWARD --logical-out br-client -i bat0 -o local-port -j DROP')
+rule('FORWARD --logical-out br-client -i local-port -o bat0 -j DROP')
+
 rule('FORWARD --logical-out br-client -o bat0 -d ' .. next_node.mac .. ' -j DROP')
 rule('OUTPUT --logical-out br-client -o bat0 -d ' .. next_node.mac .. ' -j DROP')
 rule('FORWARD --logical-out br-client -o bat0 -s ' .. next_node.mac .. ' -j DROP')

package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh

@@ -41,6 +41,10 @@ proto_gluon_bat0_setup() {
 	ip link add primary0 type dummy
 	echo 1 > /proc/sys/net/ipv6/conf/primary0/disable_ipv6
 	ip link set primary0 address "$primary0_mac" mtu 1532 up
+
+	local routing_algo="$(uci -q get batman-adv.bat0.routing_algo || echo 'BATMAN_IV')"
+	(echo "$routing_algo" >/sys/module/batman_adv/parameters/routing_algo) 2>/dev/null
+
 	echo bat0 > /sys/class/net/primary0/batman_adv/mesh_iface
 
 	proto_init_update primary0 1

package/gluon-mesh-batman-adv/luasrc/lib/gluon/radvd/arguments

 #!/usr/bin/lua
+
 local site = require "gluon.site_config"
+
 io.write("-i local-node -p " .. site.prefix6)
-if site.dns and site.dns.servers then
+
+if site.dns and site.dns.servers and site.next_node and site.next_node.ip6 then
 	io.write(" --rdnss " .. site.next_node.ip6)
 end

package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh

@@ -7,17 +7,23 @@ local util = require 'gluon.util'
 local uci = require('simple-uci').cursor()
 
 
-local gw_sel_class
+local gw_mode, gw_sel_class, routing_algo
+
+gw_mode = uci:get('batman-adv', 'bat0', 'gw_mode') or 'client'
+
 if site.mesh and site.mesh.batman_adv then
 	gw_sel_class = site.mesh.batman_adv.gw_sel_class
+	routing_algo = site.mesh.batman_adv.routing_algo
 end
 
+
 uci:delete('batman-adv', 'bat0')
 uci:section('batman-adv', 'mesh', 'bat0', {
 	orig_interval = 5000,
-	gw_mode = 'client',
+	gw_mode = gw_mode,
 	gw_sel_class = gw_sel_class,
 	hop_penalty = 15,
+	routing_algo = routing_algo,
 	multicast_mode = false,
 })
 uci:save('batman-adv')

package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/400-mesh-vpn → package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn

@@ -62,15 +62,36 @@ uci:save('firewall')
 
 -- VPN migration
 local has_fastd = fs.access('/lib/gluon/mesh-vpn/fastd')
-local fastd_enabled = uci:get_bool("fastd", "mesh_vpn", "enabled")
+local fastd_enabled = uci:get('fastd', 'mesh_vpn', 'enabled')
 
 local has_tunneldigger = fs.access('/lib/gluon/mesh-vpn/tunneldigger')
-local tunneldigger_enabled = uci:get_bool("tunneldigger", "mesh_vpn", "enabled")
-
-local enabled = fastd_enabled or tunneldigger_enabled or false
+local tunneldigger_enabled = uci:get('tunneldigger', 'mesh_vpn', 'enabled')
+
+local enabled
+
+-- If the installed VPN package has its enabled state set, keep the value
+if has_fastd and fastd_enabled then
+	enabled = fastd_enabled == '1'
+elseif has_tunneldigger and tunneldigger_enabled then
+	enabled = tunneldigger_enabled == '1'
+-- Otherwise, migrate the other package's value if any is set
+elseif fastd_enabled or tunneldigger_enabled then
+	enabled = fastd_enabled == '1' or tunneldigger_enabled == '1'
+-- If nothing is set, use the default
+else
+	enabled = site.mesh_vpn.enabled or false
+end
 
-uci:set("fastd", "mesh_vpn", "enabled", has_fastd and enabled)
-uci:save("fastd")
+if has_fastd then
+	uci:set('fastd', 'mesh_vpn', 'enabled', enabled)
+else
+	uci:delete('fastd', 'mesh_vpn')
+end
+uci:save('fastd')
 
-uci:set("tunneldigger", "mesh_vpn", "enabled", has_tunneldigger and enabled)
-uci:save("tunneldigger")
+if has_tunneldigger then
+	uci:set('tunneldigger', 'mesh_vpn', 'enabled', enabled)
+else
+	uci:delete('tunneldigger', 'mesh_vpn')
+end
+uci:save('tunneldigger')

package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd

@@ -6,11 +6,6 @@ local util = require 'gluon.util'
 local uci = require('simple-uci').cursor()
 
 
-local enabled = uci:get('fastd', 'mesh_vpn', 'enabled')
-if enabled == nil then
-	enabled = site.mesh_vpn.enabled or false
-end
-
 local syslog_level = uci:get('fastd', 'mesh_vpn', 'syslog_level') or 'verbose'
 
 local methods
@@ -40,7 +35,6 @@ end
 
 
 uci:section('fastd', 'fastd', 'mesh_vpn', {
-	enabled = enabled,
 	group = 'gluon-mesh-vpn',
 	syslog_level = syslog_level,
 	interface = 'mesh-vpn',

package/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/400-mesh-vpn-tunneldigger

@@ -6,18 +6,17 @@ local util = require 'gluon.util'
 local uci = require('simple-uci').cursor()
 
 
-local enabled = uci:get('tunneldigger', 'mesh_vpn', 'enabled')
-if enabled == nil then
-	if uci:get_first('tunneldigger', 'broker', 'interface') == "mesh-vpn" then
+local enabled
+
+-- Delete old broker config section (remove in 2019)
+if not uci:get('tunneldigger', 'mesh_vpn') then
+	if uci:get_first('tunneldigger', 'broker', 'interface') == 'mesh-vpn' then
 		enabled = uci:get_first('tunneldigger', 'broker', 'enabled')
 	end
-end
-if enabled == nil then
-	enabled = site.mesh_vpn.enabled or false
-end
 
--- Delete old broker config section
-if not uci:get('tunneldigger', 'mesh_vpn') then
+	-- In the usual case (no migration from old tunneldigger package), the
+	-- enabled state is set in the 500-mesh-vpn script
+
 	uci:delete_all('tunneldigger', 'broker')
 end
 

package/gluon-web-admin/i18n/de.po

@@ -17,7 +17,7 @@ msgid "Advanced settings"
 msgstr "Erweiterte Einstellungen"
 
 msgid ""
-"Alternatively, you can set a password to access you node. Please choose a "
+"Alternatively, you can set a password to access your node. Please choose a "
 "secure password you don't use anywhere else.<br /><br />If you set an empty "
 "password, login via password will be disabled. This is the default."
 msgstr ""

package/gluon-web-admin/i18n/fr.po

@@ -17,7 +17,7 @@ msgid "Advanced settings"
 msgstr "Paramètres avancés"
 
 msgid ""
-"Alternatively, you can set a password to access you node. Please choose a "
+"Alternatively, you can set a password to access your node. Please choose a "
 "secure password you don't use anywhere else.<br /><br />If you set an empty "
 "password, login via password will be disabled. This is the default."
 msgstr ""

package/gluon-web-admin/i18n/gluon-web-admin.pot

@@ -8,7 +8,7 @@ msgid "Advanced settings"
 msgstr ""
 
 msgid ""
-"Alternatively, you can set a password to access you node. Please choose a "
+"Alternatively, you can set a password to access your node. Please choose a "
 "secure password you don't use anywhere else.<br /><br />If you set an empty "
 "password, login via password will be disabled. This is the default."
 msgstr ""

package/gluon-web-admin/luasrc/lib/gluon/web/model/admin/remote.lua

@@ -33,7 +33,7 @@ end
 
 local f_password = Form(translate("Password"),
 	translate(
-                "Alternatively, you can set a password to access you node. Please choose a secure password you don't use anywhere else.<br /><br />"
+                "Alternatively, you can set a password to access your node. Please choose a secure password you don't use anywhere else.<br /><br />"
                 .. "If you set an empty password, login via password will be disabled. This is the default."
 	), 'password'
 )

package/gluon-web-network/i18n/de.po

@@ -19,9 +19,12 @@ msgstr "Automatisch (RA/DHCPv6)"
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-msgid "Enable PoE passthrough"
+msgid "Enable PoE Passthrough"
 msgstr "PoE-Passthrough aktivieren"
 
+msgid "Enable PoE Power Port %s"
+msgstr "PoE-Ausgabe auf Port %s aktivieren"
+
 msgid "Enable meshing on the LAN interface"
 msgstr "Mesh auf dem LAN-Port aktivieren"
 

package/gluon-web-network/i18n/fr.po

@@ -19,7 +19,10 @@ msgstr "Automatique (RA/DHCPv6)"
 msgid "Disabled"
 msgstr "Désactivé"
 
-msgid "Enable PoE passthrough"
+msgid "Enable PoE Passthrough"
+msgstr ""
+
+msgid "Enable PoE Power Port %s"
 msgstr ""
 
 msgid "Enable meshing on the LAN interface"

package/gluon-web-network/i18n/gluon-web-network.pot

@@ -10,7 +10,10 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-msgid "Enable PoE passthrough"
+msgid "Enable PoE Passthrough"
+msgstr ""
+
+msgid "Enable PoE Power Port %s"
 msgstr ""
 
 msgid "Enable meshing on the LAN interface"

package/gluon-web-network/luasrc/lib/gluon/web/model/admin/network.lua

@@ -104,15 +104,28 @@ if sysconfig.lan_ifname then
 	end
 end
 
-if uci:get('system', 'gpio_switch_poe_passthrough') then
-	local s = f:section(Section)
-	local poe_passthrough = s:option(Flag, "poe_passthrough", translate("Enable PoE passthrough"))
-	poe_passthrough.default = uci:get_bool("system", "gpio_switch_poe_passthrough", "value")
+local section
+uci:foreach("system", "gpio_switch", function(s)
+	if s[".name"]:match("poe") then
+		if not section then
+			section = f:section(Section)
+		end
+
+		local port = s.name:match("^PoE Power Port(%d*)$")
+		local name
+		if port then
+			name = translatef("Enable PoE Power Port %s", port)
+		else
+			name = translate("Enable " .. s.name)
+		end
+		local poe = section:option(Flag, s[".name"], name)
+		poe.default = uci:get_bool("system", s[".name"], "value")
 
-	function poe_passthrough:write(data)
-		uci:set('system', 'gpio_switch_poe_passthrough', 'value', data)
+		function poe:write(data)
+			uci:set("system", s[".name"], "value", data)
 		end
 	end
+end)
 
 function f:write()
 	uci:set("network", "wan", "proto", ipv4.data)

patches/lede/0001-build-move-STAGING_DIR_HOSTPKG-and-BUILD_DIR_HOST-back-to-a-common-directory-for-all-targets.patch

@@ -47,10 +47,10 @@ index 5a403cbf41e2bbd6bdb843492639a01aff8cf75b..900dae1d4afc6007f8ac04179dd7f092
  
  define Build/Configure/Default
 diff --git a/include/host-build.mk b/include/host-build.mk
-index 70bf6e5a399615edb91edfae3c43a93504d7b5d8..6c2f91581b895bda1ee9f2ee94afc2e5c06de380 100644
+index b5f1a6bfa79f5a2a7b442506d72b6192191018a2..cb0d60fd7c5930a3a71f00e70bf25340c98f5744 100644
 --- a/include/host-build.mk
 +++ b/include/host-build.mk
-@@ -122,7 +122,7 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
+@@ -126,7 +126,7 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
  endif
  
  define Host/Exports/Default

patches/lede/0029-procd-update-to-latest-git-HEAD.patch → patches/lede/0012-procd-switch-to-latest-master.patch

 From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 30 May 2017 07:29:25 +0200
-Subject: procd: update to latest git HEAD
-
-e7bb2c8 upgraded: define __GNU_SOURCE
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 13 Jul 2017 17:15:21 +0200
+Subject: procd: switch to latest master
 
 diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index 775b9a64e172b250b3ba27e71fbf07aff46ede14..f9d2f4d34f866a169eb1665ac2699c54422c3c4b 100644
+index cbbd95f1ee71a8b3d118dfa6efc8db15ba8fd4f4..4598711c2252e2c0ffc322fa2d00508de3e5a775 100644
 --- a/package/system/procd/Makefile
 +++ b/package/system/procd/Makefile
 @@ -12,9 +12,9 @@ PKG_RELEASE:=1
  
  PKG_SOURCE_PROTO:=git
  PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2017-05-29
--PKG_SOURCE_VERSION:=992b796204caf5b0290ea4a1246b43b353b6c1d7
--PKG_MIRROR_HASH:=effecf66ef6a7396dd26d54a5d232b4a895d9fe7aaca83063aaffc7b39a051d5
-+PKG_SOURCE_DATE:=2017-05-30
-+PKG_SOURCE_VERSION:=e7bb2c8d631862e1535cf6eead18387f02a69ad2
-+PKG_MIRROR_HASH:=97bb96aba2db4730fd8b2edeb15f94e18caa6017d9e50a73777c14532154cade
+-PKG_SOURCE_DATE:=2017-08-08
+-PKG_SOURCE_VERSION:=66be6a23d71fcc068d6b813f0e0be2f8f0b6aa88
+-PKG_MIRROR_HASH:=286dcc8855f1dc403895bc9252f617c14be6f7f6ec36f13d4f4de7c4a715f08c
++PKG_SOURCE_DATE:=2017-08-22
++PKG_SOURCE_VERSION:=54b46a351fab736a92221a6f9c750b5f9da499a1
++PKG_MIRROR_HASH:=dcbeea89910bbdf7d6cf20c38892d6c51de375c8b35c372a7106ae17090694f3
  CMAKE_INSTALL:=1
  
  PKG_LICENSE:=GPL-2.0

patches/lede/0012-procd-update-to-git-HEAD-version.patch

-From: Hans Dedecker <dedeckeh@gmail.com>
-Date: Mon, 6 Mar 2017 17:25:44 +0100
-Subject: procd: update to git HEAD version
-
-8f218f5 procd: service gets deleted when its last instance is freed
-35209a0 procd: update modprobe path
-
-Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index fd1bca3f4b9665581f9e9ddd9b9294fa500a9d3d..43ea23aab00918a2b664e9a5da7767f90cd568db 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2017-02-15
--PKG_SOURCE_VERSION:=5f9124103410c178d816bb5229fba7dd2286a49b
--PKG_MIRROR_HASH:=ec887b349fc60ad3882fc9eaefb5cd299d64e7d43c062df9f7b7500591ba3e85
-+PKG_SOURCE_DATE:=2017-03-05
-+PKG_SOURCE_VERSION:=8f218f5626a3cb3900dbe9801ee8ace236b0e4a5
-+PKG_MIRROR_HASH:=8ac8691888b64726453bd726fe0c98fc906540bbd2ae666dae6bea592b0b4e4d
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0

patches/lede/0013-sunxi-clean-up-modules-definitions.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 4 May 2017 07:00:06 +0200
-Subject: sunxi: clean up modules definitions
-
-Module definitions for kmod-wdt-sunxi and kmod-eeprom-sunxi are removed
-(wdt-sunxi was builtin anyways; nvmem-sunxi, which is the new name of
-eeprom-sunxi is changed to builtin). As kmod-eeprom-sunxi was specified
-in DEFAULT_PACKAGES, but not available on kernel 4.4, it was breaking the
-image builder.
-
-Support for kmod-sunxi-ir is added for kernel 4.4 (it is unclear why it
-was disable before, it builds fine with with kernel 4.4).
-
-Condtionals only relevant for pre-4.4 kernels are removed from modules.mk,
-as sunxi does't support older kernels anymore.
-
-Fixes FS#755.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
-index b0bc1bab398af55b77909deccd8f059e17d96e67..3c2f14b8418e1d296a239027f6fdee9b5ba8f9b2 100644
---- a/target/linux/sunxi/Makefile
-+++ b/target/linux/sunxi/Makefile
-@@ -27,7 +27,7 @@ KERNELNAME:=zImage dtbs
- 
- include $(INCLUDE_DIR)/target.mk
- 
--DEFAULT_PACKAGES += uboot-envtools kmod-eeprom-sunxi kmod-wdt-sunxi
-+DEFAULT_PACKAGES += uboot-envtools
- DEFAULT_PACKAGES += mkf2fs e2fsprogs
- 
- $(eval $(call BuildTarget))
-diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4
-index 2253afa124ad6c3d6b9d6798dc29f68437455341..a978e9d15b8c358f69669d3afdbf4a14bba83d31 100644
---- a/target/linux/sunxi/config-4.4
-+++ b/target/linux/sunxi/config-4.4
-@@ -356,7 +356,7 @@ CONFIG_NO_HZ_COMMON=y
- CONFIG_NO_HZ_IDLE=y
- CONFIG_NR_CPUS=8
- CONFIG_NVMEM=y
--# CONFIG_NVMEM_SUNXI_SID is not set
-+CONFIG_NVMEM_SUNXI_SID=y
- CONFIG_OF=y
- CONFIG_OF_ADDRESS=y
- CONFIG_OF_EARLY_FLATTREE=y
-diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk
-index 6f4991798decb4a65f615d3a7282270960a7555a..99b82a3b5f17348049458ced5823f7c90f784269 100644
---- a/target/linux/sunxi/modules.mk
-+++ b/target/linux/sunxi/modules.mk
-@@ -25,7 +25,7 @@ $(eval $(call KernelPackage,rtc-sunxi))
- define KernelPackage/sunxi-ir
-     SUBMENU:=$(OTHER_MENU)
-     TITLE:=Sunxi SoC built-in IR support (A20)
--    DEPENDS:=@TARGET_sunxi @!LINUX_4_4 +kmod-input-core 
-+    DEPENDS:=@TARGET_sunxi +kmod-input-core
-     $(call AddDepends/rtc)
-     KCONFIG:= \
- 	CONFIG_MEDIA_SUPPORT=y \
-@@ -42,22 +42,6 @@ endef
- 
- $(eval $(call KernelPackage,sunxi-ir))
- 
--define KernelPackage/eeprom-sunxi
--    SUBMENU:=$(OTHER_MENU)
--    TITLE:=AllWinner Security ID fuse support
--    DEPENDS:=@TARGET_sunxi @!LINUX_4_4
--    KCONFIG:= \
--	CONFIG_EEPROM_SUNXI_SID
--    FILES:=$(LINUX_DIR)/drivers/misc/eeprom/sunxi_sid.ko
--    AUTOLOAD:=$(call AutoLoad,50,sunxi_sid)
--endef
--
--define KernelPackage/eeprom-sunxi/description
-- Support for the AllWinner Security ID fuse support
--endef
--
--$(eval $(call KernelPackage,eeprom-sunxi))
--
- define KernelPackage/ata-sunxi
-     TITLE:=AllWinner sunXi AHCI SATA support
-     SUBMENU:=$(BLOCK_MENU)
-@@ -76,7 +60,7 @@ $(eval $(call KernelPackage,ata-sunxi))
- define KernelPackage/sun4i-emac
-   SUBMENU:=$(NETWORK_DEVICES_MENU)
-   TITLE:=AllWinner EMAC Ethernet support
--  DEPENDS:=@TARGET_sunxi +LINUX_4_4:kmod-of-mdio +LINUX_4_4:kmod-libphy
-+  DEPENDS:=@TARGET_sunxi +kmod-of-mdio +kmod-libphy
-   KCONFIG:=CONFIG_SUN4I_EMAC
-   FILES:=$(LINUX_DIR)/drivers/net/ethernet/allwinner/sun4i-emac.ko
-   AUTOLOAD:=$(call AutoProbe,sun4i-emac)
-@@ -85,35 +69,11 @@ endef
- $(eval $(call KernelPackage,sun4i-emac))
- 
- 
--define KernelPackage/wdt-sunxi
--    SUBMENU:=$(OTHER_MENU)
--    TITLE:=AllWinner sunXi Watchdog timer
--    DEPENDS:=@TARGET_sunxi
--    KCONFIG:=CONFIG_SUNXI_WATCHDOG
--    FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sunxi_wdt.ko
--    AUTOLOAD:=$(call AutoLoad,51,sunxi_wdt)
--endef
--
--define KernelPackage/wdt-sunxi/description
--    Kernel module for AllWinner sunXi watchdog timer.
--endef
--
--$(eval $(call KernelPackage,wdt-sunxi))
--
--
- define KernelPackage/sound-soc-sunxi
-   TITLE:=AllWinner built-in SoC sound support
--  KCONFIG:= \
--	CONFIG_SND_SUNXI_SOC_CODEC \
--	CONFIG_SND_SUN4I_CODEC
--ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.4.0)),1)
--  FILES+=$(LINUX_DIR)/sound/soc/sunxi/sunxi-codec.ko
--  AUTOLOAD:=$(call AutoLoad,65,sunxi-codec)
--endif
--ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.4.0)),1)
-+  KCONFIG:=CONFIG_SND_SUN4I_CODEC
-   FILES:=$(LINUX_DIR)/sound/soc/sunxi/sun4i-codec.ko
-   AUTOLOAD:=$(call AutoLoad,65,sun4i-codec)
--endif
-   DEPENDS:=@TARGET_sunxi +kmod-sound-soc-core
-   $(call AddDepends/sound)
- endef