This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 3b884ae65ee2fdb8bba76d0e52f51326f30fc051 (commit) via 1223078cde69625946a7f6a444b8dddf8926d335 (commit) via 6096ad9a5dd207405cb1849397fe24d2842f8f48 (commit) via 6801827a613639098f81a93917e32c162627003e (commit) via a8ae890ecd389c8c5f54c30a171acaa1f6666e61 (commit) via 795d89e9431af22763120054c5b67548faaf6f14 (commit) via eb80bf38df91ab940e5cc631f55e06249d2e5074 (commit) via 3f46fc15194f50dedbc39ed3bad5d20d97f983b0 (commit) via f887bf5fbea267d7bbbb2e15efb24e1d14dbdac8 (commit) via 4352b0897cfcca7b3ddc25f1a4c2a7ad9428e840 (commit) via 7d5c5d11ea18b50a49a19ef9b80d9e45223356a0 (commit) via e27f2aa69a4c714322d443d6d6f6fafa1ff3c2c1 (commit) via b56a93e3c3d86c0894f291ed8208f01adead7f44 (commit) via 5747b6ebfbd81a71eaec8c2a688542c0245a243a (commit) via 86e00f68b8c9549fbc72c8ef68a499a1c3e34c79 (commit) via dfb985caa97b19f00b6eaac8af37020230132acc (commit) via 7961b3c7e0d424339b366d175b88ae1f47762444 (commit) via f8348048ff816abbf704b652d6ff2a45782c094b (commit) via bb5f2c53ac519e7dc9289b431b36138a7148c85d (commit) via 028eafe79f3cf3363ec3a48e6176f28c22e084d3 (commit) via 551a554db67f06d16d4115603884653bbb6968e2 (commit) via f9b7bc925940a87e7eee98ff607212d474ca7b0f (commit) via 7e2d7b98371fc203ccd764f76f35f57cc358ace4 (commit) via 6e386cad2dbfadff70c07feb4eb50061d4a23629 (commit) from e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3b884ae65ee2fdb8bba76d0e52f51326f30fc051 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:54:22 2018 +0100
core125: Ship updated SSH configuration
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1223078cde69625946a7f6a444b8dddf8926d335 Author: Peter Müller peter.mueller@link38.eu Date: Mon Oct 8 19:30:09 2018 +0200
fix broken SFTP in OpenSSH server
Fixes #11887
The second version of this patch uses the correct path on IPFire systems and supersedes the first one. It also referrs to the correct issue ID.
Thanks to Matthias Fischer for reporting this.
Signed-off-by: Peter Müller peter.mueller@link38.eu Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6096ad9a5dd207405cb1849397fe24d2842f8f48 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:52:57 2018 +0100
core125: Ship updated dhcpcd
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6801827a613639098f81a93917e32c162627003e Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Oct 7 18:27:40 2018 +0200
dhcpcd: Update to 7.0.8
Hi,
No explicit changelog. I used: https://roy.marples.name/search/query:dhcpcd
Running here.
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a8ae890ecd389c8c5f54c30a171acaa1f6666e61 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:51:38 2018 +0100
core125: Ship updated unbound
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 795d89e9431af22763120054c5b67548faaf6f14 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Oct 9 19:03:22 2018 +0200
unbound: Update to 1.8.1
For details see: https://nlnetlabs.nl/projects/unbound/download/
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eb80bf38df91ab940e5cc631f55e06249d2e5074 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 6 17:36:30 2018 +0100
hostapd: Bump package version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3f46fc15194f50dedbc39ed3bad5d20d97f983b0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 6 17:36:29 2018 +0100
hostapd: Compile with debugging messages
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f887bf5fbea267d7bbbb2e15efb24e1d14dbdac8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 6 17:36:28 2018 +0100
hostapd: Add support for 802.11ac
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4352b0897cfcca7b3ddc25f1a4c2a7ad9428e840 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:49:47 2018 +0100
core125: Update language files
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7d5c5d11ea18b50a49a19ef9b80d9e45223356a0 Author: Peter Müller peter.mueller@link38.eu Date: Thu Oct 4 18:27:35 2018 +0200
update OpenSSH default port in language files
Fixes #11881
Signed-off-by: Peter Müller peter.mueller@link38.eu Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e27f2aa69a4c714322d443d6d6f6fafa1ff3c2c1 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Oct 4 05:09:36 2018 +0200
clamav: Update to 0.100.2
Hi,
"This is a patch release to address several vulnerabilities..."
For details see: https://blog.clamav.net/2018/10/clamav-01002-has-been-released.html
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b56a93e3c3d86c0894f291ed8208f01adead7f44 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:36:48 2018 +0100
core125: Ship updated GnuTLS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5747b6ebfbd81a71eaec8c2a688542c0245a243a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Sep 28 18:58:20 2018 +0200
gnutls: Update to 3.5.19
Hi,
For changelogs since '3.5.15' see:
https://lists.gnupg.org/pipermail/gnutls-devel/2017-October/008523.html https://lists.gnupg.org/pipermail/gnutls-devel/2018-January/008538.html https://lists.gnupg.org/pipermail/gnutls-devel/2018-February/008540.html https://lists.gnupg.org/pipermail/gnutls-devel/2018-July/008583.html
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 86e00f68b8c9549fbc72c8ef68a499a1c3e34c79 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:35:46 2018 +0100
core125: Apply changed sysctl.conf immediately
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dfb985caa97b19f00b6eaac8af37020230132acc Author: Tim FitzGeorge ipfr@tfitzgeorge.me.uk Date: Tue Sep 25 18:52:30 2018 +0100
Allow kernel to swap memory on high demand
Signed-off-by: Tim FitzGeorge ipfr@tfitzgeorge.me.uk Fixes: Bug 11839 Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7961b3c7e0d424339b366d175b88ae1f47762444 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:34:00 2018 +0100
core125: Ship updated bind
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f8348048ff816abbf704b652d6ff2a45782c094b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Mon Sep 24 18:34:38 2018 +0200
bind: Update to 9.11.4-P2
For details see: http://ftp.isc.org/isc/bind9/9.11.4-P2/RELEASE-NOTES-bind-9.11.4-P2.html
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bb5f2c53ac519e7dc9289b431b36138a7148c85d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:33:23 2018 +0100
core125: Ship updated apache
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 028eafe79f3cf3363ec3a48e6176f28c22e084d3 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Sep 23 19:12:06 2018 +0200
Apache: Update to 2.4.35
For details see:
http://apache.mirror.digionline.de//httpd/CHANGES_2.4.35
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 551a554db67f06d16d4115603884653bbb6968e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:30:05 2018 +0100
core125: Ship recently updated sqlite
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f9b7bc925940a87e7eee98ff607212d474ca7b0f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:29:23 2018 +0100
Update list of contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7e2d7b98371fc203ccd764f76f35f57cc358ace4 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:28:33 2018 +0100
Start Core Update 125
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6e386cad2dbfadff70c07feb4eb50061d4a23629 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 18 14:23:29 2018 +0100
sqlite: Update to 3.25.2.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/etc/sysctl.conf | 2 +- config/hostapd/config | 3 +- config/rootfiles/common/apache2 | 38 +++++++++++++++------- config/rootfiles/common/gnutls | 2 +- config/rootfiles/common/unbound | 2 +- config/rootfiles/core/{124 => 125}/exclude | 0 .../{oldcore/114 => core/125}/filelists/apache2 | 0 config/rootfiles/core/{124 => 125}/filelists/bind | 0 .../{oldcore/34 => core/125}/filelists/dhcpcd | 0 config/rootfiles/core/125/filelists/files | 6 ++++ .../{oldcore/110 => core/125}/filelists/gnutls | 0 .../{oldcore/89 => core/125}/filelists/sqlite | 0 .../rootfiles/core/{124 => 125}/filelists/unbound | 0 .../rootfiles/{oldcore/112 => core/125}/update.sh | 17 +++++----- config/rootfiles/{core => oldcore}/124/exclude | 0 .../124/filelists/aarch64/efibootmgr | 0 .../{core => oldcore}/124/filelists/aarch64/efivar | 0 .../124/filelists/aarch64/files-aarch64 | 0 .../{core => oldcore}/124/filelists/aarch64/grub | 0 .../{core => oldcore}/124/filelists/aarch64/linux | 0 .../124/filelists/aarch64/linux-initrd | 0 .../124/filelists/armv5tel/files-armv5tel | 0 .../124/filelists/armv5tel/linux-initrd-kirkwood | 0 .../124/filelists/armv5tel/linux-initrd-multi | 0 .../124/filelists/armv5tel/linux-kirkwood | 0 .../124/filelists/armv5tel/linux-multi | 0 .../rootfiles/{core => oldcore}/124/filelists/bind | 0 .../124/filelists/ca-certificates | 0 .../{core => oldcore}/124/filelists/cdrkit | 0 .../{core => oldcore}/124/filelists/files | 0 .../{core => oldcore}/124/filelists/i586/grub | 0 .../{core => oldcore}/124/filelists/i586/linux | 0 .../124/filelists/i586/linux-initrd | 0 .../{core => oldcore}/124/filelists/iproute2 | 0 .../rootfiles/{core => oldcore}/124/filelists/ntp | 0 .../{core => oldcore}/124/filelists/openssh | 0 .../{core => oldcore}/124/filelists/parted | 0 .../{core => oldcore}/124/filelists/pciutils | 0 .../{core => oldcore}/124/filelists/rng-tools | 0 .../{core => oldcore}/124/filelists/unbound | 0 .../124/filelists/x86_64/efibootmgr | 0 .../{core => oldcore}/124/filelists/x86_64/efivar | 0 .../{core => oldcore}/124/filelists/x86_64/grub | 0 .../{core => oldcore}/124/filelists/x86_64/linux | 0 .../124/filelists/x86_64/linux-initrd | 0 config/rootfiles/{core => oldcore}/124/update.sh | 0 config/ssh/sshd_config | 3 ++ html/cgi-bin/credits.cgi | 6 ++-- html/cgi-bin/wlanap.cgi | 14 ++++++++ langs/de/cgi-bin/de.pl | 4 +-- langs/en/cgi-bin/en.pl | 4 +-- lfs/apache2 | 4 +-- lfs/bind | 4 +-- lfs/clamav | 6 ++-- lfs/dhcpcd | 6 ++-- lfs/gnutls | 4 +-- lfs/hostapd | 2 +- lfs/sqlite | 4 +-- lfs/unbound | 4 +-- make.sh | 2 +- 60 files changed, 87 insertions(+), 50 deletions(-) copy config/rootfiles/core/{124 => 125}/exclude (100%) copy config/rootfiles/{oldcore/114 => core/125}/filelists/apache2 (100%) copy config/rootfiles/core/{124 => 125}/filelists/bind (100%) copy config/rootfiles/{oldcore/34 => core/125}/filelists/dhcpcd (100%) create mode 100644 config/rootfiles/core/125/filelists/files copy config/rootfiles/{oldcore/110 => core/125}/filelists/gnutls (100%) copy config/rootfiles/{oldcore/89 => core/125}/filelists/sqlite (100%) copy config/rootfiles/core/{124 => 125}/filelists/unbound (100%) copy config/rootfiles/{oldcore/112 => core/125}/update.sh (92%) rename config/rootfiles/{core => oldcore}/124/exclude (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/efibootmgr (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/efivar (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/files-aarch64 (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/grub (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/files-armv5tel (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/124/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/124/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/124/filelists/cdrkit (100%) rename config/rootfiles/{core => oldcore}/124/filelists/files (100%) rename config/rootfiles/{core => oldcore}/124/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/124/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/124/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/124/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/124/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/124/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/124/filelists/parted (100%) rename config/rootfiles/{core => oldcore}/124/filelists/pciutils (100%) rename config/rootfiles/{core => oldcore}/124/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/124/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/efibootmgr (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/efivar (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/124/update.sh (100%)
Difference in files: diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 345f8f52a..4066af767 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -27,7 +27,7 @@ net.ipv4.conf.all.accept_source_route = 0 net.ipv4.conf.all.log_martians = 1
kernel.printk = 1 4 1 7 -vm.swappiness=0 +vm.swappiness=1 vm.mmap_min_addr = 4096 vm.min_free_kbytes = 8192
diff --git a/config/hostapd/config b/config/hostapd/config index c3672c524..66ebbf1ce 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -152,8 +152,7 @@ CONFIG_IEEE80211AC=y # Remove debugging code that is printing out debug messages to stdout. # This can be used to reduce the size of the hostapd considerably if debugging # code is not needed. -CONFIG_NO_STDOUT_DEBUG=y - +#CONFIG_NO_STDOUT_DEBUG=y
# Add support for writing debug log to a file: -f /tmp/hostapd.log # Disabled by default. diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index d10c4f138..e1b1ca825 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -46,17 +46,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf #srv/web #srv/web/ipfire -#srv/web/ipfire/manual/howto/access.html.es -#srv/web/ipfire/manual/howto/auth.html.es -#srv/web/ipfire/manual/howto/cgi.html.es -#srv/web/ipfire/manual/howto/htaccess.html.es -#srv/web/ipfire/manual/howto/http2.html.es -#srv/web/ipfire/manual/howto/http2.html.fr -#srv/web/ipfire/manual/howto/index.html.es -#srv/web/ipfire/manual/howto/public_html.html.es -#srv/web/ipfire/manual/mod/directive-dict.html.es -#srv/web/ipfire/manual/mod/mod_brotli.html -#srv/web/ipfire/manual/mod/mod_brotli.html.en #srv/web/ipfire/cgi-bin #srv/web/ipfire/cgi-bin/printenv #srv/web/ipfire/cgi-bin/printenv.vbs @@ -452,42 +441,52 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/howto #srv/web/ipfire/manual/howto/access.html #srv/web/ipfire/manual/howto/access.html.en +#srv/web/ipfire/manual/howto/access.html.es #srv/web/ipfire/manual/howto/access.html.fr #srv/web/ipfire/manual/howto/auth.html #srv/web/ipfire/manual/howto/auth.html.en +#srv/web/ipfire/manual/howto/auth.html.es #srv/web/ipfire/manual/howto/auth.html.fr #srv/web/ipfire/manual/howto/auth.html.ja.utf8 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr #srv/web/ipfire/manual/howto/auth.html.tr.utf8 #srv/web/ipfire/manual/howto/cgi.html #srv/web/ipfire/manual/howto/cgi.html.en +#srv/web/ipfire/manual/howto/cgi.html.es #srv/web/ipfire/manual/howto/cgi.html.fr #srv/web/ipfire/manual/howto/cgi.html.ja.utf8 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html #srv/web/ipfire/manual/howto/htaccess.html.en +#srv/web/ipfire/manual/howto/htaccess.html.es #srv/web/ipfire/manual/howto/htaccess.html.fr #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html.pt-br #srv/web/ipfire/manual/howto/http2.html #srv/web/ipfire/manual/howto/http2.html.en +#srv/web/ipfire/manual/howto/http2.html.es +#srv/web/ipfire/manual/howto/http2.html.fr #srv/web/ipfire/manual/howto/index.html #srv/web/ipfire/manual/howto/index.html.en +#srv/web/ipfire/manual/howto/index.html.es #srv/web/ipfire/manual/howto/index.html.fr #srv/web/ipfire/manual/howto/index.html.ja.utf8 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr #srv/web/ipfire/manual/howto/index.html.zh-cn.utf8 #srv/web/ipfire/manual/howto/public_html.html #srv/web/ipfire/manual/howto/public_html.html.en +#srv/web/ipfire/manual/howto/public_html.html.es #srv/web/ipfire/manual/howto/public_html.html.fr #srv/web/ipfire/manual/howto/public_html.html.ja.utf8 #srv/web/ipfire/manual/howto/public_html.html.ko.euc-kr #srv/web/ipfire/manual/howto/public_html.html.tr.utf8 #srv/web/ipfire/manual/howto/reverse_proxy.html #srv/web/ipfire/manual/howto/reverse_proxy.html.en +#srv/web/ipfire/manual/howto/reverse_proxy.html.fr #srv/web/ipfire/manual/howto/ssi.html #srv/web/ipfire/manual/howto/ssi.html.en +#srv/web/ipfire/manual/howto/ssi.html.es #srv/web/ipfire/manual/howto/ssi.html.fr #srv/web/ipfire/manual/howto/ssi.html.ja.utf8 #srv/web/ipfire/manual/howto/ssi.html.ko.euc-kr @@ -575,6 +574,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/misc #srv/web/ipfire/manual/misc/index.html #srv/web/ipfire/manual/misc/index.html.en +#srv/web/ipfire/manual/misc/index.html.es #srv/web/ipfire/manual/misc/index.html.fr #srv/web/ipfire/manual/misc/index.html.ko.euc-kr #srv/web/ipfire/manual/misc/index.html.tr.utf8 @@ -606,6 +606,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/core.html.tr.utf8 #srv/web/ipfire/manual/mod/directive-dict.html #srv/web/ipfire/manual/mod/directive-dict.html.en +#srv/web/ipfire/manual/mod/directive-dict.html.es #srv/web/ipfire/manual/mod/directive-dict.html.fr #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr @@ -693,6 +694,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_authn_socache.html.fr #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.en +#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.fr #srv/web/ipfire/manual/mod/mod_authnz_ldap.html #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr @@ -730,6 +732,9 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8 +#srv/web/ipfire/manual/mod/mod_brotli.html +#srv/web/ipfire/manual/mod/mod_brotli.html.en +#srv/web/ipfire/manual/mod/mod_brotli.html.fr #srv/web/ipfire/manual/mod/mod_buffer.html #srv/web/ipfire/manual/mod/mod_buffer.html.en #srv/web/ipfire/manual/mod/mod_buffer.html.fr @@ -847,6 +852,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr #srv/web/ipfire/manual/mod/mod_http2.html #srv/web/ipfire/manual/mod/mod_http2.html.en +#srv/web/ipfire/manual/mod/mod_http2.html.fr #srv/web/ipfire/manual/mod/mod_ident.html #srv/web/ipfire/manual/mod/mod_ident.html.en #srv/web/ipfire/manual/mod/mod_ident.html.fr @@ -959,6 +965,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.en +#srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.fr #srv/web/ipfire/manual/mod/mod_proxy_html.html #srv/web/ipfire/manual/mod/mod_proxy_html.html.en #srv/web/ipfire/manual/mod/mod_proxy_html.html.fr @@ -967,6 +974,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr #srv/web/ipfire/manual/mod/mod_proxy_http2.html #srv/web/ipfire/manual/mod/mod_proxy_http2.html.en +#srv/web/ipfire/manual/mod/mod_proxy_http2.html.fr #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr @@ -974,6 +982,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en +#srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr #srv/web/ipfire/manual/mod/mod_ratelimit.html #srv/web/ipfire/manual/mod/mod_ratelimit.html.en #srv/web/ipfire/manual/mod/mod_ratelimit.html.fr @@ -1081,6 +1090,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_usertrack.html.fr #srv/web/ipfire/manual/mod/mod_version.html #srv/web/ipfire/manual/mod/mod_version.html.en +#srv/web/ipfire/manual/mod/mod_version.html.fr #srv/web/ipfire/manual/mod/mod_version.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_vhost_alias.html @@ -1089,6 +1099,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_vhost_alias.html.tr.utf8 #srv/web/ipfire/manual/mod/mod_watchdog.html #srv/web/ipfire/manual/mod/mod_watchdog.html.en +#srv/web/ipfire/manual/mod/mod_watchdog.html.fr #srv/web/ipfire/manual/mod/mod_xml2enc.html #srv/web/ipfire/manual/mod/mod_xml2enc.html.en #srv/web/ipfire/manual/mod/mod_xml2enc.html.fr @@ -1185,6 +1196,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/platform/perf-hp.html.ko.euc-kr #srv/web/ipfire/manual/platform/rpm.html #srv/web/ipfire/manual/platform/rpm.html.en +#srv/web/ipfire/manual/platform/rpm.html.fr #srv/web/ipfire/manual/platform/win_compiling.html #srv/web/ipfire/manual/platform/win_compiling.html.en #srv/web/ipfire/manual/platform/win_compiling.html.fr @@ -1260,6 +1272,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/programs/index.html.zh-cn.utf8 #srv/web/ipfire/manual/programs/log_server_status.html #srv/web/ipfire/manual/programs/log_server_status.html.en +#srv/web/ipfire/manual/programs/log_server_status.html.fr #srv/web/ipfire/manual/programs/logresolve.html #srv/web/ipfire/manual/programs/logresolve.html.en #srv/web/ipfire/manual/programs/logresolve.html.fr @@ -1277,8 +1290,10 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/programs/rotatelogs.html.tr.utf8 #srv/web/ipfire/manual/programs/split-logfile.html #srv/web/ipfire/manual/programs/split-logfile.html.en +#srv/web/ipfire/manual/programs/split-logfile.html.fr #srv/web/ipfire/manual/programs/suexec.html #srv/web/ipfire/manual/programs/suexec.html.en +#srv/web/ipfire/manual/programs/suexec.html.fr #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr #srv/web/ipfire/manual/programs/suexec.html.tr.utf8 #srv/web/ipfire/manual/rewrite @@ -1644,7 +1659,6 @@ usr/lib/apache/mod_version.so usr/lib/apache/mod_vhost_alias.so usr/lib/apache/mod_watchdog.so usr/lib/apache/mod_xml2enc.so -#usr/sbin/ab usr/sbin/apachectl #usr/sbin/checkgid #usr/sbin/envvars diff --git a/config/rootfiles/common/gnutls b/config/rootfiles/common/gnutls index 8231c7588..137fbe124 100644 --- a/config/rootfiles/common/gnutls +++ b/config/rootfiles/common/gnutls @@ -33,7 +33,7 @@ usr/lib/libgnutls-dane.so.0.4.1 #usr/lib/libgnutls.la #usr/lib/libgnutls.so usr/lib/libgnutls.so.30 -usr/lib/libgnutls.so.30.14.7 +usr/lib/libgnutls.so.30.14.11 #usr/lib/libgnutlsxx.la #usr/lib/libgnutlsxx.so usr/lib/libgnutlsxx.so.28 diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 9f7c512db..2232c6889 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.0.0 +usr/lib/libunbound.so.8.0.1 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/124/exclude b/config/rootfiles/core/125/exclude similarity index 100% rename from config/rootfiles/core/124/exclude rename to config/rootfiles/core/125/exclude diff --git a/config/rootfiles/core/125/filelists/apache2 b/config/rootfiles/core/125/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/125/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/bind b/config/rootfiles/core/125/filelists/bind similarity index 100% rename from config/rootfiles/core/124/filelists/bind rename to config/rootfiles/core/125/filelists/bind diff --git a/config/rootfiles/core/125/filelists/dhcpcd b/config/rootfiles/core/125/filelists/dhcpcd new file mode 120000 index 000000000..1e799dabb --- /dev/null +++ b/config/rootfiles/core/125/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files new file mode 100644 index 000000000..207ff839f --- /dev/null +++ b/config/rootfiles/core/125/filelists/files @@ -0,0 +1,6 @@ +etc/system-release +etc/issue +etc/ssh/sshd_config +etc/sysctl.conf +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/125/filelists/gnutls b/config/rootfiles/core/125/filelists/gnutls new file mode 120000 index 000000000..8dbe60bc3 --- /dev/null +++ b/config/rootfiles/core/125/filelists/gnutls @@ -0,0 +1 @@ +../../../common/gnutls \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/sqlite b/config/rootfiles/core/125/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/125/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/unbound b/config/rootfiles/core/125/filelists/unbound similarity index 100% rename from config/rootfiles/core/124/filelists/unbound rename to config/rootfiles/core/125/filelists/unbound diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh new file mode 100644 index 000000000..0aad5b9cd --- /dev/null +++ b/config/rootfiles/core/125/update.sh @@ -0,0 +1,68 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2017 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=125 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound restart +/etc/init.d/apache restart +/etc/init.d/sshd restart + +# Reload sysctl.conf +sysctl -p + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/124/exclude b/config/rootfiles/oldcore/124/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/124/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/124/filelists/aarch64/efibootmgr b/config/rootfiles/oldcore/124/filelists/aarch64/efibootmgr similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/efibootmgr rename to config/rootfiles/oldcore/124/filelists/aarch64/efibootmgr diff --git a/config/rootfiles/core/124/filelists/aarch64/efivar b/config/rootfiles/oldcore/124/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/efivar rename to config/rootfiles/oldcore/124/filelists/aarch64/efivar diff --git a/config/rootfiles/core/124/filelists/aarch64/files-aarch64 b/config/rootfiles/oldcore/124/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/files-aarch64 rename to config/rootfiles/oldcore/124/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/124/filelists/aarch64/grub b/config/rootfiles/oldcore/124/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/grub rename to config/rootfiles/oldcore/124/filelists/aarch64/grub diff --git a/config/rootfiles/core/124/filelists/aarch64/linux b/config/rootfiles/oldcore/124/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/linux rename to config/rootfiles/oldcore/124/filelists/aarch64/linux diff --git a/config/rootfiles/core/124/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/124/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/124/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel b/config/rootfiles/oldcore/124/filelists/armv5tel/files-armv5tel similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/files-armv5tel rename to config/rootfiles/oldcore/124/filelists/armv5tel/files-armv5tel diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/oldcore/124/filelists/bind b/config/rootfiles/oldcore/124/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/oldcore/124/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/ca-certificates b/config/rootfiles/oldcore/124/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/124/filelists/ca-certificates rename to config/rootfiles/oldcore/124/filelists/ca-certificates diff --git a/config/rootfiles/core/124/filelists/cdrkit b/config/rootfiles/oldcore/124/filelists/cdrkit similarity index 100% rename from config/rootfiles/core/124/filelists/cdrkit rename to config/rootfiles/oldcore/124/filelists/cdrkit diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/oldcore/124/filelists/files similarity index 100% rename from config/rootfiles/core/124/filelists/files rename to config/rootfiles/oldcore/124/filelists/files diff --git a/config/rootfiles/core/124/filelists/i586/grub b/config/rootfiles/oldcore/124/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/124/filelists/i586/grub rename to config/rootfiles/oldcore/124/filelists/i586/grub diff --git a/config/rootfiles/core/124/filelists/i586/linux b/config/rootfiles/oldcore/124/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/124/filelists/i586/linux rename to config/rootfiles/oldcore/124/filelists/i586/linux diff --git a/config/rootfiles/core/124/filelists/i586/linux-initrd b/config/rootfiles/oldcore/124/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/124/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/124/filelists/iproute2 b/config/rootfiles/oldcore/124/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/124/filelists/iproute2 rename to config/rootfiles/oldcore/124/filelists/iproute2 diff --git a/config/rootfiles/core/124/filelists/ntp b/config/rootfiles/oldcore/124/filelists/ntp similarity index 100% rename from config/rootfiles/core/124/filelists/ntp rename to config/rootfiles/oldcore/124/filelists/ntp diff --git a/config/rootfiles/core/124/filelists/openssh b/config/rootfiles/oldcore/124/filelists/openssh similarity index 100% rename from config/rootfiles/core/124/filelists/openssh rename to config/rootfiles/oldcore/124/filelists/openssh diff --git a/config/rootfiles/core/124/filelists/parted b/config/rootfiles/oldcore/124/filelists/parted similarity index 100% rename from config/rootfiles/core/124/filelists/parted rename to config/rootfiles/oldcore/124/filelists/parted diff --git a/config/rootfiles/core/124/filelists/pciutils b/config/rootfiles/oldcore/124/filelists/pciutils similarity index 100% rename from config/rootfiles/core/124/filelists/pciutils rename to config/rootfiles/oldcore/124/filelists/pciutils diff --git a/config/rootfiles/core/124/filelists/rng-tools b/config/rootfiles/oldcore/124/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/124/filelists/rng-tools rename to config/rootfiles/oldcore/124/filelists/rng-tools diff --git a/config/rootfiles/oldcore/124/filelists/unbound b/config/rootfiles/oldcore/124/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/oldcore/124/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/efibootmgr b/config/rootfiles/oldcore/124/filelists/x86_64/efibootmgr similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/efibootmgr rename to config/rootfiles/oldcore/124/filelists/x86_64/efibootmgr diff --git a/config/rootfiles/core/124/filelists/x86_64/efivar b/config/rootfiles/oldcore/124/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/efivar rename to config/rootfiles/oldcore/124/filelists/x86_64/efivar diff --git a/config/rootfiles/core/124/filelists/x86_64/grub b/config/rootfiles/oldcore/124/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/grub rename to config/rootfiles/oldcore/124/filelists/x86_64/grub diff --git a/config/rootfiles/core/124/filelists/x86_64/linux b/config/rootfiles/oldcore/124/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/linux rename to config/rootfiles/oldcore/124/filelists/x86_64/linux diff --git a/config/rootfiles/core/124/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/124/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/124/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/oldcore/124/update.sh similarity index 100% rename from config/rootfiles/core/124/update.sh rename to config/rootfiles/oldcore/124/update.sh diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config index 60bb0a9e6..a248c4906 100644 --- a/config/ssh/sshd_config +++ b/config/ssh/sshd_config @@ -75,4 +75,7 @@ ClientAliveInterval 10 # close unresponsive SSH sessions which fail to answer keep-alive ClientAliveCountMax 6
+# add support for SFTP +Subsystem sftp /usr/lib/openssh/sftp-server + # EOF diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index eb76de72e..2b5d73f1d 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -68,10 +68,10 @@ Matthias Fischer, Stefan Schantl, Jan Paul Tuecking, Jonatan Schlag, -Dirk Wagner, -Marcel Lorenz, Erik Kapfer, +Dirk Wagner, Peter Müller, +Marcel Lorenz, Alf Høgemark, Ben Schweikert, Peter Pfeiffer, @@ -84,10 +84,10 @@ Marcus Scholz, Ersan Yildirim, Joern-Ingo Weigert, Alfred Haas, +Wolfgang Apolinarski, Lars Schuhmacher, Rene Zingel, Sascha Kilian, -Wolfgang Apolinarski, Ronald Wiesinger, Stephan Feddersen, Daniel Weismueller, diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index bb40021cf..0abbf6d6e 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -73,6 +73,7 @@ $wlanapsettings{'SYSLOGLEVEL'} = '0'; $wlanapsettings{'DEBUG'} = '4'; $wlanapsettings{'DRIVER'} = 'NL80211'; $wlanapsettings{'HTCAPS'} = ''; +$wlanapsettings{'VHTCAPS'} = '';
&General::readhash("/var/ipfire/wlanap/settings", %wlanapsettings); &Header::getcgihash(%wlanapsettings); @@ -389,6 +390,7 @@ print<<END <option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option> <option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option> <option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option> + <option value='ac' $selected{'HW_MODE'}{'ac'}>802.11ac</option> </select> </td></tr> END @@ -428,6 +430,7 @@ END ; print <<END <tr><td width='25%' class='base'>HT Caps: </td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr> +<tr><td width='25%' class='base'>VHT Caps: </td><td class='base' colspan='3'><input type='text' name='VHTCAPS' size='30' value='$wlanapsettings{'VHTCAPS'}' /></td></tr> <tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr> <tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'> <select name='SYSLOGLEVEL'> @@ -575,6 +578,17 @@ ieee80211n=1 wmm_enabled=1 ht_capab=$wlanapsettings{'HTCAPS'} END +; + + }elsif ( $wlanapsettings{'HW_MODE'} eq 'ac' ){ + print CONFIGFILE <<END +hw_mode=a +ieee80211ac=1 +ieee80211n=1 +wmm_enabled=1 +ht_capab=$wlanapsettings{'HTCAPS'} +vht_capab=$wlanapsettings{'VHTCAPS'} +END ;
}else{ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6e3dba4db..c8d4c65e7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2153,7 +2153,7 @@ 'ssdmz pinholes' => 'DMZ-Schlupflöcher', 'ssh' => 'SSH', 'ssh access' => 'SSH-Zugriff', -'ssh access tip' => 'IPFire SSH läuft auf dem nicht-standard Port 222!', +'ssh access tip' => 'IPFire SSH läuft nicht auf dem Standardport 22!', 'ssh active sessions' => 'Aktive Benutzeranmeldungen', 'ssh fingerprint' => 'Fingerabdruck', 'ssh host keys' => 'SSH Host Schlüssel', @@ -2166,7 +2166,7 @@ 'ssh no active logins' => 'Keine aktiven Benutzeranmeldungen', 'ssh no auth' => 'Sie haben keinerlei Authentifizierungverfahren zugelassen; dies wird Ihre Anmeldung verhindern', 'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen', -'ssh port' => 'SSH Port auf 22 setzen (Standard ist 222)', +'ssh port' => 'SSH-Port auf 222 setzen (Standard ist 22)', 'ssh portfw' => 'TCP-Weiterleitung zulassen', 'ssh tempstart15' => 'SSH-Deamon in 15 Minuten beenden', 'ssh tempstart30' => 'SSH-Deamon in 30 Minuten beenden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3ec5af57e..b563e5685 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2191,7 +2191,7 @@ 'ssdmz pinholes' => 'DMZ Pinholes', 'ssh' => 'SSH', 'ssh access' => 'SSH Access', -'ssh access tip' => 'IPFire SSH is not using default port 222!', +'ssh access tip' => 'IPFire SSH is not using default port 22!', 'ssh active sessions' => 'Active logins', 'ssh fingerprint' => 'Fingerprint', 'ssh host keys' => 'SSH Host Keys', @@ -2204,7 +2204,7 @@ 'ssh no active logins' => 'No active logins', 'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in', 'ssh passwords' => 'Allow password based authentication', -'ssh port' => 'SSH port set to 22 (default is 222)', +'ssh port' => 'SSH port set to 222 (default is 22)', 'ssh portfw' => 'Allow TCP forwarding', 'ssh tempstart15' => 'Stop SSH demon in 15 minutes', 'ssh tempstart30' => 'Stop SSH demon in 30 minutes', diff --git a/lfs/apache2 b/lfs/apache2 index 1ef6bdec0..d2175e71c 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@
include Config
-VER = 2.4.34 +VER = 2.4.35
THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 818adca52f3be187fe45d6822755be95 +$(DL_FILE)_MD5 = 30c1cde80ffe814a8d16b4fdffda330a
install : $(TARGET)
diff --git a/lfs/bind b/lfs/bind index 8b04037b7..085fa005b 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@
include Config
-VER = 9.11.4-P1 +VER = 9.11.4-P2
THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b2c54d6c2003b693388041fd109e8b6b +$(DL_FILE)_MD5 = 3b831d1cb9dcb3e0868409cf98d4519b
install : $(TARGET)
diff --git a/lfs/clamav b/lfs/clamav index c0612f1aa..ad89e1356 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@
include Config
-VER = 0.100.1 +VER = 0.100.2
THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 39 +PAK_VER = 40
DEPS = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0f653df0480eebcd828939e8db9f0443 +$(DL_FILE)_MD5 = 253dd79dd57da759567e42543a569c5c
install : $(TARGET)
diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 212fd467b..9f3f5fbb6 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@
include Config
-VER = 6.11.5 +VER = 7.0.8
THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2465624b62c1154f0e89dc69c42c849b +$(DL_FILE)_MD5 = 77bbb1d73b6f30d6ddcc8b0fd3eae266
install : $(TARGET)
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \ --dbdir=/var/ipfire/dhcpc \ --libexecdir=/var/ipfire/dhcpc \ - --mandir=/usr/share/man --disable-nls + --mandir=/usr/share/man cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
diff --git a/lfs/gnutls b/lfs/gnutls index 5484d9821..8e6b54236 100644 --- a/lfs/gnutls +++ b/lfs/gnutls @@ -24,7 +24,7 @@
include Config
-VER = 3.5.15 +VER = 3.5.19
THISAPP = gnutls-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bcdcbc65c50a7499617ad9f4d0058de9 +$(DL_FILE)_MD5 = 1002f4099ce11d785e9811099aaa59a6
install : $(TARGET)
diff --git a/lfs/hostapd b/lfs/hostapd index 46f7e91b5..5a1180d03 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 42 +PAK_VER = 43
DEPS = ""
diff --git a/lfs/sqlite b/lfs/sqlite index 3b045e729..467e01805 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@
include Config
-VER = 3080704 +VER = 3250200
THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 33bb8db0038317ce1b0480ca1185c7ba +$(DL_FILE)_MD5 = bfade31d59f58badc51aeaa6ae26a5de
install : $(TARGET)
diff --git a/lfs/unbound b/lfs/unbound index ae2795e0e..8dfcfa3a0 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@
include Config
-VER = 1.8.0 +VER = 1.8.1
THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 495ffdff55a53ff1735fb58e956c1945 +$(DL_FILE)_MD5 = 00ce66e357fd2f969acf69008aa82a40
install : $(TARGET)
diff --git a/make.sh b/make.sh index d8b7856cb..c811f0573 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="124" # Core Level (Filename) +CORE="125" # Core Level (Filename) PAKFIRE_CORE="124" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan
hooks/post-receive -- IPFire 2.x development tree