Update to seahorse-3.6.0.
This commit is contained in:
ajacoutot
parent
a2552ed7a7
commit
72ad0a5a1a
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.73 2012/09/01 14:36:59 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.74 2012/09/28 15:03:28 ajacoutot Exp $
|
||||
|
||||
COMMENT= GNOME encryption interface
|
||||
|
||||
GNOME_PROJECT= seahorse
|
||||
GNOME_VERSION= 3.4.1
|
||||
REVISION= 3
|
||||
GNOME_VERSION= 3.6.0
|
||||
|
||||
CATEGORIES= security
|
||||
|
||||
@ -21,15 +20,16 @@ WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm asn1 assuan atk-1.0
|
||||
WANTLIB += avahi-client avahi-common avahi-glib c cairo cairo-gobject
|
||||
WANTLIB += com_err crypto dbus-1 drm expat ffi fontconfig freetype
|
||||
WANTLIB += gck-1 gcr-3 gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB += gmodule-2.0 gnome-keyring gobject-2.0 gpg-error gpgme
|
||||
WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gpgme icuuc secret-1
|
||||
WANTLIB += gssapi gthread-2.0 gtk-3 krb5 lber-2.4 ldap-2.4
|
||||
WANTLIB += m p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
|
||||
WANTLIB += pixman-1 png pthread pthread-stubs sasl2 soup-2.4 ssl
|
||||
WANTLIB += xcb xcb-render xcb-shm xml2 z stdc++ gcr-base-3
|
||||
WANTLIB += ICE SM atk-bridge-2.0 atspi harfbuzz icudata icule
|
||||
|
||||
LIB_DEPENDS= databases/openldap \
|
||||
x11/gnome/libgnome-keyring \
|
||||
x11/gnome/gcr \
|
||||
x11/gnome/gcr>=3.6.0 \
|
||||
x11/gnome/libsecret \
|
||||
devel/libsoup \
|
||||
security/gpgme \
|
||||
net/avahi
|
||||
@ -42,13 +42,6 @@ MODGNOME_TOOLS= yelp
|
||||
MODGNOME_ICON_CACHE= Yes
|
||||
MODGNOME_DESKTOP_FILE= Yes
|
||||
|
||||
CONFIGURE_ARGS= --enable-hkp \
|
||||
--enable-ldap \
|
||||
--enable-pkcs11 \
|
||||
--enable-pgp \
|
||||
--enable-ssh \
|
||||
--enable-sharing
|
||||
|
||||
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/seahorse
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gnome/seahorse-3.4.1.tar.xz) = hBRD7W1/hl4ck0eGdSdZEoe8xbLigcjaEbLLNV1nj6o=
|
||||
SIZE (gnome/seahorse-3.4.1.tar.xz) = 1999472
|
||||
SHA256 (gnome/seahorse-3.6.0.tar.xz) = iKC8qjru9qmi8qv0x/+/lM70dLRm151FBU0ZF11czug=
|
||||
SIZE (gnome/seahorse-3.6.0.tar.xz) = 1989472
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
$OpenBSD: patch-libseahorse_seahorse-secure-memory_c,v 1.1 2012/07/12 10:59:13 ajacoutot Exp $
|
||||
|
||||
From 9b12bfdd245867f928651bc5414cba67a3f84169 Mon Sep 17 00:00:00 2001
|
||||
From: Stef Walter <stefw@gnome.org>
|
||||
Date: Mon, 30 Apr 2012 18:19:46 +0000
|
||||
Subject: Use libsecret instead of libgnome-keyring
|
||||
|
||||
--- libseahorse/seahorse-secure-memory.c.orig Wed Sep 14 17:04:58 2011
|
||||
+++ libseahorse/seahorse-secure-memory.c Thu Jul 12 12:53:56 2012
|
||||
@@ -25,9 +25,8 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <glib.h>
|
||||
-
|
||||
-#include <gnome-keyring-memory.h>
|
||||
-
|
||||
+#include <gcr/gcr.h>
|
||||
+
|
||||
#include "seahorse-secure-memory.h"
|
||||
|
||||
/* extern declared in seahorse-secure-memory.h */
|
||||
@@ -50,7 +49,7 @@ switch_malloc (gsize size)
|
||||
if (size == 0)
|
||||
return NULL;
|
||||
if (seahorse_use_secure_mem)
|
||||
- p = gnome_keyring_memory_try_alloc (size);
|
||||
+ p = gcr_secure_memory_try_alloc (size);
|
||||
else
|
||||
p = malloc (size);
|
||||
return p;
|
||||
@@ -74,7 +73,7 @@ switch_calloc (gsize num, gsize size)
|
||||
if (size == 0 || num == 0)
|
||||
return NULL;
|
||||
if (seahorse_use_secure_mem)
|
||||
- p = gnome_keyring_memory_try_alloc (size * num);
|
||||
+ p = gcr_secure_memory_try_alloc (size * num);
|
||||
else
|
||||
p = calloc (num, size);
|
||||
return p;
|
||||
@@ -102,11 +101,11 @@ switch_realloc (gpointer mem, gsize size)
|
||||
|
||||
if (!mem) {
|
||||
if (seahorse_use_secure_mem)
|
||||
- p = gnome_keyring_memory_alloc (size);
|
||||
+ p = gcr_secure_memory_alloc (size);
|
||||
else
|
||||
p = malloc (size);
|
||||
- } else if (gnome_keyring_memory_is_secure (mem))
|
||||
- p = gnome_keyring_memory_try_realloc (mem, size);
|
||||
+ } else if (gcr_secure_memory_is_secure (mem))
|
||||
+ p = gcr_secure_memory_try_realloc (mem, size);
|
||||
else
|
||||
p = realloc (mem, size);
|
||||
return p;
|
||||
@@ -123,8 +122,8 @@ static void
|
||||
switch_free (gpointer mem)
|
||||
{
|
||||
if (mem) {
|
||||
- if (gnome_keyring_memory_is_secure (mem))
|
||||
- gnome_keyring_memory_free (mem);
|
||||
+ if (gcr_secure_memory_is_secure (mem))
|
||||
+ gcr_secure_memory_free (mem);
|
||||
else
|
||||
free (mem);
|
||||
}
|
||||
@@ -141,9 +140,9 @@ seahorse_try_gk_secure_memory ()
|
||||
{
|
||||
gpointer p;
|
||||
|
||||
- p = gnome_keyring_memory_try_alloc (10);
|
||||
+ p = gcr_secure_memory_try_alloc (10);
|
||||
if (p != NULL) {
|
||||
- gnome_keyring_memory_free (p);
|
||||
+ gcr_secure_memory_free (p);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -173,7 +172,7 @@ seahorse_secure_memory_init ()
|
||||
vtable.calloc = switch_calloc;
|
||||
g_mem_set_vtable (&vtable);
|
||||
} else {
|
||||
- g_warning ("Unable to allocate secure memory from gnome-keyring.\n");
|
||||
+ g_warning ("Unable to allocate secure memory.\n");
|
||||
g_warning ("Proceeding using insecure memory for password fields.\n");
|
||||
}
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-pgp_seahorse-gpgme-keyring_c,v 1.1 2012/05/01 18:46:25 ajacoutot Exp $
|
||||
|
||||
From f8a0cfcfc78f487447a347309affa6acadcfe77f Mon Sep 17 00:00:00 2001
|
||||
From: Stef Walter <stefw@gnome.org>
|
||||
Date: Mon, 30 Apr 2012 18:29:42 +0000
|
||||
Subject: Fix typo in finalizing of GPGME keyring
|
||||
|
||||
--- pgp/seahorse-gpgme-keyring.c.orig Fri Jan 27 14:50:26 2012
|
||||
+++ pgp/seahorse-gpgme-keyring.c Tue May 1 20:40:25 2012
|
||||
@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object)
|
||||
{
|
||||
SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
|
||||
|
||||
- g_clear_object (self->pv->actions);
|
||||
+ g_clear_object (&self->pv->actions);
|
||||
g_hash_table_destroy (self->pv->keys);
|
||||
|
||||
/* All monitoring and scheduling should be done */
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.25 2012/06/15 08:30:20 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.26 2012/09/28 15:03:28 ajacoutot Exp $
|
||||
@bin bin/seahorse
|
||||
lib/seahorse/
|
||||
@bin lib/seahorse/seahorse-ssh-askpass
|
||||
@ -12,86 +12,121 @@ share/applications/seahorse.desktop
|
||||
share/glib-2.0/schemas/org.gnome.seahorse.gschema.xml
|
||||
share/glib-2.0/schemas/org.gnome.seahorse.manager.gschema.xml
|
||||
share/glib-2.0/schemas/org.gnome.seahorse.window.gschema.xml
|
||||
share/gnome/
|
||||
share/gnome/help/
|
||||
share/gnome/help/seahorse/
|
||||
share/gnome/help/seahorse/C/
|
||||
share/gnome/help/seahorse/C/figures/
|
||||
share/gnome/help/seahorse/C/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/C/legal.xml
|
||||
share/gnome/help/seahorse/C/seahorse.xml
|
||||
share/gnome/help/seahorse/ca/
|
||||
share/gnome/help/seahorse/ca/figures/
|
||||
share/gnome/help/seahorse/ca/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/ca/seahorse.xml
|
||||
share/gnome/help/seahorse/cs/
|
||||
share/gnome/help/seahorse/cs/figures/
|
||||
share/gnome/help/seahorse/cs/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/cs/seahorse.xml
|
||||
share/gnome/help/seahorse/de/
|
||||
share/gnome/help/seahorse/de/figures/
|
||||
share/gnome/help/seahorse/de/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/de/seahorse.xml
|
||||
share/gnome/help/seahorse/el/
|
||||
share/gnome/help/seahorse/el/figures/
|
||||
share/gnome/help/seahorse/el/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/el/seahorse.xml
|
||||
share/gnome/help/seahorse/en_GB/
|
||||
share/gnome/help/seahorse/en_GB/figures/
|
||||
share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/en_GB/seahorse.xml
|
||||
share/gnome/help/seahorse/es/
|
||||
share/gnome/help/seahorse/es/figures/
|
||||
share/gnome/help/seahorse/es/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/es/seahorse.xml
|
||||
share/gnome/help/seahorse/eu/
|
||||
share/gnome/help/seahorse/eu/figures/
|
||||
share/gnome/help/seahorse/eu/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/eu/seahorse.xml
|
||||
share/gnome/help/seahorse/fr/
|
||||
share/gnome/help/seahorse/fr/figures/
|
||||
share/gnome/help/seahorse/fr/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/fr/seahorse.xml
|
||||
share/gnome/help/seahorse/gl/
|
||||
share/gnome/help/seahorse/gl/figures/
|
||||
share/gnome/help/seahorse/gl/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/gl/seahorse.xml
|
||||
share/gnome/help/seahorse/it/
|
||||
share/gnome/help/seahorse/it/figures/
|
||||
share/gnome/help/seahorse/it/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/it/seahorse.xml
|
||||
share/gnome/help/seahorse/ja/
|
||||
share/gnome/help/seahorse/ja/figures/
|
||||
share/gnome/help/seahorse/ja/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/ja/seahorse.xml
|
||||
share/gnome/help/seahorse/ko/
|
||||
share/gnome/help/seahorse/ko/figures/
|
||||
share/gnome/help/seahorse/ko/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/ko/seahorse.xml
|
||||
share/gnome/help/seahorse/oc/
|
||||
share/gnome/help/seahorse/oc/figures/
|
||||
share/gnome/help/seahorse/oc/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/oc/seahorse.xml
|
||||
share/gnome/help/seahorse/ru/
|
||||
share/gnome/help/seahorse/ru/figures/
|
||||
share/gnome/help/seahorse/ru/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/ru/seahorse.xml
|
||||
share/gnome/help/seahorse/sl/
|
||||
share/gnome/help/seahorse/sl/figures/
|
||||
share/gnome/help/seahorse/sl/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/sl/seahorse.xml
|
||||
share/gnome/help/seahorse/sv/
|
||||
share/gnome/help/seahorse/sv/figures/
|
||||
share/gnome/help/seahorse/sv/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/sv/seahorse.xml
|
||||
share/gnome/help/seahorse/vi/
|
||||
share/gnome/help/seahorse/vi/figures/
|
||||
share/gnome/help/seahorse/vi/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/vi/seahorse.xml
|
||||
share/gnome/help/seahorse/zh_CN/
|
||||
share/gnome/help/seahorse/zh_CN/figures/
|
||||
share/gnome/help/seahorse/zh_CN/figures/seahorse-window.png
|
||||
share/gnome/help/seahorse/zh_CN/seahorse.xml
|
||||
share/help/
|
||||
share/help/C/
|
||||
share/help/C/seahorse/
|
||||
share/help/C/seahorse/figures/
|
||||
share/help/C/seahorse/figures/seahorse-window.png
|
||||
share/help/C/seahorse/index.docbook
|
||||
share/help/C/seahorse/legal.xml
|
||||
share/help/ca/
|
||||
share/help/ca/seahorse/
|
||||
share/help/ca/seahorse/figures/
|
||||
share/help/ca/seahorse/figures/seahorse-window.png
|
||||
share/help/ca/seahorse/index.docbook
|
||||
share/help/ca/seahorse/legal.xml
|
||||
share/help/cs/
|
||||
share/help/cs/seahorse/
|
||||
share/help/cs/seahorse/figures/
|
||||
share/help/cs/seahorse/figures/seahorse-window.png
|
||||
share/help/cs/seahorse/index.docbook
|
||||
share/help/cs/seahorse/legal.xml
|
||||
share/help/de/
|
||||
share/help/de/seahorse/
|
||||
share/help/de/seahorse/figures/
|
||||
share/help/de/seahorse/figures/seahorse-window.png
|
||||
share/help/de/seahorse/index.docbook
|
||||
share/help/de/seahorse/legal.xml
|
||||
share/help/el/
|
||||
share/help/el/seahorse/
|
||||
share/help/el/seahorse/figures/
|
||||
share/help/el/seahorse/figures/seahorse-window.png
|
||||
share/help/el/seahorse/index.docbook
|
||||
share/help/el/seahorse/legal.xml
|
||||
share/help/en_GB/
|
||||
share/help/en_GB/seahorse/
|
||||
share/help/en_GB/seahorse/figures/
|
||||
share/help/en_GB/seahorse/figures/seahorse-window.png
|
||||
share/help/en_GB/seahorse/index.docbook
|
||||
share/help/en_GB/seahorse/legal.xml
|
||||
share/help/es/
|
||||
share/help/es/seahorse/
|
||||
share/help/es/seahorse/figures/
|
||||
share/help/es/seahorse/figures/seahorse-window.png
|
||||
share/help/es/seahorse/index.docbook
|
||||
share/help/es/seahorse/legal.xml
|
||||
share/help/eu/
|
||||
share/help/eu/seahorse/
|
||||
share/help/eu/seahorse/figures/
|
||||
share/help/eu/seahorse/figures/seahorse-window.png
|
||||
share/help/eu/seahorse/index.docbook
|
||||
share/help/eu/seahorse/legal.xml
|
||||
share/help/fr/
|
||||
share/help/fr/seahorse/
|
||||
share/help/fr/seahorse/figures/
|
||||
share/help/fr/seahorse/figures/seahorse-window.png
|
||||
share/help/fr/seahorse/index.docbook
|
||||
share/help/fr/seahorse/legal.xml
|
||||
share/help/gl/
|
||||
share/help/gl/seahorse/
|
||||
share/help/gl/seahorse/figures/
|
||||
share/help/gl/seahorse/figures/seahorse-window.png
|
||||
share/help/gl/seahorse/index.docbook
|
||||
share/help/gl/seahorse/legal.xml
|
||||
share/help/it/
|
||||
share/help/it/seahorse/
|
||||
share/help/it/seahorse/figures/
|
||||
share/help/it/seahorse/figures/seahorse-window.png
|
||||
share/help/it/seahorse/index.docbook
|
||||
share/help/it/seahorse/legal.xml
|
||||
share/help/ja/
|
||||
share/help/ja/seahorse/
|
||||
share/help/ja/seahorse/figures/
|
||||
share/help/ja/seahorse/figures/seahorse-window.png
|
||||
share/help/ja/seahorse/index.docbook
|
||||
share/help/ja/seahorse/legal.xml
|
||||
share/help/ko/
|
||||
share/help/ko/seahorse/
|
||||
share/help/ko/seahorse/figures/
|
||||
share/help/ko/seahorse/figures/seahorse-window.png
|
||||
share/help/ko/seahorse/index.docbook
|
||||
share/help/ko/seahorse/legal.xml
|
||||
share/help/oc/
|
||||
share/help/oc/seahorse/
|
||||
share/help/oc/seahorse/figures/
|
||||
share/help/oc/seahorse/figures/seahorse-window.png
|
||||
share/help/oc/seahorse/index.docbook
|
||||
share/help/oc/seahorse/legal.xml
|
||||
share/help/ru/
|
||||
share/help/ru/seahorse/
|
||||
share/help/ru/seahorse/figures/
|
||||
share/help/ru/seahorse/figures/seahorse-window.png
|
||||
share/help/ru/seahorse/index.docbook
|
||||
share/help/ru/seahorse/legal.xml
|
||||
share/help/sl/
|
||||
share/help/sl/seahorse/
|
||||
share/help/sl/seahorse/figures/
|
||||
share/help/sl/seahorse/figures/seahorse-window.png
|
||||
share/help/sl/seahorse/index.docbook
|
||||
share/help/sl/seahorse/legal.xml
|
||||
share/help/sv/
|
||||
share/help/sv/seahorse/
|
||||
share/help/sv/seahorse/figures/
|
||||
share/help/sv/seahorse/figures/seahorse-window.png
|
||||
share/help/sv/seahorse/index.docbook
|
||||
share/help/sv/seahorse/legal.xml
|
||||
share/help/vi/
|
||||
share/help/vi/seahorse/
|
||||
share/help/vi/seahorse/figures/
|
||||
share/help/vi/seahorse/figures/seahorse-window.png
|
||||
share/help/vi/seahorse/index.docbook
|
||||
share/help/vi/seahorse/legal.xml
|
||||
share/help/zh_CN/
|
||||
share/help/zh_CN/seahorse/
|
||||
share/help/zh_CN/seahorse/figures/
|
||||
share/help/zh_CN/seahorse/figures/seahorse-window.png
|
||||
share/help/zh_CN/seahorse/index.docbook
|
||||
share/help/zh_CN/seahorse/legal.xml
|
||||
share/icons/hicolor/16x16/apps/seahorse-preferences.png
|
||||
share/icons/hicolor/16x16/apps/seahorse.png
|
||||
share/icons/hicolor/22x22/apps/seahorse-preferences.png
|
||||
@ -180,27 +215,6 @@ share/locale/vi/LC_MESSAGES/seahorse.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/seahorse.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/seahorse.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/seahorse.mo
|
||||
share/omf/
|
||||
share/omf/seahorse/
|
||||
share/omf/seahorse/seahorse-C.omf
|
||||
share/omf/seahorse/seahorse-ca.omf
|
||||
share/omf/seahorse/seahorse-cs.omf
|
||||
share/omf/seahorse/seahorse-de.omf
|
||||
share/omf/seahorse/seahorse-el.omf
|
||||
share/omf/seahorse/seahorse-en_GB.omf
|
||||
share/omf/seahorse/seahorse-es.omf
|
||||
share/omf/seahorse/seahorse-eu.omf
|
||||
share/omf/seahorse/seahorse-fr.omf
|
||||
share/omf/seahorse/seahorse-gl.omf
|
||||
share/omf/seahorse/seahorse-it.omf
|
||||
share/omf/seahorse/seahorse-ja.omf
|
||||
share/omf/seahorse/seahorse-ko.omf
|
||||
share/omf/seahorse/seahorse-oc.omf
|
||||
share/omf/seahorse/seahorse-ru.omf
|
||||
share/omf/seahorse/seahorse-sl.omf
|
||||
share/omf/seahorse/seahorse-sv.omf
|
||||
share/omf/seahorse/seahorse-vi.omf
|
||||
share/omf/seahorse/seahorse-zh_CN.omf
|
||||
share/seahorse/
|
||||
share/seahorse/icons/
|
||||
share/seahorse/icons/hicolor/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user