Merge branch 'testing' into stable

extra/sites.conf

@@ -0,0 +1,163 @@
+-- Define Blocks like:
+-- ffho_pad = {
+-- 	-- name of the region
+-- 	site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+--
+--	-- short name of the region
+--	site_code = 'ffho_pad',
+--
+--	-- wifi settings
+--	ssid = 'hochstift.freifunk.net/pad-umlnd',
+--},
+{
+	{
+		site_name = 'Freifunk Hochstift - Altenbeken',
+		site_code = 'ffho_abn',
+		ssid = 'hochstift.freifunk.net/altenbkn',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Bad Driburg',
+		site_code = 'ffho_bdr',
+		ssid = 'hochstift.freifunk.net/driburg',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Bad Lippspringe',
+		site_code = 'ffho_rwb',
+		ssid = 'hochstift.freifunk.net/badlippsp',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Bad Wünnenberg',
+		site_code = 'ffho_wux',
+		ssid = 'hochstift.freifunk.net/wuennenb',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Beverungen',
+		site_code = 'ffho_bev',
+		ssid = 'hochstift.freifunk.net/beverungn',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Borchen',
+		site_code = 'ffho_rhc',
+		ssid = 'hochstift.freifunk.net/borchen',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Borgentreich',
+		site_code = 'ffho_bxg',
+		ssid = 'hochstift.freifunk.net/borgentr',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Brakel',
+		site_code = 'ffho_bkk',
+		ssid = 'hochstift.freifunk.net/brakel',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Büren',
+		site_code = 'ffho_buq',
+		ssid = 'hochstift.freifunk.net/bueren',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Delbrück',
+		site_code = 'ffho_dek',
+		ssid = 'hochstift.freifunk.net/delbrueck',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Geseke',
+		site_code = 'ffho_gee',
+		ssid = 'hochstift.freifunk.net/geseke',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Horn-Bad Meinberg',
+		site_code = 'ffho_zwg',
+		ssid = 'hochstift.freifunk.net/horn',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Hövelhof',
+		site_code = 'ffho_hvf',
+		ssid = 'hochstift.freifunk.net/hoevelhof',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Höxter',
+		site_code = 'ffho_hox',
+		ssid = 'hochstift.freifunk.net/hoexter',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Lichtenau',
+		site_code = 'ffho_lit',
+		ssid = 'hochstift.freifunk.net/lichtenau',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Lippstadt',
+		site_code = 'ffho_lip',
+		ssid = 'hochstift.freifunk.net/lippstadt',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Marienmünster',
+		site_code = 'ffho_mms',
+		ssid = 'hochstift.freifunk.net/mms',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Marsberg',
+		site_code = 'ffho_msg',
+		ssid = 'hochstift.freifunk.net/marsberg',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Nieheim',
+		site_code = 'ffho_yni',
+		ssid = 'hochstift.freifunk.net/nieheim',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Paderborn (Kernstadt)',
+		site_code = 'ffho_pad_cty',
+		ssid = 'hochstift.freifunk.net/pad-city',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+		site_code = 'ffho_pad_uml',
+		ssid = 'hochstift.freifunk.net/pad-umlnd',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Salzkotten',
+		site_code = 'ffho_szn',
+		ssid = 'hochstift.freifunk.net/salzkottn',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Schieder-Schwalenberg',
+		site_code = 'ffho_yss',
+		ssid = 'hochstift.freifunk.net/schieder',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Schlangen',
+		site_code = 'ffho_xsc',
+		ssid = 'hochstift.freifunk.net/schlangen',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Steinheim',
+		site_code = 'ffho_stm',
+		ssid = 'hochstift.freifunk.net/steinheim',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Warburg',
+		site_code = 'ffho_wag',
+		ssid = 'hochstift.freifunk.net/warburg',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Willebadessen',
+		site_code = 'ffho_ywl',
+		ssid = 'hochstift.freifunk.net/willebdn',
+	},
+	{
+		site_name = 'Freifunk Hochstift - Umland',
+		site_code = 'ffho_yho',
+		ssid = 'hochstift.freifunk.net/umland',
+	},
+	-- start hidden sites here --
+	{
+		site_select = {
+			hidden = 1,
+		},
+		site_name = 'Freifunk Hochstift - Hamburg',
+		site_code = 'ffho_ham',
+		ssid = 'hochstift.freifunk.net/hamburg',
+	},
+
+}

i18n/de.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
+"PO-Revision-Date: 2015-11-02 13:15+0100\n"
+"Last-Translator: Freifunk Hochstift <kontakt@hochstift.freifunk.net>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -12,18 +12,24 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Paderborner "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
+"Willkommen zum Einrichtungsassistenten für deinen neuen Freifunk "
+"Hochstift-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."
 
