Tue Jan 21 14:04:16 2020 UTC ()
libsecret: Update for 0.20.0

Needed for updating epiphany.

0.20.0
 * secret-backend: New interface to represent password storage backend [!34]
 * secret-backend: Add local-storage backend [!6]
 * item: Port to GTask [!43]
 * Build fixes [!34, !37, !38, !40, !41, !42, ...]
 * Updated translations

0.19.1
 * service: Fix secret_service_ensure_session_finish error propagation [!36]

0.19.0
 * secret-password: Add necessary functions to migrate from D-Bus based API [!32]
 * egg: Request that secure memory not be dumped to disk [!30]
 * Add version macros [!29]
 * Add missing GType to flags in .gir [!16, !19]
 * paths: Port from GSimpleAsyncResult to GTask [!26]
 * build: Bump meson_version to 0.50 [!18, !35]
 * Build and test fixes [!15, !20, !21, !23, !33, ...]


(nia)
diff -r1.16 -r1.17 pkgsrc/security/libsecret/Makefile
diff -r1.7 -r1.8 pkgsrc/security/libsecret/PLIST
diff -r1.12 -r1.13 pkgsrc/security/libsecret/distinfo
diff -r0 -r1.1 pkgsrc/security/libsecret/patches/patch-libsecret_secret-file-collection.c
cvs diff -r1.16 -r1.17 pkgsrc/security/libsecret/Makefile (expand / switch to unified diff)

--- pkgsrc/security/libsecret/Makefile 2019/08/16 10:16:00 1.16
+++ pkgsrc/security/libsecret/Makefile 2020/01/21 14:04:16 1.17
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.16 2019/08/16 10:16:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2020/01/21 14:04:16 nia Exp $
2 2
3DISTNAME= libsecret-0.18.8 3DISTNAME= libsecret-0.20.0
4CATEGORIES= security gnome 4CATEGORIES= security gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsecret/0.18/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsecret/0.20/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= https://wiki.gnome.org/Projects/Libsecret 9HOMEPAGE= https://wiki.gnome.org/Projects/Libsecret
10COMMENT= GObject based library for accessing the Secret Service API 10COMMENT= GObject based library for accessing the Secret Service API
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 13BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
14BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 14BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
15TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 15TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake intltool pkg-config msgfmt gsed 19USE_TOOLS+= gmake pkg-config gsed
 20USE_TOOLS+= msgfmt msgmerge xgettext
20 21
21PKGCONFIG_OVERRIDE+= libsecret/libsecret-unstable.pc.in 22PKGCONFIG_OVERRIDE+= libsecret/libsecret-unstable.pc.in
22PKGCONFIG_OVERRIDE+= libsecret/libsecret.pc.in 23PKGCONFIG_OVERRIDE+= libsecret/libsecret.pc.in
23 24
24BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0 25BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0
25.include "../../devel/glib2/buildlink3.mk" 26.include "../../devel/glib2/buildlink3.mk"
26.include "../../security/libgcrypt/buildlink3.mk" 27.include "../../security/libgcrypt/buildlink3.mk"
27.include "options.mk" 28.include "options.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/security/libsecret/PLIST (expand / switch to unified diff)

--- pkgsrc/security/libsecret/PLIST 2018/04/16 13:06:57 1.7
+++ pkgsrc/security/libsecret/PLIST 2020/01/21 14:04:16 1.8
@@ -1,60 +1,65 @@ @@ -1,60 +1,65 @@
1@comment $NetBSD: PLIST,v 1.7 2018/04/16 13:06:57 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.8 2020/01/21 14:04:16 nia Exp $
2bin/secret-tool 2bin/secret-tool
3include/libsecret-1/libsecret/secret-attributes.h 3include/libsecret-1/libsecret/secret-attributes.h
 4include/libsecret-1/libsecret/secret-backend.h
4include/libsecret-1/libsecret/secret-collection.h 5include/libsecret-1/libsecret/secret-collection.h
5include/libsecret-1/libsecret/secret-enum-types.h 6include/libsecret-1/libsecret/secret-enum-types.h
6include/libsecret-1/libsecret/secret-item.h 7include/libsecret-1/libsecret/secret-item.h
7include/libsecret-1/libsecret/secret-password.h 8include/libsecret-1/libsecret/secret-password.h
8include/libsecret-1/libsecret/secret-paths.h 9include/libsecret-1/libsecret/secret-paths.h
9include/libsecret-1/libsecret/secret-prompt.h 10include/libsecret-1/libsecret/secret-prompt.h
 11include/libsecret-1/libsecret/secret-retrievable.h
