Update to 2.25.91.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11921 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 806 insertions, 0 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
new file mode 100644
index 000000000..169d47eee
--- /dev/null
+++ b/security/gnome-keyring/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for:   gnomekeyring
+# Date Created:			08 December 2003
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-keyring
+PORTVERSION=	2.25.91
+CATEGORIES=	security gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A program that keeps passwords and other secrets
+
+LIB_DEPENDS=	tasn1.4:${PORTSDIR}/security/libtasn1 \
+    		gcrypt.16:${PORTSDIR}/security/libgcrypt
+
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+GCONF_SCHEMAS=	gnome-keyring.schemas
+
+OPTIONS=	HAL "Use HAL for keys on removable drives" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
new file mode 100644
index 000000000..de12f1de3
--- /dev/null
+++ b/security/gnome-keyring/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-keyring-2.25.91.tar.bz2) = c583ad06527f5eb456a0649dbba261dc
+SHA256 (gnome2/gnome-keyring-2.25.91.tar.bz2) = 41f6821ed012d84f5a32f68401da8fd252bf962cde1a887b1c0ca376f5d2dd15
+SIZE (gnome2/gnome-keyring-2.25.91.tar.bz2) = 1150687
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
new file mode 100644
index 000000000..9aff6d9eb
--- /dev/null
+++ b/security/gnome-keyring/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	2009-02-24 21:18:47.000000000 +0100
++++ configure	2009-02-24 21:19:24.000000000 +0100
+@@ -18069,7 +18069,7 @@
+ 
+ { echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5
+ echo $ECHO_N "checking build test tools, unit tests, and -Werror... $ECHO_C" >&6; }
+-if test "$enable_tests" == "yes"; then
++if test "$enable_tests" = "yes"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define WITH_TESTS 1
+@@ -18085,7 +18085,7 @@
+   	tests_status="no"
+ fi
+ 
+- if test "$enable_tests" == "yes"; then
++ if test "$enable_tests" = "yes"; then
+   WITH_TESTS_TRUE=
+   WITH_TESTS_FALSE='#'
+ else
+@@ -18100,7 +18100,7 @@
+ fi
+ 
+ 
+-if test "$enable_coverage" == "yes"; then
++if test "$enable_coverage" = "yes"; then
+ 	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+ 	LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
+ fi
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
new file mode 100644
index 000000000..32ffb1b09
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/Makefile.in.orig	2009-02-24 21:22:45.000000000 +0100
++++ pkcs11/rpc-layer/Makefile.in	2009-02-24 21:22:52.000000000 +0100
+@@ -348,7 +348,7 @@ gck_rpc_daemon_standalone_SOURCES = \
+ 	gck-rpc-daemon-standalone.c
+ 
+ gck_rpc_daemon_standalone_LDADD = \
+-	-ldl libgck-rpc-layer.la \
++	libgck-rpc-layer.la \
+ 	$(top_builddir)/common/libgkr-common.la
+ 
+ all: all-am
diff --git a/security/gnome-keyring/pkg-descr b/security/gnome-keyring/pkg-descr
new file mode 100644
index 000000000..75ce77c6d
--- /dev/null
+++ b/security/gnome-keyring/pkg-descr
@@ -0,0 +1,17 @@
+Gnome-keyring is a program that keep password and other secrets for
+users. It is run as a damon in the session, similar to ssh-agent, and
+other applications can locate it by an environment variable.
+
+The program can manage several keyrings, each with its own master
+password, and there is also a session keyring which is never stored to
+disk, but forgotten when the session ends.
+
+The library libgnome-keyring is used by applications to integrate with
+the gnome keyring system. However, at this point the library hasn't been
+tested and used enought to consider the API to be publically
+exposed. Therefore use of libgnome-keyring is at the moment limited to
+internal use in the gnome desktop. However, we hope that the
+gnome-keyring API will turn out useful and good, so that later it
+can be made public for any application to use.
+
+-- Gnome-keyring README
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
new file mode 100644
index 000000000..7df2fcb23
--- /dev/null
+++ b/security/gnome-keyring/pkg-plist
@@ -0,0 +1,200 @@
+bin/gnome-keyring
+bin/gnome-keyring-daemon
+etc/xdg/autostart/gnome-keyring-daemon.desktop
+include/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr-certificate.h
+include/gcr/gcr-importer.h
+include/gcr/gcr-parser.h
+include/gcr/gcr-types.h
+include/gcr/gcr.h
+include/gnome-keyring-1/gnome-keyring-memory.h
+include/gnome-keyring-1/gnome-keyring-result.h
+include/gnome-keyring-1/gnome-keyring.h
+include/gp11/gp11.h
+include/gp11/pkcs11.h
+include/gp11/pkcs11g.h
+include/gp11/pkcs11n.h
+lib/gnome-keyring/devel/gck-ssh-store-standalone.a
+lib/gnome-keyring/devel/gck-ssh-store-standalone.la
+lib/gnome-keyring/devel/gck-ssh-store-standalone.so
+lib/gnome-keyring/devel/gck-user-store-standalone.a
+lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/devel/gck-user-store-standalone.so
+lib/gnome-keyring/gnome-keyring-pkcs11.a
+lib/gnome-keyring/gnome-keyring-pkcs11.la
+lib/gnome-keyring/gnome-keyring-pkcs11.so
+lib/gnome-keyring/standalone/gck-roots-store-standalone.a
+lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/gnome-keyring/standalone/gck-roots-store-standalone.so
+lib/libgcr.a
+lib/libgcr.la
+lib/libgcr.so
+lib/libgcr.so.0
+lib/libgnome-keyring.a
+lib/libgnome-keyring.la
+lib/libgnome-keyring.so
+lib/libgnome-keyring.so.0
+lib/libgp11.a
+lib/libgp11.la
+lib/libgp11.so
+lib/libgp11.so.0
+lib/pam_gnome_keyring.a
+lib/pam_gnome_keyring.la
+lib/pam_gnome_keyring.so
+libdata/pkgconfig/gcr-0.pc
+libdata/pkgconfig/gnome-keyring-1.pc
+libdata/pkgconfig/gp11-0.pc
+libexec/gnome-keyring-ask
+share/dbus-1/services/org.gnome.keyring.service
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-daemon.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-generic-callbacks.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyring-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyrings.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-password.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html
+%%DOCSDIR%%/gnome-keyring.devhelp
+%%DOCSDIR%%/gnome-keyring.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+share/doc/gp11/GP11Object.html
+share/doc/gp11/ch01.html
+share/doc/gp11/gp11-GP11Call.html
+share/doc/gp11/gp11-gp11-test.html
+share/doc/gp11/gp11-pkcs11.html
+share/doc/gp11/gp11.devhelp
+share/doc/gp11/gp11.devhelp2
+share/doc/gp11/home.png
+share/doc/gp11/index.html
+share/doc/gp11/index.sgml
+share/doc/gp11/left.png
+share/doc/gp11/right.png
+share/doc/gp11/style.css
+share/doc/gp11/up.png
+share/gcr/ui/gcr-certificate-basics-widget.ui
+share/gcr/ui/gcr-import-dialog.ui
+share/locale/ar/LC_MESSAGES/gnome-keyring.mo
+share/locale/ast/LC_MESSAGES/gnome-keyring.mo
+share/locale/az/LC_MESSAGES/gnome-keyring.mo
+share/locale/be/LC_MESSAGES/gnome-keyring.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
+share/locale/bg/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
+share/locale/bs/LC_MESSAGES/gnome-keyring.mo
+share/locale/ca/LC_MESSAGES/gnome-keyring.mo
+share/locale/cs/LC_MESSAGES/gnome-keyring.mo
+share/locale/cy/LC_MESSAGES/gnome-keyring.mo
+share/locale/da/LC_MESSAGES/gnome-keyring.mo
+share/locale/de/LC_MESSAGES/gnome-keyring.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring.mo
+share/locale/el/LC_MESSAGES/gnome-keyring.mo
+share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
+share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
+share/locale/es/LC_MESSAGES/gnome-keyring.mo
+share/locale/et/LC_MESSAGES/gnome-keyring.mo
+share/locale/eu/LC_MESSAGES/gnome-keyring.mo
+share/locale/fa/LC_MESSAGES/gnome-keyring.mo
+share/locale/fi/LC_MESSAGES/gnome-keyring.mo
+share/locale/fr/LC_MESSAGES/gnome-keyring.mo
+share/locale/gl/LC_MESSAGES/gnome-keyring.mo
+share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/he/LC_MESSAGES/gnome-keyring.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring.mo
+share/locale/hr/LC_MESSAGES/gnome-keyring.mo
+share/locale/hu/LC_MESSAGES/gnome-keyring.mo
+share/locale/id/LC_MESSAGES/gnome-keyring.mo
+share/locale/is/LC_MESSAGES/gnome-keyring.mo
+share/locale/it/LC_MESSAGES/gnome-keyring.mo
+share/locale/ja/LC_MESSAGES/gnome-keyring.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring.mo
+share/locale/kn/LC_MESSAGES/gnome-keyring.mo
+share/locale/ko/LC_MESSAGES/gnome-keyring.mo
+share/locale/lt/LC_MESSAGES/gnome-keyring.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring.mo
+share/locale/mn/LC_MESSAGES/gnome-keyring.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring.mo
+share/locale/ms/LC_MESSAGES/gnome-keyring.mo
+share/locale/nb/LC_MESSAGES/gnome-keyring.mo
+share/locale/ne/LC_MESSAGES/gnome-keyring.mo
+share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/nn/LC_MESSAGES/gnome-keyring.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring.mo
+share/locale/or/LC_MESSAGES/gnome-keyring.mo
+share/locale/pa/LC_MESSAGES/gnome-keyring.mo
+share/locale/pl/LC_MESSAGES/gnome-keyring.mo
+share/locale/pt/LC_MESSAGES/gnome-keyring.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
+share/locale/ro/LC_MESSAGES/gnome-keyring.mo
+share/locale/ru/LC_MESSAGES/gnome-keyring.mo
+share/locale/rw/LC_MESSAGES/gnome-keyring.mo
+share/locale/si/LC_MESSAGES/gnome-keyring.mo
+share/locale/sk/LC_MESSAGES/gnome-keyring.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring.mo
+share/locale/sq/LC_MESSAGES/gnome-keyring.mo
+share/locale/sr/LC_MESSAGES/gnome-keyring.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
+share/locale/sv/LC_MESSAGES/gnome-keyring.mo
+share/locale/ta/LC_MESSAGES/gnome-keyring.mo
+share/locale/te/LC_MESSAGES/gnome-keyring.mo
+share/locale/th/LC_MESSAGES/gnome-keyring.mo
+share/locale/tr/LC_MESSAGES/gnome-keyring.mo
+share/locale/uk/LC_MESSAGES/gnome-keyring.mo
+share/locale/vi/LC_MESSAGES/gnome-keyring.mo
+share/locale/xh/LC_MESSAGES/gnome-keyring.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm share/doc/gp11
+@dirrm %%DOCSDIR%%
+@dirrm lib/gnome-keyring/standalone
+@dirrm lib/gnome-keyring/devel
+@dirrm lib/gnome-keyring
+@dirrm include/gp11
+@dirrm include/gnome-keyring-1
+@dirrm include/gcr
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrm share/gcr/ui
+@dirrm share/gcr
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
new file mode 100644
index 000000000..b47fc8ae8
--- /dev/null
+++ b/security/seahorse/Makefile
@@ -0,0 +1,73 @@
+# New ports collection makefile for:	Seahorse
+# Date created:		08 March 2000
+# Whom:			Dave McKay <dave@mu.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	seahorse
+PORTVERSION=	2.25.91
+CATEGORIES=	security gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
+
+BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
+    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		gnome-keyring:${PORTSDIR}/security/gnome-keyring
+
+USE_LDCONFIG=	yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
+GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	seahorse.schemas
+MAN1=		seahorse-daemon.1
+
+OPTIONS=	LDAP "Enable LDAP support" on \
+		HKP "Enable HKP keyserver interface" on \
+		NOTIFY "Enable libnotify support" on \
+		MDNS "Enable mDNS key sharing" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_LDAP)
+USE_OPENLDAP=	yes
+.else
+CONFIGURE_ARGS+=--disable-ldap
+.endif
+
+.if !defined(WITHOUT_HKP)
+LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+.else
+CONFIGURE_ARGS+=--disable-hkp
+.endif
+
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+.else
+CONFIGURE_ARGS+=--disable-libnotify
+.endif
+
+.if !defined(WITHOUT_MDNS)
+LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+.else
+CONFIGURE_ARGS+=--disable-sharing
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+			${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
new file mode 100644
index 000000000..59848da60
--- /dev/null
+++ b/security/seahorse/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/seahorse-2.25.91.tar.bz2) = 24862d74d64eed36af8bbfb1efa5111c
+SHA256 (gnome2/seahorse-2.25.91.tar.bz2) = e14c7afd17de12d8e6613be0da802725107f74627a8a389ef3959a726672a2d1
+SIZE (gnome2/seahorse-2.25.91.tar.bz2) = 2092622
diff --git a/security/seahorse/files/patch-common_seahorse-registry.c b/security/seahorse/files/patch-common_seahorse-registry.c
new file mode 100644
index 000000000..d3ab78c0d
--- /dev/null
+++ b/security/seahorse/files/patch-common_seahorse-registry.c
@@ -0,0 +1,44 @@
+--- common/seahorse-registry.c.orig	2009-02-14 19:20:38.000000000 +0100
++++ common/seahorse-registry.c	2009-02-24 21:15:26.000000000 +0100
+@@ -51,6 +51,25 @@
+ 	registry_singleton = NULL;
+ }
+ 
++static guint registry_hash (gconstpointer key)
++{
++	SeahorseRegistryType *rtype;
++
++	rtype = (SeahorseRegistryType *) key;
++
++	return (guint) rtype->type;
++}
++
++static gboolean registry_equal (gconstpointer a, gconstpointer b)
++{
++	SeahorseRegistryType *rta, *rtb;
++
++	rta = (SeahorseRegistryType *) a;
++	rtb = (SeahorseRegistryType *) b;
++
++	return (rta->type == rtb->type);
++}
++
+ static void
+ keys_to_list (gpointer key, gpointer value, gpointer user_data)
+ {
+@@ -63,13 +82,14 @@
+                              gpointer value, GDestroyNotify destroy_func)
+ {
+ 	GHashTable *set;
++	SeahorseRegistryType *rtype;
+ 	
+ 	g_return_if_fail (table);
+ 	g_return_if_fail (category);
+ 	
+ 	set = g_hash_table_lookup (table, GUINT_TO_POINTER (category));
+ 	if (!set) {
+-		set = g_hash_table_new_full (g_direct_hash, g_direct_equal, destroy_func, NULL);
++		set = g_hash_table_new_full (registry_hash, registry_equal, destroy_func, NULL);
+ 		g_hash_table_replace (table, GUINT_TO_POINTER (category), set);
+ 	}
+ 	
diff --git a/security/seahorse/files/patch-common_seahorse-registry.h b/security/seahorse/files/patch-common_seahorse-registry.h
new file mode 100644
index 000000000..f1f57de3b
--- /dev/null
+++ b/security/seahorse/files/patch-common_seahorse-registry.h
@@ -0,0 +1,21 @@
+--- common/seahorse-registry.h.orig	2008-11-23 18:26:42.000000000 -0500
++++ common/seahorse-registry.h	2008-11-23 18:26:47.000000000 -0500
+@@ -35,6 +35,7 @@ G_BEGIN_DECLS
+ 
+ typedef struct _SeahorseRegistry      SeahorseRegistry;
+ typedef struct _SeahorseRegistryClass SeahorseRegistryClass;
++typedef struct _SeahorseRegistryType  SeahorseRegistryType;
+ 
+ struct _SeahorseRegistry {
+ 	 GObject parent;
+@@ -44,6 +45,10 @@ struct _SeahorseRegistryClass {
+ 	GObjectClass parent_class;
+ };
+ 
++struct _SeahorseRegistryType {
++	GType type;
++};
++
+ /* member functions */
+ GType                seahorse_registry_get_type        (void) G_GNUC_CONST;
+ 
diff --git a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c
new file mode 100644
index 000000000..d3528e2a7
--- /dev/null
+++ b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c
@@ -0,0 +1,19 @@
+--- ssh/seahorse-ssh-operation.c.orig	2008-07-21 18:15:51.000000000 -0400
++++ ssh/seahorse-ssh-operation.c	2008-07-22 22:49:51.000000000 -0400
+@@ -280,11 +280,14 @@ askpass_handler (GIOChannel *source, GIO
+     const gchar *result = NULL;
+ 
+     if (condition & G_IO_IN) {
++	GIOStatus status;
+         
+         /* Read 1 line from the io channel, including newline character */
+-        g_io_channel_read_line (source, &string, &length, NULL, &err);
++        status = g_io_channel_read_line (source, &string, &length, NULL, &err);
+ 
+-        if (err != NULL) {
++	if (status == G_IO_STATUS_EOF) {
++		ret = FALSE;
++	} else if (err != NULL) {
+             g_critical ("couldn't read from seahorse-ssh-askpass: %s", err->message);
+             g_clear_error (&err);
+             ret = FALSE;
diff --git a/security/seahorse/pkg-descr b/security/seahorse/pkg-descr
new file mode 100644
index 000000000..ea4098271
--- /dev/null
+++ b/security/seahorse/pkg-descr
@@ -0,0 +1,8 @@
+Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program.
+
+It is a tool for secure communications and data storage.
+Data encryption and digital signature creation can easily
+be performed through a GUI and Key Management operations
+can easily be carried out through an intuitive interface.
+
+WWW: http://seahorse.sourceforge.net/
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
new file mode 100644
index 000000000..a94f07390
--- /dev/null
+++ b/security/seahorse/pkg-plist
@@ -0,0 +1,335 @@
+bin/seahorse
+bin/seahorse-daemon
+include/libcryptui/cryptui-key-chooser.h
+include/libcryptui/cryptui-key-combo.h
+include/libcryptui/cryptui-key-list.h
+include/libcryptui/cryptui-key-store.h
+include/libcryptui/cryptui-keyset.h
+include/libcryptui/cryptui.h
+lib/libcryptui.a
+lib/libcryptui.la
+lib/libcryptui.so
+lib/libcryptui.so.0
+lib/seahorse/seahorse-ssh-askpass
+lib/seahorse/xloadimage
+libdata/pkgconfig/cryptui-0.0.pc
+share/applications/seahorse.desktop
+share/dbus-1/services/org.gnome.seahorse.service
+share/gnome/help/seahorse/C/figures/export.png
+share/gnome/help/seahorse/C/figures/file-manager.png
+share/gnome/help/seahorse/C/figures/generate.png
+share/gnome/help/seahorse/C/figures/import.png
+share/gnome/help/seahorse/C/figures/key-manager.png
+share/gnome/help/seahorse/C/figures/key-properties.png
+share/gnome/help/seahorse/C/figures/passphrase.png
+share/gnome/help/seahorse/C/figures/preferences.png
+share/gnome/help/seahorse/C/figures/recipients.png
+share/gnome/help/seahorse/C/figures/seahorse-window.png
+share/gnome/help/seahorse/C/figures/signature.png
+share/gnome/help/seahorse/C/figures/text-editor.png
+share/gnome/help/seahorse/C/legal.xml
+share/gnome/help/seahorse/C/seahorse.xml
+share/gnome/help/seahorse/de/figures/export.png
+share/gnome/help/seahorse/de/figures/file-manager.png
+share/gnome/help/seahorse/de/figures/generate.png
+share/gnome/help/seahorse/de/figures/import.png
+share/gnome/help/seahorse/de/figures/key-manager.png
+share/gnome/help/seahorse/de/figures/key-properties.png
+share/gnome/help/seahorse/de/figures/passphrase.png
+share/gnome/help/seahorse/de/figures/preferences.png
+share/gnome/help/seahorse/de/figures/recipients.png
+share/gnome/help/seahorse/de/figures/seahorse-window.png
+share/gnome/help/seahorse/de/figures/signature.png
+share/gnome/help/seahorse/de/figures/text-editor.png
+share/gnome/help/seahorse/de/seahorse.xml
+share/gnome/help/seahorse/en_GB/figures/export.png
+share/gnome/help/seahorse/en_GB/figures/file-manager.png
+share/gnome/help/seahorse/en_GB/figures/generate.png
+share/gnome/help/seahorse/en_GB/figures/import.png
+share/gnome/help/seahorse/en_GB/figures/key-manager.png
+share/gnome/help/seahorse/en_GB/figures/key-properties.png
+share/gnome/help/seahorse/en_GB/figures/passphrase.png
+share/gnome/help/seahorse/en_GB/figures/preferences.png
+share/gnome/help/seahorse/en_GB/figures/recipients.png
+share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
+share/gnome/help/seahorse/en_GB/figures/signature.png
+share/gnome/help/seahorse/en_GB/figures/text-editor.png
+share/gnome/help/seahorse/en_GB/seahorse.xml
+share/gnome/help/seahorse/es/figures/export.png
+share/gnome/help/seahorse/es/figures/file-manager.png
+share/gnome/help/seahorse/es/figures/generate.png
+share/gnome/help/seahorse/es/figures/import.png
+share/gnome/help/seahorse/es/figures/key-manager.png
+share/gnome/help/seahorse/es/figures/key-properties.png
+share/gnome/help/seahorse/es/figures/passphrase.png
+share/gnome/help/seahorse/es/figures/preferences.png
+share/gnome/help/seahorse/es/figures/recipients.png
+share/gnome/help/seahorse/es/figures/seahorse-window.png
+share/gnome/help/seahorse/es/figures/signature.png
+share/gnome/help/seahorse/es/figures/text-editor.png
+share/gnome/help/seahorse/es/seahorse.xml
+share/gnome/help/seahorse/fr/figures/export.png
+share/gnome/help/seahorse/fr/figures/file-manager.png
+share/gnome/help/seahorse/fr/figures/generate.png
+share/gnome/help/seahorse/fr/figures/import.png
+share/gnome/help/seahorse/fr/figures/key-manager.png
+share/gnome/help/seahorse/fr/figures/key-properties.png
+share/gnome/help/seahorse/fr/figures/passphrase.png
+share/gnome/help/seahorse/fr/figures/preferences.png
+share/gnome/help/seahorse/fr/figures/recipients.png
+share/gnome/help/seahorse/fr/figures/seahorse-window.png
+share/gnome/help/seahorse/fr/figures/signature.png
+share/gnome/help/seahorse/fr/figures/text-editor.png
+share/gnome/help/seahorse/fr/seahorse.xml
+share/gnome/help/seahorse/it/figures/export.png
+share/gnome/help/seahorse/it/figures/file-manager.png
+share/gnome/help/seahorse/it/figures/generate.png
+share/gnome/help/seahorse/it/figures/import.png
+share/gnome/help/seahorse/it/figures/key-manager.png
+share/gnome/help/seahorse/it/figures/key-properties.png
+share/gnome/help/seahorse/it/figures/passphrase.png
+share/gnome/help/seahorse/it/figures/preferences.png
+share/gnome/help/seahorse/it/figures/recipients.png
+share/gnome/help/seahorse/it/figures/seahorse-window.png
+share/gnome/help/seahorse/it/figures/signature.png
+share/gnome/help/seahorse/it/figures/text-editor.png
+share/gnome/help/seahorse/it/seahorse.xml
+share/gnome/help/seahorse/oc/figures/export.png
+share/gnome/help/seahorse/oc/figures/file-manager.png
+share/gnome/help/seahorse/oc/figures/generate.png
+share/gnome/help/seahorse/oc/figures/import.png
+share/gnome/help/seahorse/oc/figures/key-manager.png
+share/gnome/help/seahorse/oc/figures/key-properties.png
+share/gnome/help/seahorse/oc/figures/passphrase.png
+share/gnome/help/seahorse/oc/figures/preferences.png
+share/gnome/help/seahorse/oc/figures/recipients.png
+share/gnome/help/seahorse/oc/figures/seahorse-window.png
+share/gnome/help/seahorse/oc/figures/signature.png
+share/gnome/help/seahorse/oc/figures/text-editor.png
+share/gnome/help/seahorse/oc/seahorse.xml
+share/gnome/help/seahorse/ru/figures/export.png
+share/gnome/help/seahorse/ru/figures/file-manager.png
+share/gnome/help/seahorse/ru/figures/generate.png
+share/gnome/help/seahorse/ru/figures/import.png
+share/gnome/help/seahorse/ru/figures/key-manager.png
+share/gnome/help/seahorse/ru/figures/key-properties.png
+share/gnome/help/seahorse/ru/figures/passphrase.png
+share/gnome/help/seahorse/ru/figures/preferences.png
+share/gnome/help/seahorse/ru/figures/recipients.png
+share/gnome/help/seahorse/ru/figures/seahorse-window.png
+share/gnome/help/seahorse/ru/figures/signature.png
+share/gnome/help/seahorse/ru/figures/text-editor.png
+share/gnome/help/seahorse/ru/seahorse.xml
+share/gnome/help/seahorse/sv/figures/export.png
+share/gnome/help/seahorse/sv/figures/file-manager.png
+share/gnome/help/seahorse/sv/figures/generate.png
+share/gnome/help/seahorse/sv/figures/import.png
+share/gnome/help/seahorse/sv/figures/key-manager.png
+share/gnome/help/seahorse/sv/figures/key-properties.png
+share/gnome/help/seahorse/sv/figures/passphrase.png
+share/gnome/help/seahorse/sv/figures/preferences.png
+share/gnome/help/seahorse/sv/figures/recipients.png
+share/gnome/help/seahorse/sv/figures/seahorse-window.png
+share/gnome/help/seahorse/sv/figures/signature.png
+share/gnome/help/seahorse/sv/figures/text-editor.png
+share/gnome/help/seahorse/sv/seahorse.xml
+share/gnome/help/seahorse/vi/figures/export.png
+share/gnome/help/seahorse/vi/figures/file-manager.png
+share/gnome/help/seahorse/vi/figures/generate.png
+share/gnome/help/seahorse/vi/figures/import.png
+share/gnome/help/seahorse/vi/figures/key-manager.png
+share/gnome/help/seahorse/vi/figures/key-properties.png
+share/gnome/help/seahorse/vi/figures/passphrase.png
+share/gnome/help/seahorse/vi/figures/preferences.png
+share/gnome/help/seahorse/vi/figures/recipients.png
+share/gnome/help/seahorse/vi/figures/seahorse-window.png
+share/gnome/help/seahorse/vi/figures/signature.png
+share/gnome/help/seahorse/vi/figures/text-editor.png
+share/gnome/help/seahorse/vi/seahorse.xml
+share/icons/hicolor/16x16/apps/seahorse-preferences.png
+share/icons/hicolor/16x16/apps/seahorse.png
+share/icons/hicolor/22x22/apps/seahorse-preferences.png
+share/icons/hicolor/22x22/apps/seahorse.png
+share/icons/hicolor/24x24/apps/seahorse-preferences.png
+share/icons/hicolor/24x24/apps/seahorse.png
+share/icons/hicolor/32x32/apps/seahorse-preferences.png
+share/icons/hicolor/32x32/apps/seahorse.png
+share/icons/hicolor/48x48/apps/seahorse-preferences.png
+share/icons/hicolor/48x48/apps/seahorse.png
+share/locale/ar/LC_MESSAGES/seahorse.mo
+share/locale/az/LC_MESSAGES/seahorse.mo
+share/locale/be@latin/LC_MESSAGES/seahorse.mo
+share/locale/bg/LC_MESSAGES/seahorse.mo
+share/locale/bn/LC_MESSAGES/seahorse.mo
+share/locale/bn_IN/LC_MESSAGES/seahorse.mo
+share/locale/ca/LC_MESSAGES/seahorse.mo
+share/locale/cs/LC_MESSAGES/seahorse.mo
+share/locale/da/LC_MESSAGES/seahorse.mo
+share/locale/de/LC_MESSAGES/seahorse.mo
+share/locale/dz/LC_MESSAGES/seahorse.mo
+share/locale/el/LC_MESSAGES/seahorse.mo
+share/locale/en_CA/LC_MESSAGES/seahorse.mo
+share/locale/en_GB/LC_MESSAGES/seahorse.mo
+share/locale/es/LC_MESSAGES/seahorse.mo
+share/locale/et/LC_MESSAGES/seahorse.mo
+share/locale/eu/LC_MESSAGES/seahorse.mo
+share/locale/fi/LC_MESSAGES/seahorse.mo
+share/locale/fr/LC_MESSAGES/seahorse.mo
+share/locale/ga/LC_MESSAGES/seahorse.mo
+share/locale/gl/LC_MESSAGES/seahorse.mo
+share/locale/gu/LC_MESSAGES/seahorse.mo
+share/locale/he/LC_MESSAGES/seahorse.mo
+share/locale/hi/LC_MESSAGES/seahorse.mo
+share/locale/hr/LC_MESSAGES/seahorse.mo
+share/locale/hu/LC_MESSAGES/seahorse.mo
+share/locale/it/LC_MESSAGES/seahorse.mo
+share/locale/ja/LC_MESSAGES/seahorse.mo
+share/locale/kn/LC_MESSAGES/seahorse.mo
+share/locale/ko/LC_MESSAGES/seahorse.mo
+share/locale/lt/LC_MESSAGES/seahorse.mo
+share/locale/lv/LC_MESSAGES/seahorse.mo
+share/locale/mk/LC_MESSAGES/seahorse.mo
+share/locale/ml/LC_MESSAGES/seahorse.mo
+share/locale/mr/LC_MESSAGES/seahorse.mo
+share/locale/ms/LC_MESSAGES/seahorse.mo
+share/locale/nb/LC_MESSAGES/seahorse.mo
+share/locale/ne/LC_MESSAGES/seahorse.mo
+share/locale/nl/LC_MESSAGES/seahorse.mo
+share/locale/nn/LC_MESSAGES/seahorse.mo
+share/locale/oc/LC_MESSAGES/seahorse.mo
+share/locale/or/LC_MESSAGES/seahorse.mo
+share/locale/pa/LC_MESSAGES/seahorse.mo
+share/locale/pl/LC_MESSAGES/seahorse.mo
+share/locale/pt/LC_MESSAGES/seahorse.mo
+share/locale/pt_BR/LC_MESSAGES/seahorse.mo
+share/locale/ru/LC_MESSAGES/seahorse.mo
+share/locale/rw/LC_MESSAGES/seahorse.mo
+share/locale/si/LC_MESSAGES/seahorse.mo
+share/locale/sk/LC_MESSAGES/seahorse.mo
+share/locale/sl/LC_MESSAGES/seahorse.mo
+share/locale/sq/LC_MESSAGES/seahorse.mo
+share/locale/sr/LC_MESSAGES/seahorse.mo
+share/locale/sr@latin/LC_MESSAGES/seahorse.mo
+share/locale/sv/LC_MESSAGES/seahorse.mo
+share/locale/ta/LC_MESSAGES/seahorse.mo
+share/locale/te/LC_MESSAGES/seahorse.mo
+share/locale/th/LC_MESSAGES/seahorse.mo
+share/locale/tr/LC_MESSAGES/seahorse.mo
+share/locale/uk/LC_MESSAGES/seahorse.mo
+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/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-de.omf
+share/omf/seahorse/seahorse-en_GB.omf
+share/omf/seahorse/seahorse-es.omf
+share/omf/seahorse/seahorse-fr.omf
+share/omf/seahorse/seahorse-it.omf
+share/omf/seahorse/seahorse-oc.omf
+share/omf/seahorse/seahorse-ru.omf
+share/omf/seahorse/seahorse-sv.omf
+share/omf/seahorse/seahorse-vi.omf
+share/pixmaps/seahorse/22x22/seahorse-key-personal.png
+share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
+share/pixmaps/seahorse/22x22/seahorse-key.png
+share/pixmaps/seahorse/22x22/seahorse-person.png
+share/pixmaps/seahorse/22x22/seahorse-share-keys.png
+share/pixmaps/seahorse/22x22/seahorse-sign-bad.png
+share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
+share/pixmaps/seahorse/22x22/seahorse-sign.png
+share/pixmaps/seahorse/48x48/seahorse-key-personal.png
+share/pixmaps/seahorse/48x48/seahorse-key-ssh.png
+share/pixmaps/seahorse/48x48/seahorse-key.png
+share/pixmaps/seahorse/48x48/seahorse-person.png
+share/pixmaps/seahorse/48x48/seahorse-share-keys.png
+share/pixmaps/seahorse/48x48/seahorse-sign-bad.png
+share/pixmaps/seahorse/48x48/seahorse-sign-ok.png
+share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-sign.png
+share/pixmaps/seahorse/scalable/seahorse-key-personal.svg
+share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
+share/pixmaps/seahorse/scalable/seahorse-key.svg
+share/pixmaps/seahorse/scalable/seahorse-person.svg
+share/pixmaps/seahorse/scalable/seahorse-share-keys.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
+share/pixmaps/seahorse/scalable/seahorse-sign.svg
+%%DATADIR%%/glade/seahorse-add-keyring.glade
+%%DATADIR%%/glade/seahorse-add-keyserver.glade
+%%DATADIR%%/glade/seahorse-add-subkey.glade
+%%DATADIR%%/glade/seahorse-add-uid.glade
+%%DATADIR%%/glade/seahorse-change-passphrase.glade
+%%DATADIR%%/glade/seahorse-expires.glade
+%%DATADIR%%/glade/seahorse-generate-select.glade
+%%DATADIR%%/glade/seahorse-gkeyring-item-properties.glade
+%%DATADIR%%/glade/seahorse-key-manager.glade
+%%DATADIR%%/glade/seahorse-key-manager.ui
+%%DATADIR%%/glade/seahorse-keyserver-results.glade
+%%DATADIR%%/glade/seahorse-keyserver-results.ui
+%%DATADIR%%/glade/seahorse-keyserver-search.glade
+%%DATADIR%%/glade/seahorse-keyserver-sync.glade
+%%DATADIR%%/glade/seahorse-notify.glade
+%%DATADIR%%/glade/seahorse-pgp-generate.glade
+%%DATADIR%%/glade/seahorse-pgp-private-key-properties.glade
+%%DATADIR%%/glade/seahorse-pgp-public-key-properties.glade
+%%DATADIR%%/glade/seahorse-prefs.glade
+%%DATADIR%%/glade/seahorse-progress.glade
+%%DATADIR%%/glade/seahorse-revoke.glade
+%%DATADIR%%/glade/seahorse-sign.glade
+%%DATADIR%%/glade/seahorse-signer.glade
+%%DATADIR%%/glade/seahorse-ssh-generate.glade
+%%DATADIR%%/glade/seahorse-ssh-key-properties.glade
+%%DATADIR%%/glade/seahorse-ssh-upload.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+@dirrm share/pixmaps/seahorse/scalable
+@dirrm share/pixmaps/seahorse/48x48
+@dirrm share/pixmaps/seahorse/22x22
+@dirrm share/pixmaps/seahorse
+@dirrm share/omf/seahorse
+@dirrm share/gnome/help/seahorse/vi/figures
+@dirrm share/gnome/help/seahorse/vi
+@dirrm share/gnome/help/seahorse/sv/figures
+@dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/ru/figures
+@dirrm share/gnome/help/seahorse/ru
+@dirrm share/gnome/help/seahorse/oc/figures
+@dirrm share/gnome/help/seahorse/oc
+@dirrm share/gnome/help/seahorse/it/figures
+@dirrm share/gnome/help/seahorse/it
+@dirrm share/gnome/help/seahorse/fr/figures
+@dirrm share/gnome/help/seahorse/fr
+@dirrm share/gnome/help/seahorse/es/figures
+@dirrm share/gnome/help/seahorse/es
+@dirrm share/gnome/help/seahorse/en_GB/figures
+@dirrm share/gnome/help/seahorse/en_GB
+@dirrm share/gnome/help/seahorse/de/figures
+@dirrm share/gnome/help/seahorse/de
+@dirrm share/gnome/help/seahorse/C/figures
+@dirrm share/gnome/help/seahorse/C
+@dirrm share/gnome/help/seahorse
+@dirrmtry share/applications
+@dirrm lib/seahorse
+@dirrm include/libcryptui
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin