Date: Mon, 4 Nov 2013 04:45:33 +0000 (UTC) From: Roman Bogorodskiy <novel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332665 - in head/security: gnome-keyring/files libgnome-keyring Message-ID: <201311040445.rA44jXA8001385@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: novel Date: Mon Nov 4 04:45:33 2013 New Revision: 332665 URL: http://svnweb.freebsd.org/changeset/ports/332665 Log: - libgnome-keyring: fix libtasn1 dependency after shlib bump - gnome-keyring: fix build with new libtasn1 [1] Reported by: sbruno Obtained from: NetBSD [1] Added: head/security/gnome-keyring/files/patch-egg_egg-asn1x.h (contents, props changed) Modified: head/security/libgnome-keyring/Makefile Added: head/security/gnome-keyring/files/patch-egg_egg-asn1x.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/gnome-keyring/files/patch-egg_egg-asn1x.h Mon Nov 4 04:45:33 2013 (r332665) @@ -0,0 +1,42 @@ +--- egg/egg-asn1x.h.orig 2010-10-19 06:11:38.000000000 +0400 ++++ egg/egg-asn1x.h 2013-11-04 08:27:50.000000000 +0400 +@@ -25,6 +25,7 @@ + #define EGG_ASN1X_H_ + + #include <glib.h> ++#include <libtasn1.h> + + #ifndef HAVE_EGG_ALLOCATOR + typedef void* (*EggAllocator) (void* p, gsize); +@@ -33,15 +34,13 @@ + + typedef gboolean (*EggAsn1xEncoder) (gpointer data, guchar *buf, gsize n_buf); + +-struct static_struct_asn; +- +-GNode* egg_asn1x_create (const struct static_struct_asn *defs, ++GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs, + const gchar *type); + +-GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs, ++GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs, + GQuark type); + +-GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs, ++GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs, + const gchar *type, + gconstpointer data, + gsize n_data); +@@ -167,10 +166,10 @@ + + void egg_asn1x_destroy (gpointer asn); + +-glong egg_asn1x_parse_time_general (const gchar *time, ++time_t egg_asn1x_parse_time_general (const gchar *time, + gssize n_time); + +-glong egg_asn1x_parse_time_utc (const gchar *time, ++time_t egg_asn1x_parse_time_utc (const gchar *time, + gssize n_time); + + gssize egg_asn1x_element_length (gconstpointer data, Modified: head/security/libgnome-keyring/Makefile ============================================================================== --- head/security/libgnome-keyring/Makefile Mon Nov 4 02:27:13 2013 (r332664) +++ head/security/libgnome-keyring/Makefile Mon Nov 4 04:45:33 2013 (r332665) @@ -10,7 +10,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Program that keeps passwords and other secrets -LIB_DEPENDS= tasn1.5:${PORTSDIR}/security/libtasn1 \ +LIB_DEPENDS= tasn1.7:${PORTSDIR}/security/libtasn1 \ gcrypt:${PORTSDIR}/security/libgcrypt USE_BZIP2= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311040445.rA44jXA8001385>