10include/libsecret-1/libsecret/secret-schema.h 12include/libsecret-1/libsecret/secret-schema.h
11include/libsecret-1/libsecret/secret-schemas.h 13include/libsecret-1/libsecret/secret-schemas.h
12include/libsecret-1/libsecret/secret-service.h 14include/libsecret-1/libsecret/secret-service.h
13include/libsecret-1/libsecret/secret-types.h 15include/libsecret-1/libsecret/secret-types.h
14include/libsecret-1/libsecret/secret-value.h 16include/libsecret-1/libsecret/secret-value.h
 17include/libsecret-1/libsecret/secret-version.h
15include/libsecret-1/libsecret/secret.h 18include/libsecret-1/libsecret/secret.h
16${PLIST.introspection}lib/girepository-1.0/Secret-1.typelib 19${PLIST.introspection}lib/girepository-1.0/Secret-1.typelib
17lib/libsecret-1.la 20lib/libsecret-1.la
18lib/pkgconfig/libsecret-1.pc 21lib/pkgconfig/libsecret-1.pc
19lib/pkgconfig/libsecret-unstable.pc 22lib/pkgconfig/libsecret-unstable.pc
20man/man1/secret-tool.1 23man/man1/secret-tool.1
21${PLIST.introspection}share/gir-1.0/Secret-1.gir 24${PLIST.introspection}share/gir-1.0/Secret-1.gir
22share/gtk-doc/html/libsecret-1/SecretCollection.html 25share/gtk-doc/html/libsecret-1/SecretCollection.html
23share/gtk-doc/html/libsecret-1/SecretItem.html 26share/gtk-doc/html/libsecret-1/SecretItem.html
24share/gtk-doc/html/libsecret-1/SecretPrompt.html 27share/gtk-doc/html/libsecret-1/SecretPrompt.html
 28share/gtk-doc/html/libsecret-1/SecretRetrievable.html
25share/gtk-doc/html/libsecret-1/SecretService.html 29share/gtk-doc/html/libsecret-1/SecretService.html
26share/gtk-doc/html/libsecret-1/SecretValue.html 30share/gtk-doc/html/libsecret-1/SecretValue.html
27share/gtk-doc/html/libsecret-1/annotation-glossary.html 31share/gtk-doc/html/libsecret-1/annotation-glossary.html
28share/gtk-doc/html/libsecret-1/c-examples.html 32share/gtk-doc/html/libsecret-1/c-examples.html
29share/gtk-doc/html/libsecret-1/c-lookup-example.html 33share/gtk-doc/html/libsecret-1/c-lookup-example.html
30share/gtk-doc/html/libsecret-1/c-remove-example.html 34share/gtk-doc/html/libsecret-1/c-remove-example.html
31share/gtk-doc/html/libsecret-1/c-store-example.html 35share/gtk-doc/html/libsecret-1/c-store-example.html
32share/gtk-doc/html/libsecret-1/complete.html 36share/gtk-doc/html/libsecret-1/complete.html
33share/gtk-doc/html/libsecret-1/examples.html 37share/gtk-doc/html/libsecret-1/examples.html
34share/gtk-doc/html/libsecret-1/home.png 38share/gtk-doc/html/libsecret-1/home.png
35share/gtk-doc/html/libsecret-1/index.html 39share/gtk-doc/html/libsecret-1/index.html
36share/gtk-doc/html/libsecret-1/js-examples.html 40share/gtk-doc/html/libsecret-1/js-examples.html
37share/gtk-doc/html/libsecret-1/js-lookup-example.html 41share/gtk-doc/html/libsecret-1/js-lookup-example.html
38share/gtk-doc/html/libsecret-1/js-remove-example.html 42share/gtk-doc/html/libsecret-1/js-remove-example.html
39share/gtk-doc/html/libsecret-1/js-store-example.html 43share/gtk-doc/html/libsecret-1/js-store-example.html
40share/gtk-doc/html/libsecret-1/left-insensitive.png 44share/gtk-doc/html/libsecret-1/left-insensitive.png
41share/gtk-doc/html/libsecret-1/left.png 45share/gtk-doc/html/libsecret-1/left.png
42share/gtk-doc/html/libsecret-1/libsecret-1.devhelp2 46share/gtk-doc/html/libsecret-1/libsecret-1.devhelp2
43share/gtk-doc/html/libsecret-1/libsecret-DBus-Path-Related-Functions.html 47share/gtk-doc/html/libsecret-1/libsecret-DBus-Path-Related-Functions.html
44share/gtk-doc/html/libsecret-1/libsecret-Password-storage.html 48share/gtk-doc/html/libsecret-1/libsecret-Password-storage.html
45share/gtk-doc/html/libsecret-1/libsecret-Secret-Attributes.html 49share/gtk-doc/html/libsecret-1/libsecret-Secret-Attributes.html
46share/gtk-doc/html/libsecret-1/libsecret-SecretError.html 50share/gtk-doc/html/libsecret-1/libsecret-SecretError.html
47share/gtk-doc/html/libsecret-1/libsecret-SecretSchema.html 51share/gtk-doc/html/libsecret-1/libsecret-SecretSchema.html
 52share/gtk-doc/html/libsecret-1/libsecret-Version-Information.html
