Update to 2.24.1. Please note that seahorse-agent and two other

tools moved to the new seahorse-plugins package.

seahorse 2.24.1
---------------

    * Fix problems with seahorse crashing when searching for
      remote keys. [Adam Schreiber]
    * Build fixes on Solaris [Jeff Cai]
    * Fix selection of keys in libcryptui. [Philip Withnall]
    * I18n fixes. [Adam Schreiber]

seahorse 2.24.0
---------------

    * Some tweaks to the password prompt window, including allowing
      minimizing to release the keyboard grab.
    * Fix compiler warnings for gcc 4.3.
    * Return a 'cancelled' error when from the daemon crypto dbus
      methods when a user cancels out of a password prompt.
    * Show revoked subkeys properly in details view of PGP keys.
    * Fix problem deleting SSH keys.
    * Fix dialog prompt column widths, and elipsize long text in
      key listing. [Adam Schreiber]
    * Fix problem with 'no keys available' when trying to sign a
      PGP key from within the key manager.
    * Add 'exportable' flag to objects/keys and don't enable export
      UI if selected objects are not exportable.
    * Build fixes [Joe Orton, Adam Schreiber]
    * Crash and other fixes. [Christian Persch]

seahorse 2.23.92
----------------

    * Fix crash when changing a stored Gnome Keyring password.
    * Fix certain crashes on syncing, searching and other operations.
    * Fix dumb 'Couldn't import keys' error message when success.

seahorse 2.23.91
----------------

    * Fix copying keys to the clipboard. [Adam Schreiber]
    * Fix double free crash when importing keys.
    * Fix crasher when deleting a key.
    * Don't add extra null bytes to SSH authorized_keys and
      similar files. [Adam Schreiber]
    * Documentation fixes. [Adam Schreiber]
    * Don't repeatedly load gnome-keyring items. [Adam Schreiber]
    * Make help button in 'First Time Options' work proprely. [Adam Schreiber]
    * Better wording for options in PGP key dialogs. [Adam Schreiber]

seahorse 2.23.90
----------------

    * Icon makeover. [Michael Monreal]

seahorse 2.23.6
---------------

    * Initial PKCS#11 certificate listing implementation.
    * Internal code refactoring.
    * Fix problems with reference counting on operations.
    * Use base64 functions in glib, rather than rolling our own.
    * Don't use deprecated LDAP functions. [Adam Schreiber]
    * String operation fixes. [Adam Schreiber]
    * Build fixes [Jeff Cai]

seahorse 2.23.5
---------------

    * Fix importing keys from key servers [Mackenzie Morgan]
    * Factor out seahorse-plugins to a different module.
    * Add XDS drag and drop support.
    * Remove gnome-vfs dependency and use gio instead.
    * Return key id of signer from DBus service even when key
      is not found locally [Adam Schreiber]
    * Refactor UI code internally into modules.
    * Remove hard GPG and GPGME dependency.
    * Replace signer drop down in key chooser with just a check
      button when only one secret key exists. [Adam Schreiber]
    * Set sync button insensitive when no server is selected.
      [Adam Schreiber]
    * Test for secure memory before using it. [Coleman Kane]
    * Change trust model used to match GPG's. [Adam Schreiber]
    * Remove libgnome and libgnomeui dependencies. [Saleem Abdulrasool]
    * Grab keyboard focus when prompting for password.
      [Josselin Mouette]
    * Use the vala programming language for some code.
    * Add initial infrastructure for PKCS#11 key/certificate support.
    * Save and load window sizes from gconf. [Adam Schreiber]
    * Build fixes [Brian Cameron, Saleem Abdulrasool, Alexis Ballier,
      Christian Persch, Rodrigo Moya]

5 files changed, 102 insertions, 109 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 68f4f6891fd..f40702797b0 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2008/07/15 11:12:42 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2008/10/27 16:51:59 wiz Exp $
 
-DISTNAME=	seahorse-2.22.3
+DISTNAME=	seahorse-2.24.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -26,7 +26,7 @@ SSH_KEYGEN_PATH=${PREFIX}/ssh-keygen
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		gawk gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -41,20 +41,26 @@ GCONF_SCHEMAS= 	seahorse.schemas
 
 BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
