Merge branch 'experimental' into testing

Conflicts:
	modules
	site.conf
	site.mk

modules

@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffpb'
 
 PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
-PACKAGES_FFPB_COMMIT=cb21f9c295cf5713c37df4a4cc61fde11fe4f53c
+PACKAGES_FFPB_COMMIT=b7a2c2f8739ffcd34bfd10ea29d2929fa1fc99c2

site.conf

@@ -19,8 +19,8 @@
 	-- network-internal ntp service
 	ntp_servers = {'ntp.services.ffpb'},
 
-	-- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/attitude_adjustment/12.09/%S/packages/'
+        -- 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',
@@ -157,7 +157,7 @@
 				mirrors = {'http://[fdca:ffee:ff12:a254::80]/stable', 'http://firmware.paderborn.freifunk.net/stable'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
-				good_signatures = 2,
+				good_signatures = 3,
 
 				-- list of public keys which are considered "good" for manifest signatures
 				pubkeys = {
@@ -165,17 +165,31 @@
 					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'a4da8601d27c73a22094a98b02501367c451f364aaabfcf5c597784bf272429c', -- THiSCO
+					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 				},
 			},
 			testing = {
 				name = 'testing',
 				mirrors = {'http://[fdca:ffee:ff12:a254::80]/testing','http://firmware.paderborn.freifunk.net/testing'},
+				good_signatures = 2,
+				pubkeys = {
+					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
+					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
+					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
+					'a4da8601d27c73a22094a98b02501367c451f364aaabfcf5c597784bf272429c', -- THiSCO
+					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+				},
+			},
+			experimental = {
+				name = 'experimental',
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/experimental','http://firmware.paderborn.freifunk.net/experimental'},
 				good_signatures = 1,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
 					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'a4da8601d27c73a22094a98b02501367c451f364aaabfcf5c597784bf272429c', -- THiSCO
+					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 				},
 			},
 		},

site.mk

@@ -1,24 +1,31 @@
 GLUON_SITE_PACKAGES := \
+	gluon-mesh-batman-adv-14 \
+	ffpb-alfred-watchdog \
+	ffpb-banner \
 	ffpb-debug \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
-	gluon-config-mode \
+	gluon-config-mode-autoupdater \
+	gluon-config-mode-hostname \
+	gluon-config-mode-mesh-vpn \
+	gluon-config-mode-geo-location \
+	gluon-config-mode-contact-info \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-luci-portconfig \
-	gluon-mesh-batman-adv \
-	gluon-mesh-vpn-fastd \
 	gluon-next-node \
+	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.5.1+exp$(shell date '+%Y%m%d')
+# 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
+DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)