From eaba4e06ceb1ceeb1873cf603133798ae171b558 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 7 Aug 2014 09:13:49 +0200
Subject: [PATCH 01/52] Fix building on rhel6 with bad %cmake macro.

---
 uid_wrapper.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 511c589..21619b1 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -37,6 +37,7 @@ fi
 pushd obj
 %cmake \
   -DUNIT_TESTING=ON \
+  -DCMAKE_SKIP_RPATH:BOOL=OFF \
   %{_builddir}/%{name}-%{version}
 
 make %{?_smp_mflags} VERBOSE=1
@@ -70,6 +71,7 @@ popd
 %changelog
 * Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
 - Handle lack of SYS_access on AArch64
+- Fix building on rhel6 with bad %cmake macro.
 
 * Thu Jul 31 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-1
 - Update to version 1.0.2.

From 3ad329c32b2e259b93896aaf0cc2bf046aa2b5db Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 7 Aug 2014 12:56:33 +0200
Subject: [PATCH 02/52] Use the cmake28 package in epel6.

---
 uid_wrapper.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 21619b1..b02f5ff 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -9,7 +9,7 @@ Url:            http://cwrap.org/
 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 Patch0:         aarch64-has-no-sys-access.patch
 
-BuildRequires:  cmake
+BuildRequires:  cmake28
 BuildRequires:  libcmocka-devel
 
 %description
@@ -35,7 +35,7 @@ if test ! -e "obj"; then
   mkdir obj
 fi
 pushd obj
-%cmake \
+%cmake28 \
   -DUNIT_TESTING=ON \
   -DCMAKE_SKIP_RPATH:BOOL=OFF \
   %{_builddir}/%{name}-%{version}
@@ -72,6 +72,7 @@ popd
 * Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
 - Handle lack of SYS_access on AArch64
 - Fix building on rhel6 with bad %cmake macro.
+- Use the cmake28 package in epel6.
 
 * Thu Jul 31 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-1
 - Update to version 1.0.2.

From 3eb5b8b8da07234d6786d51dec8bc0692c9e5c5e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 7 Aug 2014 12:58:51 +0200
Subject: [PATCH 03/52] Revert "Use the cmake28 package in epel6."

This reverts commit 3ad329c32b2e259b93896aaf0cc2bf046aa2b5db.
---
 uid_wrapper.spec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index b02f5ff..21619b1 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -9,7 +9,7 @@ Url:            http://cwrap.org/
 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 Patch0:         aarch64-has-no-sys-access.patch
 
-BuildRequires:  cmake28
+BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 
 %description
@@ -35,7 +35,7 @@ if test ! -e "obj"; then
   mkdir obj
 fi
 pushd obj
-%cmake28 \
+%cmake \
   -DUNIT_TESTING=ON \
   -DCMAKE_SKIP_RPATH:BOOL=OFF \
   %{_builddir}/%{name}-%{version}
@@ -72,7 +72,6 @@ popd
 * Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
 - Handle lack of SYS_access on AArch64
 - Fix building on rhel6 with bad %cmake macro.
-- Use the cmake28 package in epel6.
 
 * Thu Jul 31 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-1
 - Update to version 1.0.2.

From 738ded1c8ad58b808f58202eca47d3d9f98863e4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 7 Aug 2014 12:58:55 +0200
Subject: [PATCH 04/52] Revert "Fix building on rhel6 with bad %cmake macro."

This reverts commit eaba4e06ceb1ceeb1873cf603133798ae171b558.
---
 uid_wrapper.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 21619b1..511c589 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -37,7 +37,6 @@ fi
 pushd obj
 %cmake \
   -DUNIT_TESTING=ON \
-  -DCMAKE_SKIP_RPATH:BOOL=OFF \
   %{_builddir}/%{name}-%{version}
 
 make %{?_smp_mflags} VERBOSE=1
@@ -71,7 +70,6 @@ popd
 %changelog
 * Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
 - Handle lack of SYS_access on AArch64
-- Fix building on rhel6 with bad %cmake macro.
 
 * Thu Jul 31 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-1
 - Update to version 1.0.2.

