[PATCH] ipset: Update to 6.38

[PATCH] ipset: Update to 6.38

[Erik Kapfer]

[-- Attachment #1: Type: text/plain, Size: 2014 bytes --]

Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
 config/rootfiles/common/ipset | 5 +++--
 lfs/ipset                     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset
index 50ebed5..24f5e95 100644
--- a/config/rootfiles/common/ipset
+++ b/config/rootfiles/common/ipset
@@ -1,5 +1,6 @@
 etc/ipset
 #usr/include/libipset
+#usr/include/libipset/args.h
 #usr/include/libipset/data.h
 #usr/include/libipset/errcode.h
 #usr/include/libipset/linux_ip_set.h
@@ -19,8 +20,8 @@ etc/ipset
 #usr/include/libipset/utils.h
 #usr/lib/libipset.la
 #usr/lib/libipset.so
-usr/lib/libipset.so.3
-usr/lib/libipset.so.3.6.0
+usr/lib/libipset.so.11
+usr/lib/libipset.so.11.1.0
 #usr/lib/pkgconfig/libipset.pc
 usr/sbin/ipset
 #usr/share/man/man8/ipset.8
diff --git a/lfs/ipset b/lfs/ipset
index 7c43b30..62d683d 100644
--- a/lfs/ipset
+++ b/lfs/ipset
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2017  IPFire Team  <info(a)ipfire.org>                          #
+# Copyright (C) 2018  IPFire Team  <info(a)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.32
+VER        = 6.38
 
 THISAPP    = ipset-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 857a5c6a6d645196865a82bf6fd7f567
+$(DL_FILE)_MD5 = 0e5d9c85f6b78e7dff0c996e2900574b
 
 install : $(TARGET)
 
-- 
2.7.4

Re: [PATCH] ipset: Update to 6.38

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2213 bytes --]

Merged.

On Mon, 2018-06-18 at 16:01 +0200, Erik Kapfer wrote:
> Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
> ---
>  config/rootfiles/common/ipset | 5 +++--
>  lfs/ipset                     | 6 +++---
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset
> index 50ebed5..24f5e95 100644
> --- a/config/rootfiles/common/ipset
> +++ b/config/rootfiles/common/ipset
> @@ -1,5 +1,6 @@
>  etc/ipset
>  #usr/include/libipset
> +#usr/include/libipset/args.h
>  #usr/include/libipset/data.h
>  #usr/include/libipset/errcode.h
>  #usr/include/libipset/linux_ip_set.h
> @@ -19,8 +20,8 @@ etc/ipset
>  #usr/include/libipset/utils.h
>  #usr/lib/libipset.la
>  #usr/lib/libipset.so
> -usr/lib/libipset.so.3
> -usr/lib/libipset.so.3.6.0
> +usr/lib/libipset.so.11
> +usr/lib/libipset.so.11.1.0
>  #usr/lib/pkgconfig/libipset.pc
>  usr/sbin/ipset
>  #usr/share/man/man8/ipset.8
> diff --git a/lfs/ipset b/lfs/ipset
> index 7c43b30..62d683d 100644
> --- a/lfs/ipset
> +++ b/lfs/ipset
> @@ -1,7 +1,7 @@
>  #############################################################################
> ##
>  #                                                                            
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2017  IPFire Team  <info(a)ipfire.org>                         
>  #
> +# Copyright (C) 2018  IPFire Team  <info(a)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.32
> +VER        = 6.38
>  
>  THISAPP    = ipset-$(VER)
>  DL_FILE    = $(THISAPP).tar.bz2
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 857a5c6a6d645196865a82bf6fd7f567
> +$(DL_FILE)_MD5 = 0e5d9c85f6b78e7dff0c996e2900574b
>  
>  install : $(TARGET)
>