diff --git a/ipset-7.3.tar.bz2 b/ipset-7.3.tar.bz2 deleted file mode 100644 index 31a163a..0000000 --- a/ipset-7.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4644c7c5005e90a9b6385d625283eb0b69b34de7192301428665dd909fdaa35a -size 669246 diff --git a/ipset-7.4.tar.bz2 b/ipset-7.4.tar.bz2 new file mode 100644 index 0000000..40e4f6e --- /dev/null +++ b/ipset-7.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a974176e57fe4b7e2984abb231c4a18af2291bdc41536ef64e4b8ec4d4a1884 +size 670906 diff --git a/ipset-destdir.diff b/ipset-destdir.diff index c15f3eb..42b9187 100644 --- a/ipset-destdir.diff +++ b/ipset-destdir.diff @@ -16,16 +16,16 @@ Skip these two steps from Makefile.am altogether. Makefile.am | 2 -- 1 file changed, 2 deletions(-) -Index: ipset-6.29/Makefile.am +Index: ipset-7.4/Makefile.am =================================================================== ---- ipset-6.29.orig/Makefile.am -+++ ipset-6.29/Makefile.am +--- ipset-7.4.orig/Makefile.am ++++ ipset-7.4/Makefile.am @@ -72,8 +72,6 @@ modules_install: if WITH_KMOD ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \ KDIR=$$PWD/kernel modules_install - @modinfo -b ${INSTALL_MOD_PATH} ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING" -- @lsmod | ${GREP} '^ip_set' >/dev/null && echo "$$MODULE_WARNING" +- @lsmod | ${GREP} '^ip_set' >/dev/null && echo "$$MODULE_WARNING"; true else @echo Skipping kernel modules due to --with-kmod=no endif diff --git a/ipset.changes b/ipset.changes index 041f97d..5e3199f 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 1 17:06:36 UTC 2019 - Jan Engelhardt + +- Update to release 7.4 + * Wildcard support for the "hash:net,iface" type. + ------------------------------------------------------------------- Mon Aug 19 12:53:22 UTC 2019 - Jan Engelhardt diff --git a/ipset.spec b/ipset.spec index f8b6fee..66d9a82 100644 --- a/ipset.spec +++ b/ipset.spec @@ -25,7 +25,7 @@ %define ipset_build_kmp 0 %endif Name: ipset -Version: 7.3 +Version: 7.4 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0-only