core106: Add recently updated packages, etc.

This update removes dnsmasq and replaces it with unbound.

Also many packages are updated and shipped.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/106/filelists/attr b/config/rootfiles/core/106/filelists/attr
new file mode 120000 (symlink)
index 0000000..c808017
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/attr
@@ -0,0 +1 @@
+../../../common/attr
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/diffutils b/config/rootfiles/core/106/filelists/diffutils
new file mode 120000 (symlink)
index 0000000..a5c02f3
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/diffutils
@@ -0,0 +1 @@
+../../../common/diffutils
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/ed b/config/rootfiles/core/106/filelists/ed
new file mode 120000 (symlink)
index 0000000..0ed331c
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/ed
@@ -0,0 +1 @@
+../../../common/ed
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/expat b/config/rootfiles/core/106/filelists/expat
new file mode 120000 (symlink)
index 0000000..e1923cf
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/expat
@@ -0,0 +1 @@
+../../../common/expat
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/file b/config/rootfiles/core/106/filelists/file
new file mode 120000 (symlink)
index 0000000..0c60e43
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/file
@@ -0,0 +1 @@
+../../../common/file
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 409e5fe8ac4e0442392c03e5efbd9d5d44e33c72..02b9d4c0b59e0bcd424eac82c6672e4bcb0277d6 100644 (file)
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -1,2 +1,17 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
+etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
+etc/rc.d/init.d/unbound
+etc/rc.d/rc0.d/K79unbound
+etc/rc.d/rc3.d/S21unbound
+etc/rc.d/rc6.d/K79unbound
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/dnsforward.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/hosts.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+srv/web/ipfire/cgi-bin/services.cgi

diff --git a/config/rootfiles/core/106/filelists/flex b/config/rootfiles/core/106/filelists/flex
new file mode 120000 (symlink)
index 0000000..feb0390
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/flex
@@ -0,0 +1 @@
+../../../common/flex
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/gawk b/config/rootfiles/core/106/filelists/gawk
new file mode 120000 (symlink)
index 0000000..a3bbe32
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/gawk
@@ -0,0 +1 @@
+../../../common/gawk
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/gettext b/config/rootfiles/core/106/filelists/gettext
new file mode 120000 (symlink)
index 0000000..b6c6c6f
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/gnupg b/config/rootfiles/core/106/filelists/gnupg
new file mode 120000 (symlink)
index 0000000..a1a1564
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/gnupg
@@ -0,0 +1 @@
+../../../common/gnupg
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/i586/openssl-sse2 b/config/rootfiles/core/106/filelists/i586/openssl-sse2
new file mode 120000 (symlink)
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/i586/strongswan-padlock b/config/rootfiles/core/106/filelists/i586/strongswan-padlock
new file mode 120000 (symlink)
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/iproute2 b/config/rootfiles/core/106/filelists/iproute2
new file mode 120000 (symlink)
index 0000000..05f0f71
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/ipset b/config/rootfiles/core/106/filelists/ipset
new file mode 120000 (symlink)
index 0000000..2b43691
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/ipset
@@ -0,0 +1 @@
+../../../common/ipset
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/libgpg-error b/config/rootfiles/core/106/filelists/libgpg-error
new file mode 120000 (symlink)
index 0000000..cad4313
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/libgpg-error
@@ -0,0 +1 @@
+../../../common/libgpg-error
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/libjpeg b/config/rootfiles/core/106/filelists/libjpeg
new file mode 120000 (symlink)
index 0000000..3b1a782
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/libjpeg
@@ -0,0 +1 @@
+../../../common/libjpeg
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/libjpeg-compat b/config/rootfiles/core/106/filelists/libjpeg-compat
new file mode 120000 (symlink)
index 0000000..e6ff86d
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/libjpeg-compat
@@ -0,0 +1 @@
+../../../common/libjpeg-compat
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/libmnl b/config/rootfiles/core/106/filelists/libmnl
new file mode 120000 (symlink)
index 0000000..f671c41
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/libmnl
@@ -0,0 +1 @@
+../../../common/libmnl
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/libnetfilter_conntrack b/config/rootfiles/core/106/filelists/libnetfilter_conntrack
new file mode 120000 (symlink)
index 0000000..6ef5cc4
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/libnetfilter_conntrack
@@ -0,0 +1 @@
+../../../common/libnetfilter_conntrack
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/misc-progs b/config/rootfiles/core/106/filelists/misc-progs
new file mode 120000 (symlink)
index 0000000..7223cad
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/misc-progs
@@ -0,0 +1 @@
+../../../common/misc-progs
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/openssl b/config/rootfiles/core/106/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/python-daemon b/config/rootfiles/core/106/filelists/python-daemon
new file mode 120000 (symlink)
index 0000000..8e510bb
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/python-daemon
@@ -0,0 +1 @@
+../../../common/python-daemon
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/python-docutils b/config/rootfiles/core/106/filelists/python-docutils
new file mode 120000 (symlink)
index 0000000..5ae1ada
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/python-docutils
@@ -0,0 +1 @@
+../../../common/python-docutils
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/python-inotify b/config/rootfiles/core/106/filelists/python-inotify
new file mode 120000 (symlink)
index 0000000..6f572c3
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/python-inotify
@@ -0,0 +1 @@
+../../../common/python-inotify
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/python-ipaddress b/config/rootfiles/core/106/filelists/python-ipaddress
new file mode 120000 (symlink)
index 0000000..0702482
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/python-ipaddress
@@ -0,0 +1 @@
+../../../common/python-ipaddress
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/smartmontools b/config/rootfiles/core/106/filelists/smartmontools
new file mode 120000 (symlink)
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/squid b/config/rootfiles/core/106/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/strongswan b/config/rootfiles/core/106/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/unbound b/config/rootfiles/core/106/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch b/config/rootfiles/core/106/filelists/usb_modeswitch
new file mode 120000 (symlink)
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file

diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch_data b/config/rootfiles/core/106/filelists/usb_modeswitch_data
new file mode 120000 (symlink)
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/core/106/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file

diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh
index 723e9eeb68c3cf3ffca17d05a6725653feb6d664..4d50d9018fe4b54c8aefa7b7d4cb2aab4374e39c 100644 (file)
--- a/config/rootfiles/core/106/update.sh
+++ b/config/rootfiles/core/106/update.sh
@@ -41,17 +41,38 @@ done
 
 
 # Stop services
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+/etc/init.d/dnsmasq stop
 
 # Extract files
 extract_files
 
+# Delete dnsmasq
+rm -vf \
+       /etc/rc.d/init.d/dnsmasq \
+       /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \
+       /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \
+       /usr/sbin/dnsmasq
+
 # update linker config
 ldconfig
 
+grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+
+# Update DNS trust anchor
+%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem
+EOF
+
 # Update Language cache
-#/usr/local/bin/update-lang-cache
+/usr/local/bin/update-lang-cache
 
 # Start services
+/etc/init.d/unbound start
+/etc/init.d/squid start
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/init.d/ipsec start
+fi
 
 # This update need a reboot...
 touch /var/run/need_reboot