Move uid_wrapper to SPECS folder as build dependency for libssh (#3427)

* Moving uid_wrapper from Specs-extended to specs folder, needed as build dependency for libssh.

* (a) Bump version to 1.2.9
(b) remove gpg signature verification
(c) remove unwanted patches
(d) spec linting
(e) spec clean up.

* Update  cgmanifest.json for uid_wrapper to version 1.2.9

SPECS-EXTENDED/uid_wrapper/0001-pkg-config-Fix-installation-path.patch

@@ -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
-

SPECS-EXTENDED/uid_wrapper/uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch

@@ -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@)

SPECS-EXTENDED/uid_wrapper/uid_wrapper-1.2.7.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAl0tlh4ACgkQfuD8TcwB
-Tj1rrxAApPy4C4EBYcVi+J5N7S3t57dtuA0reY2OG7KKFXzD2j54KeM/N3h/TpHK
-KbhxF5/xYdle6jhDXTq4kBX98qFpbx9AGOiAkoAg480YpgX+xVVNPWzovfytuRoe
-IWKG6/jpzr9PEDg/ivjcYAXZaLokXOaUt+XUigyr/93dPpRmgcuxGrEHKfLtZEsn
-uLThWBvX9rLwIEcbqOmrsBiTJUdUTFcJkYakFIeOXKnnM2RpfQ9vXewzATGmUwjV
-t1AraXQWHF/MQmjeZhJp98x36UDIHfFXxuOpJ0s2vK0oyjOfyR+8+rf77s7gBKC3
-71A1Tcy85cKJ3qLO3EpuTOGR9L0rx+2jxKkQdhtD9v0ppUTF/L7MxT1S3xnAe8jt
-hxTQBs8dbEa0RGNpJorBajAaz2DsQJOnC8o5UE2eqLZYco4B2kRi0C6GtqeGqtos
-0GNddCtHrYKjnh6/h5vmXPllONB3f7f/7gGqjA9+0nAITpmAOSNowN7jcUXBCgWt
-D4taInPqa2Riehy//+YmrANIs7OHqCfirm8d/bI8ZMJpuYFsO1RpGPIQQ8owl5Br
-gniTWA9/niL8Oky/prc0ZS3pJW0al4u5pTG2jknAVui39KwPcRMYqSHeTv2avPUb
-dDknqtXsrULxO+Ai2QXxq3gzRgT9okX6aAwqT85juXH7tz66l8E=
-=vJOX
------END PGP SIGNATURE-----

SPECS-EXTENDED/uid_wrapper/uid_wrapper.signatures.json

@@ -1,7 +0,0 @@
-{
- "Signatures": {
-  "uid_wrapper-1.2.7.tar.gz": "a8090edbc8bdd596b9b7d0eb912a38c32b8c63bf112614339c601161c1c9ff56",
-  "uid_wrapper-1.2.7.tar.gz.asc": "0f0e6b9903b91b0300a80e131910da80947fee33c3f19ebfce8b4906ae30084c",
-  "uid_wrapper.keyring": "3861ac6763ff3edf0bbbb05fe890962a5dbcd99b2e00fae16687fd480c7fab0f"
- }
-}

SPECS/uid_wrapper/uid_wrapper.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "uid_wrapper-1.2.9.tar.gz": "7e8c024072825fe86bab46591cf4b909e399cf98f54822f9e52742f420047084"
+ }
+}

SPECS/uid_wrapper/uid_wrapper.spec

@@ -1,22 +1,15 @@
 Name:           uid_wrapper
-Version:        1.2.7
-Release:        4%{?dist}
-
+Version:        1.2.9
+Release:        1%{?dist}
 Summary:        A wrapper for privilege separation
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-URL:            http://cwrap.org/
-
+URL:            https://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
 
-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:  gcc
 BuildRequires:  gnupg2
 BuildRequires:  libcmocka-devel >= 1.1.0
 
@@ -38,7 +31,6 @@ This package doesn't have a devel package cause this project is for
 development/testing.
 
 %prep
-gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %autosetup -p1
 
 %build
@@ -78,6 +70,12 @@ popd
 %{_mandir}/man1/uid_wrapper.1*
 
 %changelog
+* Mon Jul 25 2022 Sumedh Sharma <sumsharma@microsoft.com> - 1.2.9-1
+- Bumping version to 1.2.9.
+- Remove gpg signature check.
+- Remove patches which are fixed in this version.
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.7-4
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 

cgmanifest.json

@@ -26237,8 +26237,8 @@
         "type": "other",
         "other": {
           "name": "uid_wrapper",
-          "version": "1.2.7",
-          "downloadUrl": "https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.7.tar.gz"
+          "version": "1.2.9",
+          "downloadUrl": "https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.9.tar.gz"
         }
       }
     },