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

This commit is contained in:
Stefan Schantl
2018-09-26 14:49:34 +02:00
554 changed files with 1394 additions and 1025 deletions

View File

@@ -99,6 +99,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire/kernel/crypto/ccm.ko
#lib/modules/KVER-ipfire/kernel/crypto/chacha20_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko
#lib/modules/KVER-ipfire/kernel/crypto/cts.ko
@@ -118,6 +120,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire/kernel/crypto/pcrypt.ko
#lib/modules/KVER-ipfire/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko

View File

@@ -117,6 +117,8 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ccm.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20_generic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cts.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/deflate.ko
@@ -134,6 +136,7 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/md4.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd256.ko
@@ -1063,7 +1066,6 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/b53/b53_mdio.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/bcm-sf2.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_mdio.ko
@@ -2003,7 +2005,6 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_bitmap.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_hash.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_rbtree.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_AUDIT.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CHECKSUM.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CLASSIFY.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CONNSECMARK.ko

View File

@@ -521,6 +521,8 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/ccm.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20_generic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/crypto_engine.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/cts.ko
@@ -540,6 +542,7 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/pcrypt.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/rmd256.ko
@@ -1614,7 +1617,6 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/b53/b53_mdio.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/bcm-sf2.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_mdio.ko

View File

@@ -11,7 +11,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crc32-pclmul.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/glue_helper.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-i586.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-i586.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-i586.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/events
@@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko

View File

@@ -65,6 +65,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/devlink-dev.8
#usr/share/man/man8/devlink-monitor.8
#usr/share/man/man8/devlink-port.8
#usr/share/man/man8/devlink-resource.8
#usr/share/man/man8/devlink-sb.8
#usr/share/man/man8/devlink.8
#usr/share/man/man8/genl.8
@@ -97,6 +98,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/nstat.8
#usr/share/man/man8/rdma-dev.8
#usr/share/man/man8/rdma-link.8
#usr/share/man/man8/rdma-resource.8
#usr/share/man/man8/rdma.8
#usr/share/man/man8/routef.8
#usr/share/man/man8/routel.8
@@ -111,6 +113,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/tc-bpf.8
#usr/share/man/man8/tc-cbq-details.8
#usr/share/man/man8/tc-cbq.8
#usr/share/man/man8/tc-cbs.8
#usr/share/man/man8/tc-cgroup.8
#usr/share/man/man8/tc-choke.8
#usr/share/man/man8/tc-codel.8

View File

@@ -10,8 +10,8 @@ etc/unbound/unbound.conf
#usr/include/unbound.h
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.2
usr/lib/libunbound.so.2.5.11
usr/lib/libunbound.so.8
usr/lib/libunbound.so.8.0.0
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor

View File

@@ -22,7 +22,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/des3_ede-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/ghash-clmulni-intel.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/poly1305-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx2.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-x86_64.ko
@@ -1474,7 +1473,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko