[Midnightbsd-cvs] mports [16027] trunk/security/gnome-keyring: gnome-keyring fixes
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 3 20:31:52 EST 2014
Revision: 16027
http://svnweb.midnightbsd.org/mports/?rev=16027
Author: laffer1
Date: 2014-03-03 20:31:51 -0500 (Mon, 03 Mar 2014)
Log Message:
-----------
gnome-keyring fixes
Modified Paths:
--------------
trunk/security/gnome-keyring/Makefile
trunk/security/gnome-keyring/distinfo
trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.c
Added Paths:
-----------
trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.h
trunk/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c
Removed Paths:
-------------
trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c
Modified: trunk/security/gnome-keyring/Makefile
===================================================================
--- trunk/security/gnome-keyring/Makefile 2014-03-04 01:20:36 UTC (rev 16026)
+++ trunk/security/gnome-keyring/Makefile 2014-03-04 01:31:51 UTC (rev 16027)
@@ -2,12 +2,14 @@
PORTNAME= gnome-keyring
PORTVERSION= 2.32.1
+PORTREVISION= 2
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A program that keeps passwords and other secrets
+COMMENT= Program that keeps passwords and other secrets
+
LICENSE= gpl2
LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
@@ -16,13 +18,13 @@
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \
--with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml \
org.gnome.crypto.pgp.gschema.xml
Modified: trunk/security/gnome-keyring/distinfo
===================================================================
--- trunk/security/gnome-keyring/distinfo 2014-03-04 01:20:36 UTC (rev 16026)
+++ trunk/security/gnome-keyring/distinfo 2014-03-04 01:31:51 UTC (rev 16027)
@@ -1,3 +1,2 @@
SHA256 (gnome2/gnome-keyring-2.32.1.tar.bz2) = 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
-RMD160 (gnome2/gnome-keyring-2.32.1.tar.bz2) = cb72f171f5918ff26f40feb7bba90dc7e2e120ec
SIZE (gnome2/gnome-keyring-2.32.1.tar.bz2) = 1619245
Modified: trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.c
===================================================================
--- trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.c 2014-03-04 01:20:36 UTC (rev 16026)
+++ trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.c 2014-03-04 01:31:51 UTC (rev 16027)
@@ -1,6 +1,6 @@
---- egg/egg-asn1x.c.orig 2010-09-04 12:08:41.000000000 +0200
-+++ egg/egg-asn1x.c 2010-09-04 12:10:05.000000000 +0200
-@@ -1988,8 +1988,8 @@ anode_write_integer_ulong (gulong value,
+--- egg/egg-asn1x.c.orig 2010-10-19 06:11:38.000000000 +0400
++++ egg/egg-asn1x.c 2013-11-04 22:37:43.000000000 +0400
+@@ -1988,8 +1988,8 @@
guchar buf[sizeof (gulong)];
gint bytes, i, off;
@@ -11,3 +11,21 @@
buf[i] = (value >> (off * 8)) & 0xFF;
}
+@@ -3746,7 +3746,7 @@
+ * TIME PARSING
+ */
+
+-glong
++time_t
+ egg_asn1x_parse_time_general (const gchar *time, gssize n_time)
+ {
+ gboolean ret;
+@@ -3777,7 +3777,7 @@
+ return value;
+ }
+
+-glong
++time_t
+ egg_asn1x_parse_time_utc (const gchar *time, gssize n_time)
+ {
+ gboolean ret;
Added: trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.h
===================================================================
--- trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.h (rev 0)
+++ trunk/security/gnome-keyring/files/patch-egg_egg-asn1x.h 2014-03-04 01:31:51 UTC (rev 16027)
@@ -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,
Added: trunk/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
===================================================================
--- trunk/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c (rev 0)
+++ trunk/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c 2014-03-04 01:31:51 UTC (rev 16027)
@@ -0,0 +1,44 @@
+--- egg/egg-unix-credentials.c.orig 2010-01-13 00:21:23.000000000 -0500
++++ egg/egg-unix-credentials.c 2010-01-13 00:25:46.000000000 -0500
+@@ -27,6 +27,7 @@
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/param.h>
+ #include <sys/uio.h>
+ #include <sys/un.h>
+ #include <errno.h>
+@@ -37,6 +38,33 @@
+ #include <ucred.h>
+ #endif
+
++#if __FreeBSD_version < 701101
++static char *
++strndup (const char *s, size_t n)
++{
++ size_t nAvail;
++ char *p;
++
++ if (s == NULL)
++ return NULL;
++
++ if (memchr (s, '\0', n) != NULL) {
++ nAvail = strlen(s);
++ if (nAvail > n)
++ nAvail = n;
++ } else{
++ nAvail = n;
++ }
++ p = malloc (nAvail + 1);
++ if (p == NULL)
++ return NULL;
++ memcpy (p, s, nAvail);
++ p[nAvail] = '\0';
++
++ return p;
++}
++#endif
++
+ int
+ egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
+ {
Deleted: trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c
===================================================================
--- trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c 2014-03-04 01:20:36 UTC (rev 16026)
+++ trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c 2014-03-04 01:31:51 UTC (rev 16027)
@@ -1,11 +0,0 @@
---- pkcs11/rpc-layer/gkm-rpc-dispatch.c.orig 2010-09-04 12:06:44.000000000 +0200
-+++ pkcs11/rpc-layer/gkm-rpc-dispatch.c 2010-09-04 12:07:12.000000000 +0200
-@@ -784,7 +784,7 @@ rpc_C_Finalize (CallState *cs)
- {
- CK_SLOT_ID_PTR slots;
- CK_ULONG n_slots, i;
-- CK_RV ret;
-+ CK_RV ret = CKR_OK;
-
- debug (("C_Finalize: enter"));
-
Added: trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c
===================================================================
--- trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c (rev 0)
+++ trunk/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c 2014-03-04 01:31:51 UTC (rev 16027)
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/gkm-rpc-dispatch.c.orig 2010-09-04 12:06:44.000000000 +0200
++++ pkcs11/rpc-layer/gkm-rpc-dispatch.c 2010-09-04 12:07:12.000000000 +0200
+@@ -784,7 +784,7 @@ rpc_C_Finalize (CallState *cs)
+ {
+ CK_SLOT_ID_PTR slots;
+ CK_ULONG n_slots, i;
+- CK_RV ret;
++ CK_RV ret = CKR_OK;
+
+ debug (("C_Finalize: enter"));
+
More information about the Midnightbsd-cvs
mailing list