Merge remote-tracking branch 'origin/master' into kernel-4.9

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 040b482141614b12f02cf82df0d4538d8663daa8..64faa7926c5ddd1ff7ebe543457e84f387391de1 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1115,6 +1115,8 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mpmt_os2.html
 #srv/web/ipfire/manual/mod/mpmt_os2.html.en
 #srv/web/ipfire/manual/mod/mpmt_os2.html.fr
+#srv/web/ipfire/manual/mod/overrides.html
+#srv/web/ipfire/manual/mod/overrides.html.en
 #srv/web/ipfire/manual/mod/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en

diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort
index ea2959302a9be623cf8189bb5430d4c29fdd5114..c83b15697de73c23931193aca6a20466e24e887d 100644 (file)
--- a/config/rootfiles/common/snort
+++ b/config/rootfiles/common/snort
@@ -27,10 +27,10 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_output/snort_debug.h
 #usr/include/snort/dynamic_output/stream_api.h
 #usr/include/snort/dynamic_preproc
+#usr/include/snort/dynamic_preproc/appdata_adjuster.h
 #usr/include/snort/dynamic_preproc/bitop.h
 #usr/include/snort/dynamic_preproc/cpuclock.h
 #usr/include/snort/dynamic_preproc/file_api.h
-#usr/include/snort/dynamic_preproc/file_mail_common.h
 #usr/include/snort/dynamic_preproc/idle_processing.h
 #usr/include/snort/dynamic_preproc/ipv6_port.h
 #usr/include/snort/dynamic_preproc/mempool.h
@@ -40,6 +40,8 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/perf_indicators.h
 #usr/include/snort/dynamic_preproc/preprocids.h
 #usr/include/snort/dynamic_preproc/profiler.h
+#usr/include/snort/dynamic_preproc/reg_test.h
+#usr/include/snort/dynamic_preproc/reload_api.h
 #usr/include/snort/dynamic_preproc/segment_mem.h
 #usr/include/snort/dynamic_preproc/session_api.h
 #usr/include/snort/dynamic_preproc/sfPolicy.h
@@ -60,14 +62,12 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/sf_snort_plugin_api.h
 #usr/include/snort/dynamic_preproc/sfcommon.h
 #usr/include/snort/dynamic_preproc/sfcontrol.h
-#usr/include/snort/dynamic_preproc/sfdebug.h
 #usr/include/snort/dynamic_preproc/sfrt.h
 #usr/include/snort/dynamic_preproc/sfrt_dir.h
 #usr/include/snort/dynamic_preproc/sfrt_flat.h
 #usr/include/snort/dynamic_preproc/sfrt_flat_dir.h
 #usr/include/snort/dynamic_preproc/sfrt_trie.h
 #usr/include/snort/dynamic_preproc/sidechannel_define.h
-#usr/include/snort/dynamic_preproc/sip_common.h
 #usr/include/snort/dynamic_preproc/snort_bounds.h
 #usr/include/snort/dynamic_preproc/snort_debug.h
 #usr/include/snort/dynamic_preproc/ssl.h
@@ -88,6 +88,8 @@ usr/lib/snort/dynamic_output
 usr/lib/snort/dynamic_preproc
 #usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.a
 #usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.la
+#usr/lib/snort/dynamic_preproc/libsf_dynamic_utils.a
+#usr/lib/snort/dynamic_preproc/libsf_dynamic_utils.la
 usr/lib/snort_dynamicengine
 #usr/lib/snort_dynamicengine/libsf_engine.a
 #usr/lib/snort_dynamicengine/libsf_engine.la
@@ -215,7 +217,6 @@ usr/sbin/snort
 #usr/share/doc/snort/README.reload
 #usr/share/doc/snort/README.reputation
 #usr/share/doc/snort/README.sensitive_data
-#usr/share/doc/snort/README.session
 #usr/share/doc/snort/README.sfportscan
 #usr/share/doc/snort/README.sip
 #usr/share/doc/snort/README.ssh

diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz
index 8b71758ffeeb57ba6e86484d92373f997e16a1db..5684a197eb2ec6281f7353f2d5af85d048c8c6d4 100644 (file)
--- a/config/rootfiles/common/xz
+++ b/config/rootfiles/common/xz
@@ -41,7 +41,7 @@ usr/bin/xzmore
 #usr/lib/liblzma.la
 usr/lib/liblzma.so
 usr/lib/liblzma.so.5
-usr/lib/liblzma.so.5.2.2
+usr/lib/liblzma.so.5.2.3
 #usr/lib/pkgconfig/liblzma.pc
 #usr/share/doc/xz
 #usr/share/doc/xz/AUTHORS

diff --git a/config/rootfiles/core/115/exclude b/config/rootfiles/core/116/exclude
similarity index 100%
rename from config/rootfiles/core/115/exclude
rename to config/rootfiles/core/116/exclude

diff --git a/config/rootfiles/core/115/filelists/apache2 b/config/rootfiles/core/116/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/115/filelists/apache2
rename to config/rootfiles/core/116/filelists/apache2

