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, ...]

4 files changed, 42 insertions, 10 deletions

diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index 9aabefe976b..14342b30c03 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2019/08/16 10:16:00 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2020/01/21 14:04:16 nia Exp $
 
-DISTNAME=	libsecret-0.18.8
+DISTNAME=	libsecret-0.20.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsecret/0.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsecret/0.20/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -16,7 +16,8 @@ TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake intltool pkg-config msgfmt gsed
+USE_TOOLS+=	gmake pkg-config gsed
+USE_TOOLS+=	msgfmt msgmerge xgettext
 
 PKGCONFIG_OVERRIDE+=	libsecret/libsecret-unstable.pc.in
 PKGCONFIG_OVERRIDE+=	libsecret/libsecret.pc.in
diff --git a/security/libsecret/PLIST b/security/libsecret/PLIST
index dbaeb8e0fe4..16574ec7227 100644
--- a/security/libsecret/PLIST
+++ b/security/libsecret/PLIST
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.7 2018/04/16 13:06:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/01/21 14:04:16 nia Exp $
 bin/secret-tool
 include/libsecret-1/libsecret/secret-attributes.h
+include/libsecret-1/libsecret/secret-backend.h
 include/libsecret-1/libsecret/secret-collection.h
 include/libsecret-1/libsecret/secret-enum-types.h
 include/libsecret-1/libsecret/secret-item.h
 include/libsecret-1/libsecret/secret-password.h
 include/libsecret-1/libsecret/secret-paths.h
 include/libsecret-1/libsecret/secret-prompt.h
+include/libsecret-1/libsecret/secret-retrievable.h
 include/libsecret-1/libsecret/secret-schema.h
 include/libsecret-1/libsecret/secret-schemas.h
 include/libsecret-1/libsecret/secret-service.h
 include/libsecret-1/libsecret/secret-types.h
 include/libsecret-1/libsecret/secret-value.h
+include/libsecret-1/libsecret/secret-version.h
 include/libsecret-1/libsecret/secret.h
 ${PLIST.introspection}lib/girepository-1.0/Secret-1.typelib
 lib/libsecret-1.la
@@ -22,6 +25,7 @@ ${PLIST.introspection}share/gir-1.0/Secret-1.gir
 share/gtk-doc/html/libsecret-1/SecretCollection.html
 share/gtk-doc/html/libsecret-1/SecretItem.html
 share/gtk-doc/html/libsecret-1/SecretPrompt.html
+share/gtk-doc/html/libsecret-1/SecretRetrievable.html
 share/gtk-doc/html/libsecret-1/SecretService.html
 share/gtk-doc/html/libsecret-1/SecretValue.html
 share/gtk-doc/html/libsecret-1/annotation-glossary.html
@@ -45,6 +49,7 @@ share/gtk-doc/html/libsecret-1/libsecret-Password-storage.html
 share/gtk-doc/html/libsecret-1/libsecret-Secret-Attributes.html
 share/gtk-doc/html/libsecret-1/libsecret-SecretError.html
 share/gtk-doc/html/libsecret-1/libsecret-SecretSchema.html
+share/gtk-doc/html/libsecret-1/libsecret-Version-Information.html
 share/gtk-doc/html/libsecret-1/migrating-api.html
 share/gtk-doc/html/libsecret-1/migrating-introduction.html
 share/gtk-doc/html/libsecret-1/migrating-items.html
@@ -107,6 +112,7 @@ share/locale/ko/LC_MESSAGES/libsecret.mo
 share/locale/lt/LC_MESSAGES/libsecret.mo
 share/locale/lv/LC_MESSAGES/libsecret.mo
 share/locale/ml/LC_MESSAGES/libsecret.mo
+share/locale/ms/LC_MESSAGES/libsecret.mo
 share/locale/nb/LC_MESSAGES/libsecret.mo
 share/locale/ne/LC_MESSAGES/libsecret.mo
 share/locale/nl/LC_MESSAGES/libsecret.mo
diff --git a/security/libsecret/distinfo b/security/libsecret/distinfo
index ca6fe4d2c3d..34f69b71b76 100644
--- a/security/libsecret/distinfo
+++ b/security/libsecret/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2019/08/16 10:16:00 wiz Exp $
+$NetBSD: distinfo,v 1.13 2020/01/21 14:04:16 nia Exp $
 
-SHA1 (libsecret-0.18.8.tar.xz) = 39fab7338402cbeb711680b5aca7a7891cedb9fa
-RMD160 (libsecret-0.18.8.tar.xz) = 0b1d68d70962906e0eac24fc053095b939df8134
-SHA512 (libsecret-0.18.8.tar.xz) = 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
-Size (libsecret-0.18.8.tar.xz) = 509432 bytes
+SHA1 (libsecret-0.20.0.tar.xz) = 9373ea13d39048ae7ac5c9cbb8547f4459f91688
+RMD160 (libsecret-0.20.0.tar.xz) = bba5457e5ac9c5a283401cedaefb25f06635f70c
+SHA512 (libsecret-0.20.0.tar.xz) = 13e89dddf578f79b43a44287a2bd8789cc028b53dc60b9d8ef40d2e51d9b4ada9388caa87517834634042304ece0b4fcec95d16387d2e9dc08d2b2f33073543d
+Size (libsecret-0.20.0.tar.xz) = 527552 bytes
+SHA1 (patch-libsecret_secret-file-collection.c) = b83913ec6e8c9a85f21d3ff77b8b8010e27aa8a1
diff --git a/security/libsecret/patches/patch-libsecret_secret-file-collection.c b/security/libsecret/patches/patch-libsecret_secret-file-collection.c
new file mode 100644
index 00000000000..5280f4c2079
--- /dev/null
+++ b/security/libsecret/patches/patch-libsecret_secret-file-collection.c
@@ -0,0 +1,24 @@
+$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,