From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6cb06d262c0098700031c840e742cc38ae15db73 Date: Thu, 26 Jul 2018 15:39:21 +0100 Message-ID: <20180726143921.ECF571081BD5@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4185129106071188437==" List-Id: --===============4185129106071188437== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 3.x development tree". The branch, master has been updated via 6cb06d262c0098700031c840e742cc38ae15db73 (commit) via c1bc4a66daffa11cc3fe98391fdec5c874cab90b (commit) via 8a436145ab70675b1c15b0856406c7ebb796abf9 (commit) via e9f71ba263fab12e300c8b9efec8ad17d0c28c54 (commit) via fe0e9841196b0b05195d2fea9bccd321479845c2 (commit) from 326ae1cc6875eed9461b5eb59dda03d144688522 (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 6cb06d262c0098700031c840e742cc38ae15db73 Author: Michael Tremer Date: Thu Jul 26 15:38:33 2018 +0100 nftables: Update to version 0.9.0 =20 Signed-off-by: Michael Tremer commit c1bc4a66daffa11cc3fe98391fdec5c874cab90b Author: Michael Tremer Date: Thu Jul 26 15:36:48 2018 +0100 libnftnl: Update to version 1.1.1 =20 Signed-off-by: Michael Tremer commit 8a436145ab70675b1c15b0856406c7ebb796abf9 Author: Michael Tremer Date: Thu Jul 26 15:33:20 2018 +0100 Revert "nftables: Drop package" =20 This reverts commit 8c785caba7469a9db7700c7217411dada93107e0. =20 Signed-off-by: Michael Tremer commit e9f71ba263fab12e300c8b9efec8ad17d0c28c54 Author: Michael Tremer Date: Thu Jul 26 15:32:22 2018 +0100 kernel: Re-enable support for nftables =20 This reverts commit 5d17c06060b206bb8043f355fa9f21f23995c0ef. =20 Signed-off-by: Michael Tremer commit fe0e9841196b0b05195d2fea9bccd321479845c2 Author: Michael Tremer Date: Thu Jul 26 15:31:57 2018 +0100 Revert "iptables: New package" =20 This reverts commit 46ad8236e7cda033d43d9132bc72881f87b09fb1. =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: iptables/iptables.nm | 47 --------- kernel/config-generic | 105 +++++++++++--------= -- kernel/kernel.nm | 2 +- .../libnetfilter_acct.nm =3D> libnftnl/libnftnl.nm | 25 +++-- .../usb-modeswitch.nm =3D> nftables/nftables.nm | 28 +++--- 5 files changed, 86 insertions(+), 121 deletions(-) delete mode 100644 iptables/iptables.nm copy libnetfilter_acct/libnetfilter_acct.nm =3D> libnftnl/libnftnl.nm (57%) copy usb-modeswitch/usb-modeswitch.nm =3D> nftables/nftables.nm (56%) Difference in files: diff --git a/kernel/config-generic b/kernel/config-generic index f82742647..876ef6b07 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -623,7 +623,6 @@ CONFIG_NF_LOG_COMMON=3Dm CONFIG_NF_LOG_NETDEV=3Dm CONFIG_NF_CONNTRACK_MARK=3Dy CONFIG_NF_CONNTRACK_SECMARK=3Dy -# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=3Dy CONFIG_NF_CONNTRACK_EVENTS=3Dy CONFIG_NF_CONNTRACK_TIMEOUT=3Dy @@ -659,8 +658,35 @@ CONFIG_NF_NAT_IRC=3Dm CONFIG_NF_NAT_SIP=3Dm CONFIG_NF_NAT_TFTP=3Dm CONFIG_NF_NAT_REDIRECT=3Dm -CONFIG_NETFILTER_SYNPROXY=3Dm -# CONFIG_NF_TABLES is not set +CONFIG_NF_TABLES=3Dm +CONFIG_NF_TABLES_INET=3Dm +CONFIG_NF_TABLES_NETDEV=3Dm +CONFIG_NFT_EXTHDR=3Dm +CONFIG_NFT_META=3Dm +CONFIG_NFT_RT=3Dm +CONFIG_NFT_NUMGEN=3Dm +CONFIG_NFT_CT=3Dm +CONFIG_NFT_SET_RBTREE=3Dm +CONFIG_NFT_SET_HASH=3Dm +CONFIG_NFT_SET_BITMAP=3Dm +CONFIG_NFT_COUNTER=3Dm +CONFIG_NFT_LOG=3Dm +CONFIG_NFT_LIMIT=3Dm +CONFIG_NFT_MASQ=3Dm +CONFIG_NFT_REDIR=3Dm +CONFIG_NFT_NAT=3Dm +CONFIG_NFT_OBJREF=3Dm +CONFIG_NFT_QUEUE=3Dm +CONFIG_NFT_QUOTA=3Dm +CONFIG_NFT_REJECT=3Dm +CONFIG_NFT_REJECT_INET=3Dm +# CONFIG_NFT_COMPAT is not set +CONFIG_NFT_HASH=3Dm +CONFIG_NFT_FIB=3Dm +CONFIG_NFT_FIB_INET=3Dm +CONFIG_NF_DUP_NETDEV=3Dm +CONFIG_NFT_DUP_NETDEV=3Dm +CONFIG_NFT_FWD_NETDEV=3Dm CONFIG_NETFILTER_XTABLES=3Dy =20 # @@ -673,13 +699,9 @@ CONFIG_NETFILTER_XT_SET=3Dm # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=3Dm CONFIG_NETFILTER_XT_TARGET_CLASSIFY=3Dm CONFIG_NETFILTER_XT_TARGET_CONNMARK=3Dm CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=3Dm -CONFIG_NETFILTER_XT_TARGET_CT=3Dm -CONFIG_NETFILTER_XT_TARGET_DSCP=3Dm -CONFIG_NETFILTER_XT_TARGET_HL=3Dm CONFIG_NETFILTER_XT_TARGET_HMARK=3Dm CONFIG_NETFILTER_XT_TARGET_IDLETIMER=3Dm CONFIG_NETFILTER_XT_TARGET_LED=3Dm @@ -689,15 +711,11 @@ CONFIG_NETFILTER_XT_NAT=3Dm CONFIG_NETFILTER_XT_TARGET_NETMAP=3Dm CONFIG_NETFILTER_XT_TARGET_NFLOG=3Dm CONFIG_NETFILTER_XT_TARGET_NFQUEUE=3Dm -CONFIG_NETFILTER_XT_TARGET_NOTRACK=3Dm CONFIG_NETFILTER_XT_TARGET_RATEEST=3Dm CONFIG_NETFILTER_XT_TARGET_REDIRECT=3Dm CONFIG_NETFILTER_XT_TARGET_TEE=3Dm -CONFIG_NETFILTER_XT_TARGET_TPROXY=3Dm -CONFIG_NETFILTER_XT_TARGET_TRACE=3Dm CONFIG_NETFILTER_XT_TARGET_SECMARK=3Dm CONFIG_NETFILTER_XT_TARGET_TCPMSS=3Dm -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=3Dm =20 # # Xtables matches @@ -723,7 +741,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=3Dm CONFIG_NETFILTER_XT_MATCH_HL=3Dm CONFIG_NETFILTER_XT_MATCH_IPCOMP=3Dm CONFIG_NETFILTER_XT_MATCH_IPRANGE=3Dm -CONFIG_NETFILTER_XT_MATCH_IPVS=3Dm +# CONFIG_NETFILTER_XT_MATCH_IPVS is not set CONFIG_NETFILTER_XT_MATCH_L2TP=3Dm CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm CONFIG_NETFILTER_XT_MATCH_LIMIT=3Dm @@ -815,34 +833,26 @@ CONFIG_IP_VS_PE_SIP=3Dm CONFIG_NF_DEFRAG_IPV4=3Dy CONFIG_NF_CONNTRACK_IPV4=3Dy CONFIG_NF_SOCKET_IPV4=3Dm +CONFIG_NF_TABLES_IPV4=3Dm +CONFIG_NFT_CHAIN_ROUTE_IPV4=3Dm +CONFIG_NFT_REJECT_IPV4=3Dm +CONFIG_NFT_DUP_IPV4=3Dm +CONFIG_NFT_FIB_IPV4=3Dm +CONFIG_NF_TABLES_ARP=3Dm CONFIG_NF_DUP_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_NF_REJECT_IPV4=3Dm CONFIG_NF_NAT_IPV4=3Dm +CONFIG_NFT_CHAIN_NAT_IPV4=3Dm CONFIG_NF_NAT_MASQUERADE_IPV4=3Dm +CONFIG_NFT_MASQ_IPV4=3Dm +CONFIG_NFT_REDIR_IPV4=3Dm CONFIG_NF_NAT_SNMP_BASIC=3Dm CONFIG_NF_NAT_PROTO_GRE=3Dm CONFIG_NF_NAT_PPTP=3Dm CONFIG_NF_NAT_H323=3Dm -CONFIG_IP_NF_IPTABLES=3Dm -CONFIG_IP_NF_MATCH_AH=3Dm -CONFIG_IP_NF_MATCH_ECN=3Dm -CONFIG_IP_NF_MATCH_RPFILTER=3Dm -CONFIG_IP_NF_MATCH_TTL=3Dm -CONFIG_IP_NF_FILTER=3Dm -CONFIG_IP_NF_TARGET_REJECT=3Dm -CONFIG_IP_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP_NF_NAT=3Dm -CONFIG_IP_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP_NF_TARGET_NETMAP=3Dm -CONFIG_IP_NF_TARGET_REDIRECT=3Dm -CONFIG_IP_NF_MANGLE=3Dm -CONFIG_IP_NF_TARGET_CLUSTERIP=3Dm -CONFIG_IP_NF_TARGET_ECN=3Dm -CONFIG_IP_NF_TARGET_TTL=3Dm -CONFIG_IP_NF_RAW=3Dm -CONFIG_IP_NF_SECURITY=3Dm +# CONFIG_IP_NF_IPTABLES is not set CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm @@ -853,31 +863,24 @@ CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NF_DEFRAG_IPV6=3Dy CONFIG_NF_CONNTRACK_IPV6=3Dy CONFIG_NF_SOCKET_IPV6=3Dm +CONFIG_NF_TABLES_IPV6=3Dm +CONFIG_NFT_CHAIN_ROUTE_IPV6=3Dm +CONFIG_NFT_REJECT_IPV6=3Dm +CONFIG_NFT_DUP_IPV6=3Dm +CONFIG_NFT_FIB_IPV6=3Dm CONFIG_NF_DUP_IPV6=3Dm CONFIG_NF_REJECT_IPV6=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT_IPV6=3Dm +CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_FILTER=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_MANGLE=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_SECURITY=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm +CONFIG_NFT_MASQ_IPV6=3Dm +CONFIG_NFT_REDIR_IPV6=3Dm +# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_NF_TABLES_BRIDGE=3Dm +CONFIG_NFT_BRIDGE_META=3Dm +CONFIG_NFT_BRIDGE_REJECT=3Dm +CONFIG_NF_LOG_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm CONFIG_BRIDGE_EBT_BROUTE=3Dm CONFIG_BRIDGE_EBT_T_FILTER=3Dm @@ -1012,7 +1015,6 @@ CONFIG_NET_ACT_GACT=3Dm CONFIG_GACT_PROB=3Dy CONFIG_NET_ACT_MIRRED=3Dm CONFIG_NET_ACT_SAMPLE=3Dm -CONFIG_NET_ACT_IPT=3Dm CONFIG_NET_ACT_NAT=3Dm CONFIG_NET_ACT_PEDIT=3Dm CONFIG_NET_ACT_SIMP=3Dm @@ -1020,7 +1022,6 @@ CONFIG_NET_ACT_SKBEDIT=3Dm CONFIG_NET_ACT_CSUM=3Dm CONFIG_NET_ACT_VLAN=3Dm CONFIG_NET_ACT_BPF=3Dm -CONFIG_NET_ACT_CONNMARK=3Dm CONFIG_NET_ACT_SKBMOD=3Dm CONFIG_NET_ACT_IFE=3Dm CONFIG_NET_ACT_TUNNEL_KEY=3Dm diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 200a3f2c8..902f0709a 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ =20 name =3D kernel version =3D 4.13.3 -release =3D 2 +release =3D 3 thisapp =3D linux-%{version} =20 maintainer =3D Arne Fitzenreiter diff --git a/iptables/iptables.nm b/libnftnl/libnftnl.nm similarity index 53% rename from iptables/iptables.nm rename to libnftnl/libnftnl.nm index ca62d0264..9a77c6745 100644 --- a/iptables/iptables.nm +++ b/libnftnl/libnftnl.nm @@ -3,35 +3,33 @@ # Copyright (C) - IPFire Development Team = # ############################################################################= ### =20 -name =3D iptables -version =3D 1.6.2 +name =3D libnftnl +version =3D 1.1.1 release =3D 1 +thisapp =3D %{name}-%{version} =20 groups =3D Networking/Tools -url =3D http://www.netfilter.org -license =3D GPL+ -summary =3D Tools for managing Linux kernel packet filtering capabilities +url =3D http://netfilter.org/projects/libnftnl +license =3D GPLv2 +summary =3D Library for low-level interaction with nftables =20 description - The iptables utility controls the network packet filtering code - in the Linux kernel. + Library for low-level interaction with nftables Netlink's API over + libmnl. end =20 -source_dl =3D http://ftp.netfilter.org/pub/iptables/ +source_dl =3D http://ftp.netfilter.org/pub/libnftnl/ sources =3D %{thisapp}.tar.bz2 =20 build requires - libnfnetlink-devel + autoconf + autogen + automake + libmnl-devel + libtool end =20 - configure_options +=3D \ - --disable-nftables - - install_cmds - # Remove absolute symlink - ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml - end end =20 packages diff --git a/nftables/nftables.nm b/nftables/nftables.nm new file mode 100644 index 000000000..bca58c5f1 --- /dev/null +++ b/nftables/nftables.nm @@ -0,0 +1,43 @@ +############################################################################= ### +# IPFire.org - An Open Source Firewall Solution = # +# Copyright (C) - IPFire Development Team = # +############################################################################= ### + +name =3D nftables +version =3D 0.9.0 +release =3D 1 + +groups =3D Networking/Tools +url =3D http://netfilter.org/projects/nftables/ +license =3D GPLv2 +summary =3D Netfilter Tables userspace utillites + +description + %{summary} +end + +source_dl =3D http://ftp.netfilter.org/pub/nftables/ +sources =3D %{thisapp}.tar.bz2 + +build + requires + autogen + bison + docbook2X + docbook-xsl + flex + gmp-devel + libtool + libmnl-devel + libnftnl-devel >=3D 1.0.5 + readline-devel + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end hooks/post-receive -- IPFire 3.x development tree --===============4185129106071188437==--