diff --git a/config/rootfiles/core/116/filelists/files b/config/rootfiles/core/116/filelists/files
new file mode 100644 (file)
index 0000000..d3c27e8
--- /dev/null
+++ b/config/rootfiles/core/116/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/proxy.cgi

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

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

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

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

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

diff --git a/config/rootfiles/core/115/meta b/config/rootfiles/core/116/meta
similarity index 100%
rename from config/rootfiles/core/115/meta
rename to config/rootfiles/core/116/meta

diff --git a/config/rootfiles/core/116/update.sh b/config/rootfiles/core/116/update.sh
new file mode 100644 (file)
index 0000000..3e03bb3
--- /dev/null
+++ b/config/rootfiles/core/116/update.sh
@@ -0,0 +1,65 @@
+#!/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=116
+
+# 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
+/etc/init.d/snort stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/apache restart
+/etc/init.d/snort start
+
+# This update need 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/115/exclude b/config/rootfiles/oldcore/115/exclude
new file mode 100644 (file)
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/oldcore/115/exclude
@@ -0,0 +1,30 @@
+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/ssh/ssh_config
+etc/ssh/sshd_config
+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/oldcore/115/filelists/apache2 b/config/rootfiles/oldcore/115/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/oldcore/115/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/115/filelists/bootstrap b/config/rootfiles/oldcore/115/filelists/bootstrap
similarity index 100%
rename from config/rootfiles/core/115/filelists/bootstrap
rename to config/rootfiles/oldcore/115/filelists/bootstrap

diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/oldcore/115/filelists/files
similarity index 100%
rename from config/rootfiles/core/115/filelists/files
rename to config/rootfiles/oldcore/115/filelists/files

diff --git a/config/rootfiles/core/115/filelists/logrotate b/config/rootfiles/oldcore/115/filelists/logrotate
similarity index 100%
rename from config/rootfiles/core/115/filelists/logrotate
rename to config/rootfiles/oldcore/115/filelists/logrotate

diff --git a/config/rootfiles/core/115/filelists/openvpn b/config/rootfiles/oldcore/115/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/115/filelists/openvpn
rename to config/rootfiles/oldcore/115/filelists/openvpn

diff --git a/config/rootfiles/core/115/filelists/perl-Font-TTF b/config/rootfiles/oldcore/115/filelists/perl-Font-TTF
similarity index 100%
rename from config/rootfiles/core/115/filelists/perl-Font-TTF
rename to config/rootfiles/oldcore/115/filelists/perl-Font-TTF

diff --git a/config/rootfiles/core/115/filelists/perl-IO-String b/config/rootfiles/oldcore/115/filelists/perl-IO-String
similarity index 100%
rename from config/rootfiles/core/115/filelists/perl-IO-String
rename to config/rootfiles/oldcore/115/filelists/perl-IO-String

diff --git a/config/rootfiles/core/115/filelists/perl-PDF-API2 b/config/rootfiles/oldcore/115/filelists/perl-PDF-API2
similarity index 100%
rename from config/rootfiles/core/115/filelists/perl-PDF-API2
rename to config/rootfiles/oldcore/115/filelists/perl-PDF-API2

diff --git a/config/rootfiles/core/115/filelists/ubuntu-font-family b/config/rootfiles/oldcore/115/filelists/ubuntu-font-family
similarity index 100%
rename from config/rootfiles/core/115/filelists/ubuntu-font-family
rename to config/rootfiles/oldcore/115/filelists/ubuntu-font-family

diff --git a/config/rootfiles/core/115/filelists/wpa_supplicant b/config/rootfiles/oldcore/115/filelists/wpa_supplicant
similarity index 100%
rename from config/rootfiles/core/115/filelists/wpa_supplicant
rename to config/rootfiles/oldcore/115/filelists/wpa_supplicant

diff --git a/config/rootfiles/oldcore/115/meta b/config/rootfiles/oldcore/115/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/115/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/oldcore/115/update.sh
similarity index 100%
rename from config/rootfiles/core/115/update.sh
rename to config/rootfiles/oldcore/115/update.sh

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 3d9519757d9c816a2fa8bc91d3db9da478fc5d07..ff48333b732a44c53b7443c56d30815068bb193b 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -259,9 +259,9 @@ if ($snortsettings{'OINKCODE'} ne "") {
 
 if (!$errormessage) {
        if ($snortsettings{'RULES'} eq 'subscripted') {
-               $url=" https://www.snort.org/rules/snortrules-snapshot-2990.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+               $url=" https://www.snort.org/rules/snortrules-snapshot-29110.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
        } elsif ($snortsettings{'RULES'} eq 'registered') {
-               $url=" https://www.snort.org/rules/snortrules-snapshot-2990.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+               $url=" https://www.snort.org/rules/snortrules-snapshot-29110.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
        } elsif ($snortsettings{'RULES'} eq 'community') {
                $url=" https://www.snort.org/rules/community";
        } else {

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index dd83bba73b3f97c9c28053d12ddb56e7eb3ba610..6aa14e15a70a28f40c895b208ffaaa8b18be79ba 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -359,7 +359,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                $errormessage = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
                goto ERROR;
        }
-       
+
        if (!(&General::validport($proxysettings{'PROXY_PORT'})))
        {
                $errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
@@ -695,7 +695,7 @@ ERROR:
                        system ('/usr/bin/touch', "${General::swroot}/proxy/transparent_blue"); }
 
                if ($proxysettings{'ACTION'} eq $Lang::tr{'advproxy save and restart'}) { system('/usr/local/bin/squidctrl restart >/dev/null 2>&1'); }
-               if ($proxysettings{'ACTION'} eq $Lang::tr{'proxy reconfigure'}) { system('/usr/local/bin/squidctrl reconfigure >/dev/null 2>&1'); }     
+               if ($proxysettings{'ACTION'} eq $Lang::tr{'proxy reconfigure'}) { system('/usr/local/bin/squidctrl reconfigure >/dev/null 2>&1'); }
   }
 }
 
@@ -1118,7 +1118,7 @@ print <<END
        <td colspan='4'><b>$Lang::tr{'advproxy cache management'}</b></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'proxy cachemgr'}:</td>
+       <td class='base'><a href='/cgi-bin/cachemgr.cgi' target='_blank'>$Lang::tr{'proxy cachemgr'}:</td>
        <td><input type='checkbox' name='CACHEMGR' $checked{'CACHEMGR'}{'on'} /></td>
        <td class='base'>$Lang::tr{'advproxy admin mail'}:</td>
        <td><input type='text' name='ADMIN_MAIL_ADDRESS' value='$proxysettings{'ADMIN_MAIL_ADDRESS'}' /></td>
@@ -3206,7 +3206,7 @@ END
 
        if ($proxysettings{'OFFLINE_MODE'} eq 'on') {  print FILE "offline_mode on\n\n"; }
        if ($proxysettings{'CACHE_DIGESTS'} eq 'on') {  print FILE "digest_generation on\n\n"; } else {  print FILE "digest_generation off\n\n"; }
-       
+
        if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACHE_POLICY'} eq 'LRU')))
        {
                if (!($proxysettings{'MEM_POLICY'} eq 'LRU'))

diff --git a/lfs/apache2 b/lfs/apache2
index 4276a8880a6dcfc012c43d9d389d9bd38438f015..28855fdc5c26578caad5132e03a290f45d1eb7fd 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.4.28
+VER        = 2.4.29
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 49007ffe8e37a0834255b279810edf24
+$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index b613ed76ec6edd3f0ab9b533c774d40b9839edfd..8782e1e05bdc4c75c0ffd282d84ac362f0939a15 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2l
+VER        = 1.0.2m
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -94,7 +94,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f85123cd390e864dfbe517e7616e6566
+$(DL_FILE)_MD5 = 10e9e37f492094b9ef296f68f24a7666
 
 install : $(TARGET)
 

diff --git a/lfs/snort b/lfs/snort
index 032ce30cab9ef1cb9aa7b9367226f172432879a1..f66bf0127e98bc8e7b17cace81bf0fe60a5e6f44 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.9.0
+VER        = 2.9.11
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fd3012bf36710481d66b40ad046b231d
+$(DL_FILE)_MD5 = 4f3ee0c2ad330e487273016efd0c9d64
 
 install : $(TARGET)
 

diff --git a/lfs/wget b/lfs/wget
index 8d3d13c2755caef9e61c8f34d04d9bad7140fd97..774928bdcb58f108a5df471187a81f30d2d43d7c 100644 (file)
--- a/lfs/wget
+++ b/lfs/wget
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.19.1
+VER        = 1.19.2
 
 THISAPP    = wget-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d30d82186b93fcabb4116ff513bfa9bd
+$(DL_FILE)_MD5 = caabf9727fa429626316619a6369fffa
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \

diff --git a/lfs/xz b/lfs/xz
index c09cb34486f3d0fd38c7d1b22d3c027fcd582d74..a0da50a193fafb033455b6a9fc154c8721783073 100644 (file)
--- a/lfs/xz
+++ b/lfs/xz
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2.2
+VER        = 5.2.3
 
 THISAPP    = xz-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e26772b69940085c0632589ab1d52e64
+$(DL_FILE)_MD5 = 60fb79cab777e3f71ca43d298adacbd5
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -e '/mf\.buffer = NULL/a next->coder->mf.size = 0;' -i src/liblzma/lz/lz_encoder.c
        cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index a21db99af58ae070121d493cc6fd3ecb3881631f..0d9f391665d6b04393c01b48f71cbd4543635dd9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="115"                                                     # Core Level (Filename)
-PAKFIRE_CORE="115"                                             # Core Level (PAKFIRE)
+CORE="116"                                                     # Core Level (Filename)
+PAKFIRE_CORE="116"                                             # 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