Merge branch 'experimental' into testing

extra/default.conf

@@ -7,4 +7,5 @@ subst = {
 	['%%V4'] = '10.132.112.0/21',
 	['%%V6'] = 'a00',
 	['%%N4'] = '10.132.112.1',
+	['%%DS'] = '6fdb7c99404fe91fca18e84bf48864681018741dc33fb6bde67d6041fc99210c',
 }

extra/groups.conf

@@ -5,6 +5,7 @@
 			['%%V4'] = '10.132.32.0/20',
 			['%%V6'] = '100',
 			['%%N4'] = '10.132.32.1',
+			['%%DS'] = '346fe028635137fa012d2e7ef4c30c1998d988636d358c929559616e24f4f6bc',
 		},
 	},
 	pad_uml = {
@@ -13,6 +14,7 @@
 			['%%V4'] = '10.132.48.0/21',
 			['%%V6'] = '200',
 			['%%N4'] = '10.132.48.1',
+			['%%DS'] = '4d6ebfb6c5ac1507a7a9bd4b40c1e84f7f750db29a33ca721009f3d0e9b1569e',
 		},
 	},
 	buq = {
@@ -21,6 +23,7 @@
 			['%%V4'] = '10.132.56.0/21',
 			['%%V6'] = '300',
 			['%%N4'] = '10.132.56.1',
+			['%%DS'] = 'f57ae6294491f9b58cf2183dda44927a0b33f825156da68b05302dd8a0cc08b6',
 		},
 	},
 	pb_nord = {
@@ -29,6 +32,7 @@
 			['%%V4'] = '10.132.64.0/21',
 			['%%V6'] = '400',
 			['%%N4'] = '10.132.64.1',
+			['%%DS'] = '59452bf36c5614022c54fe9f5b4a0012da07a25d455b99079db0758b2fd748c8',
 		},
 	},
 	pb_ost = {
@@ -37,6 +41,7 @@
 			['%%V4'] = '10.132.72.0/21',
 			['%%V6'] = '500',
 			['%%N4'] = '10.132.72.1',
+			['%%DS'] = 'ff018701d9378be833e6bcd2b38791f785cdeb41dcfa15255069d83a090f7a60',
 		},
 	},
 	pb_sued = {
@@ -45,6 +50,7 @@
 			['%%V4'] = '10.132.80.0/21',
 			['%%V6'] = '600',
 			['%%N4'] = '10.132.80.1',
+			['%%DS'] = '23598bf0196a7650428717c5ecd4cf6f3062271ed1020c86711176adffbcdc3b',
 		},
 	},
 	pb_west = {
@@ -53,6 +59,7 @@
 			['%%V4'] = '10.132.88.0/21',
 			['%%V6'] = '700',
 			['%%N4'] = '10.132.88.1',
+			['%%DS'] = '1b8bed9940f072b2ad3ab51a97868c4f4346d73d7a7e41fee5954f0f67905e0c',
 		},
 	},
 	hx_nord = {
@@ -61,6 +68,7 @@
 			['%%V4'] = '10.132.96.0/21',
 			['%%V6'] = '800',
 			['%%N4'] = '10.132.96.1',
+			['%%DS'] = 'a98d1fdc66bf8b952937183edf9d8a581ee375c09f30eb902deecea5d4036b1a',
 		},
 	},
 	hx_sued = {
@@ -69,6 +77,7 @@
 			['%%V4'] = '10.132.104.0/21',
 			['%%V6'] = '900',
 			['%%N4'] = '10.132.104.1',
+			['%%DS'] = '936f9b7ec3988901fc9f314958e923e9af7ac1f47234df27cc5fc5305ab973c0',
 		},
 	},
 	uml = {
@@ -77,6 +86,7 @@
 			['%%V4'] = '10.132.112.0/21',
 			['%%V6'] = 'a00',
 			['%%N4'] = '10.132.112.1',
+			['%%DS'] = '47ab039f19c4865701a4d4f5123109ee4c340808b03d1261e596283206b2ebc2',
 		},
 	},
 }

extra/template.conf

@@ -12,6 +12,13 @@
 	-- site_code = 'ffho_${un-code}'
 	site_code = '%SC',
 
+	-- 32 bytes of random data, encoded in hexadecimal, used to seed other 
+	-- random values specific to the mesh domain. It must be the same for all 
+	-- nodes of one mesh, but should be different for firmwares that are not 
+	-- supposed to mesh with each other.
+	-- TODO: Must be set individual by any domain
+	domain_seed = '%DS',
+
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '%V4',
 	prefix6 = '2a03:2260:2342:%V6::/64',
@@ -33,6 +40,11 @@
 	-- regulatory domain of your wifi
 	regdom = 'DE',
 
+	mesh = {
+		-- for now, we don't use vxlan on the mesh
+		vxlan = false,
+	},
+
 	-- wifi settings (2.4 GHz and 5 GHz)
 	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
 	-- mesh.id = 'ffho-mesh-${group-name}',
@@ -67,7 +79,7 @@
 	next_node = {
 		ip4 = '%N4',
 		ip6 = '2a03:2260:2342:%V6::1',
-		name = 'node.ffho.net',
+		name = { 'node.ffho.net' },
 
 		-- mac address, must be unique in the client network
 		-- (usually, you don't need to change this)
@@ -213,6 +225,13 @@
 		-- Show/hide the altitude field
 		geo_location = {
 			show_altitude = false,
+			osm = {
+				center = {
+					lat = 51.695543946,
+					lon = 8.958663940,
+				},
+				zoom = 11,
+			},
 		},
 		-- define if the contact field is obligatory (optional)
 		owner = {

i18n/de.po

@@ -55,11 +55,3 @@ msgstr ""
 "<a href=\"https://hochstift.freifunk.net/\">unserer Webseite</a>."
 "</p>"
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."

i18n/en.po

@@ -55,11 +55,3 @@ msgstr ""
 "3 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"
 "<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known.

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2017.1.x
-PACKAGES_FFHO_COMMIT=806f98a8f4bc0896ba29b903a8b9f72c39db2f09
+PACKAGES_FFHO_BRANCH=master
+PACKAGES_FFHO_COMMIT=8a7a1ae9ade64447a24748755afe9b0413209521

patches/0001-openwrt-patch-iw.patch

@@ -0,0 +1,33 @@
+From: Karsten Böddeker <freifunk@kb-light.de>
+Date: Sat, 23 Apr 2016 15:20:30 +0200
+Subject: openwrt: patch iw
+
+diff --git a/patches/lede/1001-iw-patch-200-reduce-size-patch.patch b/patches/lede/1001-iw-patch-200-reduce-size-patch.patch
+new file mode 100644
+index 0000000..09c978e
+--- /dev/null
++++ b/patches/lede/1001-iw-patch-200-reduce-size-patch.patch
+@@ -0,0 +1,23 @@
++From: Karsten Böddeker <freifunk@kb-light.de>
++Date: Sat, 23 Apr 2016 15:20:29 +0200
++Subject: iw: patch 200-reduce_size.patch
++
++diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
++index dea24fb..fefbf1f 100644
++--- a/package/network/utils/iw/patches/200-reduce_size.patch
+++++ b/package/network/utils/iw/patches/200-reduce_size.patch
++@@ -1,12 +1,11 @@
++ --- a/Makefile
++ +++ b/Makefile
++-@@ -16,8 +16,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
+++@@ -17,7 +17,7 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
++  OBJS = iw.o genl.o event.o info.o phy.o \
++  	interface.o ibss.o station.o survey.o util.o ocb.o \
++  	mesh.o mpath.o mpp.o scan.o reg.o version.o \
++--	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
+++ 	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
++ -	bitrate.o wowlan.o coalesce.o roc.o p2p.o vendor.o
++-+	reason.o status.o link.o offch.o ps.o cqm.o \
++ +	bitrate.o vendor.o
++  OBJS += sections.o
++  

patches/0002-web-osm-translation-mismatch.patch

@@ -0,0 +1,17 @@
+From: Michael Schwarz <post@michael-schwarz.name>
+Date: Fre, 18 Jan 2018 09:18:30 +0200
+Subject: gluon: patch gluon-config-mode-geo-location translation
+
+diff --git a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
+index 6a211b64..928b4c5a 100644
+--- a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
++++ b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
+@@ -15,7 +15,7 @@ return function(form, uci)
+ 	if not text then
+ 		text = pkg_i18n.translate(
+ 			'If you want the location of your node to ' ..
+-			'be displayed on the map, you can enter its coordinates here.'
++			'be displayed on public maps, you can enter its coordinates here.'
+ 		)
+ 		if osm then
+ 			text = text .. ' ' .. osm.help(i18n)

site.mk

@@ -1,31 +1,26 @@
+GLUON_FEATURES := \
+        autoupdater \
+        ebtables-filter-multicast \
+        ebtables-filter-ra-dhcp \
+        ebtables-limit-arp \
+	config-mode-geo-location-osm \
+        mesh-batman-adv-15 \
+        mesh-vpn-fastd \
+        radvd \
+        respondd \
+        status-page \
+        web-advanced \
+        web-wizard
+
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
-	gluon-respondd \
+	-gluon-web-autoupdater \
 	ffho-ap-timer \
-	gluon-autoupdater \
 	ffho-autoupdater-wifi-fallback \
 	ffho-banner \
-	gluon-config-mode-core \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-contact-info \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
 	ffho-config-mode-site-select \
 	ffho-debug \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-source-filter \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-status-page \
-	gluon-web-admin \
 	ffho-web-ap-timer \
 	ffho-web-autoupdater \
-	gluon-web-logging \
-	gluon-web-network \
-	gluon-web-wifi-config \
 	iwinfo \
 	haveged
 
@@ -44,7 +39,6 @@ USB_NIC := \
 WLAN := \
 	kmod-ath9k \
 	kmod-ath10k-ct \
-	ath10k-firmware-qca988x-ct
 
 ifeq ($(GLUON_TARGET),x86-generic)
 	GLUON_SITE_PACKAGES += \
@@ -62,7 +56,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.1.0~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.2.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)