+# In pkgsrc, the shipped gettext cannot handle the .po files,
+# so we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ; do \
+	    mv $$f $$f.original ; \
+	    ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-# XXX
-.include "../../x11/libSM/buildlink3.mk"
+# XXX: avahi for SHARING
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index bbf05532fe2..ca936bf1142 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.18 2008/04/15 18:53:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/10/27 16:51:59 wiz Exp $
 bin/seahorse
-bin/seahorse-agent
 bin/seahorse-daemon
-bin/seahorse-preferences
-bin/seahorse-tool
 include/libcryptui/cryptui-key-chooser.h
 include/libcryptui/cryptui-key-combo.h
 include/libcryptui/cryptui-key-list.h
@@ -14,13 +11,7 @@ lib/libcryptui.la
 lib/pkgconfig/cryptui-0.0.pc
 lib/seahorse/seahorse-ssh-askpass
 lib/seahorse/xloadimage
-man/man1/seahorse-agent.1
 man/man1/seahorse-daemon.1
-man/man1/seahorse-tool.1
-share/applications/seahorse-pgp-encrypted.desktop
-share/applications/seahorse-pgp-keys.desktop
-share/applications/seahorse-pgp-preferences.desktop
-share/applications/seahorse-pgp-signature.desktop
 share/applications/seahorse.desktop
 share/dbus-1/services/org.gnome.seahorse.service
 share/gconf/schemas/seahorse.schemas
@@ -38,6 +29,19 @@ share/gnome/help/seahorse/C/figures/signature.png
 share/gnome/help/seahorse/C/figures/text-editor.png
 share/gnome/help/seahorse/C/legal.xml
 share/gnome/help/seahorse/C/seahorse.xml
+share/gnome/help/seahorse/de/figures/export.png
+share/gnome/help/seahorse/de/figures/file-manager.png
+share/gnome/help/seahorse/de/figures/generate.png
+share/gnome/help/seahorse/de/figures/import.png
+share/gnome/help/seahorse/de/figures/key-manager.png
+share/gnome/help/seahorse/de/figures/key-properties.png
+share/gnome/help/seahorse/de/figures/passphrase.png
+share/gnome/help/seahorse/de/figures/preferences.png
+share/gnome/help/seahorse/de/figures/recipients.png
+share/gnome/help/seahorse/de/figures/seahorse-window.png
+share/gnome/help/seahorse/de/figures/signature.png
+share/gnome/help/seahorse/de/figures/text-editor.png
+share/gnome/help/seahorse/de/seahorse.xml
 share/gnome/help/seahorse/en_GB/figures/export.png
 share/gnome/help/seahorse/en_GB/figures/file-manager.png
 share/gnome/help/seahorse/en_GB/figures/generate.png
@@ -142,14 +146,16 @@ share/gnome/help/seahorse/vi/figures/seahorse-window.png
 share/gnome/help/seahorse/vi/figures/signature.png
 share/gnome/help/seahorse/vi/figures/text-editor.png
 share/gnome/help/seahorse/vi/seahorse.xml
-share/icons/hicolor/22x22/apps/seahorse-preferences.svg
-share/icons/hicolor/22x22/apps/seahorse.svg
-share/icons/hicolor/48x48/apps/seahorse-applet.png
+share/icons/hicolor/16x16/apps/seahorse-preferences.png
+share/icons/hicolor/16x16/apps/seahorse.png
+share/icons/hicolor/22x22/apps/seahorse-preferences.png
+share/icons/hicolor/22x22/apps/seahorse.png
+share/icons/hicolor/24x24/apps/seahorse-preferences.png
+share/icons/hicolor/24x24/apps/seahorse.png
+share/icons/hicolor/32x32/apps/seahorse-preferences.png
+share/icons/hicolor/32x32/apps/seahorse.png
 share/icons/hicolor/48x48/apps/seahorse-preferences.png
 share/icons/hicolor/48x48/apps/seahorse.png
