update to 2.26.3

changes:
-Build fixes
-Fix problem with RSA key sizes that are not a multiple of 8.
 This affected use of SSH keys in particular
-Fix crash related to secure memory

4 files changed, 8 insertions, 75 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index c98d8725a9a..b9b2c6544c0 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2009/04/16 19:35:29 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2009/07/09 17:59:25 drochner Exp $
 
-DISTNAME=	gnome-keyring-2.26.1
+DISTNAME=	gnome-keyring-2.26.3
 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 f5ded2df3b9..93b9cbec9fa 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:13:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/07/09 17:59:25 drochner Exp $
 bin/gnome-keyring
 bin/gnome-keyring-daemon
 include/gcr/gcr-certificate-basics-widget.h
@@ -103,6 +103,7 @@ 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/ca@valencia/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
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 64df8a6ed1e..7e6c3760634 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.33 2009/04/16 19:35:29 drochner Exp $
+$NetBSD: distinfo,v 1.34 2009/07/09 17:59:25 drochner Exp $
 
-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 (gnome-keyring-2.26.3.tar.bz2) = c07136f0757937a7fe6989cbdf3bf8103da55364
+RMD160 (gnome-keyring-2.26.3.tar.bz2) = 323cf0fe5f11260573e0d20998c879380f4c2122
+Size (gnome-keyring-2.26.3.tar.bz2) = 2692915 bytes
 SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
 SHA1 (patch-ad) = df4a9a69ca9262066daf2272869ce63471c15bd3
 SHA1 (patch-ae) = f3e972fb377476b2fef00e8d8416f8adbd0192de
diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa
deleted file mode 100644
index bc707e2d57b..00000000000
--- a/security/gnome-keyring/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2009/04/16 19:35:29 drochner Exp $
-
---- configure.orig	2009-04-12 16:12:49.000000000 +0200
-+++ configure
-@@ -19198,7 +19198,7 @@ fi
- 
- { $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
-@@ -19214,7 +19214,7 @@ $as_echo "no" >&6; }
-   	tests_status="no"
- fi
- 
-- if test "$enable_tests" == "yes"; then
-+ if test "$enable_tests" = "yes"; then
-   WITH_TESTS_TRUE=
-   WITH_TESTS_FALSE='#'
- else
-@@ -19229,7 +19229,7 @@ if test "${enable_coverage+set}" = set; 
- 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
-@@ -19247,7 +19247,7 @@ fi
- $as_echo_n "checking valgrind... " >&6; }
- valgrind_status="yes"
- 
-- if test "$enable_valgrind" == "run"; then
-+ if test "$enable_valgrind" = "run"; then
-   WITH_VALGRIND_TRUE=
-   WITH_VALGRIND_FALSE='#'
- else
-@@ -19257,7 +19257,7 @@ fi
- 
- 
- # Run gnome-keyring-daemon under valgrind as default
--if test "$enable_valgrind" == "run"; then
-+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
- { $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
-   { $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
- 		{ { $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; }; }