From 7815ed353015e0a625a8baf4a62685cfc62fd3ef Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 06:49:33 +0000
Subject: [PATCH 05/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 511c589..0b00003 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -68,6 +68,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
 - Handle lack of SYS_access on AArch64
 

From 755e8e08d0066bcdb690488bb7ae86f8472e0844 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 2 Oct 2014 15:01:49 +0200
Subject: [PATCH 06/52] Do not own /usr/lib64/cmake.

resolves: #1146410
---
 uid_wrapper.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 0b00003..ecaaba2 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -59,7 +59,6 @@ popd
 %files
 %doc AUTHORS README ChangeLog COPYING
 %{_libdir}/libuid_wrapper.so*
-%dir %{_libdir}/cmake
 %dir %{_libdir}/cmake/uid_wrapper
 %{_libdir}/cmake/uid_wrapper/uid_wrapper-config-version.cmake
 %{_libdir}/cmake/uid_wrapper/uid_wrapper-config.cmake
@@ -68,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Thu Oct 02 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-4
+- resolves: #1146410 - Do not own /usr/lib64/cmake.
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From f79ed1c744293b5917b004154e41e26060250ad0 Mon Sep 17 00:00:00 2001
From: Michael Adam <madam@redhat.com>
Date: Mon, 15 Dec 2014 22:13:27 +0100
Subject: [PATCH 07/52] Fix format errors in changelog.

Signed-off-by: Michael Adam <madam@redhat.com>
---
 uid_wrapper.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index ecaaba2..ff085e8 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -67,7 +67,10 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
-* Thu Oct 02 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-4
+* Mon Dec 15 2014 Michael Adam <madam@redhat.com> - 1.0.2-5
+- Fix format errors in changelog.
+
+* Thu Oct 02 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-4
 - resolves: #1146410 - Do not own /usr/lib64/cmake.
 
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-3
@@ -76,26 +79,26 @@ popd
 * Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
 - Handle lack of SYS_access on AArch64
 
-* Thu Jul 31 2014 - Andreas Schneider <asn@redhat.com> - 1.0.2-1
+* Thu Jul 31 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-1
 - Update to version 1.0.2.
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Tue Mar 11 2014 - Andreas Schneider <asn@redhat.com> - 1.0.1-3
+* Tue Mar 11 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-3
 - Fix some typos.
 - resolves: #1060910 - Fedora import
 
-* Tue Feb 11 2014 - Andreas Schneider <asn@redhat.com> - 1.0.1-2
+* Tue Feb 11 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-2
 - Remove Group
 - Remove glibc-devel build requirement
 - Do not create a subpackage.
 
-* Tue Feb 04 2014 - Andreas Schneider <asn@redhat.com> - 1.0.1-1
+* Tue Feb 04 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-1
 - Update to version 1.0.1
   * Added --libs to pkg-config.
   * Added socket_wrapper-config.cmake
   * Fixed a bug packaging the obj directory.
 
-* Mon Feb 03 2014 - Andreas Schneider <asn@redhat.com> - 1.0.0-1
+* Mon Feb 03 2014 Andreas Schneider <asn@redhat.com> - 1.0.0-1
 - Initial version 1.0.0

From 18d6c1a637e498c26856f5a913494ba5dc62b338 Mon Sep 17 00:00:00 2001
From: Michael Adam <madam@redhat.com>
Date: Mon, 15 Dec 2014 22:40:13 +0100
Subject: [PATCH 08/52] Require cmake, to not have directory _libdir/cmake
 without owner

Reviewed-by: Michael Adam <madam@redhat.com>
---
 uid_wrapper.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index ff085e8..2b78975 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -12,6 +12,8 @@ Patch0:         aarch64-has-no-sys-access.patch
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 
+Requires:       cmake
+
 %description
 Some projects like a file server need privilege separation to be able to switch
 to the connection user and do file operations. uid_wrapper convincingly lies
@@ -69,6 +71,7 @@ popd
 %changelog
 * Mon Dec 15 2014 Michael Adam <madam@redhat.com> - 1.0.2-5
 - Fix format errors in changelog.
+- Require cmake.
 
 * Thu Oct 02 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-4
 - resolves: #1146410 - Do not own /usr/lib64/cmake.

From 58ff6dd9f2be140c7ab583539c3c8f69d6abb3e6 Mon Sep 17 00:00:00 2001
From: Michael Adam <madam@redhat.com>
Date: Mon, 15 Dec 2014 22:17:00 +0100
Subject: [PATCH 09/52] Don't own _libdir/pkgconfig and require pkgconfig
 instead.

Reviewed-by: Michael Adam <madam@redhat.com>
---
 uid_wrapper.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 2b78975..3b179d5 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -13,6 +13,7 @@ BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 
 Requires:       cmake
+Requires:       pkgconfig
 
 %description
 Some projects like a file server need privilege separation to be able to switch
@@ -64,7 +65,6 @@ popd
 %dir %{_libdir}/cmake/uid_wrapper
 %{_libdir}/cmake/uid_wrapper/uid_wrapper-config-version.cmake
 %{_libdir}/cmake/uid_wrapper/uid_wrapper-config.cmake
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/uid_wrapper.pc
 %{_mandir}/man1/uid_wrapper.1*
 
@@ -72,6 +72,7 @@ popd
 * Mon Dec 15 2014 Michael Adam <madam@redhat.com> - 1.0.2-5
 - Fix format errors in changelog.
 - Require cmake.
+- Don't own _libdir/pkgconfig, and require pkgconfig instead.
 
 * Thu Oct 02 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-4
 - resolves: #1146410 - Do not own /usr/lib64/cmake.

From d87926c9220422b4a386324685103ababba3e47c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 21 Jan 2015 13:52:25 +0100
Subject: [PATCH 10/52] Update to version 1.1.0

---
 .gitignore                      |  1 +
 aarch64-has-no-sys-access.patch | 15 ---------------
 sources                         |  2 +-
 uid_wrapper.spec                |  9 +++++----
 4 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 aarch64-has-no-sys-access.patch

diff --git a/.gitignore b/.gitignore
index dffae94..1082de1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /uid_wrapper-1.0.1.tar.gz
 /uid_wrapper-1.0.2.tar.gz
+/uid_wrapper-1.1.0.tar.gz
diff --git a/aarch64-has-no-sys-access.patch b/aarch64-has-no-sys-access.patch
deleted file mode 100644
index 9e0cae7..0000000
--- a/aarch64-has-no-sys-access.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: uid_wrapper-1.0.2/tests/testsuite.c
-===================================================================
---- uid_wrapper-1.0.2.orig/tests/testsuite.c
-+++ uid_wrapper-1.0.2/tests/testsuite.c
-@@ -198,8 +198,10 @@ static void test_uwrap_syscall(void **st
- 	rc = access(".", R_OK);
- 	assert_int_equal(rc, 0);
- 
-+#ifdef SYS_access
- 	rc = syscall(SYS_access, ".", R_OK);
- 	assert_int_equal(rc, 0);
-+#endif
- 
- 	ZERO_STRUCT(tv1);
- 	ZERO_STRUCT(tv2);
diff --git a/sources b/sources
index 0aadc5b..7289e50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fb6b12fa2f0dd918f2d5ad90e60014f  uid_wrapper-1.0.2.tar.gz
+097385bb018d4f3e521a176e9e6d3f07  uid_wrapper-1.1.0.tar.gz
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 3b179d5..1e1f172 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,13 +1,12 @@
 Name:           uid_wrapper
-Version:        1.0.2
-Release:        5%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
 Url:            http://cwrap.org/
 
 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
-Patch0:         aarch64-has-no-sys-access.patch
 
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
@@ -31,7 +30,6 @@ development/testing.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 if test ! -e "obj"; then
@@ -69,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Wed Jan 21 2015 Andreas Schneider <asn@redhat.com> - 1.1.0-1
+- Update to version 1.1.0
+
 * Mon Dec 15 2014 Michael Adam <madam@redhat.com> - 1.0.2-5
 - Fix format errors in changelog.
 - Require cmake.

From 8145165173aef96071f101f7609a9e29703a0b09 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 01:28:53 +0000
Subject: [PATCH 11/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 1e1f172..13266e6 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -67,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Wed Jan 21 2015 Andreas Schneider <asn@redhat.com> - 1.1.0-1
 - Update to version 1.1.0
 

From 630ecda9f317e1020ea24a03f49b2f552f04c517 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 2 Sep 2015 14:04:24 +0200
Subject: [PATCH 12/52] Update to version 1.1.1

---
 .gitignore       | 1 +
 sources          | 2 +-
 uid_wrapper.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1082de1..6b9ea66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /uid_wrapper-1.0.1.tar.gz
 /uid_wrapper-1.0.2.tar.gz
 /uid_wrapper-1.1.0.tar.gz
+/uid_wrapper-1.1.1.tar.gz
diff --git a/sources b/sources
index 7289e50..9812371 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-097385bb018d4f3e521a176e9e6d3f07  uid_wrapper-1.1.0.tar.gz
+ea0a3917db8bd48cebf10f518d8bbb96  uid_wrapper-1.1.1.tar.gz
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 13266e6..6b17100 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -67,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Wed Sep 02 2015 Andreas Schneider <asn@redhat.com> - 1.1.1-1
+- Update to version 1.1.1
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 7cd1177e2fee948dc126613f22cf70305ef9ffbd Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 29 Oct 2015 13:58:25 +0100
Subject: [PATCH 13/52] Update to version 1.2.0

---
 .gitignore       | 1 +
 sources          | 2 +-
 uid_wrapper.spec | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6b9ea66..f16c8ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /uid_wrapper-1.0.2.tar.gz
 /uid_wrapper-1.1.0.tar.gz
 /uid_wrapper-1.1.1.tar.gz
+/uid_wrapper-1.2.0.tar.gz
diff --git a/sources b/sources
index 9812371..30a3318 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea0a3917db8bd48cebf10f518d8bbb96  uid_wrapper-1.1.1.tar.gz
+8d75bb77e1f9d6e17d400e78b18bbf30  uid_wrapper-1.2.0.tar.gz
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 6b17100..8377dfd 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,5 +1,5 @@
 Name:           uid_wrapper
-Version:        1.1.1
+Version:        1.2.0
 Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
@@ -67,6 +67,12 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Thu Oct 29 2015 Andreas Schneider <asn@redhat.com> - 1.2.0-1
+- Update to version 1.2.0
+  * Added privilege checks for all set*uid and set*gid functions.
+  * Added a lot more and accurate tests which work as root.
+  * Fixed some minor issues
+
 * Wed Sep 02 2015 Andreas Schneider <asn@redhat.com> - 1.1.1-1
 - Update to version 1.1.1
 

From e67ff82ad3ed3ee9fcf79f5d0d17b69b67b51251 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 02:17:07 +0000
Subject: [PATCH 14/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 8377dfd..d332908 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -67,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Thu Oct 29 2015 Andreas Schneider <asn@redhat.com> - 1.2.0-1
 - Update to version 1.2.0
   * Added privilege checks for all set*uid and set*gid functions.

From 586b66ef77a3e111cd6776ce93074b7df1bfe511 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 23 Mar 2016 09:39:16 +0100
Subject: [PATCH 15/52] Update to version 1.2.1

---
 .gitignore       |  1 +
 sources          |  2 +-
 uid_wrapper.spec | 11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f16c8ca..2eb3c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /uid_wrapper-1.1.0.tar.gz
 /uid_wrapper-1.1.1.tar.gz
 /uid_wrapper-1.2.0.tar.gz
+/uid_wrapper-1.2.1.tar.gz
diff --git a/sources b/sources
index 30a3318..93e98d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d75bb77e1f9d6e17d400e78b18bbf30  uid_wrapper-1.2.0.tar.gz
+7068033341c3d6a883066d45dc4dcd26  uid_wrapper-1.2.1.tar.gz
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index d332908..2e14447 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -54,7 +54,7 @@ popd
 
 %check
 pushd obj
-make test
+make test || cat $(find Testing -name "*.log")
 popd
 
 %files
@@ -67,6 +67,11 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Wed Mar 23 2016 Andreas Schneider <asn@redhat.com> - 1.2.1-1
+- Update to version 1.2.1
+  * Documented missing options.
+  * Fixed a comipilation issue with -O3.
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 88db6139ef0e1513f36bd846123b23f2e64e61bc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 16:39:34 +0000
Subject: [PATCH 16/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 2e14447..01813be 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -67,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Wed Mar 23 2016 Andreas Schneider <asn@redhat.com> - 1.2.1-1
 - Update to version 1.2.1
   * Documented missing options.

From 0632840831954dacdf595388b59a65b8fc206b69 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 27 Jun 2017 11:23:18 +0200
Subject: [PATCH 17/52] drop requirements on cmake, pkgconfig

Instead, own the directories for the files augmenting these packages.

https://fedoraproject.org/wiki/Packaging:Guidelines#The_directory_is_owned_by_a_package_which_is_not_required_for_your_package_to_function
---
 uid_wrapper.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 01813be..d6d6c15 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -11,9 +11,6 @@ Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 
-Requires:       cmake
-Requires:       pkgconfig
-
 %description
 Some projects like a file server need privilege separation to be able to switch
 to the connection user and do file operations. uid_wrapper convincingly lies
@@ -60,13 +57,19 @@ popd
 %files
 %doc AUTHORS README ChangeLog COPYING
 %{_libdir}/libuid_wrapper.so*
+%dir %{_libdir}/cmake
 %dir %{_libdir}/cmake/uid_wrapper
 %{_libdir}/cmake/uid_wrapper/uid_wrapper-config-version.cmake
 %{_libdir}/cmake/uid_wrapper/uid_wrapper-config.cmake
+%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/uid_wrapper.pc
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Tue Jun 27 2017 Nils Philippsen <nils@redhat.com> - 1.2.1-3
+- drop requirements on cmake, pkgconfig and rather own the directories for the
+  files augmenting these packages
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From c716037bba15948f7e533845549122af9b02aff7 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 13 Jul 2017 12:54:08 +0200
Subject: [PATCH 18/52] Update to version 1.2.2:

---
 .gitignore       | 1 +
 sources          | 2 +-
 uid_wrapper.spec | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2eb3c3c..21956bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /uid_wrapper-1.1.1.tar.gz
 /uid_wrapper-1.2.0.tar.gz
 /uid_wrapper-1.2.1.tar.gz
+/uid_wrapper-1.2.2.tar.gz
diff --git a/sources b/sources
index 93e98d2..5278931 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7068033341c3d6a883066d45dc4dcd26  uid_wrapper-1.2.1.tar.gz
+SHA512 (uid_wrapper-1.2.2.tar.gz) = a93bbf01cdbc77026b38183c7809aafb28b75ed7b92e311260d6ed86977f228cc6f01ce26e03d40bd7062cd04bcc24fd6718e45b388fe66caf32b8f64bfdb27f
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index d6d6c15..5ac94a5 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -66,6 +66,11 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Thu Jul 13 2017 Andreas Schneider <asn@redhat.com> - 1.2.2-1
+- Update to version 1.2.2:
+  * Added support for fork'ed and then exec'ed processes
+  * Added support for Alpha
+
 * Tue Jun 27 2017 Nils Philippsen <nils@redhat.com> - 1.2.1-3
 - drop requirements on cmake, pkgconfig and rather own the directories for the
   files augmenting these packages

From a080e16eb8a7fcc8e6c8e55c002db27f4a7a26fc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 20:55:35 +0000
Subject: [PATCH 19/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 5ac94a5..dfc316d 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -66,6 +66,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Thu Jul 13 2017 Andreas Schneider <asn@redhat.com> - 1.2.2-1
 - Update to version 1.2.2:
   * Added support for fork'ed and then exec'ed processes

From 6ca59d76f2c3f304448ac93d939a4a56046b5f45 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 31 Jul 2017 17:45:39 +0200
Subject: [PATCH 20/52] Update to version 1.2.4

---
 .gitignore       |  1 +
 sources          |  2 +-
 uid_wrapper.spec | 12 ++++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21956bf..5dd1a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /uid_wrapper-1.2.0.tar.gz
 /uid_wrapper-1.2.1.tar.gz
 /uid_wrapper-1.2.2.tar.gz
+/uid_wrapper-1.2.4.tar.gz
diff --git a/sources b/sources
index 5278931..eb47d36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uid_wrapper-1.2.2.tar.gz) = a93bbf01cdbc77026b38183c7809aafb28b75ed7b92e311260d6ed86977f228cc6f01ce26e03d40bd7062cd04bcc24fd6718e45b388fe66caf32b8f64bfdb27f
+SHA512 (uid_wrapper-1.2.4.tar.gz) = 212b35f7d0655611c5bb7927e4e29049ce79a4e677805fa7154142dff559ddc6dd7117a4c94314b69e27c954ff03ef49470ed69e2405cf46b5958643c6021d3b
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index dfc316d..d9f99e8 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -66,6 +66,14 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Mon Jul 31 2017 Andreas Schneider <asn@redhat.com> - 1.2.4-1
+- Update to version 1.2.4
+  * Added deadlock workaround for glibc < 2.24
+  * Fixed a possible deadlock bug if uid_wrapper is turned off
+  * Logging is always turned on now
+  * Fixed a memory leak
+  * Limited number of groups during fork+exec
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From b741e9fb27f2ee5472d59c92c0807efd752485f0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 19:56:04 +0000
Subject: [PATCH 21/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index d9f99e8..566f04b 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -66,6 +66,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Mon Jul 31 2017 Andreas Schneider <asn@redhat.com> - 1.2.4-1
 - Update to version 1.2.4
   * Added deadlock workaround for glibc < 2.24

From 987476009afe32c28b062225acbcfbb23b840475 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Mon, 9 Jul 2018 19:06:52 +0200
Subject: [PATCH 22/52] add BuildRequires: gcc

Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
---
 uid_wrapper.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 566f04b..7ce6f11 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -8,6 +8,7 @@ Url:            http://cwrap.org/
 
 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 
+BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 

From dfc97f4502b6fec008fd5dc1fc64959187f5e7ec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 08:10:52 +0000
Subject: [PATCH 23/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 7ce6f11..90bdd31 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -67,6 +67,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 41c2def7f758c69c4d7e791fdfca58b508543655 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:41:14 +0100
Subject: [PATCH 24/52] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 uid_wrapper.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 90bdd31..6d82176 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -46,9 +46,7 @@ pushd obj
 make DESTDIR=%{buildroot} install
 popd
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %check
 pushd obj

From 71a5be22d68e79041920cd9585dc191db6232f8a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 10:43:30 +0000
Subject: [PATCH 25/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 6d82176..c43e664 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -65,6 +65,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From a78d8cdcf291d0667b4ca2216946dfe402cbda18 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 02:23:48 +0000
Subject: [PATCH 26/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index c43e664..5e3f864 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -65,6 +65,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 548c022a72f75af9fbca12a691493ed112765801 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 02:30:45 +0000
Subject: [PATCH 27/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 5e3f864..8bf4a78 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -65,6 +65,9 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * 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 d3e8eb2dc972bd5ca19741042f03275aa8577b11 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 11 Feb 2020 17:06:05 +0100
Subject: [PATCH 28/52] Update to version 1.2.7

---
 .gitignore          |   2 ++
 sources             |   3 ++-
 uid_wrapper.keyring | Bin 0 -> 3432 bytes
 uid_wrapper.spec    |  26 +++++++++++++++++++++-----
 4 files changed, 25 insertions(+), 6 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 8bf4a78..b8a6e6f 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,16 +1,22 @@
 Name:           uid_wrapper
-Version:        1.2.4
-Release:        6%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 
 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 +33,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 +61,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 +73,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
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From e0a8453ad922b6164feb444b1776bb4414ba9919 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 12 Feb 2020 10:04:07 +0100
Subject: [PATCH 29/52] 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 b8a6e6f..d9b9997 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 757c5efdf2ab895e4decef0ea5115a15a32d7629 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 30/52] 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 d9b9997..b658ec4 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
 

From f5c569a098849563dd6130bff1b3639c1a1c3a9f Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Wed, 8 Jul 2020 16:44:28 +0200
Subject: [PATCH 31/52] Improve compatibility with new CMake macro

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 uid_wrapper.spec | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index b658ec4..dca6d0b 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -40,28 +40,17 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %autosetup -p1
 
 %build
-if test ! -e "obj"; then
-  mkdir obj
-fi
-pushd obj
 %cmake \
-  -DUNIT_TESTING=ON \
-  %{_builddir}/%{name}-%{version}
-
-make %{?_smp_mflags} VERBOSE=1
-popd
+  -DUNIT_TESTING=ON
+%cmake_build
 
 %install
-pushd obj
-make DESTDIR=%{buildroot} install
-popd
+%cmake_install
 
 %ldconfig_scriptlets
 
 %check
-pushd obj
-make test || cat $(find Testing -name "*.log")
-popd
+%ctest
 
 %files
 %doc AUTHORS README.md ChangeLog

From 8c7488d20d2aa3f29699b2b3ff1415851491f14f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 13:13:38 +0000
Subject: [PATCH 32/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index dca6d0b..3c34fc6 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -65,6 +65,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Mar 03 2020 Anderson Sasaki <ansasaki@redhat.com> - 1.2.7-3
 - Fix invalid library path in cmake configuration file (bz#1809275)
 

From e1ee9f02ab0561b0e66a74ab29708c47c6801a61 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 22:36:57 +0000
Subject: [PATCH 33/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 3c34fc6..7d8bf62 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -65,6 +65,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 059dd3b4cc7d6ff54e694ccf18f3617feefaa557 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 19 Apr 2021 15:59:17 +0200
Subject: [PATCH 34/52] Update to version 1.2.8

---
 .gitignore                                    |  2 ++
 0001-pkg-config-Fix-installation-path.patch   | 23 -------------------
 sources                                       |  4 ++--
 ...7-cmake-config-fix-installation-path.patch |  6 -----
 uid_wrapper.spec                              | 11 +++++----
 5 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 0001-pkg-config-Fix-installation-path.patch
 delete mode 100644 uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch

diff --git a/.gitignore b/.gitignore
index 74551c9..e56c28a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /uid_wrapper-1.2.4.tar.gz
 /uid_wrapper-1.2.7.tar.gz
 /uid_wrapper-1.2.7.tar.gz.asc
+/uid_wrapper-1.2.8.tar.gz.asc
+/uid_wrapper-1.2.8.tar.gz
diff --git a/0001-pkg-config-Fix-installation-path.patch b/0001-pkg-config-Fix-installation-path.patch
deleted file mode 100644
index e9bcfb0..0000000
--- a/0001-pkg-config-Fix-installation-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/sources b/sources
index aaf8e11..a868637 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uid_wrapper-1.2.7.tar.gz) = ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a
-SHA512 (uid_wrapper-1.2.7.tar.gz.asc) = 20f2e4b7a5b3dff2f479140a8cd143bec74a29fd3f4888ac96d7dff6c4a77d886a8cb28b065090890c4100b3cdc0fd9e2973a87259b8c3957df49c264c479e0a
+SHA512 (uid_wrapper-1.2.8.tar.gz.asc) = 831c55c0f93acde9a0342c974879bd3d484d8e930a38c752844b7a3000e7b875ec84085f2c1c620546ae563164f22a0b76b2eb6357121b0c239ae0beaf080ab0
+SHA512 (uid_wrapper-1.2.8.tar.gz) = 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
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
deleted file mode 100644
index d159122..0000000
--- a/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-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 7d8bf62..a70135a 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.2.7
-Release:        5%{?dist}
+Version:        1.2.8
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -10,9 +10,6 @@ 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
-Patch1:         uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch
-
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  gnupg2
@@ -65,6 +62,10 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Mon Apr 19 2021 Andreas Schneider <asn@redhat.com> - 1.2.8-1
+- Update to version 1.2.8
+  o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.2.8/ChangeLog
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 1949b202b505705d9483d61e369b62019a47caa3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 19:58:48 +0000
Subject: [PATCH 35/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index a70135a..c3b4eaa 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -62,6 +62,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Apr 19 2021 Andreas Schneider <asn@redhat.com> - 1.2.8-1
 - Update to version 1.2.8
   o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.2.8/ChangeLog

From 09a20e3b47920606964dcb6d7464f468c0d3a34d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 2 Dec 2021 14:54:25 +0100
Subject: [PATCH 36/52] Rebase to version 1.2.9

---
 .gitignore       | 2 ++
 sources          | 4 ++--
 uid_wrapper.spec | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e56c28a..adeee05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /uid_wrapper-1.2.7.tar.gz.asc
 /uid_wrapper-1.2.8.tar.gz.asc
 /uid_wrapper-1.2.8.tar.gz
+/uid_wrapper-1.2.9.tar.gz
+/uid_wrapper-1.2.9.tar.gz.asc
diff --git a/sources b/sources
index a868637..f94256b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uid_wrapper-1.2.8.tar.gz.asc) = 831c55c0f93acde9a0342c974879bd3d484d8e930a38c752844b7a3000e7b875ec84085f2c1c620546ae563164f22a0b76b2eb6357121b0c239ae0beaf080ab0
-SHA512 (uid_wrapper-1.2.8.tar.gz) = 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
+SHA512 (uid_wrapper-1.2.9.tar.gz) = 561dd8d5b139020f47a908e6baca9197d46f6192c280c23f85fad80fcac3fffb2823200777b0f353f79949cfb45b7dcc21b9a585a4bc21b26632b0e0df11d825
+SHA512 (uid_wrapper-1.2.9.tar.gz.asc) = cbb964c51c510e071a3a6224bb86e07816a40bf215c8acc5a244f853842df702e879f59a154ed140d90e2f1c9957212edfc8369a7121329cc35aa8874b600794
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index c3b4eaa..6846460 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.2.8
-Release:        2%{?dist}
+Version:        1.2.9
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -62,6 +62,10 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Thu Dec 02 2021 Andreas Schneider <asn@redhat.com> - 1.2.9-1
+- Rebase to version 1.2.9
+- resolves: rhbz#2021214 - Add support for getgroups_chk()
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 953b7d23c78456967c9a462edca7c20d84c61487 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 03:27:49 +0000
Subject: [PATCH 37/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 6846460..285da20 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -62,6 +62,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Dec 02 2021 Andreas Schneider <asn@redhat.com> - 1.2.9-1
 - Rebase to version 1.2.9
 - resolves: rhbz#2021214 - Add support for getgroups_chk()

From 54048dd483e592c1945489bf911a3dc0caa80011 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 11:19:40 +0000
Subject: [PATCH 38/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 285da20..8adb3c8 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.2.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -62,6 +62,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From bda9434ce57460900012b5ccc3d8231bf9e6e461 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 17 Jan 2023 15:02:48 +0100
Subject: [PATCH 39/52] Update to version 1.3.0

---
 .gitignore       |  2 ++
 sources          |  4 ++--
 uid_wrapper.spec | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index adeee05..0598ce8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /uid_wrapper-1.2.8.tar.gz
 /uid_wrapper-1.2.9.tar.gz
 /uid_wrapper-1.2.9.tar.gz.asc
+/uid_wrapper-1.3.0.tar.gz
+/uid_wrapper-1.3.0.tar.gz.asc
diff --git a/sources b/sources
index f94256b..21bf0cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uid_wrapper-1.2.9.tar.gz) = 561dd8d5b139020f47a908e6baca9197d46f6192c280c23f85fad80fcac3fffb2823200777b0f353f79949cfb45b7dcc21b9a585a4bc21b26632b0e0df11d825
-SHA512 (uid_wrapper-1.2.9.tar.gz.asc) = cbb964c51c510e071a3a6224bb86e07816a40bf215c8acc5a244f853842df702e879f59a154ed140d90e2f1c9957212edfc8369a7121329cc35aa8874b600794
+SHA512 (uid_wrapper-1.3.0.tar.gz) = a66515b701882cf8ac62c6aae719eb07a46b852ecfd5274c7a1f038b066db85fbc0cdf4fff2c79e7b1e45d08622cd90884498f668fe479989e47e79ecd932095
+SHA512 (uid_wrapper-1.3.0.tar.gz.asc) = d6b4178749249ee2bcacb85d9aa767e4b1d07e3cfcae1376745ea7559818af3716a9ccb8731cd24c3acd1a3ff419a6814d6a0e9c65d3a31b4cefbc314a81554e
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 8adb3c8..7f44f64 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
-Version:        1.2.9
-Release:        3%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -50,7 +50,7 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %ctest
 
 %files
-%doc AUTHORS README.md ChangeLog
+%doc AUTHORS README.md CHANGELOG
 %license LICENSE
 %{_libdir}/libuid_wrapper.so*
 %dir %{_libdir}/cmake
@@ -62,6 +62,10 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Tue Jan 17 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-1
+- Update to version 1.3.0
+  o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.3.0/CHANGELOG
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 80c043d9070e0a4f5df8486a72e2c94c45185389 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 05:45:00 +0000
Subject: [PATCH 40/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 7f44f64..34c4847 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
@@ -62,6 +62,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Jan 17 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-1
 - Update to version 1.3.0
   o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.3.0/CHANGELOG

From 284272133bd9dc398e4561fe64876d28c7400fc0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 27 Feb 2023 10:35:24 +0100
Subject: [PATCH 41/52] Fix building with cmocka >= 1.1.6

---
 uid_wrapper-fix-cmocka-1.1.6+-support.patch | 31 +++++++++++++++++++++
 uid_wrapper.spec                            |  7 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 uid_wrapper-fix-cmocka-1.1.6+-support.patch

diff --git a/uid_wrapper-fix-cmocka-1.1.6+-support.patch b/uid_wrapper-fix-cmocka-1.1.6+-support.patch
new file mode 100644
index 0000000..58184b4
--- /dev/null
+++ b/uid_wrapper-fix-cmocka-1.1.6+-support.patch
@@ -0,0 +1,31 @@
+From 850f24c6366abda30bfd77734b90330b8809d306 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 17 Feb 2023 17:51:27 +0100
+Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
+---
+ tests/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 635e86e..68e050e 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ project(tests C)
+ 
++if (TARGET cmocka::cmocka)
++    set(CMOCKA_LIBRARY cmocka::cmocka)
++endif()
++
+ add_library(uwrap_fake_socket_wrapper SHARED uwrap_fake_socket_wrapper.c)
+ target_compile_options(uwrap_fake_socket_wrapper
+                        PRIVATE
+-- 
+2.39.2
+
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 34c4847..3cc1bad 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?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:         uid_wrapper-fix-cmocka-1.1.6+-support.patch
+
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  gnupg2
@@ -62,6 +64,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Mon Feb 27 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-3
+- Fix building with cmocka >= 1.1.6
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From e5d7f1583716d5e8f08bf21379860325e61c4500 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 6 Mar 2023 19:46:01 +0100
Subject: [PATCH 42/52] Update License to SPDX expression

---
 uid_wrapper.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 3cc1bad..28d93e8 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,9 +1,9 @@
 Name:           uid_wrapper
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        A wrapper for privilege separation
-License:        GPLv3+
+License:        GPL-3.0-or-later
 Url:            http://cwrap.org/
 
 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
@@ -35,7 +35,7 @@ This package doesn't have a devel package cause this project is for
 development/testing.
 
 %prep
-gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 %build
@@ -64,6 +64,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Mon Mar 06 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-4
+- Update License to SPDX expression
+
 * Mon Feb 27 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-3
 - Fix building with cmocka >= 1.1.6
 

From ea6ebb3c74916d40ec120b67e53da003d30e7388 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 17:03:03 +0000
Subject: [PATCH 43/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 28d93e8..b99bd3b 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPL-3.0-or-later
@@ -64,6 +64,9 @@ development/testing.
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Mon Mar 06 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-4
 - Update License to SPDX expression
 

From 55339606afb8966dcca68ff408fc87546900afe5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 07:02:58 +0000
Subject: [PATCH 44/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 uid_wrapper.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index b99bd3b..921e3f2 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        A wrapper for privilege separation
 License:        GPL-3.0-or-later
@@ -64,6 +64,9 @@ development/testing.
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 603bc5a8c28710f598f70e1c487ac3b747dd535f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 13 Jun 2024 08:16:28 +0200
Subject: [PATCH 45/52] Convert to %autorelease and %autochangelog

[skip changelog]
---
 changelog        | 154 ++++++++++++++++++++++++++++++++++++++++++++++
 uid_wrapper.spec | 157 +----------------------------------------------
 2 files changed, 156 insertions(+), 155 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..0f6fdab
--- /dev/null
+++ b/changelog
@@ -0,0 +1,154 @@
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Mar 06 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-4
+- Update License to SPDX expression
+
+* Mon Feb 27 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-3
+- Fix building with cmocka >= 1.1.6
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 17 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-1
+- Update to version 1.3.0
+  o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.3.0/CHANGELOG
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 02 2021 Andreas Schneider <asn@redhat.com> - 1.2.9-1
+- Rebase to version 1.2.9
+- resolves: rhbz#2021214 - Add support for getgroups_chk()
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Apr 19 2021 Andreas Schneider <asn@redhat.com> - 1.2.8-1
+- Update to version 1.2.8
+  o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.2.8/ChangeLog
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* 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
+
+* 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
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jul 31 2017 Andreas Schneider <asn@redhat.com> - 1.2.4-1
+- Update to version 1.2.4
+  * Added deadlock workaround for glibc < 2.24
+  * Fixed a possible deadlock bug if uid_wrapper is turned off
+  * Logging is always turned on now
+  * Fixed a memory leak
+  * Limited number of groups during fork+exec
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 13 2017 Andreas Schneider <asn@redhat.com> - 1.2.2-1
+- Update to version 1.2.2:
+  * Added support for fork'ed and then exec'ed processes
+  * Added support for Alpha
+
+* Tue Jun 27 2017 Nils Philippsen <nils@redhat.com> - 1.2.1-3
+- drop requirements on cmake, pkgconfig and rather own the directories for the
+  files augmenting these packages
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Mar 23 2016 Andreas Schneider <asn@redhat.com> - 1.2.1-1
+- Update to version 1.2.1
+  * Documented missing options.
+  * Fixed a comipilation issue with -O3.
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Oct 29 2015 Andreas Schneider <asn@redhat.com> - 1.2.0-1
+- Update to version 1.2.0
+  * Added privilege checks for all set*uid and set*gid functions.
+  * Added a lot more and accurate tests which work as root.
+  * Fixed some minor issues
+
+* Wed Sep 02 2015 Andreas Schneider <asn@redhat.com> - 1.1.1-1
+- Update to version 1.1.1
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jan 21 2015 Andreas Schneider <asn@redhat.com> - 1.1.0-1
+- Update to version 1.1.0
+
+* Mon Dec 15 2014 Michael Adam <madam@redhat.com> - 1.0.2-5
+- Fix format errors in changelog.
+- Require cmake.
+- Don't own _libdir/pkgconfig, and require pkgconfig instead.
+
+* Thu Oct 02 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-4
+- resolves: #1146410 - Do not own /usr/lib64/cmake.
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
+- Handle lack of SYS_access on AArch64
+
+* Thu Jul 31 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-1
+- Update to version 1.0.2.
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 11 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-3
+- Fix some typos.
+- resolves: #1060910 - Fedora import
+
+* Tue Feb 11 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-2
+- Remove Group
+- Remove glibc-devel build requirement
+- Do not create a subpackage.
+
+* Tue Feb 04 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-1
+- Update to version 1.0.1
+  * Added --libs to pkg-config.
+  * Added socket_wrapper-config.cmake
+  * Fixed a bug packaging the obj directory.
+
+* Mon Feb 03 2014 Andreas Schneider <asn@redhat.com> - 1.0.0-1
+- Initial version 1.0.0
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 921e3f2..9ba5ca8 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           uid_wrapper
 Version:        1.3.0
-Release:        6%{?dist}
+Release:        %autorelease
 
 Summary:        A wrapper for privilege separation
 License:        GPL-3.0-or-later
@@ -64,157 +64,4 @@ development/testing.
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Mar 06 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-4
-- Update License to SPDX expression
-
-* Mon Feb 27 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-3
-- Fix building with cmocka >= 1.1.6
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 17 2023 Andreas Schneider <asn@redhat.com> - 1.3.0-1
-- Update to version 1.3.0
-  o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.3.0/CHANGELOG
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Dec 02 2021 Andreas Schneider <asn@redhat.com> - 1.2.9-1
-- Rebase to version 1.2.9
-- resolves: rhbz#2021214 - Add support for getgroups_chk()
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Apr 19 2021 Andreas Schneider <asn@redhat.com> - 1.2.8-1
-- Update to version 1.2.8
-  o https://gitlab.com/cwrap/uid_wrapper/-/blob/uid_wrapper-1.2.8/ChangeLog
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* 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
-
-* 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
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jul 31 2017 Andreas Schneider <asn@redhat.com> - 1.2.4-1
-- Update to version 1.2.4
-  * Added deadlock workaround for glibc < 2.24
-  * Fixed a possible deadlock bug if uid_wrapper is turned off
-  * Logging is always turned on now
-  * Fixed a memory leak
-  * Limited number of groups during fork+exec
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 13 2017 Andreas Schneider <asn@redhat.com> - 1.2.2-1
-- Update to version 1.2.2:
-  * Added support for fork'ed and then exec'ed processes
-  * Added support for Alpha
-
-* Tue Jun 27 2017 Nils Philippsen <nils@redhat.com> - 1.2.1-3
-- drop requirements on cmake, pkgconfig and rather own the directories for the
-  files augmenting these packages
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Mar 23 2016 Andreas Schneider <asn@redhat.com> - 1.2.1-1
-- Update to version 1.2.1
-  * Documented missing options.
-  * Fixed a comipilation issue with -O3.
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Oct 29 2015 Andreas Schneider <asn@redhat.com> - 1.2.0-1
-- Update to version 1.2.0
-  * Added privilege checks for all set*uid and set*gid functions.
-  * Added a lot more and accurate tests which work as root.
-  * Fixed some minor issues
-
-* Wed Sep 02 2015 Andreas Schneider <asn@redhat.com> - 1.1.1-1
-- Update to version 1.1.1
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jan 21 2015 Andreas Schneider <asn@redhat.com> - 1.1.0-1
-- Update to version 1.1.0
-
-* Mon Dec 15 2014 Michael Adam <madam@redhat.com> - 1.0.2-5
-- Fix format errors in changelog.
-- Require cmake.
-- Don't own _libdir/pkgconfig, and require pkgconfig instead.
-
-* Thu Oct 02 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-4
-- resolves: #1146410 - Do not own /usr/lib64/cmake.
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.2-2
-- Handle lack of SYS_access on AArch64
-
-* Thu Jul 31 2014 Andreas Schneider <asn@redhat.com> - 1.0.2-1
-- Update to version 1.0.2.
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Mar 11 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-3
-- Fix some typos.
-- resolves: #1060910 - Fedora import
-
-* Tue Feb 11 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-2
-- Remove Group
-- Remove glibc-devel build requirement
-- Do not create a subpackage.
-
-* Tue Feb 04 2014 Andreas Schneider <asn@redhat.com> - 1.0.1-1
-- Update to version 1.0.1
-  * Added --libs to pkg-config.
-  * Added socket_wrapper-config.cmake
-  * Fixed a bug packaging the obj directory.
-
-* Mon Feb 03 2014 Andreas Schneider <asn@redhat.com> - 1.0.0-1
-- Initial version 1.0.0
+%autochangelog

From b0c058b68129865b9d5c7bc3f8a9b0e33393bae9 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 13 Jun 2024 08:17:45 +0200
Subject: [PATCH 46/52] Update to version 1.3.1

---
 .gitignore                                  |  2 ++
 sources                                     |  4 +--
 uid_wrapper-fix-cmocka-1.1.6+-support.patch | 31 ---------------------
 uid_wrapper.spec                            |  4 +--
 4 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 uid_wrapper-fix-cmocka-1.1.6+-support.patch

diff --git a/.gitignore b/.gitignore
index 0598ce8..b5f4d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /uid_wrapper-1.2.9.tar.gz.asc
 /uid_wrapper-1.3.0.tar.gz
 /uid_wrapper-1.3.0.tar.gz.asc
+/uid_wrapper-1.3.1.tar.gz
+/uid_wrapper-1.3.1.tar.gz.asc
diff --git a/sources b/sources
index 21bf0cc..9f010a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uid_wrapper-1.3.0.tar.gz) = a66515b701882cf8ac62c6aae719eb07a46b852ecfd5274c7a1f038b066db85fbc0cdf4fff2c79e7b1e45d08622cd90884498f668fe479989e47e79ecd932095
-SHA512 (uid_wrapper-1.3.0.tar.gz.asc) = d6b4178749249ee2bcacb85d9aa767e4b1d07e3cfcae1376745ea7559818af3716a9ccb8731cd24c3acd1a3ff419a6814d6a0e9c65d3a31b4cefbc314a81554e
+SHA512 (uid_wrapper-1.3.1.tar.gz) = a221f1ee5e654d328dd614882917781c036bca140b9fb8d08157862b775f17b4a7813b7efbc4e5ae3ef9bf1540c0ca158d7bdb503b7f62ac563dd29aa75396b6
+SHA512 (uid_wrapper-1.3.1.tar.gz.asc) = 1ce6ebc0c0827a9d7e94ee6d8a8037b89ba1e4eb1bc7bef33afe6a5af2090ca4a21209ad13c25c31fba57298cefa0208f577737f8755d9fb726d821eaa6789ec
diff --git a/uid_wrapper-fix-cmocka-1.1.6+-support.patch b/uid_wrapper-fix-cmocka-1.1.6+-support.patch
deleted file mode 100644
index 58184b4..0000000
--- a/uid_wrapper-fix-cmocka-1.1.6+-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 850f24c6366abda30bfd77734b90330b8809d306 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Fri, 17 Feb 2023 17:51:27 +0100
-Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
----
- tests/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 635e86e..68e050e 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,5 +1,9 @@
- project(tests C)
- 
-+if (TARGET cmocka::cmocka)
-+    set(CMOCKA_LIBRARY cmocka::cmocka)
-+endif()
-+
- add_library(uwrap_fake_socket_wrapper SHARED uwrap_fake_socket_wrapper.c)
- target_compile_options(uwrap_fake_socket_wrapper
-                        PRIVATE
--- 
-2.39.2
-
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 9ba5ca8..f18b0c9 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,5 +1,5 @@
 Name:           uid_wrapper
-Version:        1.3.0
+Version:        1.3.1
 Release:        %autorelease
 
 Summary:        A wrapper for privilege separation
@@ -10,8 +10,6 @@ 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:         uid_wrapper-fix-cmocka-1.1.6+-support.patch
-
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  gnupg2

From b6187571328738d9e05ea4a03c40fcead59138f0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 08:11:47 +0000
Subject: [PATCH 47/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From f653a6b04c448ae64b2bb09d10fc38f01e3923b6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 13:41:02 +0000
Subject: [PATCH 48/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From b306c68380d67eeef9d72083649ef23a6f4b7b04 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@redhat.com>
Date: Thu, 17 Jul 2025 15:48:25 +0200
Subject: [PATCH 49/52] Fix tests

---
 uid_wrapper.spec      |  2 ++
 uwrap-fix-tests.patch | 65 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 uwrap-fix-tests.patch

diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index f18b0c9..bad4551 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -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:         uwrap-fix-tests.patch
+
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  gnupg2
diff --git a/uwrap-fix-tests.patch b/uwrap-fix-tests.patch
new file mode 100644
index 0000000..4699855
--- /dev/null
+++ b/uwrap-fix-tests.patch
@@ -0,0 +1,65 @@
+From fb17ea0d4a346e21332f5eb32dcb02b2e57c2320 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Thu, 17 Jul 2025 15:19:39 +0200
+Subject: [PATCH 1/2] cpack: Fix ignore files
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ CPackConfig.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CPackConfig.cmake b/CPackConfig.cmake
+index 955c8ee..c1a3373 100644
+--- a/CPackConfig.cmake
++++ b/CPackConfig.cmake
+@@ -16,7 +16,7 @@ set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+ 
+ ### source generator
+ set(CPACK_SOURCE_GENERATOR "TGZ")
+-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build*;/obj*;tags;cscope.*")
++set(CPACK_SOURCE_IGNORE_FILES "~$;\.swp$;\.git;\.gitignore;/\.cache/;/\.clangd/;/build*;/obj*;tags;cscope.*")
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+ 
+ if (WIN32)
+-- 
+GitLab
+
+
+From a85877afadfbca22b2d8927dca62d6cc0e25dd65 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Thu, 17 Jul 2025 15:20:43 +0200
+Subject: [PATCH 2/2] tests: Add missing include for stdint.h
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ tests/test_thread_sync_setreuid.c | 1 +
+ tests/test_uwrap_disabled.c       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tests/test_thread_sync_setreuid.c b/tests/test_thread_sync_setreuid.c
+index 720a707..627791c 100644
+--- a/tests/test_thread_sync_setreuid.c
++++ b/tests/test_thread_sync_setreuid.c
+@@ -2,6 +2,7 @@
+ 
+ #include <stdarg.h>
+ #include <stddef.h>
++#include <stdint.h>
+ #include <setjmp.h>
+ #include <cmocka.h>
+ 
+diff --git a/tests/test_uwrap_disabled.c b/tests/test_uwrap_disabled.c
+index 52a2bf0..61a8c87 100644
+--- a/tests/test_uwrap_disabled.c
++++ b/tests/test_uwrap_disabled.c
+@@ -2,6 +2,7 @@
+ 
+ #include <stdarg.h>
+ #include <stddef.h>
++#include <stdint.h>
+ #include <setjmp.h>
+ #include <cmocka.h>
+ 
+-- 
+GitLab
+

From 03fe9bf3f77119c7707c9585380c20be8211cb9b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@redhat.com>
Date: Thu, 24 Jul 2025 11:44:49 +0200
Subject: [PATCH 50/52] Update to version 1.3.2

---
 .gitignore            |  2 ++
 sources               |  4 +--
 uid_wrapper.spec      |  4 +--
 uwrap-fix-tests.patch | 65 -------------------------------------------
 4 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 uwrap-fix-tests.patch

diff --git a/.gitignore b/.gitignore
index b5f4d75..14419bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /uid_wrapper-1.3.0.tar.gz.asc
 /uid_wrapper-1.3.1.tar.gz
 /uid_wrapper-1.3.1.tar.gz.asc
+/uid_wrapper-1.3.2.tar.gz
+/uid_wrapper-1.3.2.tar.gz.asc
diff --git a/sources b/sources
index 9f010a3..6362a44 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uid_wrapper-1.3.1.tar.gz) = a221f1ee5e654d328dd614882917781c036bca140b9fb8d08157862b775f17b4a7813b7efbc4e5ae3ef9bf1540c0ca158d7bdb503b7f62ac563dd29aa75396b6
-SHA512 (uid_wrapper-1.3.1.tar.gz.asc) = 1ce6ebc0c0827a9d7e94ee6d8a8037b89ba1e4eb1bc7bef33afe6a5af2090ca4a21209ad13c25c31fba57298cefa0208f577737f8755d9fb726d821eaa6789ec
+SHA512 (uid_wrapper-1.3.2.tar.gz) = a248494c445b8186e3fc9e3eb8b21149a08dc504871ffaf339d5f61e13f7291973d07d467d81e253d165792dd15f5df69db8a7e1e3424093a5b051f9a562d6fb
+SHA512 (uid_wrapper-1.3.2.tar.gz.asc) = d24956d7f396a91e1b063d074ace3da7c098b06bf43433d80d89d162c394b93b078330106fc4318a42ccca7c0eea6f317a28a2f0976ab821f61478c03ff378da
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index bad4551..eb88e68 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,5 +1,5 @@
 Name:           uid_wrapper
-Version:        1.3.1
+Version:        1.3.2
 Release:        %autorelease
 
 Summary:        A wrapper for privilege separation
@@ -10,8 +10,6 @@ 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:         uwrap-fix-tests.patch
-
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  gnupg2
diff --git a/uwrap-fix-tests.patch b/uwrap-fix-tests.patch
deleted file mode 100644
index 4699855..0000000
--- a/uwrap-fix-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From fb17ea0d4a346e21332f5eb32dcb02b2e57c2320 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Thu, 17 Jul 2025 15:19:39 +0200
-Subject: [PATCH 1/2] cpack: Fix ignore files
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
----
- CPackConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CPackConfig.cmake b/CPackConfig.cmake
-index 955c8ee..c1a3373 100644
---- a/CPackConfig.cmake
-+++ b/CPackConfig.cmake
-@@ -16,7 +16,7 @@ set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
- 
- ### source generator
- set(CPACK_SOURCE_GENERATOR "TGZ")
--set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build*;/obj*;tags;cscope.*")
-+set(CPACK_SOURCE_IGNORE_FILES "~$;\.swp$;\.git;\.gitignore;/\.cache/;/\.clangd/;/build*;/obj*;tags;cscope.*")
- set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
- 
- if (WIN32)
--- 
-GitLab
-
-
-From a85877afadfbca22b2d8927dca62d6cc0e25dd65 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Thu, 17 Jul 2025 15:20:43 +0200
-Subject: [PATCH 2/2] tests: Add missing include for stdint.h
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
----
- tests/test_thread_sync_setreuid.c | 1 +
- tests/test_uwrap_disabled.c       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/tests/test_thread_sync_setreuid.c b/tests/test_thread_sync_setreuid.c
-index 720a707..627791c 100644
---- a/tests/test_thread_sync_setreuid.c
-+++ b/tests/test_thread_sync_setreuid.c
-@@ -2,6 +2,7 @@
- 
- #include <stdarg.h>
- #include <stddef.h>
-+#include <stdint.h>
- #include <setjmp.h>
- #include <cmocka.h>
- 
-diff --git a/tests/test_uwrap_disabled.c b/tests/test_uwrap_disabled.c
-index 52a2bf0..61a8c87 100644
---- a/tests/test_uwrap_disabled.c
-+++ b/tests/test_uwrap_disabled.c
-@@ -2,6 +2,7 @@
- 
- #include <stdarg.h>
- #include <stddef.h>
-+#include <stdint.h>
- #include <setjmp.h>
- #include <cmocka.h>
- 
--- 
-GitLab
-

From d272a7e93f831eb70d08d8ddaa61512c31654aeb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 19:34:03 +0000
Subject: [PATCH 51/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild


From 78ea4f67d91624b4c5c44abef0f85286180ae85c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:08:35 +0000
Subject: [PATCH 52/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild