diff --git a/devel/pam_wrapper/Makefile b/devel/pam_wrapper/Makefile index 1d7ed4600252..7f3876739ba4 100644 --- a/devel/pam_wrapper/Makefile +++ b/devel/pam_wrapper/Makefile @@ -1,25 +1,23 @@ -PORTNAME= pam_wrapper -PORTVERSION= 1.0.6 -PORTREVISION= 3 -CATEGORIES= devel -MASTER_SITES= SAMBA/cwrap +PORTNAME= pam_wrapper +PORTVERSION= 1.0.6 +PORTREVISION= 3 +CATEGORIES= devel +MASTER_SITES= SAMBA/cwrap -MAINTAINER= ports@FreeBSD.org -COMMENT= Preloadable wrapper to test PAM applications and PAM Modules -WWW= https://cwrap.org/pam_wrapper.html +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Tool to test PAM applications and PAM modules +WWW= https://cwrap.org/nss_wrapper.html \ + https://git.samba.org/?p=pam_wrapper.git -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING -EXTRA_PATCHES= ${PATCHDIR}/python-detection.patch:-p1 +TEST_DEPENDS= cmocka>=1.1.1:sysutils/cmocka -USES= cmake python -USE_LDCONFIG= yes +USES= cmake:testing pathfix python -OPTIONS_DEFINE= TEST -OPTIONS_DEFAULT= TEST - -TEST_TEST_TARGET= test -TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka +CMAKE_OFF= UNIT_TESTING +CMAKE_TESTING_ON= UNIT_TESTING +USE_LDCONFIG= yes .include diff --git a/devel/pam_wrapper/files/python-detection.patch b/devel/pam_wrapper/files/python-detection.patch deleted file mode 100644 index f9a9c8a7d178..000000000000 --- a/devel/pam_wrapper/files/python-detection.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 6d25aa0f94a8fb7f263b88eb3b0c0d15c1d88ed6 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 3 Jul 2018 11:33:04 +0200 -Subject: cmake: Fix python2 and python3 detection - -Signed-off-by: Andreas Schneider ---- - src/python/python2/CMakeLists.txt | 40 ++++++++++++++++++++++++--------------- - src/python/python3/CMakeLists.txt | 40 ++++++++++++++++++++++++--------------- - 2 files changed, 50 insertions(+), 30 deletions(-) - -diff --git a/src/python/python2/CMakeLists.txt b/src/python/python2/CMakeLists.txt -index faceec3..02b4063 100644 ---- a/src/python/python2/CMakeLists.txt -+++ b/src/python/python2/CMakeLists.txt -@@ -1,23 +1,33 @@ - project(python2-pamtest C) - --unset(PYTHON_EXECUTABLE CACHE) --unset(PYTHON_INCLUDE_DIR CACHE) --unset(PYTHON_LIBRARY CACHE) --unset(PYTHON_SITELIB CACHE) --unset(PYTHONLIBS_FOUND CACHE) --unset(PYTHONLIBS_VERSION_STRING CACHE) -+if (NOT PYTHON2_LIBRARY) -+ unset(PYTHON_EXECUTABLE CACHE) -+ unset(PYTHON_INCLUDE_DIR CACHE) -+ unset(PYTHON_LIBRARY CACHE) -+ unset(PYTHON_SITELIB CACHE) -+ unset(PYTHONLIBS_FOUND CACHE) -+ unset(PYTHONLIBS_VERSION_STRING CACHE) - --set(Python_ADDITIONAL_VERSIONS 2.7 2.6) --find_package(PythonLibs) --find_package(PythonInterp) --find_package(PythonSiteLibs) -+ find_package(PythonLibs 2) -+ find_package(PythonInterp 2) -+ find_package(PythonSiteLibs 2) - --if (PYTHONLIBS_FOUND) -- set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "PYTHON2_EXECUTABLE") -- set(PYTHON2_INCLUDE_DIR ${PYTHON_INCLUDE_DIR}) -- set(PYTHON2_LIBRARY ${PYTHON_LIBRARY}) -- set(PYTHON2_SITELIB ${PYTHON_SITELIB}) -+ if (PYTHONLIBS_FOUND) -+ set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "PYTHON2_EXECUTABLE") -+ set(PYTHON2_INCLUDE_DIR ${PYTHON_INCLUDE_DIR}) -+ set(PYTHON2_LIBRARY ${PYTHON_LIBRARY}) -+ set(PYTHON2_SITELIB ${PYTHON_SITELIB}) -+ endif() - -+ unset(PYTHON_EXECUTABLE CACHE) -+ unset(PYTHON_INCLUDE_DIR CACHE) -+ unset(PYTHON_LIBRARY CACHE) -+ unset(PYTHON_SITELIB CACHE) -+ unset(PYTHONLIBS_FOUND CACHE) -+ unset(PYTHONLIBS_VERSION_STRING CACHE) -+endif() -+ -+if (PYTHON2_INCLUDE_DIR AND PYTHON2_LIBRARY AND PYTHON2_SITELIB) - include_directories(${CMAKE_BINARY_DIR}) - include_directories(${pam_wrapper-headers_DIR}) - include_directories(${PYTHON2_INCLUDE_DIR}) -diff --git a/src/python/python3/CMakeLists.txt b/src/python/python3/CMakeLists.txt -index 1e1599b..1a61303 100644 ---- a/src/python/python3/CMakeLists.txt -+++ b/src/python/python3/CMakeLists.txt -@@ -1,23 +1,33 @@ - project(python3-pamtest C) - --unset(PYTHON_EXECUTABLE CACHE) --unset(PYTHON_INCLUDE_DIR CACHE) --unset(PYTHON_LIBRARY CACHE) --unset(PYTHON_SITELIB CACHE) --unset(PYTHONLIBS_FOUND CACHE) --unset(PYTHONLIBS_VERSION_STRING CACHE) -+if (NOT PYTHON3_LIBRARY) -+ unset(PYTHON_EXECUTABLE CACHE) -+ unset(PYTHON_INCLUDE_DIR CACHE) -+ unset(PYTHON_LIBRARY CACHE) -+ unset(PYTHON_SITELIB CACHE) -+ unset(PYTHONLIBS_FOUND CACHE) -+ unset(PYTHONLIBS_VERSION_STRING CACHE) - --set(Python_ADDITIONAL_VERSIONS 3.8 3.7 3.6) --find_package(PythonLibs) --find_package(PythonInterp) --find_package(PythonSiteLibs) -+ find_package(PythonLibs 3) -+ find_package(PythonInterp 3) -+ find_package(PythonSiteLibs 3) - --if (PYTHONLIBS_FOUND) -- set(PYTHON3_LIBRARY ${PYTHON_LIBRARY}) -- set(PYTHON3_INCLUDE_DIR ${PYTHON_INCLUDE_DIR}) -- set(PYTHON3_SITELIB ${PYTHON_SITELIB}) -- set(PYTHON3_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "PYTHON3_EXECUTABLE") -+ if (PYTHONLIBS_FOUND) -+ set(PYTHON3_LIBRARY ${PYTHON_LIBRARY}) -+ set(PYTHON3_INCLUDE_DIR ${PYTHON_INCLUDE_DIR}) -+ set(PYTHON3_SITELIB ${PYTHON_SITELIB}) -+ set(PYTHON3_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "PYTHON3_EXECUTABLE") -+ endif() - -+ unset(PYTHON_EXECUTABLE CACHE) -+ unset(PYTHON_INCLUDE_DIR CACHE) -+ unset(PYTHON_LIBRARY CACHE) -+ unset(PYTHON_SITELIB CACHE) -+ unset(PYTHONLIBS_FOUND CACHE) -+ unset(PYTHONLIBS_VERSION_STRING CACHE) -+endif() -+ -+if (PYTHON3_INCLUDE_DIR AND PYTHON3_LIBRARY AND PYTHON3_SITELIB) - include_directories(${CMAKE_BINARY_DIR}) - include_directories(${pam_wrapper-headers_DIR}) - include_directories(${PYTHON3_INCLUDE_DIR}) --- -cgit v1.1 - diff --git a/devel/pam_wrapper/pkg-plist b/devel/pam_wrapper/pkg-plist index e16b23f152bb..5c58409319ba 100644 --- a/devel/pam_wrapper/pkg-plist +++ b/devel/pam_wrapper/pkg-plist @@ -1,21 +1,21 @@ -libdata/pkgconfig/pam_wrapper.pc -libdata/pkgconfig/libpamtest.pc +include/libpamtest.h +lib/cmake/libpamtest/libpamtest-config-version.cmake +lib/cmake/libpamtest/libpamtest-config.cmake lib/cmake/pam_wrapper/pam_wrapper-config-version.cmake lib/cmake/pam_wrapper/pam_wrapper-config.cmake -lib/cmake/libpamtest/libpamtest-config.cmake -lib/cmake/libpamtest/libpamtest-config-version.cmake -lib/libpam_wrapper.so.0.0.3 -lib/libpam_wrapper.so.0 lib/libpam_wrapper.so -lib/libpamtest.so.0.0.3 -lib/libpamtest.so.0 +lib/libpam_wrapper.so.0 +lib/libpam_wrapper.so.0.0.3 lib/libpamtest.so -lib/pam_wrapper/pam_matrix.so +lib/libpamtest.so.0 +lib/libpamtest.so.0.0.3 lib/pam_wrapper/pam_get_items.so +lib/pam_wrapper/pam_matrix.so lib/pam_wrapper/pam_set_items.so %%PYTHON_SITELIBDIR%%/pypamtest.so -include/libpamtest.h +libdata/pkgconfig/libpamtest.pc +libdata/pkgconfig/pam_wrapper.pc share/man/man1/pam_wrapper.1.gz -share/man/man8/pam_matrix.8.gz share/man/man8/pam_get_items.8.gz +share/man/man8/pam_matrix.8.gz share/man/man8/pam_set_items.8.gz