1.1 --- a/gnupg/gnupg.patch Fri Aug 03 16:29:17 2012 +0200
1.2 +++ b/gnupg/gnupg.patch Fri Aug 03 16:34:12 2012 +0200
1.3 @@ -1,31 +1,47 @@
1.4 Index: agent/genkey.c
1.5 ---- agent/genkey.c.orig 2009-06-29 08:20:15 +0200
1.6 -+++ agent/genkey.c 2009-09-06 22:59:18 +0200
1.7 +--- agent/genkey.c.orig 2011-08-04 11:59:33.000000000 +0200
1.8 ++++ agent/genkey.c 2011-12-11 12:25:38.000000000 +0100
1.9 @@ -190,11 +190,9 @@
1.10 return gpg_error (GPG_ERR_INV_PASSPHRASE);
1.11
1.12 - desc = xtryasprintf
1.13 + desc = xtryasprintf
1.14 - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
1.15 + ( "Warning: You have entered an insecure passphrase.%%0A"
1.16 - "A passphrase should be at least %u character long.",
1.17 + "A passphrase should be at least %u character long.",
1.18 - "Warning: You have entered an insecure passphrase.%%0A"
1.19 -- "A passphrase should be at least %u characters long.",
1.20 +- "A passphrase should be at least %u characters long.",
1.21 - minlen), minlen );
1.22 + minlen);
1.23 if (!desc)
1.24 return gpg_error_from_syserror ();
1.25 err = take_this_one_anyway (ctrl, desc);
1.26 +@@ -211,13 +209,10 @@
1.27 + return gpg_error (GPG_ERR_INV_PASSPHRASE);
1.28 +
1.29 + desc = xtryasprintf
1.30 +- ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
1.31 ++ ( "Warning: You have entered an insecure passphrase.%%0A"
1.32 + "A passphrase should contain at least %u digit or%%0A"
1.33 + "special character.",
1.34 +- "Warning: You have entered an insecure passphrase.%%0A"
1.35 +- "A passphrase should contain at least %u digits or%%0A"
1.36 +- "special characters.",
1.37 +- minnonalpha), minnonalpha );
1.38 ++ minnonalpha);
1.39 + if (!desc)
1.40 + return gpg_error_from_syserror ();
1.41 + err = take_this_one_anyway (ctrl, desc);
1.42 Index: configure
1.43 ---- configure.orig 2009-09-04 18:09:14 +0200
1.44 -+++ configure 2009-09-06 23:05:29 +0200
1.45 -@@ -7782,13 +7782,13 @@
1.46 +--- configure.orig 2011-08-04 16:27:00.000000000 +0200
1.47 ++++ configure 2011-12-11 12:26:25.000000000 +0100
1.48 +@@ -7908,13 +7908,13 @@
1.49 # Check wether it is necessary to link against libdl.
1.50 #
1.51 gnupg_dlopen_save_libs="$LIBS"
1.52 -LIBS=""
1.53 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
1.54 $as_echo_n "checking for library containing dlopen... " >&6; }
1.55 - if test "${ac_cv_search_dlopen+set}" = set; then :
1.56 + if ${ac_cv_search_dlopen+:} false; then :
1.57 $as_echo_n "(cached) " >&6
1.58 else
1.59 ac_func_search_save_LIBS=$LIBS
