From afce330c513426aae2bab7c58a757ba90dfbdc50 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 02:43:49 +0000 Subject: import ipset-6.29-1.el7 --- diff --git a/.gitignore b/.gitignore index 2604c77..0ad1a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ipset-6.19.tar.bz2 +SOURCES/ipset-6.29.tar.bz2 diff --git a/.ipset.metadata b/.ipset.metadata index 73e8802..0a33019 100644 --- a/.ipset.metadata +++ b/.ipset.metadata @@ -1 +1 @@ -b8f9fe56b6470bb62c4d9adbc86ca7ed97a3430d SOURCES/ipset-6.19.tar.bz2 +fa11b387716544c798bc9549cedbd8dbee471605 SOURCES/ipset-6.29.tar.bz2 diff --git a/SOURCES/ipset.start-stop b/SOURCES/ipset.start-stop index 92e9157..dd7071f 100644 --- a/SOURCES/ipset.start-stop +++ b/SOURCES/ipset.start-stop @@ -136,7 +136,13 @@ save() { lsmod | grep -q "^ip_set " [[ $? -ne 0 ]] && return 6 - [[ -z $(${IPSET_BIN} list -name) ]] && return 0 + if [[ -z $(${IPSET_BIN} list -name) ]]; then + if [[ -f $IPSET_DATA ]]; then + mv $IPSET_DATA $IPSET_DATA.save && chmod 600 $IPSET_DATA.save \ + || return 1 + fi + return 0 + fi ret=0 TMP_FILE=$(/bin/mktemp -q /tmp/$IPSET.XXXXXX) \ diff --git a/SPECS/ipset.spec b/SPECS/ipset.spec index e5b5ab3..976e03c 100644 --- a/SPECS/ipset.spec +++ b/SPECS/ipset.spec @@ -2,8 +2,8 @@ %define legacy_actions %{_libexecdir}/initscripts/legacy-actions Name: ipset -Version: 6.19 -Release: 6%{?dist} +Version: 6.29 +Release: 1%{?dist} Summary: Manage Linux IP sets License: GPLv2 @@ -149,8 +149,7 @@ fi %files devel %{_includedir}/lib%{name} %{_libdir}/lib%{name}.so -# not installed with 6.19 -#%{_libdir}/pkgconfig/lib%{name}.pc +%{_libdir}/pkgconfig/lib%{name}.pc %files service %{_unitdir}/%{name}.service @@ -163,6 +162,14 @@ fi %changelog +* Wed Feb 1 2017 Thomas Woerner - 6.29-1 +- Rebase to 6.29 (RHBZ#1351299) +- Fixes: + - Backport ipset capability to run in namespaces (RHBZ#1226051) + - Fix service save with empty ipset list and existing ipset save file + (RHBZ#1377621) + - Fix internal error at printing to output buffer (RHBZ#1395865) + * Wed Aug 17 2016 Thomas Woerner - 6.19-6 - Use /etc/sysconfig/ipset-config in service as EnvironmentFile (RHBZ#1136257) - Use /etc/sysconfig/ipset for data as in RHEL-6 (RHBZ#1136257)