Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 8a99cc3e5336525d0e5b74937a88224f84bc43ed..e55c43c03b9975fe0f6dd106dc84dba5255cd018 100644 (file)
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -63,7 +63,6 @@ etc/strongswan.d/charon/xcbc.conf
 etc/strongswan.d/pki.conf
 etc/strongswan.d/scepclient.conf
 etc/strongswan.d/starter.conf
-etc/strongswan.d/tools.conf
 usr/bin/pki
 #usr/lib/ipsec
 #usr/lib/ipsec/libcharon.a
@@ -225,4 +224,3 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/strongswan.d/pki.conf
 #usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
 #usr/share/strongswan/templates/config/strongswan.d/starter.conf
-#usr/share/strongswan/templates/config/strongswan.d/tools.conf

diff --git a/make.sh b/make.sh
index 174ef258cf3a85ddf3883e406276416a928b379b..8cb2b88cc599956f914f975f8714914eb0385d81 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -475,7 +475,6 @@ buildipfire() {
   ipfiremake sqlite
   ipfiremake python
   ipfiremake fireinfo
-  ipfiremake ddns
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
@@ -764,6 +763,7 @@ buildipfire() {
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
+  ipfiremake ddns
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux