CVS commit: pkgsrc/security/kauth

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jan 27 19:08:12 UTC 2018

Modified Files:
        pkgsrc/security/kauth: Makefile distinfo
Added Files:
        pkgsrc/security/kauth/patches: patch-cmake_KF5AuthMacros.cmake

Log Message:
kauth: allow overriding the dbus install directory


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/kauth/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/kauth/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/kauth/patches/patch-cmake_KF5AuthMacros.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/kauth/Makefile
diff -u pkgsrc/security/kauth/Makefile:1.15 pkgsrc/security/kauth/Makefile:1.16
--- pkgsrc/security/kauth/Makefile:1.15 Wed Jan 24 19:06:09 2018
+++ pkgsrc/security/kauth/Makefile      Sat Jan 27 19:08:12 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2018/01/24 19:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/27 19:08:12 markd Exp $
 
 DISTNAME=      kauth-${KF5VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 
 HOMEPAGE=      https://community.kde.org/Frameworks

Index: pkgsrc/security/kauth/distinfo
diff -u pkgsrc/security/kauth/distinfo:1.3 pkgsrc/security/kauth/distinfo:1.4
--- pkgsrc/security/kauth/distinfo:1.3  Wed Jan 17 20:06:50 2018
+++ pkgsrc/security/kauth/distinfo      Sat Jan 27 19:08:12 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2018/01/17 20:06:50 markd Exp $
+$NetBSD: distinfo,v 1.4 2018/01/27 19:08:12 markd Exp $
 
 SHA1 (kauth-5.41.0.tar.xz) = c27eca013d745a9bac55da62c86e7c517a3b12f4
 RMD160 (kauth-5.41.0.tar.xz) = 7b2961b3854f05832a9b99845a36580c5e5bc861
 SHA512 (kauth-5.41.0.tar.xz) = cbdd40ccd9c0cf067cb08b0db252f4cef1ea58a810246e232038caabadd92111e6b8cd3947f1591cd5e69e5ee00f8b9d93fce6ef0c063cb7991e0d88948d6bd6
 Size (kauth-5.41.0.tar.xz) = 84928 bytes
+SHA1 (patch-cmake_KF5AuthMacros.cmake) = edc57a69476c68ed4b0769929303160c2f318268
 SHA1 (patch-src_ConfigureChecks.cmake) = c38cca661b579dcab28b16c982e7a336f58d6984

Added files:

Index: pkgsrc/security/kauth/patches/patch-cmake_KF5AuthMacros.cmake
diff -u /dev/null pkgsrc/security/kauth/patches/patch-cmake_KF5AuthMacros.cmake:1.1
--- /dev/null   Sat Jan 27 19:08:12 2018
+++ pkgsrc/security/kauth/patches/patch-cmake_KF5AuthMacros.cmake       Sat Jan 27 19:08:12 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-cmake_KF5AuthMacros.cmake,v 1.1 2018/01/27 19:08:12 markd Exp $
+
+Allow overriding the dbus-1/system.d install directory
+
+--- cmake/KF5AuthMacros.cmake.orig     2017-12-02 20:02:04.000000000 +0000
++++ cmake/KF5AuthMacros.cmake
+@@ -32,12 +32,15 @@
+ # to a DBus policy to let the helper register on the system bus, and a service file for letting the helper
+ # being automatically activated by the system bus.
+ # *WARNING* You have to install the helper in ${KAUTH_HELPER_INSTALL_DIR} to make sure everything will work.
++
++set(KAUTH_DBUS_DIR  ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/ CACHE PATH "DBus system directory")
++
+ function(KAUTH_INSTALL_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
+     if(KAUTH_HELPER_BACKEND_NAME STREQUAL "DBUS")
+         configure_file(${KAUTH_STUB_FILES_DIR}/dbus_policy.stub
+                         ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf
+-                DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
++                DESTINATION ${KAUTH_DBUS_DIR})
+ 
+         configure_file(${KAUTH_STUB_FILES_DIR}/dbus_service.stub
+                         ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)