+msgid "gluon-config-mode:site-select"
+msgstr ""
+"Hier hast du die Möglichkeit die Region, in der sich dein "
+"Knoten befindet, auszuwählen. Bitte denke daran, dass dein Router "
+"sich nur mit dem Netz der ausgewählten Region verbindet."
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
-"er auf den Servern des Paderborner Freifunk-Projektes eingetragen wurde, "
-"kann sich dein Knoten mit dem Paderborner Mesh-VPN zu verbinden. Bitte "
+"er auf den Servern des Freifunk Hochstift-Projektes eingetragen wurde, "
+"kann sich dein Knoten mit dem Mesh-VPN verbinden. Bitte "
 "schicke dazu diesen Schlüssel und den Namen deines Knotens "
-"an maschinenraum@paderborn.freifunk.net oder benutze am besten gleich das "
-"<a href=\"http://paderborn.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>\"> "
+"an <a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a> oder benutze am besten gleich das "
+"<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\"> "
 "vorausgefüllte Formular auf unserer Webseite</a>.<br><br>"
 
 msgid "gluon-config-mode:reboot"
@@ -32,8 +38,8 @@ msgstr ""
 "Dein Knoten startet gerade neu und wird anschließend versuchen, "
 "sich anschließend mit anderen Freifunkknoten in seiner Nähe zu "
 "verbinden. Weitere Informationen zur  "
-"Paderborner Freifunk-Community findest du auf  "
-"<a href=\"http://paderborn.freifunk.net/\">unserer Webseite</a>. "
+"Freifunk Hochstift-Community findest du auf  "
+"<a href=\"http://hochstift.freifunk.net/\">unserer Webseite</a>. "
 "</p> "
 "<p> "
 "Viel Spaß mit deinem Knoten und der Erkundung von Freifunk! "

i18n/en.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
+"PO-Revision-Date: 2015-11-02 13:15+0100\n"
+"Last-Translator: Freifunk Hochstift <kontakt@hochstift.freifunk.net>\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -12,24 +12,29 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Paderborn node. "
+"Welcome the the setup wizard of your new Freifunk Hochstift node. "
 "Please fill out the following form and transmit it."
 
+msgid "gluon-config-mode:site-select"
+msgstr ""
+"Here you have the possibility of selecting the region in which "
+"your node is placed. Please keep in mind that your router "
+"connects only with the mesh of the selected region"
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "This is your Freifunk node's public key. The node won't be able to "
 "connect to the mesh VPN until the key has been registered on the Freifunk "
-"Paderborn servers. "
+"Hochstift servers. "
 "To register the key fill out "
-"<a href=\"http://paderborn.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>\">this form</a> "
+"<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\">this form</a> "
 "or send it together with your node's name (<em><%=hostname%></em>) to "
-"<a href=\"mailto:maschinenraum@paderborn.freifunk.net\">maschinenraum@paderborn.freifunk.net</a>."
-
+"<a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a>."
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>The node is currently rebooting and will try to connect to other "
 "nearby Freifunk nodes  after that. "
-"Your can find lots of information on the Freifunk Paderborn community on "
-"<a href=\"https://paderborn.freifunk.net/\">our homepage</a>.</p>"
+"Your can find lots of information on the Freifunk Hochstift community on "
+"<a href=\"https://hochstift.freifunk.net/\">our homepage</a>.</p>"
 "<p>Have fun with your node and exploring the Freifunk network!</p>"

i18n/gluon-site.pot

@@ -4,6 +4,9 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "gluon-config-mode:welcome"
 msgstr ""
 
+msgid "gluon-config-mode:site-select"
+msgstr ""
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 

modules

@@ -1,4 +1,5 @@
-GLUON_SITE_FEEDS='ffpb'
+GLUON_SITE_FEEDS='ffho'
 
-PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
-PACKAGES_FFPB_COMMIT=fcbb5718c146ae77ed882597c9533c957f5c9d30
+PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
+PACKAGES_FFHO_BRANCH=v2015.1.x
+PACKAGES_FFHO_COMMIT=94fe25943b03aaaf6f92a1ed11eda80031d1e57f

patches/0001-add-support-for-futro.patch

@@ -0,0 +1,85 @@
+From 7c749b9250367d6eb4c1d0b978cecc13c1a5e919 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Karsten=20B=C3=B6ddeker?= <freifunk@kb-light.de>
+Date: Thu, 15 Oct 2015 16:35:06 +0200
+Subject: [PATCH] add support for futro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Karsten Böddeker <freifunk@kb-light.de>
+---
+ patches/openwrt/1000-Add-support-for-futro.patch | 50 ++++++++++++++++++++++++
+ targets/x86-generic/profiles.mk                  |  4 +-
+ 2 files changed, 53 insertions(+), 1 deletion(-)
+ create mode 100644 patches/openwrt/1000-Add-support-for-futro.patch
+
+diff --git a/patches/openwrt/1000-Add-support-for-futro.patch b/patches/openwrt/1000-Add-support-for-futro.patch
+new file mode 100644
+index 0000000..9efa901
+--- /dev/null
++++ b/patches/openwrt/1000-Add-support-for-futro.patch
+@@ -0,0 +1,50 @@
++From: Karsten Böddeker <freifunk@kb-light.de>
++Date: Thu, 15 Oct 2015 14:40:53 +0200
++Subject: Add support for futro
++
++diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
++index 96c899a..0c531ca 100644
++--- a/package/kernel/linux/modules/usb.mk
+++++ b/package/kernel/linux/modules/usb.mk
++@@ -1439,3 +1439,32 @@ define KernelPackage/usb3/description
++ endef
++
++ $(eval $(call KernelPackage,usb3))
+++
+++define KernelPackage/usb-net-rtl8150
+++  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
+++  KCONFIG:=CONFIG_USB_RTL8150
+++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/rtl8150.ko
+++  AUTOLOAD:=$(call AutoProbe,rtl8150)
+++  $(call AddDepends/usb-net)
+++endef
+++
+++define KernelPackage/usb-net-rtl8150/description
+++ Kernel module for USB-to-Ethernet Realtek 8150 convertors
+++endef
+++
+++$(eval $(call KernelPackage,usb-net-rtl8150))
+++
+++
+++define KernelPackage/usb-net-rtl8152
+++  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
+++  KCONFIG:=CONFIG_USB_RTL8152
+++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko
+++  AUTOLOAD:=$(call AutoProbe,r8152)
+++  $(call AddDepends/usb-net)
+++endef
+++
+++define KernelPackage/usb-net-rtl8152/description
+++ Kernel module for USB-to-Ethernet Realtek 8152 USB2.0/3.0 convertors
+++endef
+++
+++$(eval $(call KernelPackage,usb-net-rtl8152))
++diff --git a/target/linux/x86/generic/config-3.10 b/target/linux/x86/generic/config-3.10
++index 2babaab..12d1c7f 100644
++--- a/target/linux/x86/generic/config-3.10
+++++ b/target/linux/x86/generic/config-3.10
++@@ -201,3 +201,4 @@ CONFIG_VT_CONSOLE=y
++ CONFIG_X86_PM_TIMER=y
++ # CONFIG_XO15_EBOOK is not set
++ # CONFIG_ZISOFS is not set
+++CONFIG_PATA_ATIIXP=y
+diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
+index b6551a7..a8a068d 100644
+--- a/targets/x86-generic/profiles.mk
++++ b/targets/x86-generic/profiles.mk
+@@ -1,4 +1,6 @@
+-X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity
++X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity \
++       kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152
++
+
+
+ $(eval $(call GluonProfile,GENERIC,$(X86_GENERIC_NETWORK_MODULES)))
+--
+2.1.4

site.conf

@@ -4,34 +4,40 @@
 	-- e.g. freifunk-0123456789ab
 	hostname_prefix = 'freifunk',
 
-	-- name of this community
-	site_name = 'Freifunk Paderborn',
-	-- short name of this community
-	site_code = 'ffpb',
+	-- name of this site
+	-- site_name = 'Freifunk Hochstift - ${site}',
+	site_name = 'Bitte wählen',
+	
+	-- short name of this site
+	-- site_code = 'ffho_${un-code}'
+	site_code = 'ffho',
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '10.132.0.0/18',
 	prefix6 = 'fdca:ffee:ff12:132::/64',
 
 	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = { '2001:470:6d:860::/64', },
+	additional_prefix6 = {
+		'2001:470:6d:860::/64',
+		'2a03:2260:2342:2300::/64',
+	},
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 
 	-- network-internal ntp service
-	ntp_servers = {'ntp.services.ffpb'},
+	ntp_servers = {'ntp.in.ffho.net'},
 
-        -- OpenWRT Package Repository (IPv6 capable)
+	-- OpenWRT Package Repository (IPv6 capable)
 	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
 
 	-- regulatory domain of your wifi
 	regdom = 'DE',
 
 	-- wifi settings (2.4 GHz and 5 GHz)
-	-- the most important thing to change is the SSID
-	-- of the client network (yourcity.freifunk.net) and
-	-- both(!) mesh_?ssid ad-hoc mesh network ids.
+	-- ssid = 'hochstift.freifunk.net/${kürzel}',
+	-- mesh_ssid = 'ffho-mesh-${un-code}',
+	-- mesh_bssid = '${idividual-mac}'
 	wifi24 = {
 		ssid = 'paderborn.freifunk.net',
 		channel = 1,
@@ -219,9 +225,9 @@
 		},
 	},
 
-	-- configure ffpb-debug
+	-- configure ffho-debug
 	debugserver = {
-		host = { 'debugreport.paderborn.freifunk.net', 'fdca:ffee:ff12:a254::deb9' },
+		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },
 		port = 1337,
 		liveport = 1338,
 	},

site.mk

@@ -1,18 +1,21 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-14 \
-	ffpb-banner \
-	ffpb-debug \
-    ffpb-node-tuning \
-	ffpb-ebtables-net-rules \
-	ffpb-openwrt-migration-tools \
+	ffho-banner \
+	ffho-debug \
+	ffho-node-tuning \
+	ffho-ebtables-net-rules \
+	ffho-openwrt-migration-tools \
+	ffho-alfred-config \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
+	gluon-config-mode-contact-info \
+	ffho-config-mode-mesh-vpn \
+	ffho-config-mode-geo-location \
+	ffho-config-mode-site-select \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \