5 files changed, 73 insertions, 31 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index def4e8097bc8..660c4e7a5449 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.26.0
+PORTVERSION=	2.26.1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index f34ad439b1c5..0cea189d417d 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 0395fcf79b990465030a2795dcddacb9
-SHA256 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
-SIZE (gnome2/gnome-keyring-2.26.0.tar.bz2) = 1211953
+MD5 (gnome2/gnome-keyring-2.26.1.tar.bz2) = 060b349a0aae130fdd3cd0a9827258c6
+SHA256 (gnome2/gnome-keyring-2.26.1.tar.bz2) = 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
+SIZE (gnome2/gnome-keyring-2.26.1.tar.bz2) = 2738687
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
index 9aff6d9ebf19..4ffb1972567e 100644
--- a/security/gnome-keyring/files/patch-configure
+++ b/security/gnome-keyring/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	2009-02-24 21:18:47.000000000 +0100
-+++ configure	2009-02-24 21:19:24.000000000 +0100
-@@ -18069,7 +18069,7 @@
+--- configure.orig	2009-04-13 00:24:12.000000000 -0400
++++ configure	2009-04-13 00:24:58.000000000 -0400
+@@ -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
-@@ -18085,7 +18085,7 @@
+@@ -19214,7 +19214,7 @@ $as_echo "no" >&6; }
    	tests_status="no"
  fi
  
@@ -18,7 +18,7 @@
    WITH_TESTS_TRUE=
    WITH_TESTS_FALSE='#'
  else
-@@ -18100,7 +18100,7 @@
+@@ -19229,7 +19229,7 @@ if test "${enable_coverage+set}" = set; 
  fi
  
  
@@ -27,3 +27,30 @@
  	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
+@@ -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; }; }
diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1.h b/security/gnome-keyring/files/patch-egg_egg-asn1.h
deleted file mode 100644
index a3d4296af2e4..000000000000
--- a/security/gnome-keyring/files/patch-egg_egg-asn1.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- egg/egg-asn1.h.orig	2009-02-25 16:40:49.000000000 -0500
-+++ egg/egg-asn1.h	2009-02-25 16:41:21.000000000 -0500
-@@ -75,9 +75,9 @@ gchar*             egg_asn1_read_dn     
- gchar*             egg_asn1_read_dn_part                  (ASN1_TYPE asn, const gchar *part, const gchar *match);
- 
- 
--glong              egg_asn1_time_parse_utc                (const gchar* value);
-+time_t              egg_asn1_time_parse_utc                (const gchar* value);
- 
--glong              egg_asn1_time_parse_general            (const gchar* value);
-+time_t              egg_asn1_time_parse_general            (const gchar* value);
- 
- 
- typedef void       (*EggAsn1DnCallback)                   (guint index, GQuark oid, const guchar *value,
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 9ba05cb2fa2c..48bf9475f89e 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -47,15 +47,33 @@ libdata/pkgconfig/gnome-keyring-1.pc
 libdata/pkgconfig/gp11-0.pc
 libexec/gnome-keyring-ask
 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-gcr-types.html
+share/doc/gcr/gcr.devhelp
+share/doc/gcr/gcr.devhelp2
+share/doc/gcr/home.png
+share/doc/gcr/index.html
+share/doc/gcr/index.sgml
+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-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
@@ -71,11 +89,15 @@ share/dbus-1/services/org.gnome.keyring.service
 %%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-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.devhelp
 share/doc/gp11/gp11.devhelp2
 share/doc/gp11/home.png
@@ -88,6 +110,7 @@ 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/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
@@ -126,6 +149,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
@@ -164,6 +188,7 @@ 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 share/doc/gcr
 @dirrm lib/gnome-keyring/standalone
 @dirrm lib/gnome-keyring/devel
 @dirrm lib/gnome-keyring
@@ -190,6 +215,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
@@ -198,3 +225,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as