Jan Engelhardt 2018-01-06 21:51:59 +00:00 committed by Git OBS Bridge
parent e9f036679a
commit b98b05bc9f
4 changed files with 24 additions and 11 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d70e831b670b7aa25dde81fd994d3a7ce0c0e801559a557105576df66cd8d680
size 547940

3
ipset-6.35.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37071013e1f92e0ca2f5deac86e657db87290fe651f64f44ce662f3aa40bf4dc
size 545744

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Jan 6 21:47:52 UTC 2018 - jengelh@inai.de
- Update to new upstream release 6.35
* Userspace revision handling is reworked
* Backport patch: netfilter: ipset: use nfnl_mutex_is_locked
* Missing nfnl_lock()/nfnl_unlock() is added to
ip_set_net_exit()
* netfilter: ipset: add resched points during set listing
* Fix "don't update counters" mode when counters used at the
matching
* netfilter: ipset: Fix race between dump and swap
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 23 19:10:12 UTC 2017 - jengelh@inai.de Sat Sep 23 19:10:12 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package ipset # spec file for package ipset
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
# #
%define lname libipset3 %define lname libipset11
%if 0%{?suse_version} && 0%{?suse_version} < 1330 %if 0%{?suse_version} && 0%{?suse_version} < 1330
# Factory gets new kernels, old releases don't. # Factory gets new kernels, old releases don't.
# Always build KMPs for all versions older than Factory. # Always build KMPs for all versions older than Factory.
@ -25,7 +25,7 @@
%define ipset_build_kmp 0 %define ipset_build_kmp 0
%endif %endif
Name: ipset Name: ipset
Version: 6.34 Version: 6.35
Release: 0 Release: 0
Summary: Netfilter ipset administration utility Summary: Netfilter ipset administration utility
License: GPL-2.0 License: GPL-2.0
@ -129,16 +129,16 @@ make %{?_smp_mflags}
%install %install
export PATH="$PATH:%_sbindir" export PATH="$PATH:%_sbindir"
b=%buildroot b="%buildroot"
%if 0%{?ipset_build_kmp} %if 0%{?ipset_build_kmp}
for flavor in %flavors_to_build; do for flavor in %flavors_to_build; do
pushd "../%name-$flavor-%version/" pushd "../%name-$flavor-%version/"
make %{?_smp_mflags} install modules_install \ make %{?_smp_mflags} install modules_install \
DESTDIR="$b" INSTALL_MOD_PATH="$b" V=1 DESTDIR="$b" INSTALL_MOD_PATH="$b" V=1
popd; popd
done; done
%endif %endif
make %{?_smp_mflags} install DESTDIR="$b" %make_install
find "$b/%_libdir/" -type f -name "*.la" -delete -print find "$b/%_libdir/" -type f -name "*.la" -delete -print
%post -n %lname -p /sbin/ldconfig %post -n %lname -p /sbin/ldconfig
@ -149,7 +149,7 @@ find "$b/%_libdir/" -type f -name "*.la" -delete -print
%_mandir/man*/* %_mandir/man*/*
%files -n %lname %files -n %lname
%_libdir/libipset.so.3* %_libdir/libipset.so.11*
%files devel %files devel
%_libdir/libipset.so %_libdir/libipset.so