From 86837cc57aeff2bc77f7077c7cf7130ea4a31eb9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 26 2018 15:29:29 +0000
Subject: import ipset-6.38-3.el7_6


---

diff --git a/SOURCES/ipset.start-stop b/SOURCES/ipset.start-stop
index 6c84bd3..61178c1 100644
--- a/SOURCES/ipset.start-stop
+++ b/SOURCES/ipset.start-stop
@@ -104,9 +104,16 @@ load() {
 	chmod 600 "${merged}"
 	set +f
 	if [ -d ${IPSET_DATA_DIR} ]; then
+		# Copy the first lines of each saved set first, as they create
+		# the sets, then the rest: list:set entries depend on other
+		# sets, so make sure they all get created first
 		for f in ${IPSET_DATA_DIR}/*; do
 			[ "${f}" = "${IPSET_DATA_DIR}/*" ] && break
-			cat "${f}" >> ${merged}
+			head -n1 "${f}" >> ${merged}
+		done
+		for f in ${IPSET_DATA_DIR}/*; do
+			[ "${f}" = "${IPSET_DATA_DIR}/*" ] && break
+			tail -n +2 "${f}" >> ${merged}
 		done
 	fi
 	set -f
diff --git a/SPECS/ipset.spec b/SPECS/ipset.spec
index bbcf667..591672c 100644
--- a/SPECS/ipset.spec
+++ b/SPECS/ipset.spec
@@ -3,7 +3,7 @@
 
 Name:             ipset
 Version:          6.38
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Manage Linux IP sets
 
 License:          GPLv2
@@ -176,6 +176,9 @@ exit 0
 
 
 %changelog
+* Tue Nov 06 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-3
+- Fix loading of sets with dependencies on other sets (RHBZ#1646666)
+
 * Wed Jun 27 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-2
 - Fix upgrade and downgrade triggers in specfile (RHBZ#1594722)