From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] ipset: Update to 6.38
Date: Mon, 18 Jun 2018 15:12:38 +0100
Message-ID: <5638793a55485ec17d26f39fe85b777309ffa1d6.camel@ipfire.org>
In-Reply-To: <1529330494-8236-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0691613539111026896=="
List-Id: <development.lists.ipfire.org>

--===============0691613539111026896==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(-)
>=20
> 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 @@
>  ##########################################################################=
###
> ##
>  #                                                                         =
  =20
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2017  IPFire Team  <info(a)ipfire.org>                    =
    =20
>  #
> +# Copyright (C) 2018  IPFire Team  <info(a)ipfire.org>                    =
    =20
>  #
>  #                                                                         =
  =20
>  #
>  # 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 @@
> =20
>  include Config
> =20
> -VER        =3D 6.32
> +VER        =3D 6.38
> =20
>  THISAPP    =3D ipset-$(VER)
>  DL_FILE    =3D $(THISAPP).tar.bz2
> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
> =20
>  $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =20
> -$(DL_FILE)_MD5 =3D 857a5c6a6d645196865a82bf6fd7f567
> +$(DL_FILE)_MD5 =3D 0e5d9c85f6b78e7dff0c996e2900574b
> =20
>  install : $(TARGET)
> =20

--===============0691613539111026896==--