Update to libgnome-keyring-3.8.0.

This commit is contained in:
ajacoutot 2013-03-29 07:55:44 +00:00
parent b9c49561c4
commit 2d72e858ff
5 changed files with 13 additions and 39 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2013/03/11 11:46:11 espie Exp $
# $OpenBSD: Makefile,v 1.25 2013/03/29 07:55:44 ajacoutot Exp $
COMMENT= library for gnome keyring integration
GNOME_PROJECT= libgnome-keyring
GNOME_VERSION= 3.6.0
REVISION= 2
GNOME_VERSION= 3.8.0
SHARED_LIBS += gnome-keyring 7.0 # 2.0
@ -12,7 +11,7 @@ SHARED_LIBS += gnome-keyring 7.0 # 2.0
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += dbus-1 ffi gcrypt glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gpg-error gthread-2.0 pcre pthread
WANTLIB += gpg-error pcre pthread
MODGNOME_TOOLS= goi vala

View File

@ -1,2 +1,2 @@
SHA256 (gnome/libgnome-keyring-3.6.0.tar.xz) = bco3+3s3+AD0mAMf/jA6VnQQvsCam92HehiGXa/MmDA=
SIZE (gnome/libgnome-keyring-3.6.0.tar.xz) = 423376
SHA256 (gnome/libgnome-keyring-3.8.0.tar.xz) = qGRvK8Yu+QO+QilGpjVrBxj3pMuym1vdNahBNva4L3Y=
SIZE (gnome/libgnome-keyring-3.8.0.tar.xz) = 426056

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-egg_egg-hkdf_c,v 1.1 2012/10/24 07:04:03 ajacoutot Exp $
From 6d15fac56b6feddef32d57a0ee4697771ea99a8d Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 22 Oct 2012 20:09:46 +0000
Subject: Fix incorrect loop condition in egg_hkdf_perform()
--- egg/egg-hkdf.c.orig Wed Aug 8 21:00:54 2012
+++ egg/egg-hkdf.c Wed Oct 24 08:30:56 2012
@@ -39,7 +39,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gpointer buffer = NULL;
gcry_md_hd_t md1, md2;
guint hash_len;
- guchar i;
+ gint i;
gint flags, algo;
gsize step, n_buffer;
guchar *at;
@@ -89,7 +89,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gcry_md_reset (md2);
gcry_md_write (md2, buffer, n_buffer);
gcry_md_write (md2, info, n_info);
- gcry_md_write (md2, &i, 1);
+ gcry_md_putc (md2, i);
n_buffer = hash_len;
memcpy (buffer, gcry_md_read (md2, algo), n_buffer);

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2011/09/12 07:28:53 jasper Exp $
@lib lib/libgnome-keyring.so.${LIBgnome-keyring_VERSION}

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2012/09/27 09:01:40 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.10 2013/03/29 07:55:44 ajacoutot Exp $
include/gnome-keyring-1/
include/gnome-keyring-1/gnome-keyring-memory.h
include/gnome-keyring-1/gnome-keyring-result.h
@ -8,6 +7,7 @@ lib/girepository-1.0/
lib/girepository-1.0/GnomeKeyring-1.0.typelib
lib/libgnome-keyring.a
lib/libgnome-keyring.la
@lib lib/libgnome-keyring.so.${LIBgnome-keyring_VERSION}
lib/pkgconfig/
lib/pkgconfig/gnome-keyring-1.pc
share/gir-1.0/
@ -82,6 +82,9 @@ share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/libgnome-keyring.mo
share/locale/fi/LC_MESSAGES/libgnome-keyring.mo
share/locale/fr/LC_MESSAGES/libgnome-keyring.mo
share/locale/fur/
share/locale/fur/LC_MESSAGES/
share/locale/fur/LC_MESSAGES/libgnome-keyring.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/libgnome-keyring.mo
@ -129,8 +132,6 @@ share/locale/nn/LC_MESSAGES/libgnome-keyring.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/libgnome-keyring.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/libgnome-keyring.mo
share/locale/pl/LC_MESSAGES/libgnome-keyring.mo
share/locale/pt/LC_MESSAGES/libgnome-keyring.mo
@ -150,6 +151,9 @@ share/locale/ta/LC_MESSAGES/libgnome-keyring.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/libgnome-keyring.mo
share/locale/tg/
share/locale/tg/LC_MESSAGES/
share/locale/tg/LC_MESSAGES/libgnome-keyring.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/libgnome-keyring.mo