ipset: Update to version 7.1

Message ID 20190303082250.8165-1-ummeegge@ipfire.org
State Accepted
Commit 46a073f1b5538d3606c8f3b67787be6d0f29f03a
Headers
Series ipset: Update to version 7.1 |

Commit Message

ummeegge March 3, 2019, 7:22 p.m. UTC
  Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
---
 config/rootfiles/common/ipset | 7 ++++---
 lfs/ipset                     | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)
  

Comments

Michael Tremer March 4, 2019, 3:05 a.m. UTC | #1
Thank you. Merged!

> On 3 Mar 2019, at 08:22, Erik Kapfer <ummeegge@ipfire.org> wrote:
> 
> Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
> ---
> config/rootfiles/common/ipset | 7 ++++---
> lfs/ipset                     | 6 +++---
> 2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset
> index 24f5e95f5..b3fcb640b 100644
> --- a/config/rootfiles/common/ipset
> +++ b/config/rootfiles/common/ipset
> @@ -3,6 +3,7 @@ etc/ipset
> #usr/include/libipset/args.h
> #usr/include/libipset/data.h
> #usr/include/libipset/errcode.h
> +#usr/include/libipset/ipset.h
> #usr/include/libipset/linux_ip_set.h
> #usr/include/libipset/linux_ip_set_bitmap.h
> #usr/include/libipset/linux_ip_set_hash.h
> @@ -16,12 +17,12 @@ etc/ipset
> #usr/include/libipset/session.h
> #usr/include/libipset/transport.h
> #usr/include/libipset/types.h
> -#usr/include/libipset/ui.h
> #usr/include/libipset/utils.h
> #usr/lib/libipset.la
> #usr/lib/libipset.so
> -usr/lib/libipset.so.11
> -usr/lib/libipset.so.11.1.0
> +usr/lib/libipset.so.13
> +usr/lib/libipset.so.13.1.0
> #usr/lib/pkgconfig/libipset.pc
> usr/sbin/ipset
> +#usr/share/man/man3/libipset.3
> #usr/share/man/man8/ipset.8
> diff --git a/lfs/ipset b/lfs/ipset
> index d33e9327f..3382c668c 100644
> --- a/lfs/ipset
> +++ b/lfs/ipset
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +# 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        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 6.38
> +VER        = 7.1
> 
> THISAPP    = ipset-$(VER)
> DL_FILE    = $(THISAPP).tar.bz2
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 0e5d9c85f6b78e7dff0c996e2900574b
> +$(DL_FILE)_MD5 = 72b477d1ce076d681b0799f88280f2f3
> 
> install : $(TARGET)
> 
> -- 
> 2.12.2
>
  

Patch

diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset
index 24f5e95f5..b3fcb640b 100644
--- a/config/rootfiles/common/ipset
+++ b/config/rootfiles/common/ipset
@@ -3,6 +3,7 @@  etc/ipset
 #usr/include/libipset/args.h
 #usr/include/libipset/data.h
 #usr/include/libipset/errcode.h
+#usr/include/libipset/ipset.h
 #usr/include/libipset/linux_ip_set.h
 #usr/include/libipset/linux_ip_set_bitmap.h
 #usr/include/libipset/linux_ip_set_hash.h
@@ -16,12 +17,12 @@  etc/ipset
 #usr/include/libipset/session.h
 #usr/include/libipset/transport.h
 #usr/include/libipset/types.h
-#usr/include/libipset/ui.h
 #usr/include/libipset/utils.h
 #usr/lib/libipset.la
 #usr/lib/libipset.so
-usr/lib/libipset.so.11
-usr/lib/libipset.so.11.1.0
+usr/lib/libipset.so.13
+usr/lib/libipset.so.13.1.0
 #usr/lib/pkgconfig/libipset.pc
 usr/sbin/ipset
+#usr/share/man/man3/libipset.3
 #usr/share/man/man8/ipset.8
diff --git a/lfs/ipset b/lfs/ipset
index d33e9327f..3382c668c 100644
--- a/lfs/ipset
+++ b/lfs/ipset
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 6.38
+VER        = 7.1
 
 THISAPP    = ipset-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0e5d9c85f6b78e7dff0c996e2900574b
+$(DL_FILE)_MD5 = 72b477d1ce076d681b0799f88280f2f3
 
 install : $(TARGET)