diff --git a/general.ent b/general.ent index 6d0389cd02..7038ba9e52 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + @@ -82,7 +82,7 @@ - + diff --git a/general/prog/python-slip.xml b/general/prog/python-slip.xml index 7a7ee0dc6e..1ece54563d 100644 --- a/general/prog/python-slip.xml +++ b/general/prog/python-slip.xml @@ -68,8 +68,9 @@ Required - and - + , + , and + User Notes: diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index c8504f83b3..7a445559b9 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,30 @@ --> + + December 4th, 2019 + + + [dj] - Update to blfs-bootscripts-20191203. + + + [dj] - Update to firewalld-0.8.0. Fixes + #12734. + + + [dj] - Update to nftables-0.9.3. Fixes + #12850. + + + [dj] - Update to libnftnl-1.1.5. Fixes + #12851. + + + [dj] - Add missing dependency "six" to python-slip. + + + + December 3rd, 2019 diff --git a/networking/netlibs/libnftnl.xml b/networking/netlibs/libnftnl.xml index 5140f2a4e4..4595ead561 100644 --- a/networking/netlibs/libnftnl.xml +++ b/networking/netlibs/libnftnl.xml @@ -6,9 +6,9 @@ - - - + + + ]> diff --git a/packages.ent b/packages.ent index 28e73dd91b..561fe5e8d7 100644 --- a/packages.ent +++ b/packages.ent @@ -11,7 +11,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -584,7 +584,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + diff --git a/postlfs/security/firewalld.xml b/postlfs/security/firewalld.xml index e2cb2d36b8..66e0f2e708 100644 --- a/postlfs/security/firewalld.xml +++ b/postlfs/security/firewalld.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -75,38 +75,29 @@ - Additional Downloads - - - - Required patch: - - - - - firewalld Dependencies Required - or , + , and Recommended - and (for building - the manual pages), and - ipset - for ipset support (only when used with iptables) + , + , and + (for building the manual pages) Optional - (runtime only, required for - fireall-applet) and (runtime only, required for - fireall-config) + fireall-config), + (runtime only, required for + fireall-applet), and + ipset + for ipset support (only when used with iptables) User Notes: @@ -117,12 +108,6 @@ Installation of firewalld - - Fix an issue with use of built-in kernel modules: - - -patch -Np1 -i ../firewalld-&firewalld-version;-builtin-1.patch - Install firewalld by running the following commands: @@ -140,9 +125,20 @@ make make - To run the testsuite, isssue the command make test. + The testsuite for firewalld is very dependent + on the running kernel and system configuration. It requires + ipset as well as both backends, and all + supported kernel options available. + + If the above conditions are met, run the testsuite as the + root user with the command + make -C src check. Any test failures are likely the + result of an incomplete configuration. Failed tests will give a detailed + failure status at + src/test/testsuite.dir/<###>/testsuite.log. + Prevent installation of the distributed firewalld init script with the @@ -172,6 +168,12 @@ make installation of systemd services. + + : These switches + disable iptables support and are required if + you wish to build without iptables support. + + diff --git a/postlfs/security/iptables.xml b/postlfs/security/iptables.xml index 8a9016420b..ba84b43f37 100644 --- a/postlfs/security/iptables.xml +++ b/postlfs/security/iptables.xml @@ -74,7 +74,14 @@ Optional - + , + (required for nfsypproxy support), + bpf-utils + (required for Berkely Packet Filter support), + libnfnetlink + (required for connlable support), and + libnetfilter_conntrack" + (required for connlabel support) diff --git a/postlfs/security/nftables.xml b/postlfs/security/nftables.xml index e7a0d5f3c4..a1437364cc 100644 --- a/postlfs/security/nftables.xml +++ b/postlfs/security/nftables.xml @@ -6,9 +6,9 @@ - - - + + + ]> @@ -79,10 +79,14 @@ + Recommended + + (for JSON rules table support) + + Optional - , - , and + and @@ -140,6 +144,7 @@ ./configure --prefix=/usr \ --sbindir=/sbin \ --sysconfdir=/etc \ + --with-json \ --with-python-bin=/usr/bin/python3 && make @@ -163,6 +168,11 @@ ln -sfv ../../lib/$(readlink /usr/lib/libnftables.so) /usr/lib/libnftables.so + + --with-json: build with support for JSON rules. + Omit if is not available. + + --with-python-bin=/usr/bin/python3: force use of Python3. @@ -175,12 +185,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libnftables.so) /usr/lib/libnftables.so - --with-json: build with support for JSON output if - is available. - - - - --with-xtables: build with + : build with libxtables support.