diff -r 09d8a3107646 -r 63f79f03cb7f gnupg/gnupg.patch
--- a/gnupg/gnupg.patch	Fri Aug 03 16:29:17 2012 +0200
+++ b/gnupg/gnupg.patch	Fri Aug 03 16:34:12 2012 +0200
@@ -1,31 +1,47 @@
 Index: agent/genkey.c
---- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
-+++ agent/genkey.c	2009-09-06 22:59:18 +0200
+--- agent/genkey.c.orig	2011-08-04 11:59:33.000000000 +0200
++++ agent/genkey.c	2011-12-11 12:25:38.000000000 +0100
 @@ -190,11 +190,9 @@
          return gpg_error (GPG_ERR_INV_PASSPHRASE);
  
-       desc = xtryasprintf 
+       desc = xtryasprintf
 -        ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
 +        (           "Warning: You have entered an insecure passphrase.%%0A"
-                     "A passphrase should be at least %u character long.", 
+                     "A passphrase should be at least %u character long.",
 -                    "Warning: You have entered an insecure passphrase.%%0A"
--                    "A passphrase should be at least %u characters long.", 
+-                    "A passphrase should be at least %u characters long.",
 -                    minlen), minlen );
 +                    minlen);
        if (!desc)
          return gpg_error_from_syserror ();
        err = take_this_one_anyway (ctrl, desc);
+@@ -211,13 +209,10 @@
+         return gpg_error (GPG_ERR_INV_PASSPHRASE);
+ 
+       desc = xtryasprintf
+-        ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
++        (           "Warning: You have entered an insecure passphrase.%%0A"
+                     "A passphrase should contain at least %u digit or%%0A"
+                     "special character.",
+-                    "Warning: You have entered an insecure passphrase.%%0A"
+-                    "A passphrase should contain at least %u digits or%%0A"
+-                    "special characters.",
+-                    minnonalpha), minnonalpha );
++                    minnonalpha);
+       if (!desc)
+         return gpg_error_from_syserror ();
+       err = take_this_one_anyway (ctrl, desc);
 Index: configure
---- configure.orig	2009-09-04 18:09:14 +0200
-+++ configure	2009-09-06 23:05:29 +0200
-@@ -7782,13 +7782,13 @@
+--- configure.orig	2011-08-04 16:27:00.000000000 +0200
++++ configure	2011-12-11 12:26:25.000000000 +0100
+@@ -7908,13 +7908,13 @@
  # Check wether it is necessary to link against libdl.
  #
  gnupg_dlopen_save_libs="$LIBS"
 -LIBS=""
  { $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 :
+ if ${ac_cv_search_dlopen+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS