Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index 5c616f8da311b5c35a0f1bc2dc3eff34bd0343d3..1eb9f6f37d5a0e868acb86ad488b46591781b404 100644 (file)
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -170,6 +170,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_HEADERDATA.3
 #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
 #usr/share/man/man3/CURLOPT_HEADEROPT.3
+#usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3
 #usr/share/man/man3/CURLOPT_HTTP200ALIASES.3
 #usr/share/man/man3/CURLOPT_HTTPAUTH.3
 #usr/share/man/man3/CURLOPT_HTTPGET.3
@@ -340,6 +341,8 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
+#usr/share/man/man3/CURLOPT_TRAILERDATA.3
+#usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3
 #usr/share/man/man3/CURLOPT_TRANSFERTEXT.3
 #usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3
 #usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3

diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot
new file mode 100644 (file)
index 0000000..68d1e70
--- /dev/null
+++ b/config/rootfiles/common/knot
@@ -0,0 +1,93 @@
+usr/bin/kdig
+#usr/bin/khost
+#usr/bin/knsec3hash
+#usr/bin/knsupdate
+#usr/include/knot
+#usr/include/knot/module.h
+#usr/include/libdnssec
+#usr/include/libdnssec/binary.h
+#usr/include/libdnssec/crypto.h
+#usr/include/libdnssec/dnssec.h
+#usr/include/libdnssec/error.h
+#usr/include/libdnssec/key.h
+#usr/include/libdnssec/keyid.h
+#usr/include/libdnssec/keystore.h
+#usr/include/libdnssec/keytag.h
+#usr/include/libdnssec/list.h
+#usr/include/libdnssec/nsec.h
+#usr/include/libdnssec/random.h
+#usr/include/libdnssec/sign.h
+#usr/include/libdnssec/tsig.h
+#usr/include/libdnssec/version.h
+#usr/include/libknot
+#usr/include/libknot/attribute.h
+#usr/include/libknot/codes.h
+#usr/include/libknot/consts.h
+#usr/include/libknot/control
+#usr/include/libknot/control/control.h
+#usr/include/libknot/cookies.h
+#usr/include/libknot/db
+#usr/include/libknot/db/db.h
+#usr/include/libknot/db/db_lmdb.h
+#usr/include/libknot/db/db_trie.h
+#usr/include/libknot/descriptor.h
+#usr/include/libknot/dname.h
+#usr/include/libknot/endian.h
+#usr/include/libknot/errcode.h
+#usr/include/libknot/error.h
+#usr/include/libknot/libknot.h
+#usr/include/libknot/lookup.h
+#usr/include/libknot/mm_ctx.h
+#usr/include/libknot/packet
+#usr/include/libknot/packet/compr.h
+#usr/include/libknot/packet/pkt.h
+#usr/include/libknot/packet/rrset-wire.h
+#usr/include/libknot/packet/wire.h
+#usr/include/libknot/rdata.h
+#usr/include/libknot/rdataset.h
+#usr/include/libknot/rrset-dump.h
+#usr/include/libknot/rrset.h
+#usr/include/libknot/rrtype
+#usr/include/libknot/rrtype/dnskey.h
+#usr/include/libknot/rrtype/ds.h
+#usr/include/libknot/rrtype/naptr.h
+#usr/include/libknot/rrtype/nsec.h
+#usr/include/libknot/rrtype/nsec3.h
+#usr/include/libknot/rrtype/nsec3param.h
+#usr/include/libknot/rrtype/opt.h
+#usr/include/libknot/rrtype/rdname.h
+#usr/include/libknot/rrtype/rrsig.h
+#usr/include/libknot/rrtype/soa.h
+#usr/include/libknot/rrtype/tsig.h
+#usr/include/libknot/tsig-op.h
+#usr/include/libknot/tsig.h
+#usr/include/libknot/version.h
+#usr/include/libknot/wire.h
+#usr/include/libknot/yparser
+#usr/include/libknot/yparser/yparser.h
+#usr/include/libknot/yparser/ypformat.h
+#usr/include/libknot/yparser/ypschema.h
+#usr/include/libknot/yparser/yptrafo.h
+#usr/include/libzscanner
+#usr/include/libzscanner/error.h
+#usr/include/libzscanner/scanner.h
+#usr/include/libzscanner/version.h
+#usr/lib/libdnssec.la
+#usr/lib/libdnssec.so
+usr/lib/libdnssec.so.6
+usr/lib/libdnssec.so.6.0.0
+#usr/lib/libknot.la
+#usr/lib/libknot.so
+usr/lib/libknot.so.8
+usr/lib/libknot.so.8.0.0
+#usr/lib/libzscanner.la
+#usr/lib/libzscanner.so
+usr/lib/libzscanner.so.2
+usr/lib/libzscanner.so.2.0.0
+#usr/lib/pkgconfig/libdnssec.pc
+#usr/lib/pkgconfig/libknot.pc
+#usr/lib/pkgconfig/libzscanner.pc
+#usr/share/man/man1/kdig.1
+#usr/share/man/man1/khost.1
+#usr/share/man/man1/knsec3hash.1
+#usr/share/man/man1/knsupdate.1

diff --git a/config/rootfiles/common/libedit b/config/rootfiles/common/libedit
new file mode 100644 (file)
index 0000000..65b3b86
--- /dev/null
+++ b/config/rootfiles/common/libedit
@@ -0,0 +1,50 @@
+#usr/include/editline
+#usr/include/editline/readline.h
+#usr/include/histedit.h
+#usr/lib/libedit.la
+#usr/lib/libedit.so
+usr/lib/libedit.so.0
+usr/lib/libedit.so.0.0.59
+#usr/lib/pkgconfig/libedit.pc
+#usr/share/man/man3/editline.3
+#usr/share/man/man3/el_deletestr.3
+#usr/share/man/man3/el_end.3
+#usr/share/man/man3/el_get.3
+#usr/share/man/man3/el_getc.3
+#usr/share/man/man3/el_gets.3
+#usr/share/man/man3/el_init.3
+#usr/share/man/man3/el_init_fd.3
+#usr/share/man/man3/el_insertstr.3
+#usr/share/man/man3/el_line.3
+#usr/share/man/man3/el_parse.3
+#usr/share/man/man3/el_push.3
+#usr/share/man/man3/el_reset.3
+#usr/share/man/man3/el_resize.3
+#usr/share/man/man3/el_set.3
+#usr/share/man/man3/el_source.3
+#usr/share/man/man3/el_wdeletestr.3
+#usr/share/man/man3/el_wget.3
+#usr/share/man/man3/el_wgetc.3
+#usr/share/man/man3/el_wgets.3
+#usr/share/man/man3/el_winsertstr.3
+#usr/share/man/man3/el_wline.3
+#usr/share/man/man3/el_wparse.3
+#usr/share/man/man3/el_wpush.3
+#usr/share/man/man3/el_wset.3
+#usr/share/man/man3/history_end.3
+#usr/share/man/man3/history_init.3
+#usr/share/man/man3/history_w.3
+#usr/share/man/man3/history_wend.3
+#usr/share/man/man3/history_winit.3
+#usr/share/man/man3/tok_end.3
+#usr/share/man/man3/tok_init.3
+#usr/share/man/man3/tok_line.3
+#usr/share/man/man3/tok_reset.3
+#usr/share/man/man3/tok_str.3
+#usr/share/man/man3/tok_wend.3
+#usr/share/man/man3/tok_winit.3
+#usr/share/man/man3/tok_wline.3
+#usr/share/man/man3/tok_wreset.3
+#usr/share/man/man3/tok_wstr.3
+#usr/share/man/man5/editrc.5
+#usr/share/man/man7/editline.7

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

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

diff --git a/config/rootfiles/packages/i586/borgbackup b/config/rootfiles/packages/i586/borgbackup
new file mode 100644 (file)
index 0000000..7655c01
--- /dev/null
+++ b/config/rootfiles/packages/i586/borgbackup
@@ -0,0 +1,109 @@
+usr/bin/borg
+usr/lib/python3.6/site-packages/borg
+usr/lib/python3.6/site-packages/borg/__init__.py
+usr/lib/python3.6/site-packages/borg/__main__.py
+usr/lib/python3.6/site-packages/borg/__pycache__
+usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/_chunker.c
+usr/lib/python3.6/site-packages/borg/_hashindex.c
+usr/lib/python3.6/site-packages/borg/_version.py
+usr/lib/python3.6/site-packages/borg/archive.py
+usr/lib/python3.6/site-packages/borg/archiver.py
+usr/lib/python3.6/site-packages/borg/cache.py
+usr/lib/python3.6/site-packages/borg/chunker.c
+usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/chunker.pyx
+usr/lib/python3.6/site-packages/borg/compress.c
+usr/lib/python3.6/site-packages/borg/compress.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/compress.pyx
+usr/lib/python3.6/site-packages/borg/crypto.c
+usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/crypto.pyx
+usr/lib/python3.6/site-packages/borg/fuse.py
+usr/lib/python3.6/site-packages/borg/hashindex.c
+usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/hashindex.pyx
+usr/lib/python3.6/site-packages/borg/helpers.py
+usr/lib/python3.6/site-packages/borg/key.py
+usr/lib/python3.6/site-packages/borg/keymanager.py
+usr/lib/python3.6/site-packages/borg/locking.py
+usr/lib/python3.6/site-packages/borg/logger.py
+usr/lib/python3.6/site-packages/borg/lrucache.py
+usr/lib/python3.6/site-packages/borg/paperkey.html
+usr/lib/python3.6/site-packages/borg/platform.py
+usr/lib/python3.6/site-packages/borg/platform_darwin.c
+usr/lib/python3.6/site-packages/borg/platform_darwin.pyx
+usr/lib/python3.6/site-packages/borg/platform_freebsd.c
+usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx
+usr/lib/python3.6/site-packages/borg/platform_linux.c
+usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/platform_linux.pyx
+usr/lib/python3.6/site-packages/borg/remote.py
+usr/lib/python3.6/site-packages/borg/repository.py
+usr/lib/python3.6/site-packages/borg/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite
+#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/archive.py
+#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py
+#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz
+#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py
+#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py
+#usr/lib/python3.6/site-packages/borg/testsuite/compress.py
+#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py
+#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py
+#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py
+#usr/lib/python3.6/site-packages/borg/testsuite/key.py
+#usr/lib/python3.6/site-packages/borg/testsuite/locking.py
+#usr/lib/python3.6/site-packages/borg/testsuite/logger.py
+#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py
+#usr/lib/python3.6/site-packages/borg/testsuite/platform.py
+#usr/lib/python3.6/site-packages/borg/testsuite/repository.py
+#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py
+#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py
+usr/lib/python3.6/site-packages/borg/upgrader.py
+usr/lib/python3.6/site-packages/borg/xattr.py
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt

diff --git a/config/rootfiles/packages/i586/python3-llfuse b/config/rootfiles/packages/i586/python3-llfuse
new file mode 100644 (file)
index 0000000..29c59e3
--- /dev/null
+++ b/config/rootfiles/packages/i586/python3-llfuse
@@ -0,0 +1,7 @@
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe
+usr/lib/python3.6/site-packages/llfuse.cpython-36m-i386-linux-gnu.so

diff --git a/lfs/curl b/lfs/curl
index f00677b5e7c7f55e6d6e0c57c5c668c0408764a1..e57bbbf4594fc07fdca9746b23f4977217a6df3c 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.63.0
+VER        = 7.64.0
 
 THISAPP    = curl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6121427a7199cd6094fc48c9e31e8992
+$(DL_FILE)_MD5 = a026740d599a32bcbbe6e70679397899
 
 install : $(TARGET)
 

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index cd940ae8b45795b61db05ae716116a760bab4b21..d7372ea8273c61b9ee1ddf02c452587a37788c2a 100644 (file)
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.1.0
+VER        = 7.1.1
 
 THISAPP    = dhcpcd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 918520b171f32f0da97316f3bcf3edc1
+$(DL_FILE)_MD5 = adc0a949cb718b455d81deea9ba2875f
 
 install : $(TARGET)
 

diff --git a/lfs/knot b/lfs/knot
new file mode 100644 (file)
index 0000000..729db91
--- /dev/null
+++ b/lfs/knot
@@ -0,0 +1,89 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.7.6
+
+THISAPP    = knot-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6afbbaff4e9d93de8d6311958d86b323
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure    \
+               --prefix=/usr           \
+               --enable-static=no      \
+               --disable-daemon        \
+               --disable-modules       \
+               --enable-maxminddb=no   \
+               --disable-documentation
+
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+

diff --git a/lfs/libedit b/lfs/libedit
new file mode 100644 (file)
index 0000000..f3a831b
--- /dev/null
+++ b/lfs/libedit
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 20181209-3.1
+
+THISAPP    = libedit-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 22e945a0476e388e6f78bfc8d6e1192c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure    \
+               --prefix=/usr           \
+               --enable-static=no
+
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+

diff --git a/lfs/linux b/lfs/linux
index c031f1e80961cba0cbf05e39441fa137837823e8..b41942803b849d305420c487350c70f46b3beb91 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.97
-ARM_PATCHES = 4.14.97-ipfire0
+VER         = 4.14.98
+ARM_PATCHES = 4.14.98-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -82,7 +82,7 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 14dc56d3933045782caca454d32e8874
+$(DL_FILE)_MD5                                 = 3df5c7536542b6cb3d6158c84f8fc70e
 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = b2f6559b08f764c0d974e860660d416a
 
 install : $(TARGET)
@@ -128,11 +128,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
 
        # Wlan Patches
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/backports-4.2.6-1_ath10k_remove_logspam.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-rt2x00usb_suppress_queue_warnings.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
 
        # Add LED trigger
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.16-ledtrig_netdev.patch
@@ -150,20 +147,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
 
 endif
 ifeq "$(BUILD_ARCH)" "aarch64"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 

diff --git a/lfs/powertop b/lfs/powertop
index de92af56ac0c4f3e1da6fbe4e2442ea3c55bc64c..f8a12abca784c0104b792917fae127f4cfe2d90b 100644 (file)
--- a/lfs/powertop
+++ b/lfs/powertop
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = v2.9
+VER        = v2.10
 
 THISAPP    = powertop-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = powertop
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 583518c5c4434c6e9b9c58c3920950b6
+$(DL_FILE)_MD5 = a69bd55901cf919cc564187402ea2c9c
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 70fc430f335000315d2007509bcd982559473fa9..122aeebd0b396524df1dd313573fdc1c02f29f14 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1590,6 +1590,8 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
+  lfsmake2 libedit
+  lfsmake2 knot
 }
 
 buildinstaller() {