-share/icons/hicolor/scalable/apps/seahorse-applet.svg
-share/icons/hicolor/scalable/apps/seahorse-preferences.svg
-share/icons/hicolor/scalable/apps/seahorse.svg
 share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
 share/locale/be@latin/LC_MESSAGES/seahorse.mo
@@ -203,7 +209,7 @@ share/locale/sk/LC_MESSAGES/seahorse.mo
 share/locale/sl/LC_MESSAGES/seahorse.mo
 share/locale/sq/LC_MESSAGES/seahorse.mo
 share/locale/sr/LC_MESSAGES/seahorse.mo
-share/locale/sr@Latn/LC_MESSAGES/seahorse.mo
+share/locale/sr@latin/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
 share/locale/ta/LC_MESSAGES/seahorse.mo
 share/locale/te/LC_MESSAGES/seahorse.mo
@@ -214,8 +220,8 @@ share/locale/vi/LC_MESSAGES/seahorse.mo
 share/locale/zh_CN/LC_MESSAGES/seahorse.mo
 share/locale/zh_HK/LC_MESSAGES/seahorse.mo
 share/locale/zh_TW/LC_MESSAGES/seahorse.mo
-share/mime/packages/seahorse.xml
 share/omf/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-de.omf
 share/omf/seahorse/seahorse-en_GB.omf
 share/omf/seahorse/seahorse-es.omf
 share/omf/seahorse/seahorse-fr.omf
@@ -224,63 +230,36 @@ share/omf/seahorse/seahorse-oc.omf
 share/omf/seahorse/seahorse-ru.omf
 share/omf/seahorse/seahorse-sv.omf
 share/omf/seahorse/seahorse-vi.omf
-share/pixmaps/seahorse-applet.svg
-share/pixmaps/seahorse-preferences.png
-share/pixmaps/seahorse.png
-share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
-share/pixmaps/seahorse/22x22/seahorse-applet-key.png
-share/pixmaps/seahorse/22x22/seahorse-applet-signed.png
-share/pixmaps/seahorse/22x22/seahorse-applet-text.png
-share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
 share/pixmaps/seahorse/22x22/seahorse-key-personal.png
 share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
 share/pixmaps/seahorse/22x22/seahorse-key.png
 share/pixmaps/seahorse/22x22/seahorse-person.png
-share/pixmaps/seahorse/22x22/seahorse-preferences.png
 share/pixmaps/seahorse/22x22/seahorse-share-keys.png
 share/pixmaps/seahorse/22x22/seahorse-sign-bad.png
 share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
 share/pixmaps/seahorse/22x22/seahorse-sign.png
-share/pixmaps/seahorse/22x22/seahorse.png
-share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
-share/pixmaps/seahorse/48x48/seahorse-applet-key.png
-share/pixmaps/seahorse/48x48/seahorse-applet-signed.png
-share/pixmaps/seahorse/48x48/seahorse-applet-text.png
-share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
-share/pixmaps/seahorse/48x48/seahorse-applet.png
 share/pixmaps/seahorse/48x48/seahorse-key-personal.png
 share/pixmaps/seahorse/48x48/seahorse-key-ssh.png
 share/pixmaps/seahorse/48x48/seahorse-key.png
 share/pixmaps/seahorse/48x48/seahorse-person.png
-share/pixmaps/seahorse/48x48/seahorse-preferences.png
 share/pixmaps/seahorse/48x48/seahorse-share-keys.png
 share/pixmaps/seahorse/48x48/seahorse-sign-bad.png
 share/pixmaps/seahorse/48x48/seahorse-sign-ok.png
 share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
 share/pixmaps/seahorse/48x48/seahorse-sign.png
-share/pixmaps/seahorse/48x48/seahorse.png
-share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-key.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-text.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
-share/pixmaps/seahorse/scalable/seahorse-applet.svg
 share/pixmaps/seahorse/scalable/seahorse-key-personal.svg
 share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
 share/pixmaps/seahorse/scalable/seahorse-key.svg
 share/pixmaps/seahorse/scalable/seahorse-person.svg
-share/pixmaps/seahorse/scalable/seahorse-preferences.svg
 share/pixmaps/seahorse/scalable/seahorse-share-keys.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
 share/pixmaps/seahorse/scalable/seahorse-sign.svg
