From f5d629313c71cb3f1c3a938a52552d6f1694d06b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 11 Feb 2020 17:06:05 +0100
Subject: [PATCH 1/4] Update to version 1.2.7

---
 .gitignore          |   2 ++
 sources             |   3 ++-
 uid_wrapper.keyring | Bin 0 -> 3432 bytes
 uid_wrapper.spec    |  27 ++++++++++++++++++++++++---
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 uid_wrapper.keyring

diff --git a/.gitignore b/.gitignore
index 5dd1a57..74551c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /uid_wrapper-1.2.1.tar.gz
 /uid_wrapper-1.2.2.tar.gz
 /uid_wrapper-1.2.4.tar.gz
+/uid_wrapper-1.2.7.tar.gz
+/uid_wrapper-1.2.7.tar.gz.asc
diff --git a/sources b/sources
index eb47d36..aaf8e11 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (uid_wrapper-1.2.4.tar.gz) = 212b35f7d0655611c5bb7927e4e29049ce79a4e677805fa7154142dff559ddc6dd7117a4c94314b69e27c954ff03ef49470ed69e2405cf46b5958643c6021d3b
+SHA512 (uid_wrapper-1.2.7.tar.gz) = ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a
+SHA512 (uid_wrapper-1.2.7.tar.gz.asc) = 20f2e4b7a5b3dff2f479140a8cd143bec74a29fd3f4888ac96d7dff6c4a77d886a8cb28b065090890c4100b3cdc0fd9e2973a87259b8c3957df49c264c479e0a
diff --git a/uid_wrapper.keyring b/uid_wrapper.keyring
new file mode 100644
index 0000000000000000000000000000000000000000..411bf36750f0fc4a8856034415e39c7116559ee4
GIT binary patch
literal 3432
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
VTN!XODEjiKYZpn?3j8ay;a|;#Qj`Dy

literal 0
HcmV?d00001

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 5e3f864..79a82b3 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,16 +1,27 @@
 Name:           uid_wrapper
+<<<<<<< HEAD
 Version:        1.2.4
 Release:        5%{?dist}
+=======
+Version:        1.2.7
+Release:        1%{?dist}
+>>>>>>> d3e8eb2... Update to version 1.2.7
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
 Url:            http://cwrap.org/
 
 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
+Source1:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
+Source2:        uid_wrapper.keyring
 
 BuildRequires:  gcc
 BuildRequires:  cmake
-BuildRequires:  libcmocka-devel
+BuildRequires:  gnupg2
+BuildRequires:  libcmocka-devel >= 1.1.0
+
+Recommends:     cmake
+Recommends:     pkgconfig
 
 %description
 Some projects like a file server need privilege separation to be able to switch
@@ -27,7 +38,8 @@ This package doesn't have a devel package cause this project is for
 development/testing.
 
 %prep
-%setup -q
+gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%autosetup -p1
 
 %build
 if test ! -e "obj"; then
@@ -54,7 +66,8 @@ make test || cat $(find Testing -name "*.log")
 popd
 
 %files
-%doc AUTHORS README ChangeLog COPYING
+%doc AUTHORS README.md ChangeLog
+%license LICENSE
 %{_libdir}/libuid_wrapper.so*
 %dir %{_libdir}/cmake
 %dir %{_libdir}/cmake/uid_wrapper
@@ -65,6 +78,14 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Tue Feb 11 2020 Andreas Schneider <asn@redhat.com> - 1.2.7-1
+- Update to version 1.2.7
+  * Fix unsetting initial XIDs
+  * Fix manpage installation
+  * Fix cmake-config installation
+  * Fixed running with sanitizers
+- resolves: #1690028 - Allow running without RTLD_DEEPBIND
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 77bfb88cf7bf4b93cfc90765ec33feedf3f88ae0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 11 Feb 2020 17:10:16 +0100
Subject: [PATCH 2/4] Fix spec file

---
 uid_wrapper.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 79a82b3..584b657 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,11 +1,6 @@
 Name:           uid_wrapper
