rpm/pam_wrapper
SHA256
1
0
Fork 0
forked from pool/pam_wrapper
Code Pull Requests Activity

Accepting request 1190427 from devel:tools

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1190427
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_wrapper?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2024-07-31 11:28:32 +00:00 committed by Git OBS Bridge
commit dd60a6af18
8 changed files with 32 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pam_wrapper-1.1.4.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

16
pam_wrapper-1.1.4.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmF6YZYACgkQfuD8TcwB
Tj0dCA//drNm6b6q3GhW1CX5Gksc9mNCbatwHYZMCOz1Km1TXEM6pQzIYU4JJiIX
yRARln4dlrNHifsUbKOL0ipoRiCzBXeN1NK47TbefOB0vumykJwuG6LNBzbAz+a4
iAZfvT5D2OPEJG7fkB5Pr97/AD09y5T8LlqphIsMDWTFuDErqm19MwfCgdaLA2jU
3qA9MR88HTg5wyQIJ5cfjz1qVWfQlFUxsUy+D39HE7IotAxZISfJn8+mDToznFoG
ZD0O4oMEUOvMelQPNeHworihlEVaTz9/k5VtTWAE70PzEQgxNWq1C8WOJpJ2TUDD
H8aE0/6UC2u9ava5fUuzBeIaz4hqsnKIdgeLMxne9PoSLSyyAnjRseWwdhAiJmnh
0JzKoqrB8bFQ446por2lBkJcph23w2jhrLPm/6nupndSFPPU0VKzA0R2MmR3T6JW
wmJO3Eqs04P59k+4vxog9/AqHip6VF4WGtmE1sVwZdEeMEfBkXINUF31NIigCHkB
1n1mbzxBTFb16+Qur0QpmeE5jLL/X1WWx6qWMcVZCxpNGarIjd18aMmiQmqO+ilU
KYbdxc9ssCb/oyWHBLJW/jVzpBwUiN93I7iQaqb+2Se1Y9PI/E5mA2OHFiIXDpU5
m39WX2jK9c393jlRY+geg2AQlYQ6I4TFdk1USiaMeZT6HuqMFTg=
=wA4W
-----END PGP SIGNATURE-----

3
pam_wrapper-1.1.7.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1c93e2b687d08834df0e09026dd63d2ce4f577701d406a013e9a8afe469bde1
size 95969

16
pam_wrapper-1.1.7.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmafa38ACgkQfuD8TcwB
Tj057Q//S/9ucQraJbqxV6S+NR63tE2IrLNodg5zJcc30xrR5baFYKMnCacunLHW
uqckCR9a3VU3bbBc4eUhkZ/Kic9eC68/1jA3VYZaRokrDIhqfgqRzQVTkILxAuB4
ctxRqCakMiLwn7hFv2HFSlDbZoD3WJ1TrmwaL9Wiu+pOTVF5Cp916GiRWuYGCm6o
9CJg9Sw/ZYFqQjYc7UpRezMBaxhz+6CRvaM/bsMkimUSfM+Eiz909fJ7FCSeWrRi
BIRbBrg0gU8u7S368rdMC1hSKEeZ4ghYs/h7O5/NMkYudjxDAqCCo1E7ypxqO3gS
+1mtVQ4+cBoEQDpKCKFjtRDSPwfefgBA0ys0wFpJ0w+q4y/M46trVioGG3ryShMd
36YT3xYoAxVenp+uwog4hyplD9ICpGUXIUXy2z862A7AZAy2Zd34yCC/0mBoVNyp
IDtb4GPpyahWOmZXSnL3W24QsOy/f8rfiI4TmnRZ5aF7I4KJ3W4yWWt2cWe5sHM7
+wq4Kjy6YuIV/G61rl+BlOg6qVcD2FGHYsj+TC3yTMr5BC3MeZeJxgLz5JEGgMl8
Zwb3r0z2G+FW9B5PNFRZGel6CdynCF2vyLsIJtriqnit3h3Kj/7XdEBe3GLoeP2B
Q3Tb9PLuDblwQlidfjQZkIkVbdJU+nmidTDP7q2/wOmLa7kgKRs=
=MOW7
-----END PGP SIGNATURE-----

107
pam_wrapper-fix-cmocka-1.1.6+-support.patch
View File