-share/pixmaps/seahorse/scalable/seahorse.svg
 share/seahorse/glade/seahorse-add-keyring.glade
 share/seahorse/glade/seahorse-add-keyserver.glade
 share/seahorse/glade/seahorse-add-subkey.glade
 share/seahorse/glade/seahorse-add-uid.glade
-share/seahorse/glade/seahorse-agent-cache.glade
 share/seahorse/glade/seahorse-change-passphrase.glade
 share/seahorse/glade/seahorse-expires.glade
 share/seahorse/glade/seahorse-generate-select.glade
@@ -291,7 +270,6 @@ share/seahorse/glade/seahorse-keyserver-results.glade
 share/seahorse/glade/seahorse-keyserver-results.ui
 share/seahorse/glade/seahorse-keyserver-search.glade
 share/seahorse/glade/seahorse-keyserver-sync.glade
-share/seahorse/glade/seahorse-multi-encrypt.glade
 share/seahorse/glade/seahorse-notify.glade
 share/seahorse/glade/seahorse-pgp-generate.glade
 share/seahorse/glade/seahorse-pgp-private-key-properties.glade
@@ -313,10 +291,11 @@ share/seahorse/glade/seahorse-ssh-upload.glade
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/seahorse
 @comment in rarian: @dirrm share/omf
-@comment in shared-mime-info: @dirrm share/mime/packages
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/seahorse/vi/figures
 @dirrm share/gnome/help/seahorse/vi
@@ -334,6 +313,8 @@ share/seahorse/glade/seahorse-ssh-upload.glade
 @dirrm share/gnome/help/seahorse/es
 @dirrm share/gnome/help/seahorse/en_GB/figures
 @dirrm share/gnome/help/seahorse/en_GB
+@dirrm share/gnome/help/seahorse/de/figures
+@dirrm share/gnome/help/seahorse/de
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk
index 72564194190..c74314af267 100644
--- a/security/seahorse/buildlink3.mk
+++ b/security/seahorse/buildlink3.mk
@@ -1,19 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/03/06 14:53:54 wiz Exp $
-# XXX
-# XXX This file was created automatically using createbuildlink-3.10.
-# XXX After this file has been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed.  Please do not commit
-# XXX unverified buildlink3.mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX	BUILDLINK_DEPMETHOD.seahorse?=	build
+# $NetBSD: buildlink3.mk,v 1.12 2008/10/27 16:51:59 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SEAHORSE_BUILDLINK3_MK:=	${SEAHORSE_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	seahorse
 .endif
 
@@ -21,24 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nseahorse}
 BUILDLINK_PACKAGES+=	seahorse
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seahorse
 
