From 488b721b237b4e02ba7807d88b45718ddd3b05d6 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Tue, 27 Aug 2019 23:19:37 +0200
Subject: [PATCH] try to get clat on gluon

---
 gluon     |  2 +-
 modules   | 11 ++++++++---
 site.conf |  4 +++-
 site.mk   | 10 ++++++----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/gluon b/gluon
index cd05007..f704458 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit cd05007adf42c199673c971cf7f389c955d2be02
+Subproject commit f704458cfb58c30eee8c67d7bd7840d1e40cf1d8
diff --git a/modules b/modules
index 8bf9188..1e38b17 100644
--- a/modules
+++ b/modules
@@ -1,11 +1,16 @@
-GLUON_SITE_FEEDS='ffhb ffffmpackages'
+GLUON_SITE_FEEDS='ffhb christfddhcp ffffmpackages'
 
-PACKAGES_GLUON_REPO=git://github.com/genofire/gluon-packages.git
+PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_BRANCH=master
-PACKAGES_GLUON_COMMIT=227cf16d90a72af3b0f3c69f16ef79e49bbcf12f
+PACKAGES_GLUON_COMMIT=89260206971f1716c256a75324651dca52d0211a
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
 PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
 
+
+PACKAGES_CHRISTFDDHCP_REPO=https://github.com/christf/gluon-sargon.git
+PACKAGES_CHRISTFDDHCP_COMMIT=d81a81af9f593dfd6aa5f7afbdb076c7c144c901
+PACKAGES_CHRISTFDDHCP_BRANCH=bump
+
 PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
 PACKAGES_FFFFMPACKAGES_COMMIT=b0cd16ee80fa8c093b1c6a5b442f7e81b9d85e42
diff --git a/site.conf b/site.conf
index 6933577..16f042f 100644
--- a/site.conf
+++ b/site.conf
@@ -6,7 +6,9 @@
 	node_prefix6 = '2a06:8782:ffbb:bab0::/64',
 
 	prefix6 = '2a06:8782:ffbb:bab1::/64',
-	node_client_prefix6 = 'fd2f:5119:f2c::/64', -- just magic ula, if routed to legacy network
+	node_client_prefix6 = 'fd2f:5119:f2c::/64', -- infrastructure net (ULA) for node-client-ip addresses
+	clat_range = 'fdff:ffff:ffff::/48', -- infrastructure net (ULA) from which a /96 clat prefix will be generated.
+	plat_range = 'fdff:ffff:fffe::/48', -- infrastructure net (ULA) from which a /96 plat prefix will be generated.
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {
diff --git a/site.mk b/site.mk
index 5aa90f2..09b0fa7 100755
--- a/site.mk
+++ b/site.mk
@@ -25,7 +25,10 @@ GLUON_SITE_PACKAGES := \
 	iwinfo \
 	iptables \
 	gluon-iptables-clamp-mss-to-pmtu \
-	babeldev
+	babeldev \
+	haveged \
+	gluon-xlat464-clat  \
+	gluon-ddhcpd
 
 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
@@ -34,7 +37,7 @@ GLUON_PRIORITY ?= 0
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
 GLUON_WLAN_MESH ?= 11s
-
+GLUON_DEPRECATED ?= 0
 
 # Debug packages
 DEBUG_PACKAGES := \
@@ -43,6 +46,5 @@ DEBUG_PACKAGES := \
 # x86-64
 ifeq ($(GLUON_TARGET),x86-64)
 GLUON_SITE_PACKAGES += \
-	$(DEBUG_PACKAGES) \
-	haveged
+	$(DEBUG_PACKAGES)
 endif