48share/gtk-doc/html/libsecret-1/migrating-api.html 53share/gtk-doc/html/libsecret-1/migrating-api.html
49share/gtk-doc/html/libsecret-1/migrating-introduction.html 54share/gtk-doc/html/libsecret-1/migrating-introduction.html
50share/gtk-doc/html/libsecret-1/migrating-items.html 55share/gtk-doc/html/libsecret-1/migrating-items.html
51share/gtk-doc/html/libsecret-1/migrating-keyrings.html 56share/gtk-doc/html/libsecret-1/migrating-keyrings.html
52share/gtk-doc/html/libsecret-1/migrating-locking.html 57share/gtk-doc/html/libsecret-1/migrating-locking.html
53share/gtk-doc/html/libsecret-1/migrating-memory.html 58share/gtk-doc/html/libsecret-1/migrating-memory.html
54share/gtk-doc/html/libsecret-1/migrating-misc.html 59share/gtk-doc/html/libsecret-1/migrating-misc.html
55share/gtk-doc/html/libsecret-1/migrating-removing.html 60share/gtk-doc/html/libsecret-1/migrating-removing.html
56share/gtk-doc/html/libsecret-1/migrating-schemas.html 61share/gtk-doc/html/libsecret-1/migrating-schemas.html
57share/gtk-doc/html/libsecret-1/migrating-searching.html 62share/gtk-doc/html/libsecret-1/migrating-searching.html
58share/gtk-doc/html/libsecret-1/migrating-storing.html 63share/gtk-doc/html/libsecret-1/migrating-storing.html
59share/gtk-doc/html/libsecret-1/migrating.html 64share/gtk-doc/html/libsecret-1/migrating.html
60share/gtk-doc/html/libsecret-1/py-examples.html 65share/gtk-doc/html/libsecret-1/py-examples.html
@@ -97,26 +102,27 @@ share/locale/fr/LC_MESSAGES/libsecret.mo @@ -97,26 +102,27 @@ share/locale/fr/LC_MESSAGES/libsecret.mo
97share/locale/fur/LC_MESSAGES/libsecret.mo 102share/locale/fur/LC_MESSAGES/libsecret.mo
98share/locale/gl/LC_MESSAGES/libsecret.mo 103share/locale/gl/LC_MESSAGES/libsecret.mo
99share/locale/he/LC_MESSAGES/libsecret.mo 104share/locale/he/LC_MESSAGES/libsecret.mo
100share/locale/hr/LC_MESSAGES/libsecret.mo 105share/locale/hr/LC_MESSAGES/libsecret.mo
101share/locale/hu/LC_MESSAGES/libsecret.mo 106share/locale/hu/LC_MESSAGES/libsecret.mo
102share/locale/id/LC_MESSAGES/libsecret.mo 107share/locale/id/LC_MESSAGES/libsecret.mo
103share/locale/it/LC_MESSAGES/libsecret.mo 108share/locale/it/LC_MESSAGES/libsecret.mo
104share/locale/ja/LC_MESSAGES/libsecret.mo 109share/locale/ja/LC_MESSAGES/libsecret.mo
105share/locale/kk/LC_MESSAGES/libsecret.mo 110share/locale/kk/LC_MESSAGES/libsecret.mo
106share/locale/ko/LC_MESSAGES/libsecret.mo 111share/locale/ko/LC_MESSAGES/libsecret.mo
107share/locale/lt/LC_MESSAGES/libsecret.mo 112share/locale/lt/LC_MESSAGES/libsecret.mo
108share/locale/lv/LC_MESSAGES/libsecret.mo 113share/locale/lv/LC_MESSAGES/libsecret.mo
109share/locale/ml/LC_MESSAGES/libsecret.mo 114share/locale/ml/LC_MESSAGES/libsecret.mo
 115share/locale/ms/LC_MESSAGES/libsecret.mo
