From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 10 Jul 2014 17:17:45 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=510e4cc9c184adc0a58624a9b3c15181c1f38dfb;hp=bfdab6e3644fef33b22dfcf10e641ebdf8b55367

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 8a99cc3e5..e55c43c03 100644
--- 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 174ef258c..8cb2b88cc 100755
--- 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