Merge branch 'ddns' into next

diff --cc config/rootfiles/core/80/filelists/files
index 2c38e1ea757ef3ced0bf6eb40e19c19d683a82ab,a274ebaf29af46c8c6a7d8f63c252174d5426b4f..528137824af1b792850c4852de1fdd38c5831686
--- 1/config/rootfiles/core/80/filelists/files
--- 2/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@@ -1,10 -1,8 +1,9 @@@
  etc/system-release
  etc/issue
  etc/rc.d/init.d/dhcrelay
 +etc/rc.d/init.d/dnsmasq
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
  srv/web/ipfire/cgi-bin/routing.cgi
- usr/local/bin/setddns.pl
  usr/sbin/dhcrelay
  var/ipfire/general-functions.pl
  var/ipfire/langs

diff --cc config/rootfiles/core/80/update.sh
Simple merge

diff --cc make.sh
Simple merge