CVS commit: pkgsrc/security/kwallet

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Feb  8 13:49:04 UTC 2018

Modified Files:
        pkgsrc/security/kwallet: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/kwallet/patches:
            patch-src_runtime_kwalletd_backend_blowfish.h

Log Message:
kwallet: Fix build, handle categories file correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/kwallet/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/kwallet/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/kwallet/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/kwallet/patches/patch-src_runtime_kwalletd_backend_blowfish.h

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

Modified files:

Index: pkgsrc/security/kwallet/Makefile
diff -u pkgsrc/security/kwallet/Makefile:1.36 pkgsrc/security/kwallet/Makefile:1.37
--- pkgsrc/security/kwallet/Makefile:1.36       Wed Jan 24 19:06:09 2018
+++ pkgsrc/security/kwallet/Makefile    Thu Feb  8 13:49:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/01/24 19:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.37 2018/02/08 13:49:03 jperkin Exp $
 
 DISTNAME=      kwallet-${KF5VER}
 PKGREVISION=   1
@@ -14,6 +14,16 @@ BUILD_DEPENDS+=      kdoctools>=${KF5VER}:../
 
 USE_TOOLS+=    msgmerge
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       pre-configure
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
+
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
+CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/kwallet.categories \
+               ${PKG_SYSCONFDIR}/xdg/kwallet.categories
+
 .include "../../lang/python/tool.mk"
 .include "../../devel/knotifications/buildlink3.mk"
 .include "../../devel/kservice/buildlink3.mk"

Index: pkgsrc/security/kwallet/PLIST
diff -u pkgsrc/security/kwallet/PLIST:1.6 pkgsrc/security/kwallet/PLIST:1.7
--- pkgsrc/security/kwallet/PLIST:1.6   Wed Jan 17 20:06:50 2018
+++ pkgsrc/security/kwallet/PLIST       Thu Feb  8 13:49:03 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/17 20:06:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/02/08 13:49:03 jperkin Exp $
 bin/kwallet-query
 bin/kwalletd5
 include/KF5/KWallet/KWallet
@@ -20,6 +20,7 @@ qt5/mkspecs/modules/qt_KWallet.pri
 share/dbus-1/interfaces/kf5_org.kde.KWallet.xml
 share/dbus-1/services/org.kde.kwalletd.service
 share/dbus-1/services/org.kde.kwalletd5.service
+share/examples/kde-xdg/kwallet.categories
 share/knotifications5/kwalletd.notifyrc
 share/kservices5/kwalletd5.desktop
 share/locale/ar/LC_MESSAGES/kwalletd5.mo

Index: pkgsrc/security/kwallet/distinfo
diff -u pkgsrc/security/kwallet/distinfo:1.12 pkgsrc/security/kwallet/distinfo:1.13
--- pkgsrc/security/kwallet/distinfo:1.12       Wed Jan 17 20:06:50 2018
+++ pkgsrc/security/kwallet/distinfo    Thu Feb  8 13:49:03 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2018/01/17 20:06:50 markd Exp $
+$NetBSD: distinfo,v 1.13 2018/02/08 13:49:03 jperkin Exp $
 
 SHA1 (kwallet-5.41.0.tar.xz) = 6c6eee6baa6a1733d383bb06e1b4163065a9dc8e
 RMD160 (kwallet-5.41.0.tar.xz) = e60000156ec099870c4367dcb3a3a05242292b6f
 SHA512 (kwallet-5.41.0.tar.xz) = 572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74
 Size (kwallet-5.41.0.tar.xz) = 306496 bytes
+SHA1 (patch-src_runtime_kwalletd_backend_blowfish.h) = c36149fb54391d3023f37f13d3617a6a3efd6518

Added files:

Index: pkgsrc/security/kwallet/patches/patch-src_runtime_kwalletd_backend_blowfish.h
diff -u /dev/null pkgsrc/security/kwallet/patches/patch-src_runtime_kwalletd_backend_blowfish.h:1.1
--- /dev/null   Thu Feb  8 13:49:04 2018
+++ pkgsrc/security/kwallet/patches/patch-src_runtime_kwalletd_backend_blowfish.h       Thu Feb  8 13:49:04 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_kwalletd_backend_blowfish.h,v 1.1 2018/02/08 13:49:04 jperkin Exp $
+
+Avoid macro conflicts.
+
+--- src/runtime/kwalletd/backend/blowfish.h.orig       2017-12-02 20:09:03.000000000 +0000
++++ src/runtime/kwalletd/backend/blowfish.h
+@@ -54,6 +54,8 @@ public:
+     virtual int decrypt(void *block, int len);
+ 
+ private:
++#undef _S
++#undef _P
+     uint32_t _S[4][256];
+     uint32_t _P[18];
+