From 3c0fc5638fc937675377b13c8e40600b75914d51 Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 16 Apr 2009 19:35:29 +0000 Subject: update to 2.26.1 changes: -DBus now automatically starts the gnome-keyring service properly -Initialize daemon with LOGNAME and USERNAME environment variables -Add DBus method for getting the gnome-keyring environment variables -misc fixes --- security/gnome-keyring/Makefile | 5 ++-- security/gnome-keyring/PLIST | 43 +++++++++++++++++++++++++++------ security/gnome-keyring/distinfo | 13 +++++----- security/gnome-keyring/patches/patch-aa | 34 +++++++++++++------------- security/gnome-keyring/patches/patch-ae | 8 +++--- security/gnome-keyring/patches/patch-ag | 22 +++++++++++++++++ 6 files changed, 87 insertions(+), 38 deletions(-) create mode 100644 security/gnome-keyring/patches/patch-ag (limited to 'security') diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 2fa98e9f7c9..c98d8725a9a 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2009/03/30 14:14:19 dsainty Exp $ +# $NetBSD: Makefile,v 1.46 2009/04/16 19:35:29 drochner Exp $ -DISTNAME= gnome-keyring-2.26.0 -PKGREVISION= 1 +DISTNAME= gnome-keyring-2.26.1 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.26/} EXTRACT_SUFX= .tar.bz2 diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST index fa56c502a09..22bd5d5b2d4 100644 --- a/security/gnome-keyring/PLIST +++ b/security/gnome-keyring/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2009/03/22 14:45:19 snj Exp $ +@comment $NetBSD: PLIST,v 1.18 2009/04/16 19:35:29 drochner Exp $ bin/gnome-keyring bin/gnome-keyring-daemon include/gcr/gcr-certificate-basics-widget.h @@ -15,9 +15,9 @@ include/gp11/gp11.h include/gp11/pkcs11.h include/gp11/pkcs11g.h include/gp11/pkcs11n.h -lib/gnome-keyring/gnome-keyring-pkcs11.la 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/libgcr.la lib/libgnome-keyring.la @@ -32,15 +32,33 @@ 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/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-gcr-types.html +share/gtk-doc/html/gcr/gcr.devhelp +share/gtk-doc/html/gcr/gcr.devhelp2 +share/gtk-doc/html/gcr/home.png +share/gtk-doc/html/gcr/index.html +share/gtk-doc/html/gcr/index.sgml +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-generic-callbacks.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-keyring-info.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 @@ -56,11 +74,15 @@ 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/GP11Object.html share/gtk-doc/html/gp11/ch01.html -share/gtk-doc/html/gp11/gp11-GP11Call.html -share/gtk-doc/html/gp11/gp11-gp11-test.html -share/gtk-doc/html/gp11/gp11-pkcs11.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.devhelp share/gtk-doc/html/gp11/gp11.devhelp2 share/gtk-doc/html/gp11/home.png @@ -71,6 +93,7 @@ share/gtk-doc/html/gp11/right.png share/gtk-doc/html/gp11/style.css share/gtk-doc/html/gp11/up.png share/locale/ar/LC_MESSAGES/gnome-keyring.mo +share/locale/as/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 @@ -109,6 +132,7 @@ 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/mai/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 @@ -147,6 +171,8 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo @dirrm share/gtk-doc/html/gp11 @dirrm share/gtk-doc/html/gnome-keyring +@dirrm share/gtk-doc/html/gcr +@dirrm share/gcr/ui @comment in GConf: @dirrm share/gconf/schemas @comment in dbus: @dirrm share/dbus-1/services @dirrm lib/security @@ -155,3 +181,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo @dirrm lib/gnome-keyring @dirrm include/gp11 @dirrm include/gnome-keyring-1 +@dirrm include/gcr diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 1edbd95bb43..64df8a6ed1e 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.32 2009/03/17 13:52:08 tnn Exp $ +$NetBSD: distinfo,v 1.33 2009/04/16 19:35:29 drochner Exp $ -SHA1 (gnome-keyring-2.26.0.tar.bz2) = dcbc2f06bca8f8d6d310064a85f5ab97a6af8889 -RMD160 (gnome-keyring-2.26.0.tar.bz2) = 0cbf6208864f39a9437faadd9fb348eaccef65ba -Size (gnome-keyring-2.26.0.tar.bz2) = 1211953 bytes -SHA1 (patch-aa) = 7f7c15099b1abedf24493c4a14d6a71941ed09bd +SHA1 (gnome-keyring-2.26.1.tar.bz2) = 3ff24987392b3f51109709b2c020af3557155ef8 +RMD160 (gnome-keyring-2.26.1.tar.bz2) = 0975197ae8e58a8d98a2ff11c062ec6c9cf74a79 +Size (gnome-keyring-2.26.1.tar.bz2) = 2738687 bytes +SHA1 (patch-aa) = e54ed8fa51c01393dacef53ee0e12ae622042611 SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7 SHA1 (patch-ad) = df4a9a69ca9262066daf2272869ce63471c15bd3 -SHA1 (patch-ae) = c727e8e6fa07daf2c40cf2a2de4322eb4f683b96 +SHA1 (patch-ae) = f3e972fb377476b2fef00e8d8416f8adbd0192de SHA1 (patch-af) = 72c8b88b21c71f94efd2e5f684f9007ed567b0aa +SHA1 (patch-ag) = dbe8f9e2d78100f2f7375380dc6259f469e7d169 diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa index 24faad78866..bc707e2d57b 100644 --- a/security/gnome-keyring/patches/patch-aa +++ b/security/gnome-keyring/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.9 2009/03/15 18:14:24 jmcneill Exp $ +$NetBSD: patch-aa,v 1.10 2009/04/16 19:35:29 drochner Exp $ ---- configure.orig 2009-03-14 14:57:51.000000000 -0400 +--- configure.orig 2009-04-12 16:12:49.000000000 +0200 +++ configure -@@ -18124,7 +18124,7 @@ fi +@@ -19198,7 +19198,7 @@ fi - { 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; } + { $as_echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5 + $as_echo_n "checking build test tools, unit tests, and -Werror... " >&6; } -if test "$enable_tests" == "yes"; then +if test "$enable_tests" = "yes"; then cat >>confdefs.h <<_ACEOF #define WITH_TESTS 1 -@@ -18140,7 +18140,7 @@ echo "${ECHO_T}no" >&6; } +@@ -19214,7 +19214,7 @@ $as_echo "no" >&6; } tests_status="no" fi @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2009/03/15 18:14:24 jmcneill Exp $ WITH_TESTS_TRUE= WITH_TESTS_FALSE='#' else -@@ -18155,7 +18155,7 @@ if test "${enable_coverage+set}" = set; +@@ -19229,7 +19229,7 @@ if test "${enable_coverage+set}" = set; fi @@ -29,8 +29,8 @@ $NetBSD: patch-aa,v 1.9 2009/03/15 18:14:24 jmcneill Exp $ CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage" fi -@@ -18173,7 +18173,7 @@ fi - echo $ECHO_N "checking valgrind... $ECHO_C" >&6; } +@@ -19247,7 +19247,7 @@ fi + $as_echo_n "checking valgrind... " >&6; } valgrind_status="yes" - if test "$enable_valgrind" == "run"; then @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.9 2009/03/15 18:14:24 jmcneill Exp $ WITH_VALGRIND_TRUE= WITH_VALGRIND_FALSE='#' else -@@ -18183,7 +18183,7 @@ fi +@@ -19257,7 +19257,7 @@ fi # Run gnome-keyring-daemon under valgrind as default @@ -46,22 +46,22 @@ $NetBSD: patch-aa,v 1.9 2009/03/15 18:14:24 jmcneill Exp $ +if test "$enable_valgrind" = "run"; then # Extract the first word of "valgrind", so it can be a program name with args. set dummy valgrind; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 -@@ -18254,7 +18254,7 @@ fi + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -19328,7 +19328,7 @@ fi # Build valgrind support into code -if test "$enable_valgrind" == "yes"; then +if test "$enable_valgrind" = "yes"; then if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then - { echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5 - echo $ECHO_N "checking for valgrind/valgrind.h... $ECHO_C" >&6; } -@@ -18387,7 +18387,7 @@ else + { $as_echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5 + $as_echo_n "checking for valgrind/valgrind.h... " >&6; } +@@ -19463,7 +19463,7 @@ else fi - if test "$have_valgrind" == "no"; then + if test "$have_valgrind" = "no"; then - { { echo "$as_me:$LINENO: error: The valgrind headers are missing" >&5 - echo "$as_me: error: The valgrind headers are missing" >&2;} + { { $as_echo "$as_me:$LINENO: error: The valgrind headers are missing" >&5 + $as_echo "$as_me: error: The valgrind headers are missing" >&2;} { (exit 1); exit 1; }; } diff --git a/security/gnome-keyring/patches/patch-ae b/security/gnome-keyring/patches/patch-ae index 77066512534..2129d89b932 100644 --- a/security/gnome-keyring/patches/patch-ae +++ b/security/gnome-keyring/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.1 2009/03/15 18:14:24 jmcneill Exp $ +$NetBSD: patch-ae,v 1.2 2009/04/16 19:35:29 drochner Exp $ ---- daemon/Makefile.in.orig 2009-03-14 14:57:47.000000000 -0400 +--- daemon/Makefile.in.orig 2009-04-12 16:12:50.000000000 +0200 +++ daemon/Makefile.in -@@ -364,7 +364,7 @@ servicedir = $(DBUS_SERVICES_DIR) - service_in_files = org.gnome.keyring.service.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 -desktopdir = $(sysconfdir)/xdg/autostart +desktopdir = $(PREFIX)/share/gnome/autostart diff --git a/security/gnome-keyring/patches/patch-ag b/security/gnome-keyring/patches/patch-ag new file mode 100644 index 00000000000..efb4fe6a1ce --- /dev/null +++ b/security/gnome-keyring/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 2009/04/16 19:35:29 drochner Exp $ + +--- egg/egg-asn1.c.orig 2009-04-15 16:55:43.000000000 +0200 ++++ egg/egg-asn1.c +@@ -572,7 +572,7 @@ when_to_time (struct tm *when, gint offs + return result; + } + +-glong ++time_t + egg_asn1_time_parse_utc (const gchar *time) + { + struct tm when; +@@ -690,7 +690,7 @@ parse_general_time (const gchar *time, s + return TRUE; + } + +-glong ++time_t + egg_asn1_time_parse_general (const gchar *time) + { + struct tm when; -- cgit v1.2.3