Date: Tue, 3 Jul 2018 13:09:10 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473829 - in head/devel: nss_wrapper pam_wrapper pam_wrapper/files resolv_wrapper socket_wrapper uid_wrapper Message-ID: <201807031309.w63D9ANl054626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Tue Jul 3 13:09:10 2018 New Revision: 473829 URL: https://svnweb.freebsd.org/changeset/ports/473829 Log: Incorporate mat@ cleanup suggrestions Added: head/devel/pam_wrapper/files/ head/devel/pam_wrapper/files/python-detection.patch (contents, props changed) head/devel/pam_wrapper/pkg-plist (contents, props changed) Modified: head/devel/nss_wrapper/Makefile head/devel/nss_wrapper/pkg-descr head/devel/pam_wrapper/Makefile head/devel/pam_wrapper/pkg-descr head/devel/resolv_wrapper/Makefile head/devel/resolv_wrapper/pkg-descr head/devel/socket_wrapper/Makefile head/devel/socket_wrapper/pkg-descr head/devel/uid_wrapper/Makefile head/devel/uid_wrapper/pkg-descr Modified: head/devel/nss_wrapper/Makefile ============================================================================== --- head/devel/nss_wrapper/Makefile Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/nss_wrapper/Makefile Tue Jul 3 13:09:10 2018 (r473829) @@ -14,14 +14,14 @@ USES= cmake:outsource perl5 shebangfix USE_PERL5= run USE_LDCONFIG= yes -CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" +CMAKE_ARGS= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST -TEST_TARGET= test +TEST_TEST_TARGET= test TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka +TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka SHEBANG_FILES= nss_wrapper.pl Modified: head/devel/nss_wrapper/pkg-descr ============================================================================== --- head/devel/nss_wrapper/pkg-descr Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/nss_wrapper/pkg-descr Tue Jul 3 13:09:10 2018 (r473829) @@ -14,4 +14,4 @@ with socket_wrapper. - Network name resolution using a hosts file. - Loading and testing of NSS modules. -WWW: https://cwrap.org/ +WWW: https://cwrap.org/nss_wrapper.html Modified: head/devel/pam_wrapper/Makefile ============================================================================== --- head/devel/pam_wrapper/Makefile Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/pam_wrapper/Makefile Tue Jul 3 13:09:10 2018 (r473829) @@ -2,6 +2,7 @@ PORTNAME= pam_wrapper PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SAMBA/cwrap @@ -10,38 +11,18 @@ COMMENT= Preloadable wrapper to test PAM applications LICENSE= GPLv3 +EXTRA_PATCHES= ${PATCHDIR}/python-detection.patch:-p1 + USES= cmake:outsource python:2.7+ USE_LDCONFIG= yes -CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" +CMAKE_ARGS= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST -TEST_TARGET= test +TEST_TEST_TARGET= test TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka - -PLIST_FILES= libdata/pkgconfig/pam_wrapper.pc \ - libdata/pkgconfig/libpamtest.pc \ - 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/libpamtest.so \ - lib/pam_wrapper/pam_matrix.so \ - lib/pam_wrapper/pam_get_items.so \ - lib/pam_wrapper/pam_set_items.so \ - ${PYTHON_SITELIBDIR}/pypamtest.so \ - include/libpamtest.h \ - man/man1/pam_wrapper.1.gz \ - man/man8/pam_matrix.8.gz \ - man/man8/pam_get_items.8.gz \ - man/man8/pam_set_items.8.gz +TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka .include <bsd.port.mk> Added: head/devel/pam_wrapper/files/python-detection.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pam_wrapper/files/python-detection.patch Tue Jul 3 13:09:10 2018 (r473829) @@ -0,0 +1,120 @@ +From 6d25aa0f94a8fb7f263b88eb3b0c0d15c1d88ed6 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@samba.org> +Date: Tue, 3 Jul 2018 11:33:04 +0200 +Subject: cmake: Fix python2 and python3 detection + +Signed-off-by: Andreas Schneider <asn@samba.org> +--- + 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 + Modified: head/devel/pam_wrapper/pkg-descr ============================================================================== --- head/devel/pam_wrapper/pkg-descr Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/pam_wrapper/pkg-descr Tue Jul 3 13:09:10 2018 (r473829) @@ -5,4 +5,4 @@ we have implemented. It simplifies testing of modules. with the cmocka unit testing framework or you can use the provided Python bindings to write tests for your module in Python. -WWW: https://cwrap.org/ +WWW: https://cwrap.org/pam_wrapper.html Added: head/devel/pam_wrapper/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pam_wrapper/pkg-plist Tue Jul 3 13:09:10 2018 (r473829) @@ -0,0 +1,21 @@ +libdata/pkgconfig/pam_wrapper.pc +libdata/pkgconfig/libpamtest.pc +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/libpamtest.so +lib/pam_wrapper/pam_matrix.so +lib/pam_wrapper/pam_get_items.so +lib/pam_wrapper/pam_set_items.so +%%PYTHON_SITELIBDIR%%/pypamtest.so +include/libpamtest.h +man/man1/pam_wrapper.1.gz +man/man8/pam_matrix.8.gz +man/man8/pam_get_items.8.gz +man/man8/pam_set_items.8.gz Modified: head/devel/resolv_wrapper/Makefile ============================================================================== --- head/devel/resolv_wrapper/Makefile Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/resolv_wrapper/Makefile Tue Jul 3 13:09:10 2018 (r473829) @@ -13,14 +13,14 @@ LICENSE= GPLv3 USES= cmake:outsource USE_LDCONFIG= yes -CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" +CMAKE_ARGS= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST -TEST_TARGET= test +TEST_TEST_TARGET= test TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka +TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka PLIST_FILES= libdata/pkgconfig/resolv_wrapper.pc \ lib/cmake/resolv_wrapper/resolv_wrapper-config-version.cmake \ Modified: head/devel/resolv_wrapper/pkg-descr ============================================================================== --- head/devel/resolv_wrapper/pkg-descr Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/resolv_wrapper/pkg-descr Tue Jul 3 13:09:10 2018 (r473829) @@ -7,4 +7,4 @@ and return valid responses to your application. - Redirects name queries to the nameservers specified in your resolv.conf - Can fake DNS queries using a simple formatted DNS hosts file. -WWW: https://cwrap.org/ +WWW: https://cwrap.org/resolv_wrapper.html Modified: head/devel/socket_wrapper/Makefile ============================================================================== --- head/devel/socket_wrapper/Makefile Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/socket_wrapper/Makefile Tue Jul 3 13:09:10 2018 (r473829) @@ -13,14 +13,14 @@ LICENSE= GPLv3 USES= cmake:outsource USE_LDCONFIG= yes -CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" +CMAKE_ARGS= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST -TEST_TARGET= test +TEST_TEST_TARGET= test TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka +TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka PLIST_FILES= libdata/pkgconfig/socket_wrapper.pc \ lib/cmake/socket_wrapper/socket_wrapper-config-version.cmake \ Modified: head/devel/socket_wrapper/pkg-descr ============================================================================== --- head/devel/socket_wrapper/pkg-descr Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/socket_wrapper/pkg-descr Tue Jul 3 13:09:10 2018 (r473829) @@ -7,4 +7,4 @@ testing of complex network configurations. - Support for IPv4 and IPv6 socket and addressing emulation. - Ablility to capture network traffic in pcap format. -WWW: https://cwrap.org/ +WWW: https://cwrap.org/socket_wrapper.html Modified: head/devel/uid_wrapper/Makefile ============================================================================== --- head/devel/uid_wrapper/Makefile Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/uid_wrapper/Makefile Tue Jul 3 13:09:10 2018 (r473829) @@ -13,14 +13,14 @@ LICENSE= GPLv3 USES= cmake:outsource USE_LDCONFIG= yes -CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" +CMAKE_ARGS= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST -TEST_TARGET= test +TEST_TEST_TARGET= test TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka +TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka PLIST_FILES= libdata/pkgconfig/uid_wrapper.pc \ lib/cmake/uid_wrapper/uid_wrapper-config-version.cmake \ Modified: head/devel/uid_wrapper/pkg-descr ============================================================================== --- head/devel/uid_wrapper/pkg-descr Tue Jul 3 13:08:59 2018 (r473828) +++ head/devel/uid_wrapper/pkg-descr Tue Jul 3 13:09:10 2018 (r473829) @@ -14,4 +14,4 @@ to the connection user and do file operations. uid_wra the application letting it believe it is operating as root and even switching between UIDs and GIDs as needed. -WWW: https://cwrap.org/ +WWW: https://cwrap.org/uid_wrapper.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807031309.w63D9ANl054626>