-<<<<<<< HEAD
-Version:        1.2.4
-Release:        5%{?dist}
-=======
 Version:        1.2.7
 Release:        1%{?dist}
->>>>>>> d3e8eb2... Update to version 1.2.7
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+

From 03a7488ddc0793db8c48c82c07b6301a44bbf05f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 12 Feb 2020 10:04:07 +0100
Subject: [PATCH 3/4] Fix invalid lib pkg-config lib path

resolves: #1801869
---
 0001-pkg-config-Fix-installation-path.patch | 23 +++++++++++++++++++++
 uid_wrapper.spec                            |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 0001-pkg-config-Fix-installation-path.patch

diff --git a/0001-pkg-config-Fix-installation-path.patch b/0001-pkg-config-Fix-installation-path.patch
new file mode 100644
index 0000000..e9bcfb0
--- /dev/null
+++ b/0001-pkg-config-Fix-installation-path.patch
@@ -0,0 +1,23 @@
+From 7b3211858d07cb93f89c1fd5eaa178f14e1f1968 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Wed, 12 Feb 2020 09:52:40 +0100
+Subject: [PATCH] pkg-config: Fix installation path
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ uid_wrapper.pc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/uid_wrapper.pc.cmake b/uid_wrapper.pc.cmake
+index c15d3be..7e0095c 100644
+--- a/uid_wrapper.pc.cmake
++++ b/uid_wrapper.pc.cmake
+@@ -1,4 +1,4 @@
+ Name: @PROJECT_NAME@
+ Description: The uid_wrapper library
+ Version: @PROJECT_VERSION@
+-Libs: @CMAKE_INSTALL_LIBDIR@/@UID_WRAPPER_LIB@
++Libs: @CMAKE_INSTALL_FULL_LIBDIR@/@UID_WRAPPER_LIB@
+-- 
+2.24.1
+
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 584b657..08d3966 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -10,6 +10,8 @@ Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 Source1:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
 Source2:        uid_wrapper.keyring
 
+Patch0:         0001-pkg-config-Fix-installation-path.patch
+
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  gnupg2
@@ -73,6 +75,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Wed Feb 12 2020 Andreas Schneider <asn@redhat.com> - 1.2.7-2
+- resolves: #1801869 - Fix invalid lib pkg-config lib path
+
 * Tue Feb 11 2020 Andreas Schneider <asn@redhat.com> - 1.2.7-1
 - Update to version 1.2.7
   * Fix unsetting initial XIDs

From 6ebd68036a876787e9fdaaa48bc9c4f68cca42a1 Mon Sep 17 00:00:00 2001
From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: Tue, 3 Mar 2020 10:31:17 +0100
Subject: [PATCH 4/4] Fix invalid library path in cmake configuration

Resolves: #1809275
---
 uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch | 6 ++++++
 uid_wrapper.spec                                           | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch

diff --git a/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch b/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch
new file mode 100644
index 0000000..d159122
--- /dev/null
+++ b/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch
@@ -0,0 +1,6 @@
+index 0a3e3fd..43ab1fa 100644
+--- a/uid_wrapper-config.cmake.in
++++ b/uid_wrapper-config.cmake.in
+@@ -1 +1 @@
+-set(UID_WRAPPER_LIBRARY @CMAKE_INSTALL_LIBDIR@/@UID_WRAPPER_LIB@)
++set(UID_WRAPPER_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@UID_WRAPPER_LIB@)
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 08d3966..1ddca27 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -11,6 +11,7 @@ Source1:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
 Source2:        uid_wrapper.keyring
 
 Patch0:         0001-pkg-config-Fix-installation-path.patch
+Patch1:         uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch
 
 BuildRequires:  gcc
 BuildRequires:  cmake
@@ -75,6 +76,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Tue Mar 03 2020 Anderson Sasaki <ansasaki@redhat.com> - 1.2.7-3
+- Fix invalid library path in cmake configuration file (bz#1809275)
+
 * Wed Feb 12 2020 Andreas Schneider <asn@redhat.com> - 1.2.7-2
 - resolves: #1801869 - Fix invalid lib pkg-config lib path