diff options
Diffstat (limited to 'security/gnome-keyring')
| -rw-r--r-- | security/gnome-keyring/Makefile | 8 | ||||
| -rw-r--r-- | security/gnome-keyring/distinfo | 6 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c | 11 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c | 10 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c | 11 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-egg_egg-unix-credentials.c | 44 | ||||
| -rw-r--r-- | security/gnome-keyring/pkg-plist | 90 |
7 files changed, 109 insertions, 71 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 7fbf00b8f570..12995c21b88e 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.85 2009/10/18 13:46:28 avl Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.92 2010/04/27 16:51:29 kwm Exp $ # PORTNAME= gnome-keyring -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,8 +15,7 @@ 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 +LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2 diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 3a115b6dbf63..0773b83ba4f8 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-keyring-2.28.2.tar.bz2) = 97ea6823e88b39284187764c1ca95a59 -SHA256 (gnome2/gnome-keyring-2.28.2.tar.bz2) = d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6 -SIZE (gnome2/gnome-keyring-2.28.2.tar.bz2) = 3009480 +MD5 (gnome2/gnome-keyring-2.30.1.tar.bz2) = 41f4d9323c4ad7c58d88348979f7daba +SHA256 (gnome2/gnome-keyring-2.30.1.tar.bz2) = a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a +SIZE (gnome2/gnome-keyring-2.30.1.tar.bz2) = 1593050 diff --git a/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c new file mode 100644 index 000000000000..6cdb0ca6a213 --- /dev/null +++ b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c @@ -0,0 +1,11 @@ +--- daemon/control/gkd-control-client.c.orig 2009-12-21 18:43:16.000000000 -0500 ++++ daemon/control/gkd-control-client.c 2009-12-21 18:44:17.000000000 -0500 +@@ -31,6 +31,8 @@ + #include <errno.h> + #include <fcntl.h> + ++#include <string.h> ++#include <sys/stat.h> + #include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> diff --git a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c deleted file mode 100644 index fd4ca0d28a34..000000000000 --- a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c +++ /dev/null @@ -1,10 +0,0 @@ ---- daemon/keyrings/gkr-keyrings.c.orig 2009-12-16 23:41:18.000000000 -0500 -+++ daemon/keyrings/gkr-keyrings.c 2009-12-16 23:41:38.000000000 -0500 -@@ -38,6 +38,7 @@ - #include <errno.h> - #include <stdlib.h> - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> diff --git a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c new file mode 100644 index 000000000000..1c4cb9ae4a1b --- /dev/null +++ b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c @@ -0,0 +1,11 @@ +--- daemon/prompt/gkd-prompt.c.orig 2009-12-21 19:17:13.000000000 -0500 ++++ daemon/prompt/gkd-prompt.c 2009-12-21 19:17:23.000000000 -0500 +@@ -21,6 +21,8 @@ + + #include "config.h" + ++#include <sys/wait.h> ++ + #include "gkd-prompt.h" + #include "gkd-prompt-marshal.h" + #include "gkd-prompt-util.h" diff --git a/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c new file mode 100644 index 000000000000..5ae53f8b02cc --- /dev/null +++ b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c @@ -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) + { diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist index 9c579006e301..ab1d77448aec 100644 --- a/security/gnome-keyring/pkg-plist +++ b/security/gnome-keyring/pkg-plist @@ -1,16 +1,16 @@ bin/gnome-keyring bin/gnome-keyring-daemon -etc/xdg/autostart/gnome-keyring-daemon.desktop +etc/xdg/autostart/gnome-keyring-pkcs11.desktop +etc/xdg/autostart/gnome-keyring-secrets.desktop +etc/xdg/autostart/gnome-keyring-ssh.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-unlock-options-widget.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 @@ -27,14 +27,13 @@ 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/gnome-keyring/standalone/gck-secret-store-standalone.a +lib/gnome-keyring/standalone/gck-secret-store-standalone.la +lib/gnome-keyring/standalone/gck-secret-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 @@ -43,21 +42,20 @@ 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 +libexec/gnome-keyring-prompt share/dbus-1/services/org.gnome.keyring.service -share/doc/gcr/GcrCertificateBasicsWidget.html -share/doc/gcr/GcrCertificateDetailsWidget.html -share/doc/gcr/GcrImporter.html -share/doc/gcr/GcrParser.html -share/doc/gcr/GcrSimpleCertificate.html share/doc/gcr/ch01.html -share/doc/gcr/gcr-GcrImportDialog.html -share/doc/gcr/gcr-GcrTokenManager.html -share/doc/gcr/gcr-GcrXxx.html -share/doc/gcr/gcr-gcr-certificate.html +share/doc/gcr/gcr-GcrCertificate.html +share/doc/gcr/gcr-gcr-certificate-basics-widget.html +share/doc/gcr/gcr-gcr-certificate-details-widget.html +share/doc/gcr/gcr-gcr-import-dialog.html +share/doc/gcr/gcr-gcr-importer.html +share/doc/gcr/gcr-gcr-initializer.html +share/doc/gcr/gcr-gcr-parser.html +share/doc/gcr/gcr-gcr-simple-certificate.html share/doc/gcr/gcr-gcr-types.html +share/doc/gcr/gcr-gcr-xxx.html share/doc/gcr/gcr.devhelp share/doc/gcr/gcr.devhelp2 share/doc/gcr/home.png @@ -67,37 +65,15 @@ share/doc/gcr/left.png share/doc/gcr/right.png share/doc/gcr/style.css share/doc/gcr/up.png -%%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-item-info.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.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/GP11Module.html +share/doc/gp11/GP11Object.html +share/doc/gp11/GP11Session.html +share/doc/gp11/GP11Slot.html share/doc/gp11/ch01.html -share/doc/gp11/gp11-gp11-attribute.html -share/doc/gp11/gp11-gp11-attributes.html -share/doc/gp11/gp11-gp11-error.html -share/doc/gp11/gp11-gp11-misc.html -share/doc/gp11/gp11-gp11-module.html -share/doc/gp11/gp11-gp11-object.html -share/doc/gp11/gp11-gp11-session.html -share/doc/gp11/gp11-gp11-slot.html +share/doc/gp11/gp11-Errors.html +share/doc/gp11/gp11-GP11Attribute.html +share/doc/gp11/gp11-GP11Attributes.html +share/doc/gp11/gp11-Miscellaneous-Functions.html share/doc/gp11/gp11.devhelp share/doc/gp11/gp11.devhelp2 share/doc/gp11/home.png @@ -109,6 +85,13 @@ 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/gcr/ui/gcr-unlock-options-widget.ui +%%DATADIR%%/introspect/introspect-collection.xml +%%DATADIR%%/introspect/introspect-item.xml +%%DATADIR%%/introspect/introspect-prompt.xml +%%DATADIR%%/introspect/introspect-service.xml +%%DATADIR%%/introspect/introspect-session.xml +%%DATADIR%%/ui/gkd-prompt.ui share/locale/ar/LC_MESSAGES/gnome-keyring.mo share/locale/as/LC_MESSAGES/gnome-keyring.mo share/locale/ast/LC_MESSAGES/gnome-keyring.mo @@ -189,17 +172,18 @@ 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 %%DATADIR%%/ui +@dirrm %%DATADIR%%/introspect +@dirrm %%DATADIR%% +@dirrm share/gcr/ui +@dirrm share/gcr @dirrm share/doc/gp11 -@dirrm %%DOCSDIR%% @dirrm share/doc/gcr @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 -@dirrm share/gcr/ui -@dirrm share/gcr @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES |