Merge branch 'ddns' into next

diff --combined 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 --combined config/rootfiles/core/80/update.sh
index 8032dccf170f0ba3d0aadafd28591626c2cc61eb,5ff84641d1492836023aa1df88e7ed914f1115fb..26e004496003bdd6dbd30dfd0c8913770e496b58
--- 1/config/rootfiles/core/80/update.sh
--- 2/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@@ -37,7 -37,6 +37,7 @@@ don
  extract_files
  
  # Start services
 +/etc/init.d/dnsmasq restart
  
  # Update Language cache
  perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@@ -47,6 -46,25 +47,25 @@@ rm -f 
        /opt/pakfire/db/installed/meta-libgpg-error \
        /opt/pakfire/db/rootfiles/libgpg-error
  
+ # Generate ddns configuration file
+ /srv/web/ipfire/cgi-bin/ddns.cgi
+ 
+ touch /var/ipfire/ddns/ddns.conf
+ chown nobody.nobody /var/ipfire/ddns/ddns.conf
+ 
+ # Update crontab
+ sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"
+ 
+ grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+ 
+ # Update dynamic DNS records every five minutes.
+ # Force an update once a month
+ */5 * * * *   [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
+ 3 2 1 * *     [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
+ EOF
+ 
+ fcrontab -z &>/dev/null
+ 
  sync
  
  # This update need a reboot...

diff --combined make.sh
index 51ee693acd2d239f040813207480f91209dd7256,cb88ee74616ae4c68a2acee3abef6e2b10a3e681..174ef258cf3a85ddf3883e406276416a928b379b
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -385,6 -385,9 +385,6 @@@ buildipfire() 
    export LOGFILE
    ipfiremake configroot
    ipfiremake backup
 -  ipfiremake bind
 -  ipfiremake dhcp
 -  ipfiremake dhcpcd
    ipfiremake libusb
    ipfiremake libusbx
    ipfiremake libpcap
@@@ -456,25 -459,23 +456,26 @@@
                ;;
    esac
    ipfiremake pkg-config
 +  ipfiremake openssl
 +  ipfiremake openssl-compat
 +  ipfiremake libgpg-error
 +  ipfiremake libgcrypt
 +  ipfiremake libassuan
 +  ipfiremake bind
 +  ipfiremake dhcp
 +  ipfiremake dhcpcd
    ipfiremake linux-atm
    ipfiremake cpio
    ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
 -  ipfiremake openssl
 -  ipfiremake openssl-compat
 -  ipfiremake libgpg-error
 -  ipfiremake libgcrypt
 -  ipfiremake libassuan
    ipfiremake curl
    ipfiremake tcl
    ipfiremake sqlite
    ipfiremake python
    ipfiremake fireinfo
+   ipfiremake ddns
    ipfiremake libnet
    ipfiremake libnl
    ipfiremake libidn
@@@ -508,7 -509,6 +509,7 @@@
    ipfiremake arping
    ipfiremake beep
    ipfiremake dvdrtools
 +  ipfiremake nettle
    ipfiremake dnsmasq
    ipfiremake dosfstools
    ipfiremake reiserfsprogs