From 65c53682aafe9d7736d5890bf318ea7a4a1b29c8 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 11 Jun 2010 13:45:50 +0000 Subject: update to 2.30.1 This switches to the gnome-2.30 release branch pkgsrc note: temporarily add a dependency on libgnome-keyring which was split out of the old gnome-keyring pkg, so that client pkgs get the same as before --- security/gnome-keyring/Makefile | 11 +++-- security/gnome-keyring/PLIST | 78 +++++++++++++-------------------- security/gnome-keyring/buildlink3.mk | 5 ++- security/gnome-keyring/distinfo | 13 +++--- security/gnome-keyring/patches/patch-ac | 12 ----- security/gnome-keyring/patches/patch-ad | 15 +++++-- security/gnome-keyring/patches/patch-ae | 12 ++--- 7 files changed, 67 insertions(+), 79 deletions(-) delete mode 100644 security/gnome-keyring/patches/patch-ac diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index e4e70e1c2d9..d47193a71d1 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2009/12/15 14:52:03 drochner Exp $ +# $NetBSD: Makefile,v 1.53 2010/06/11 13:45:50 drochner Exp $ -DISTNAME= gnome-keyring-2.28.2 +DISTNAME= gnome-keyring-2.30.1 CATEGORIES= security gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.28/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.30/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -40,6 +40,11 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 +# XXX not necessary technically, just for transition, +# can be removed when all dependant pkgs are switched to +# libgnome-keyring if the library is needed +.include "../../security/libgnome-keyring/buildlink3.mk" + .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST index 860987ca821..f607a0b20aa 100644 --- a/security/gnome-keyring/PLIST +++ b/security/gnome-keyring/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2009/12/15 14:07:22 wiz Exp $ +@comment $NetBSD: PLIST,v 1.23 2010/06/11 13:45:50 drochner Exp $ bin/gnome-keyring bin/gnome-keyring-daemon include/gcr/gcr-certificate-basics-widget.h @@ -7,10 +7,8 @@ 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 @@ -19,30 +17,38 @@ lib/gnome-keyring/devel/gck-ssh-store-standalone.la lib/gnome-keyring/devel/gck-user-store-standalone.la lib/gnome-keyring/gnome-keyring-pkcs11.la lib/gnome-keyring/standalone/gck-roots-store-standalone.la +lib/gnome-keyring/standalone/gck-secret-store-standalone.la lib/libgcr.la -lib/libgnome-keyring.la lib/libgp11.la lib/pkgconfig/gcr-0.pc -lib/pkgconfig/gnome-keyring-1.pc lib/pkgconfig/gp11-0.pc lib/security/pam_gnome_keyring.la -libexec/gnome-keyring-ask +libexec/gnome-keyring-prompt share/dbus-1/services/org.gnome.keyring.service share/gconf/schemas/gnome-keyring.schemas share/gcr/ui/gcr-certificate-basics-widget.ui share/gcr/ui/gcr-import-dialog.ui -share/gnome/autostart/gnome-keyring-daemon.desktop -share/gtk-doc/html/gcr/GcrCertificateBasicsWidget.html -share/gtk-doc/html/gcr/GcrCertificateDetailsWidget.html -share/gtk-doc/html/gcr/GcrImporter.html -share/gtk-doc/html/gcr/GcrParser.html -share/gtk-doc/html/gcr/GcrSimpleCertificate.html +share/gcr/ui/gcr-unlock-options-widget.ui +share/gnome-keyring/introspect/introspect-collection.xml +share/gnome-keyring/introspect/introspect-item.xml +share/gnome-keyring/introspect/introspect-prompt.xml +share/gnome-keyring/introspect/introspect-service.xml +share/gnome-keyring/introspect/introspect-session.xml +share/gnome-keyring/ui/gkd-prompt.ui +share/gnome/autostart/gnome-keyring-pkcs11.desktop +share/gnome/autostart/gnome-keyring-secrets.desktop +share/gnome/autostart/gnome-keyring-ssh.desktop share/gtk-doc/html/gcr/ch01.html -share/gtk-doc/html/gcr/gcr-GcrImportDialog.html -share/gtk-doc/html/gcr/gcr-GcrTokenManager.html -share/gtk-doc/html/gcr/gcr-GcrXxx.html -share/gtk-doc/html/gcr/gcr-gcr-certificate.html +share/gtk-doc/html/gcr/gcr-GcrCertificate.html +share/gtk-doc/html/gcr/gcr-gcr-certificate-basics-widget.html +share/gtk-doc/html/gcr/gcr-gcr-certificate-details-widget.html +share/gtk-doc/html/gcr/gcr-gcr-import-dialog.html +share/gtk-doc/html/gcr/gcr-gcr-importer.html +share/gtk-doc/html/gcr/gcr-gcr-initializer.html +share/gtk-doc/html/gcr/gcr-gcr-parser.html +share/gtk-doc/html/gcr/gcr-gcr-simple-certificate.html share/gtk-doc/html/gcr/gcr-gcr-types.html +share/gtk-doc/html/gcr/gcr-gcr-xxx.html share/gtk-doc/html/gcr/gcr.devhelp share/gtk-doc/html/gcr/gcr.devhelp2 share/gtk-doc/html/gcr/home.png @@ -52,37 +58,15 @@ share/gtk-doc/html/gcr/left.png share/gtk-doc/html/gcr/right.png share/gtk-doc/html/gcr/style.css share/gtk-doc/html/gcr/up.png -share/gtk-doc/html/gnome-keyring/ch01.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-daemon.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-find.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-items.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyrings.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-memory.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-misc.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-network.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-password.html -share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-result.html -share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp -share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2 -share/gtk-doc/html/gnome-keyring/home.png -share/gtk-doc/html/gnome-keyring/index.html -share/gtk-doc/html/gnome-keyring/index.sgml -share/gtk-doc/html/gnome-keyring/left.png -share/gtk-doc/html/gnome-keyring/right.png -share/gtk-doc/html/gnome-keyring/style.css -share/gtk-doc/html/gnome-keyring/up.png +share/gtk-doc/html/gp11/GP11Module.html +share/gtk-doc/html/gp11/GP11Object.html +share/gtk-doc/html/gp11/GP11Session.html +share/gtk-doc/html/gp11/GP11Slot.html share/gtk-doc/html/gp11/ch01.html -share/gtk-doc/html/gp11/gp11-gp11-attribute.html -share/gtk-doc/html/gp11/gp11-gp11-attributes.html -share/gtk-doc/html/gp11/gp11-gp11-error.html -share/gtk-doc/html/gp11/gp11-gp11-misc.html -share/gtk-doc/html/gp11/gp11-gp11-module.html -share/gtk-doc/html/gp11/gp11-gp11-object.html -share/gtk-doc/html/gp11/gp11-gp11-session.html -share/gtk-doc/html/gp11/gp11-gp11-slot.html +share/gtk-doc/html/gp11/gp11-Errors.html +share/gtk-doc/html/gp11/gp11-GP11Attribute.html +share/gtk-doc/html/gp11/gp11-GP11Attributes.html +share/gtk-doc/html/gp11/gp11-Miscellaneous-Functions.html share/gtk-doc/html/gp11/gp11.devhelp share/gtk-doc/html/gp11/gp11.devhelp2 share/gtk-doc/html/gp11/home.png diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk index f494df96c8a..584294db1e8 100644 --- a/security/gnome-keyring/buildlink3.mk +++ b/security/gnome-keyring/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/06/11 13:45:50 drochner Exp $ BUILDLINK_TREE+= gnome-keyring @@ -9,6 +9,9 @@ BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0 BUILDLINK_ABI_DEPENDS.gnome-keyring?= gnome-keyring>=2.26.3nb1 BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring +# XXX see Makefile +.include "../../security/libgnome-keyring/buildlink3.mk" + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index a9ec0a46358..b18456628ad 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.36 2009/12/15 14:07:22 wiz Exp $ +$NetBSD: distinfo,v 1.37 2010/06/11 13:45:50 drochner Exp $ -SHA1 (gnome-keyring-2.28.2.tar.bz2) = 099146a0cb3c03683cfc3fe3caaddf5dff00acf8 -RMD160 (gnome-keyring-2.28.2.tar.bz2) = 0e09c7274c4c4ea037bc7eb4ff8edaaca53f04f0 -Size (gnome-keyring-2.28.2.tar.bz2) = 3009480 bytes -SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7 -SHA1 (patch-ad) = df4a9a69ca9262066daf2272869ce63471c15bd3 -SHA1 (patch-ae) = f3e972fb377476b2fef00e8d8416f8adbd0192de +SHA1 (gnome-keyring-2.30.1.tar.bz2) = bf7623d8a2bc9013a8109e1e433d0a45e9dd759b +RMD160 (gnome-keyring-2.30.1.tar.bz2) = 70ec1c3e033fbd6ab71bd411750c136ee2e701d1 +Size (gnome-keyring-2.30.1.tar.bz2) = 1593050 bytes +SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4 +SHA1 (patch-ae) = e89399e9f179fd4f7e33abbe5b9f26fa54fae849 SHA1 (patch-af) = 03f4ff07a7b9830dbc5c228efb4d971adfe85d89 SHA1 (patch-ag) = 4b6f5510124c58613c5b8ce8782f913cca43a570 diff --git a/security/gnome-keyring/patches/patch-ac b/security/gnome-keyring/patches/patch-ac deleted file mode 100644 index 82c71a877a2..00000000000 --- a/security/gnome-keyring/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/04/10 16:53:44 drochner Exp $ - ---- library/gnome-keyring.c.orig 2008-04-02 18:29:58.000000000 +0200 -+++ library/gnome-keyring.c -@@ -1779,6 +1779,7 @@ gnome_keyring_daemon_set_display_sync (c - * Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or - * an error result otherwise. - **/ -+extern char **environ; - GnomeKeyringResult - gnome_keyring_daemon_prepare_environment_sync (void) - { diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad index 08c282c5d81..6f05e0bcf37 100644 --- a/security/gnome-keyring/patches/patch-ad +++ b/security/gnome-keyring/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2009/03/15 18:14:24 jmcneill Exp $ +$NetBSD: patch-ad,v 1.7 2010/06/11 13:45:50 drochner Exp $ ---- egg/egg-unix-credentials.c.orig 2009-01-17 18:08:46.000000000 -0500 +--- egg/egg-unix-credentials.c.orig 2009-12-15 04:00:09.000000000 +0000 +++ egg/egg-unix-credentials.c -@@ -130,7 +130,6 @@ egg_unix_credentials_read (int sock, pid +@@ -127,7 +127,6 @@ egg_unix_credentials_read (int sock, pid cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr); *pid = 0; *uid = cred->sc_euid; @@ -10,3 +10,12 @@ $NetBSD: patch-ad,v 1.6 2009/03/15 18:14:24 jmcneill Exp $ #elif defined(HAVE_GETPEEREID) /* OpenBSD */ uid_t euid; gid_t egid; +@@ -215,7 +214,7 @@ egg_unix_credentials_setup (int sock) + #if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED) + int val = 1; + if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) { +- fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd); ++ fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", sock); + retval = -1; + } + #endif diff --git a/security/gnome-keyring/patches/patch-ae b/security/gnome-keyring/patches/patch-ae index 2129d89b932..c4c601441ab 100644 --- a/security/gnome-keyring/patches/patch-ae +++ b/security/gnome-keyring/patches/patch-ae @@ -1,11 +1,11 @@ -$NetBSD: patch-ae,v 1.2 2009/04/16 19:35:29 drochner Exp $ +$NetBSD: patch-ae,v 1.3 2010/06/11 13:45:50 drochner Exp $ ---- daemon/Makefile.in.orig 2009-04-12 16:12:50.000000000 +0200 +--- daemon/Makefile.in.orig 2010-04-26 19:47:36.000000000 +0000 +++ daemon/Makefile.in -@@ -346,7 +346,7 @@ service_in_files = org.gnome.keyring.ser - service_DATA = $(service_in_files:.service.in=.service) - service_PATH = $(VALGRIND_RUN)$(bindir) - desktop_in_files = gnome-keyring-daemon.desktop.in +@@ -418,7 +418,7 @@ desktop_in_files = \ + gnome-keyring-secrets.desktop.in \ + gnome-keyring-ssh.desktop.in + -desktopdir = $(sysconfdir)/xdg/autostart +desktopdir = $(PREFIX)/share/gnome/autostart desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -- cgit v1.2.3