110share/locale/nb/LC_MESSAGES/libsecret.mo 116share/locale/nb/LC_MESSAGES/libsecret.mo
111share/locale/ne/LC_MESSAGES/libsecret.mo 117share/locale/ne/LC_MESSAGES/libsecret.mo
112share/locale/nl/LC_MESSAGES/libsecret.mo 118share/locale/nl/LC_MESSAGES/libsecret.mo
113share/locale/oc/LC_MESSAGES/libsecret.mo 119share/locale/oc/LC_MESSAGES/libsecret.mo
114share/locale/pa/LC_MESSAGES/libsecret.mo 120share/locale/pa/LC_MESSAGES/libsecret.mo
115share/locale/pl/LC_MESSAGES/libsecret.mo 121share/locale/pl/LC_MESSAGES/libsecret.mo
116share/locale/pt/LC_MESSAGES/libsecret.mo 122share/locale/pt/LC_MESSAGES/libsecret.mo
117share/locale/pt_BR/LC_MESSAGES/libsecret.mo 123share/locale/pt_BR/LC_MESSAGES/libsecret.mo
118share/locale/ro/LC_MESSAGES/libsecret.mo 124share/locale/ro/LC_MESSAGES/libsecret.mo
119share/locale/ru/LC_MESSAGES/libsecret.mo 125share/locale/ru/LC_MESSAGES/libsecret.mo
120share/locale/sk/LC_MESSAGES/libsecret.mo 126share/locale/sk/LC_MESSAGES/libsecret.mo
121share/locale/sl/LC_MESSAGES/libsecret.mo 127share/locale/sl/LC_MESSAGES/libsecret.mo
122share/locale/sr/LC_MESSAGES/libsecret.mo 128share/locale/sr/LC_MESSAGES/libsecret.mo
cvs diff -r1.12 -r1.13 pkgsrc/security/libsecret/distinfo (expand / switch to unified diff)

--- pkgsrc/security/libsecret/distinfo 2019/08/16 10:16:00 1.12
+++ pkgsrc/security/libsecret/distinfo 2020/01/21 14:04:16 1.13
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.12 2019/08/16 10:16:00 wiz Exp $ 1$NetBSD: distinfo,v 1.13 2020/01/21 14:04:16 nia Exp $
2 2
3SHA1 (libsecret-0.18.8.tar.xz) = 39fab7338402cbeb711680b5aca7a7891cedb9fa 3SHA1 (libsecret-0.20.0.tar.xz) = 9373ea13d39048ae7ac5c9cbb8547f4459f91688
4RMD160 (libsecret-0.18.8.tar.xz) = 0b1d68d70962906e0eac24fc053095b939df8134 4RMD160 (libsecret-0.20.0.tar.xz) = bba5457e5ac9c5a283401cedaefb25f06635f70c
5SHA512 (libsecret-0.18.8.tar.xz) = 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4 5SHA512 (libsecret-0.20.0.tar.xz) = 13e89dddf578f79b43a44287a2bd8789cc028b53dc60b9d8ef40d2e51d9b4ada9388caa87517834634042304ece0b4fcec95d16387d2e9dc08d2b2f33073543d
6Size (libsecret-0.18.8.tar.xz) = 509432 bytes 6Size (libsecret-0.20.0.tar.xz) = 527552 bytes
 7SHA1 (patch-libsecret_secret-file-collection.c) = b83913ec6e8c9a85f21d3ff77b8b8010e27aa8a1
File Added: pkgsrc/security/libsecret/patches/Attic/patch-libsecret_secret-file-collection.c
$NetBSD: patch-libsecret_secret-file-collection.c,v 1.1 2020/01/21 14:04:16 nia Exp $

Avoid conflicting with encrypt(3) on NetBSD

--- libsecret/secret-file-collection.c.orig	2019-10-14 15:15:45.000000000 +0000
+++ libsecret/secret-file-collection.c
@@ -164,7 +164,7 @@ decrypt (SecretFileCollection *self,
 }
 
 static gboolean
-encrypt (SecretFileCollection *self,
+encrypt_ (SecretFileCollection *self,
 	 guint8 *data,
 	 gsize n_data)
 {
@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFi
 	g_variant_store (serialized_item, data);
 	g_variant_unref (serialized_item);
 	memset (data + n_data, n_padded - n_data, n_padded - n_data);
-	if (!encrypt (self, data, n_padded)) {
+	if (!encrypt_ (self, data, n_padded)) {
 		egg_secure_free (data);
 		g_set_error (error,
 			     SECRET_ERROR,