-.if !empty(SEAHORSE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.seahorse+=	seahorse>=0.8.1
-BUILDLINK_ABI_DEPENDS.seahorse?=	seahorse>=2.20.3nb1
+.if ${SEAHORSE_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.seahorse+=	seahorse>=2.24.1
 BUILDLINK_PKGSRCDIR.seahorse?=	../../security/seahorse
 .endif	# SEAHORSE_BUILDLINK3_MK
 
-# XXX
-# XXX Uncomment and keep only the buildlink3 lines below which are directly
-# XXX needed for dependencies to compile, link, and run.  If this package
-# XXX provides a wrappered API or otherwise does not expose the APIs of the
-# XXX buildlink3 lines below to dependencies, remove them.
-# XXX
-#.include "../../databases/gnome-mime-data/buildlink3.mk"
-#.include "../../devel/libglade/buildlink3.mk"
-#.include "../../devel/libgnomeui/buildlink3.mk"
-#.include "../../net/libsoup-devel/buildlink3.mk"
-#.include "../../security/gpgme/buildlink3.mk"
-#.include "../../sysutils/gnome-vfs/buildlink3.mk"
-#.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 26e607769af..395a7b5072f 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.25 2008/07/15 11:12:42 drochner Exp $
+$NetBSD: distinfo,v 1.26 2008/10/27 16:51:59 wiz Exp $
 
-SHA1 (seahorse-2.22.3.tar.bz2) = 11a5c4a641e3419e022f3c8e733b49a1139a52ed
-RMD160 (seahorse-2.22.3.tar.bz2) = 63acdec4f689734bcf36bd0ef4a9fbc09fcba12a
-Size (seahorse-2.22.3.tar.bz2) = 2121204 bytes
-SHA1 (patch-aa) = 991e7eb505efa2b81a6f56910aa9359743e1cb3b
-SHA1 (patch-ab) = c069dcda73f0ade281d2a847b8aee2ed3d945a3c
-SHA1 (patch-ac) = 0ad2021c9bda727b3b219cd6d6ca0a6132cc0a37
-SHA1 (patch-ae) = a0a85645b1df89ffb992c9191c30b228d2c5bd6f
-SHA1 (patch-ah) = 4a60c47ffd0de18fc423e317e870d08e8295a95c
-SHA1 (patch-ai) = 435ed5231c352f01ed4d83e4c5447cfef6468953
-SHA1 (patch-aj) = 8ce56f143c38a402eeca41b23f4d90d2c7ca04d6
+SHA1 (seahorse-2.24.1.tar.bz2) = 66a993a5a24e2e2637db6964c39c0a6cc432e0ec
+RMD160 (seahorse-2.24.1.tar.bz2) = 0cf99ed7de4eeb7100f0de346dc82a8d74b3ff36
+Size (seahorse-2.24.1.tar.bz2) = 2197087 bytes
+SHA1 (patch-aa) = 312f108adf95a33dc24b4025de7c0d74b9d2df3d
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
index 5e2dbd737d7..f278b841559 100644
--- a/security/seahorse/patches/patch-aa
+++ b/security/seahorse/patches/patch-aa
@@ -1,15 +1,49 @@
-$NetBSD: patch-aa,v 1.9 2007/06/12 20:09:11 joerg Exp $
+$NetBSD: patch-aa,v 1.10 2008/10/27 16:51:59 wiz Exp $
 
---- Makefile.am.orig	2007-06-12 19:57:32.000000000 +0000
-+++ Makefile.am
-@@ -16,8 +16,8 @@ SUBDIRS = libcryptui \
-           help \
-           pixmaps \
-           plugins \
--          $(AGENT_DIR) \
--          daemon 
-+          daemon \
-+          $(AGENT_DIR)
- 
- EXTRA_DIST = \
-     AUTHORS \
+--- configure.orig	2008-10-27 14:54:33.000000000 +0000
++++ configure
+@@ -17343,7 +17343,7 @@ _ACEOF
+ 
+ fi
+ 
+- if test "$enable_pgp" == "yes"; then
++ if test "$enable_pgp" = "yes"; then
+   WITH_PGP_TRUE=
+   WITH_PGP_FALSE='#'
+ else
+@@ -18602,7 +18602,7 @@ else
+ echo "${ECHO_T}yes" >&6; }
+ 	enable_pkcs11="yes"
+ fi
+-	if test "$enable_pkcs11" == "yes"; then
++	if test "$enable_pkcs11" = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_PKCS11 1
+@@ -18613,7 +18613,7 @@ _ACEOF
+ 	fi
+ fi
+ 
+- if test "$enable_pkcs11" == "yes"; then
++ if test "$enable_pkcs11" = "yes"; then
+   WITH_PKCS11_TRUE=
+   WITH_PKCS11_FALSE='#'
+ else
+@@ -18738,7 +18738,7 @@ _ACEOF
+ 
+ fi
+ 
+- if test "$enable_ssh" == "yes"; then
++ if test "$enable_ssh" = "yes"; then
+   WITH_SSH_TRUE=
+   WITH_SSH_FALSE='#'
+ else
+@@ -18795,7 +18795,7 @@ if test "$enable_tests" != "yes"; then
+     enable_tests="no"
+ fi
+ 
+- if test "$enable_tests" == "yes"; then
++ if test "$enable_tests" = "yes"; then
+   WITH_TESTS_TRUE=
+   WITH_TESTS_FALSE='#'
+ else