diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index af57b88ca..e1870e4af 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -270,7 +270,7 @@ usr/lib/libbind9.so.161.0.2 #usr/lib/libdns.la #usr/lib/libdns.so usr/lib/libdns.so.1106 -usr/lib/libdns.so.1106.0.0 +usr/lib/libdns.so.1106.0.1 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1100 diff --git a/config/rootfiles/core/134/filelists/bind b/config/rootfiles/core/134/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/134/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/files b/config/rootfiles/core/134/filelists/files index b74ce2e5f..31f9cbcc4 100644 --- a/config/rootfiles/core/134/filelists/files +++ b/config/rootfiles/core/134/filelists/files @@ -1,6 +1,8 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall etc/rc.d/init.d/unbound srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/general-functions.pl var/ipfire/langs diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 6ce9542b2..5031e4088 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -89,9 +89,9 @@ Alfred Haas, Lars Schuhmacher, Rene Zingel, Sascha Kilian, +Stéphane Pautrel, Ronald Wiesinger, Stephan Feddersen, -Stéphane Pautrel, Florian Bührle, Bernhard Bitsch, Justin Luth, diff --git a/lfs/bind b/lfs/bind index c26487dc9..2f7e83ac1 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.7 +VER = 9.11.8 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5c16cdab2ee066ed43a623febfd29244 +$(DL_FILE)_MD5 = 67b856b6e5cbe4ff4b4456259ec37336 install : $(TARGET) diff --git a/make.sh b/make.sh index 5b1e0ed99..aca75fc71 100755 --- a/make.sh +++ b/make.sh @@ -27,7 +27,7 @@ SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.23" # Version number CORE="134" # Core Level (Filename) -PAKFIRE_CORE="133" # Core Level (PAKFIRE) +PAKFIRE_CORE="134" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index da89857d8..b3483a744 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -379,6 +379,9 @@ iptables_init() { # run wirelessctrl /usr/local/bin/wirelessctrl + # run captivectrl + /usr/local/bin/captivectrl + # POLICY CHAIN iptables -N POLICYIN iptables -A INPUT -j POLICYIN