diff -r a737f787c44a -r 552d1939222f gnupg/gnupg.patch
--- a/gnupg/gnupg.patch	Fri Oct 22 23:04:26 2010 +0200
+++ b/gnupg/gnupg.patch	Fri Oct 22 23:20:14 2010 +0200
@@ -1,7 +1,7 @@
 Index: agent/genkey.c
---- agent/genkey.c.orig	2007-11-19 16:11:31 +0100
-+++ agent/genkey.c	2007-12-21 09:17:46 +0100
-@@ -188,11 +188,9 @@
+--- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
++++ agent/genkey.c	2009-09-06 22:59:18 +0200
+@@ -190,11 +190,9 @@
          return gpg_error (GPG_ERR_INV_PASSPHRASE);
  
        desc = xtryasprintf 
@@ -16,24 +16,24 @@
          return gpg_error_from_syserror ();
        err = take_this_one_anyway (ctrl, desc);
 Index: configure
---- configure.orig	2007-12-20 09:40:04 +0100
-+++ configure	2007-12-21 09:08:55 +0100
-@@ -6909,13 +6909,13 @@
+--- configure.orig	2009-09-04 18:09:14 +0200
++++ configure	2009-09-06 23:05:29 +0200
+@@ -7992,13 +7992,13 @@
  # Check wether it is necessary to link against libdl.
  #
  gnupg_dlopen_save_libs="$LIBS"
 -LIBS=""
- { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
- echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_search_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+ $as_echo_n "checking for library containing dlopen... " >&6; }
+ if test "${ac_cv_search_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
 +  LIBS=""
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-Index: configure
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+Index: g10/seckey-cert.c
 --- g10/seckey-cert.c.orig	2008-03-18 17:46:32.000000000 +0100
 +++ g10/seckey-cert.c	2009-02-18 21:25:25.508715635 +0100
 @@ -209,6 +209,11 @@