gcr: Update wip/gcr to 3.28.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gcr: Update wip/gcr to 3.28.0
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sat, 17 Nov 2018 00:32:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Nov 17 01:32:52 2018 +0100
Changeset:	5e6bae3c226e023cdd2ae3b099bb6a81220f39f8

Modified Files:
	gcr/Makefile
	gcr/PLIST
	gcr/distinfo
Removed Files:
	gcr/files/memrchr.c
	gcr/patches/patch-configure.ac
	gcr/patches/patch-egg_egg-armor.c
	gcr/patches/patch-egg_egg-asn1x.h
	gcr/patches/patch-gcr_gcr-certificate.h

Log Message:
gcr: Update wip/gcr to 3.28.0

pkgsrc changes:
 - Remove all patches, none of them are no more needed
   (memrchr() is no more used and no duplicate symbols seems present)
 - Remove tool dependency on auto* tools (configure.ac no longer patched)
 - Remove dependency on dbus-glib (not needed)
 - Temporarily comment out build dependency on vala that is no longer
   automatically recognized. Add a big XXX comment about that (needs further
   investigation).

Changes:
gcr 3.28.0:
- Fix year 2038 workaround in ASN.1 decoder [#787963]
- Fix test errors when ssh-keygen is not found
- Updated translations

gcr 3.27.92:
- Provide API for reliably calling ssh programs [#735873]
- Updated translations

gcr 3.27.4:
- Fix encoding of EC parameters [#785234]
- Fix hang in certificate export dialog [#789804]
- Fix failure case in gcr_secure_memory_try_realloc() [#775685]
- Switch to using GLib resources
- Build fixes [#771052, #775685, #775966, #774312, #774311, #764562, #764569]
- Updated translations

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e6bae3c226e023cdd2ae3b099bb6a81220f39f8

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

diffstat:
 gcr/Makefile                            | 16 +++++--------
 gcr/PLIST                               |  8 +++----
 gcr/distinfo                            | 12 ++++------
 gcr/files/memrchr.c                     | 40 ---------------------------------
 gcr/patches/patch-configure.ac          | 15 -------------
 gcr/patches/patch-egg_egg-armor.c       | 17 --------------
 gcr/patches/patch-egg_egg-asn1x.h       | 15 -------------
 gcr/patches/patch-gcr_gcr-certificate.h | 15 -------------
 8 files changed, 13 insertions(+), 125 deletions(-)

diffs:
diff --git a/gcr/Makefile b/gcr/Makefile
index e71b8a0c75..71c50716ae 100644
--- a/gcr/Makefile
+++ b/gcr/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.67 2015/12/05 21:26:08 adam Exp $
 
-DISTNAME=		gcr-3.20.0
+DISTNAME=		gcr-3.28.0
 CATEGORIES=		security
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcr/3.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcr/3.28/}
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
@@ -12,31 +12,25 @@ LICENSE=		gnu-gpl-v2
 
 BUILD_DEPENDS+=		gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 BUILD_DEPENDS+=		gettext-m4-[0-9]*:../../devel/gettext-m4
-BUILD_DEPENDS+=		vala-[0-9]*:../../lang/vala
+# XXX: Seems not automatically recognized, investigate further if it is
+# XXX: needed and reenable/delete this comment.
+#BUILD_DEPENDS+=	vala-[0-9]*:../../lang/vala
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
-USE_TOOLS+=		autoreconf autoconf automake
 
 PKGCONFIG_OVERRIDE+=	gck-1.pc.in
 PKGCONFIG_OVERRIDE+=	gcr-base-3.pc.in
 PKGCONFIG_OVERRIDE+=	gcr-ui.pc.in
 PKGCONFIG_OVERRIDE+=	gcr-3.pc.in
 
-post-patch:
-	cp ${FILESDIR}/memrchr.c ${WRKSRC}/egg/
-
-pre-configure:
-	${RUN} cd ${WRKSRC} &&autoreconf
-
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../security/p11-kit/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.12
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/gcr/PLIST b/gcr/PLIST
index b8698aa155..c58adc31e1 100644
--- a/gcr/PLIST
+++ b/gcr/PLIST
@@ -30,6 +30,7 @@ include/gcr-3/gcr/gcr-secret-exchange.h
 include/gcr-3/gcr/gcr-secure-memory.h
 include/gcr-3/gcr/gcr-simple-certificate.h
 include/gcr-3/gcr/gcr-simple-collection.h
+include/gcr-3/gcr/gcr-ssh-askpass.h
 include/gcr-3/gcr/gcr-system-prompt.h
 include/gcr-3/gcr/gcr-system-prompter.h
 include/gcr-3/gcr/gcr-trust.h
@@ -70,14 +71,13 @@ lib/pkgconfig/gcr-3.pc
 lib/pkgconfig/gcr-base-3.pc
 lib/pkgconfig/gcr-ui-3.pc
 libexec/gcr-prompter
+libexec/gcr-ssh-askpass
 share/GConf/gsettings/org.gnome.crypto.pgp.convert
 share/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
 share/applications/gcr-prompter.desktop
 share/applications/gcr-viewer.desktop
 share/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
 share/dbus-1/services/org.gnome.keyring.SystemPrompter.service
-share/gcr-3/ui/gcr-pkcs11-import-dialog.ui
-share/gcr-3/ui/gcr-unlock-options-widget.ui
 share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 share/gtk-doc/html/gck/GckAttributes.html
 share/gtk-doc/html/gck/GckEnumerator.html
@@ -96,7 +96,6 @@ share/gtk-doc/html/gck/gck-PKCS11-URIs.html
 share/gtk-doc/html/gck/gck.devhelp2
 share/gtk-doc/html/gck/home.png
 share/gtk-doc/html/gck/index.html
-share/gtk-doc/html/gck/index.sgml
 share/gtk-doc/html/gck/left-insensitive.png
 share/gtk-doc/html/gck/left.png
 share/gtk-doc/html/gck/pkcs11-links.html
@@ -141,6 +140,7 @@ share/gtk-doc/html/gcr-3/gcr-3.devhelp2
 share/gtk-doc/html/gcr-3/gcr-GcrCertificateRequest.html
 share/gtk-doc/html/gcr-3/gcr-GcrColumn.html
 share/gtk-doc/html/gcr-3/gcr-GcrImportInteraction.html
+share/gtk-doc/html/gcr-3/gcr-GcrSshAskpass.html
 share/gtk-doc/html/gcr-3/gcr-Key-Fingerprints.html
 share/gtk-doc/html/gcr-3/gcr-Library-PKCS#11.html
 share/gtk-doc/html/gcr-3/gcr-Library-Utilities.html
@@ -149,7 +149,6 @@ share/gtk-doc/html/gcr-3/gcr-Trust-Storage-and-Lookups.html
 share/gtk-doc/html/gcr-3/home.png
 share/gtk-doc/html/gcr-3/import-button.png
 share/gtk-doc/html/gcr-3/index.html
-share/gtk-doc/html/gcr-3/index.sgml
 share/gtk-doc/html/gcr-3/key-widget.png
 share/gtk-doc/html/gcr-3/left-insensitive.png
 share/gtk-doc/html/gcr-3/left.png
@@ -222,6 +221,7 @@ share/locale/eu/LC_MESSAGES/gcr.mo
 share/locale/fa/LC_MESSAGES/gcr.mo
 share/locale/fi/LC_MESSAGES/gcr.mo
 share/locale/fr/LC_MESSAGES/gcr.mo
+share/locale/fur/LC_MESSAGES/gcr.mo
 share/locale/ga/LC_MESSAGES/gcr.mo
 share/locale/gl/LC_MESSAGES/gcr.mo
 share/locale/gu/LC_MESSAGES/gcr.mo
diff --git a/gcr/distinfo b/gcr/distinfo
index b21751d59f..5a918eb40c 100644
--- a/gcr/distinfo
+++ b/gcr/distinfo
@@ -1,10 +1,6 @@
 $NetBSD: distinfo,v 1.21 2015/11/04 03:28:30 agc Exp $
 
-SHA1 (gcr-3.20.0.tar.xz) = 4556e4c752520320baee8fd608d82164d34c13d6
-RMD160 (gcr-3.20.0.tar.xz) = 7ece08c6fa1545ff498c4225171f505324ae65ff
-SHA512 (gcr-3.20.0.tar.xz) = 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
-Size (gcr-3.20.0.tar.xz) = 1324216 bytes
-SHA1 (patch-configure.ac) = 3f09919dc392e00d88555d4949fe920e2daa25a3
-SHA1 (patch-egg_egg-armor.c) = 19f79aad00dbad9f89305d29433d5cd7bbeb3e9e
-SHA1 (patch-egg_egg-asn1x.h) = a172af2a79febc165d9585566068b0975412deb0
-SHA1 (patch-gcr_gcr-certificate.h) = 9935af2169e215d5e7ccdacf398ac35c17bcc179
+SHA1 (gcr-3.28.0.tar.xz) = 65cddbc1e12266233aca4d1857a93b42ef52f620
+RMD160 (gcr-3.28.0.tar.xz) = 8180637d78b7ca893aff5bca6d6050fb7e14d4be
+SHA512 (gcr-3.28.0.tar.xz) = 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
+Size (gcr-3.28.0.tar.xz) = 1329044 bytes
diff --git a/gcr/files/memrchr.c b/gcr/files/memrchr.c
deleted file mode 100644
index 0686e234ec..0000000000
--- a/gcr/files/memrchr.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$OpenBSD: memrchr.c,v 1.2 2007/11/27 16:22:12 martynas Exp $	*/
-
-/*
- * Copyright (c) 2007 Todd C. Miller <Todd.Miller%courtesan.com@localhost>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-
-#include <string.h>
-
-/*
- * Reverse memchr()
- * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
- */
-void *
-memrchr(const void *s, int c, size_t n)
-{
-	const unsigned char *cp;
-
-	if (n != 0) {
-		cp = (unsigned char *)s + n;
-		do {
-			if (*(--cp) == (unsigned char)c)
-				return((void *)cp);
-		} while (--n != 0);
-	}
-	return(NULL);
-}
\ No newline at end of file
diff --git a/gcr/patches/patch-configure.ac b/gcr/patches/patch-configure.ac
deleted file mode 100644
index d25665d1cb..0000000000
--- a/gcr/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Detect memrchr function.
-
---- configure.ac.orig	2015-09-28 16:08:46.000000000 +0000
-+++ configure.ac
-@@ -144,7 +144,7 @@ AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC
- #
- 
- AC_CHECK_FUNCS(timegm, AC_DEFINE(HAVE_TIMEGM,1,[Have timegm]))
--AC_CHECK_FUNCS(mlock)
-+AC_CHECK_FUNCS(mlock memrchr)
- 
- # --------------------------------------------------------------------
- # p11-kit
diff --git a/gcr/patches/patch-egg_egg-armor.c b/gcr/patches/patch-egg_egg-armor.c
deleted file mode 100644
index 47f3a0e6a8..0000000000
--- a/gcr/patches/patch-egg_egg-armor.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Include memrchr for platforms that don't have it.
-
---- egg/egg-armor.c.orig	2014-09-23 07:40:08.000000000 +0000
-+++ egg/egg-armor.c
-@@ -33,6 +33,10 @@
- #include <ctype.h>
- #include <string.h>
- 
-+#ifndef HAVE_MEMRCHR
-+#include "memrchr.c"
-+#endif
-+
- /*
-  * Armor looks like:
-  *
diff --git a/gcr/patches/patch-egg_egg-asn1x.h b/gcr/patches/patch-egg_egg-asn1x.h
deleted file mode 100644
index ae5c70c5ff..0000000000
--- a/gcr/patches/patch-egg_egg-asn1x.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Avoid duplicate symbols.
-
---- egg/egg-asn1x.h.orig	2014-09-23 07:40:08.000000000 +0000
-+++ egg/egg-asn1x.h
-@@ -67,7 +67,7 @@ typedef enum {
- 	EGG_ASN1X_GENERALIZED_TIME = 37,
- } EggAsn1xType;
- 
--enum {
-+extern enum {
- 	EGG_ASN1X_NO_STRICT = 0x01,
- } EggAsn1xFlags;
- 
diff --git a/gcr/patches/patch-gcr_gcr-certificate.h b/gcr/patches/patch-gcr_gcr-certificate.h
deleted file mode 100644
index d20e25950a..0000000000
--- a/gcr/patches/patch-gcr_gcr-certificate.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Avoid duplicate symbols.
-
---- gcr/gcr-certificate.h.orig	2014-09-23 07:40:08.000000000 +0000
-+++ gcr/gcr-certificate.h
-@@ -149,6 +149,8 @@ void                gcr_certificate_mixi
-                                                             GValue *value,
-                                                             GParamSpec *pspec);
- 
-+enum EggAsn1xFlags;
-+
- G_END_DECLS
- 
- #endif /* __GCR_CERTIFICATE_H__ */
Prev by Date: compiler-rt-netbsd: Rebase to SVN r. 347088
Next by Date: wyeb-git: remove patch - merged upstream
Previous by Thread: compiler-rt-netbsd: Rebase to SVN r. 347088
Next by Thread: wyeb-git: remove patch - merged upstream
Indexes:
Home | Main Index | Thread Index | Old Index