comparison: gnupg/gnupg.patch
gnupg/gnupg.patch
- changeset 587
- d0df67c21897
- parent 373
- b8e8f9dbbfd3
equal
deleted
inserted
replaced
| 3:cd4ad49f7c0a | 4:3e6f718be01b |
|---|---|
| 1 Index: agent/genkey.c | 1 Index: agent/genkey.c |
| 2 --- agent/genkey.c.orig 2009-06-29 08:20:15 +0200 | 2 --- agent/genkey.c.orig 2011-08-04 11:59:33.000000000 +0200 |
| 3 +++ agent/genkey.c 2009-09-06 22:59:18 +0200 | 3 +++ agent/genkey.c 2011-12-11 12:25:38.000000000 +0100 |
| 4 @@ -190,11 +190,9 @@ | 4 @@ -190,11 +190,9 @@ |
| 5 return gpg_error (GPG_ERR_INV_PASSPHRASE); | 5 return gpg_error (GPG_ERR_INV_PASSPHRASE); |
| 6 | 6 |
| 7 desc = xtryasprintf | 7 desc = xtryasprintf |
| 8 - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" | 8 - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" |
| 9 + ( "Warning: You have entered an insecure passphrase.%%0A" | 9 + ( "Warning: You have entered an insecure passphrase.%%0A" |
| 10 "A passphrase should be at least %u character long.", | 10 "A passphrase should be at least %u character long.", |
| 11 - "Warning: You have entered an insecure passphrase.%%0A" | 11 - "Warning: You have entered an insecure passphrase.%%0A" |
| 12 - "A passphrase should be at least %u characters long.", | 12 - "A passphrase should be at least %u characters long.", |
| 13 - minlen), minlen ); | 13 - minlen), minlen ); |
| 14 + minlen); | 14 + minlen); |
| 15 if (!desc) | 15 if (!desc) |
| 16 return gpg_error_from_syserror (); | 16 return gpg_error_from_syserror (); |
| 17 err = take_this_one_anyway (ctrl, desc); | 17 err = take_this_one_anyway (ctrl, desc); |
| 18 @@ -211,13 +209,10 @@ | |
| 19 return gpg_error (GPG_ERR_INV_PASSPHRASE); | |
| 20 | |
| 21 desc = xtryasprintf | |
| 22 - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" | |
| 23 + ( "Warning: You have entered an insecure passphrase.%%0A" | |
| 24 "A passphrase should contain at least %u digit or%%0A" | |
| 25 "special character.", | |
| 26 - "Warning: You have entered an insecure passphrase.%%0A" | |
| 27 - "A passphrase should contain at least %u digits or%%0A" | |
| 28 - "special characters.", | |
| 29 - minnonalpha), minnonalpha ); | |
| 30 + minnonalpha); | |
| 31 if (!desc) | |
| 32 return gpg_error_from_syserror (); | |
| 33 err = take_this_one_anyway (ctrl, desc); | |
| 18 Index: configure | 34 Index: configure |
| 19 --- configure.orig 2009-09-04 18:09:14 +0200 | 35 --- configure.orig 2011-08-04 16:27:00.000000000 +0200 |
| 20 +++ configure 2009-09-06 23:05:29 +0200 | 36 +++ configure 2011-12-11 12:26:25.000000000 +0100 |
| 21 @@ -7782,13 +7782,13 @@ | 37 @@ -7908,13 +7908,13 @@ |
| 22 # Check wether it is necessary to link against libdl. | 38 # Check wether it is necessary to link against libdl. |
| 23 # | 39 # |
| 24 gnupg_dlopen_save_libs="$LIBS" | 40 gnupg_dlopen_save_libs="$LIBS" |
| 25 -LIBS="" | 41 -LIBS="" |
| 26 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 | 42 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 |
| 27 $as_echo_n "checking for library containing dlopen... " >&6; } | 43 $as_echo_n "checking for library containing dlopen... " >&6; } |
| 28 if test "${ac_cv_search_dlopen+set}" = set; then : | 44 if ${ac_cv_search_dlopen+:} false; then : |
| 29 $as_echo_n "(cached) " >&6 | 45 $as_echo_n "(cached) " >&6 |
| 30 else | 46 else |
| 31 ac_func_search_save_LIBS=$LIBS | 47 ac_func_search_save_LIBS=$LIBS |
| 32 + LIBS="" | 48 + LIBS="" |
| 33 cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 49 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
