.gitignore

@@ -1,2 +1,2 @@
-nss_wrapper-1.1.15.tar.gz
+SOURCES/nss_wrapper-1.1.13.tar.gz
-nss_wrapper.keyring
+SOURCES/nss_wrapper.keyring

.nss_wrapper.metadata

@@ -0,0 +1,2 @@
+ae7dccfe28ac92b69cf60d453279127d52c2505a SOURCES/nss_wrapper-1.1.13.tar.gz
+3f2ab0bca02893402ba0ad172a6bd44456a65f86 SOURCES/nss_wrapper.keyring

SOURCES/nss_wrapper-1.1.13.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmNrTNwACgkQfuD8TcwB
+Tj3WoQ/9GKqsov0wiifUzR7KkWEC1IAg/X9ja5q02V/BxWVhiMlfbcHsfo797eNf
+shEMt1JF0knL2EJZYK/ToP5FnTTKmGS41lmV8SLSHz/Lkes9hgcTW4ErIks7xbYw
+a1KTyWjpSsPaz4nfzWRN5e3BjZUAhX91Cy0RRZR4mYvHkIEX79ib0FAwJeRs48QB
+8IwMqR2vULT8TzifUmve1VOKuyLFEq85nzb+q1eJwXGbB+Xo8mr1kjfKm2a/zAaA
+tGC1rDQJkMi36Qwm/r9i1fwsaMUWnNCF1Mi/uZnh7vLVdD8FqK+EInUVeGHNX/hr
+Ryv8/xu+V7/B6vkWHa2ILzlQEWoXBN1wUm616pSLnJ4D6yj10YBkvsJ6ndY8ZvSk
+8bAm6YZqssMQXpXL+7oJn946oyfQ2WBTswZb/St9ujhgTtM/a3TMFLWOG4tZLJ19
+hdyZOzrzRq2nzhTzsbhc77TKoirpdODGr6aWGBlLYJrhksEe3FfCyGUGVNY6N280
+A+wXkbS/sKy6t9ArFvArvrhabc+Rj8/2JiN9h6lXfMsRsatyJH1hrUE2kQEXudFx
++BIa4/5dGMrVCoDcbLAxgE7H9ZJUFmo/w+9WhEMdqVPxi49hKnf+iL3DyQPpjL9f
+Y6jYwgKFsjYrpLtch9LMa5svsY9S5gPY4qixH20RqQvng5PUWlU=
+=9HJb
+-----END PGP SIGNATURE-----

SPECS/nss_wrapper.spec

@@ -1,8 +1,8 @@
 Name:           nss_wrapper
-Version:        1.1.15
+Version:        1.1.13
-Release:        7%{?dist}
+Release:        1%{?dist}
 
-License:        BSD-3-Clause
+License:        BSD
 Summary:        A wrapper for the user, group and hosts NSS API
 Url:            https://cwrap.org/
 
@@ -10,15 +10,13 @@ Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 Source1:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
 Source2:        nss_wrapper.keyring
 
-Patch0:         nss_wrapper-fix-cmocka-1.1.6+-support.patch
-
 BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  gnupg2
 BuildRequires:  libcmocka-devel
 BuildRequires:  perl-generators
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} > 1.1.5
 Recommends:     cmake
 Recommends:     pkgconfig
 
@@ -47,30 +45,39 @@ development/testing.
 
 %package libs
 Summary: nss_library shared library only
+Conflicts: nss_wrapper <= 1.1.5
 
 %description libs
 The %{name}-libs package provides only the shared library.
 For a minimal footprint, install just this package.
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %autosetup -p1
 
 %build
+mkdir -p build
+pushd build
 %cmake \
-  -DUNIT_TESTING=ON
+  -DUNIT_TESTING=ON \
+  %{_builddir}/%{name}-%{version}
 
 %cmake_build
+popd
 
 %install
+pushd build
 %cmake_install
 
 sed -i '1 s|/usr/bin/env\ perl|/usr/bin/perl|' %{buildroot}%{_bindir}/nss_wrapper.pl
+popd
 
 %ldconfig_scriptlets
 
 %check
+pushd build
 %ctest
+popd
 
 %files
 %{_bindir}/nss_wrapper.pl
@@ -86,96 +93,15 @@ sed -i '1 s|/usr/bin/env\ perl|/usr/bin/perl|' %{buildroot}%{_bindir}/nss_wrappe
 %{_libdir}/libnss_wrapper.so*
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.1.15-7
+* Wed Nov 09 2022 Andreas Schneider <asn@redhat.com> - 1.1.3-1
-- Bump release for October 2024 mass rebuild:
+- related: rhbz#2139665 - Rebase to version 1.1.13
-  Resolves: RHEL-64018
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.15-6
+* Thu Nov 03 2022 Andreas Schneider <asn@redhat.com> - 1.1.12-5
-- Bump release for June 2024 mass rebuild
+- related: rhbz#2124635 - Fix dependency to nss_wrapper-libs
 
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.15-5
+* Thu Nov 03 2022 Andreas Schneider <asn@redhat.com> - 1.1.12-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- resolves: rhbz#2139665 - Rebase to version 1.1.12
-
+- resolves: rhbz#2124635 - Reduce dependencies of the package
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.15-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Mar 06 2023 Andreas Schneider <asn@redhat.com> - 1.1.15-2
-- Update License to SPDX expression
-
-* Mon Feb 27 2023 Andreas Schneider <asn@redhat.com> - 1.1.15-1
-- Update to version 1.1.15
-  https://gitlab.com/cwrap/nss_wrapper/-/blob/nss_wrapper-1.1.15/CHANGELOG
-- Fix building with cmocka >= 1.1.6
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Nov 09 2022 Andreas Schneider <asn@redhat.com> - 1.1.13-1
-- Update to version 1.1.13
-  https://gitlab.com/cwrap/nss_wrapper/-/blob/nss_wrapper-1.1.13/CHANGELOG
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 24 2022 Andreas Schneider <asn@redhat.com> - 1.1.12-1
-- Update to version 1.1.12
-  https://gitlab.com/cwrap/nss_wrapper/-/blob/nss_wrapper-1.1.12/CHANGELOG
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Nov 15 2021 Honza Horak <hhorak@redhat.com> - 1.1.11-7
-- Introduce nss_wrapper-libs package to allow install smaller footprint
-  Resolves: RHBZ#2023435
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Aug 05 2020 Andreas Schneider <asn@redhat.com> - 1.1.11-4
-- Build using new cmake macros
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Apr 02 2020 Andreas Schneider <asn@redhat.com> - 1.1.11-1
-- Update to version 1.1.11
-  https://gitlab.com/cwrap/nss_wrapper/-/blob/master/CHANGELOG
-
-* Mon Mar 16 2020 Andreas Schneider <asn@redhat.com> - 1.1.10-1
-- Update to version 1.1.10
-  https://gitlab.com/cwrap/nss_wrapper/-/blob/master/CHANGELOG
-
-* Mon Mar 16 2020 Andreas Schneider <asn@redhat.com> - 1.1.9-1
-- Update to version 1.1.9
-
-* Mon Feb 17 2020 Andreas Schneider <asn@redhat.com> - 1.1.8-1
-- Update to version 1.1.8
-- resolves: #1799808
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Nov 18 2019 Andreas Schneider <asn@redhat.com> - 1.1.7-3
-- Fixed patch for pkg-config
-
-* Mon Nov 18 2019 Andreas Schneider <asn@redhat.com> - 1.1.7-2
-- resolves: #1772368 - Incorrect path in pkg-config file
-
-* Wed Nov 13 2019 Andreas Schneider <asn@redhat.com> - 1.1.7-1
-- Update to version 1.1.7
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

nss_wrapper-1.1.15.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmPRTgYACgkQfuD8TcwB
-Tj20jxAAlm7ArKtzRTX4iTvBpa9lq4bGqRQp44GTiXi6JNcDfkG8vdNhC9M+ivWR
-WXJzmtHYhNLCa0exQW2i2KSE1VKiljVNj4bcDrhVLxihOqKZBppfybyiKlN1LpJ9
-8MUpKI8SwhA3bwR5v7t5GdVbCGulh6Qbr7j8Ix9wlfif3GzmXeodbUr9gGjCN3BU
-+xa+gmPkfa6V2sz3kfbdme1w33xRwKUeYkEN1jZ6gNNlH3CYcusQaxgQ6RkL5atY
-Ax3wvSfGoeQsjQLOzUbORnLjdekh5Y4GgxWmyfAoQBPKEP07sCjq7Sp317xJiqUG
-DWVe1PIO9nJHyA3Tdwx2G2oVT47emLK8QndJcE5B+h/o+x60dATXG+7dZJBtzjNa
-9L4Kri4Lq5gc7iZcvbm4MQMmKse7BKCMl6pHIhF4WfH2lt1Xd2FCNSAEVv9Q+OzH
-gdvVEJm8+6npV99+fP/WzVBHY6MRpOFIijPVJzDvNlCIrEbfx7pfjoE+nQcqnBgs
-PT0n15nbP+sOQIVtmXZ7Tkd0FRCaC/dYNGEuqceua60enjO6zff30LaGjM97rNgW
-lNjylfHaS9EXQd/I2UjHUHdSkJfGAw7RgCVLV2tUmTG7VvE+DapQzfql8ONNADup
-mMeI3UZUffN0fS5gDd67tOm+iUB1X9azkYLPd5M5GZFAfWuBiqU=
-=nRU2
------END PGP SIGNATURE-----

nss_wrapper-fix-cmocka-1.1.6+-support.patch

@@ -1,31 +0,0 @@
-From 2c879a0ffa70cee33329291d7576ec971d420da2 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 3b94076..733cc4e 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()
-+
- set(TESTSUITE_LIBRARIES nss_utils ${NWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY})
- string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
- 
--- 
-2.39.2
-

sources

@@ -1,2 +0,0 @@
-SHA512 (nss_wrapper-1.1.15.tar.gz) = 803dfb67e042800e60f4735177384ff3b9348f4c96c02e62ae0b449583542fdaf443eb1fa48b5d5e4ea6fe0d81ce84f340bd406c968c05f71b5c64dd499feacd
-SHA512 (nss_wrapper.keyring) = 94e0b3873184c3c5bfed321a8cd70696c0d6a0f357ba3dd7ba0e68e3f2ee270c62fa3138b3dc5a869c15e9f6e0e4e14e9d4a060863b1c846a49082c05b68fc71