From 128f2ce4adb3b8002efcea69f070e450bccd7378 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fb.com>
Date: May 14 2021 17:23:04 +0000
Subject: Add CAP_CHECKPOINT_RESTORE to capability.h for setpriv (#1960708)


---

diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec
index a53e178..108ec7b 100644
--- a/SPECS/util-linux.spec
+++ b/SPECS/util-linux.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.32.1
-Release: 27.1%{?dist}
+Release: 27.2%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -391,6 +391,12 @@ chfn and chsh utilities with dependence on libuser
 
 %prep
 %autosetup -p1 -Sgit -n %{name}-%{upstream_version}
+# Temporary hack for https://bugzilla.redhat.com/show_bug.cgi?id=1960708
+mkdir -p backported-includes/linux
+sed \
+  -e '/CAP_LAST_CAP/i#define CAP_CHECKPOINT_RESTORE 40' \
+  -e 's/CAP_LAST_CAP.*$/CAP_LAST_CAP CAP_CHECKPOINT_RESTORE/' \
+  /usr/include/linux/capability.h > backported-includes/linux/capability.h
 
 %build
 unset LINGUAS || :
@@ -401,7 +407,7 @@ unset LINGUAS || :
 # if we modify .po files by RHEL patches
 rm -f po/stamp*
 
-export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
+export CFLAGS="-I$PWD/backported-includes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
 export SUID_CFLAGS="-fpie"
 export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 export DAEMON_CFLAGS="$SUID_CFLAGS"
@@ -1074,7 +1080,10 @@ fi
 %{_libdir}/python*/site-packages/libmount/
 
 %changelog
-* Thu Apr 15 2021 Anita Zhang <anitazha@redhat.com> 2.32.1-27.1
+* Fri May 14 2021 Davide Cavalca <dcavalca@fb.com> 2.32.1-27.2
+- Add CAP_CHECKPOINT_RESTORE to capability.h for setpriv (#1960708)
+
+* Thu Apr 15 2021 Anita Zhang <anitazha@fb.com> 2.32.1-27.1
 - Backport https://github.com/karelzak/util-linux/commit/89f95425746e0371c033260c2bc0ef176eba6a37
   for setpriv --reset-env support
 - Remove FB kernel headers BuildRequires since RH kernel has them