@ -1,107 +0,0 @@
From 9e7f8ac9ee1f968ac8af2d9c2e9dbd91a3090b73 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 17 Feb 2023 18:08:45 +0100
Subject: [PATCH 1/2] cmake: Drop FindCMocka.cmake Module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We should use config mode.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
---
cmake/Modules/FindCMocka.cmake | 49 ----------------------------------
1 file changed, 49 deletions(-)
delete mode 100644 cmake/Modules/FindCMocka.cmake
diff --git a/cmake/Modules/FindCMocka.cmake b/cmake/Modules/FindCMocka.cmake
deleted file mode 100644
index 2dd9fc5..0000000
--- a/cmake/Modules/FindCMocka.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# - Try to find CMocka
-# Once done this will define
-#
-# CMOCKA_ROOT_DIR - Set this variable to the root installation of CMocka
-#
-# Read-Only variables:
-# CMOCKA_FOUND - system has CMocka
-# CMOCKA_INCLUDE_DIR - the CMocka include directory
-# CMOCKA_LIBRARIES - Link these to use CMocka
-# CMOCKA_DEFINITIONS - Compiler switches required for using CMocka
-#
-#=============================================================================
-# Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-#
-
-find_path(CMOCKA_INCLUDE_DIR
- NAMES
- cmocka.h
- PATHS
- ${CMOCKA_ROOT_DIR}/include
-)
-
-find_library(CMOCKA_LIBRARY
- NAMES
- cmocka
- PATHS
- ${CMOCKA_ROOT_DIR}/include
-)
-
-if (CMOCKA_LIBRARY)
- set(CMOCKA_LIBRARIES
- ${CMOCKA_LIBRARIES}
- ${CMOCKA_LIBRARY}
- )
-endif (CMOCKA_LIBRARY)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR)
-
-# show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view
-mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARIES)
--
2.39.2
From 8e94874bf5c0d569a16985eafa9922d8c527a9fb Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 17 Feb 2023 17:51:27 +0100
Subject: [PATCH 2/2] 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 9d56f21..26f2da2 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(PAM_MATRIX_PATH "${CMAKE_BINARY_DIR}/src/modules/pam_matrix.so")
configure_file(services/matrix.in ${CMAKE_CURRENT_BINARY_DIR}/services/matrix @ONLY)
--
2.39.2

2
pam_wrapper-rpmlintrc
View File

@ -5,7 +5,5 @@
# Learn more at http://cwrap.org
#
addFilter("shlib-policy-name-error")
addFilter("shared-lib-calls-exit")
addFilter("shlib-fixed-dependency")
addFilter("shlib-policy-missing-suffix")
addFilter("devel-file-in-non-devel-package")

8
pam_wrapper.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 23 07:48:44 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
- Update to version 1.1.7
https://gitlab.com/cwrap/pam_wrapper/-/blob/pam_wrapper-1.1.7/CHANGELOG
- Removed pam_wrapper-fix-cmocka-1.1.6+-support.patch
- Make pam_wrapper-devel-doc a noarch package
-------------------------------------------------------------------
Mon Feb 27 09:38:30 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>

32
pam_wrapper.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package pam_wrapper
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,9 +22,8 @@
# Do NOT create library package or a devel package!
#
############################# NOTE ##################################
%bcond_without python2
Name: pam_wrapper
Version: 1.1.4
Version: 1.1.7
Release: 0
Summary: A tool to test PAM applications and PAM modules
License: GPL-3.0-or-later
@ -32,7 +31,6 @@ 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: %{name}-rpmlintrc
Patch0: pam_wrapper-fix-cmocka-1.1.6+-support.patch
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: libcmocka-devel
@ -42,9 +40,6 @@ BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(python3)
Recommends: cmake
Recommends: pkgconfig
%if %{with python2}
BuildRequires: pkgconfig(python2)
%endif
%description
This component of cwrap allows you to either test your PAM (Linux-PAM
@ -81,20 +76,11 @@ files for libpamtest
%package -n libpamtest-devel-doc
Summary: The libpamtest API documentation
BuildArch: noarch
%description -n libpamtest-devel-doc
Documentation for libpamtest development.
%package -n python2-libpamtest
Summary: A python wrapper for libpamtest
Requires: libpamtest0 = %{version}-%{release}
Requires: pam_wrapper = %{version}-%{release}
%description -n python2-libpamtest
If you plan to develop python tests for a PAM module, you can use this
library, which simplifies testing of modules. This subpackage includes
the header files for libpamtest
%package -n python3-libpamtest
Summary: A python wrapper for libpamtest
Requires: libpamtest0 = %{version}-%{release}
@ -112,17 +98,14 @@ the header files for libpamtest
# CMAKE_SKIP_RPATH:BOOL=OFF is required to run the tests!
%cmake \
-DUNIT_TESTING=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF
-DCMAKE_SKIP_RPATH:BOOL=OFF \
-DPYTHON_INSTALL_SITEARCH=%{python3_sitearch}
%cmake_build
%cmake_build doc
%install
%cmake_install
%if %{without python2}
rm -rf %{python2_sitearch}/pypamtest.so
%endif
%check
%ctest
@ -165,11 +148,6 @@ rm -rf %{python2_sitearch}/pypamtest.so
%files -n libpamtest-devel-doc
%doc build/doc/html
%if %{with python2}
%files -n python2-libpamtest
%{python2_sitearch}/pypamtest.so
%endif
%files -n python3-libpamtest
%{python3_sitearch}/pypamtest.so