1 Index: agent/genkey.c |
1 Index: agent/genkey.c |
2 --- agent/genkey.c.orig 2007-11-19 16:11:31 +0100 |
2 --- agent/genkey.c.orig 2009-06-29 08:20:15 +0200 |
3 +++ agent/genkey.c 2007-12-21 09:17:46 +0100 |
3 +++ agent/genkey.c 2009-09-06 22:59:18 +0200 |
4 @@ -188,11 +188,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" |
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 Index: configure |
18 Index: configure |
19 --- configure.orig 2007-12-20 09:40:04 +0100 |
19 --- configure.orig 2009-09-04 18:09:14 +0200 |
20 +++ configure 2007-12-21 09:08:55 +0100 |
20 +++ configure 2009-09-06 23:05:29 +0200 |
21 @@ -6909,13 +6909,13 @@ |
21 @@ -7992,13 +7992,13 @@ |
22 # Check wether it is necessary to link against libdl. |
22 # Check wether it is necessary to link against libdl. |
23 # |
23 # |
24 gnupg_dlopen_save_libs="$LIBS" |
24 gnupg_dlopen_save_libs="$LIBS" |
25 -LIBS="" |
25 -LIBS="" |
26 { echo "$as_me:$LINENO: checking for library containing dlopen" >&5 |
26 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 |
27 echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; } |
27 $as_echo_n "checking for library containing dlopen... " >&6; } |
28 if test "${ac_cv_search_dlopen+set}" = set; then |
28 if test "${ac_cv_search_dlopen+set}" = set; then : |
29 echo $ECHO_N "(cached) $ECHO_C" >&6 |
29 $as_echo_n "(cached) " >&6 |
30 else |
30 else |
31 ac_func_search_save_LIBS=$LIBS |
31 ac_func_search_save_LIBS=$LIBS |
32 + LIBS="" |
32 + LIBS="" |
33 cat >conftest.$ac_ext <<_ACEOF |
33 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
34 /* confdefs.h. */ |
34 /* end confdefs.h. */ |
35 _ACEOF |
35 |
36 Index: configure |
36 Index: g10/seckey-cert.c |
37 --- g10/seckey-cert.c.orig 2008-03-18 17:46:32.000000000 +0100 |
37 --- g10/seckey-cert.c.orig 2008-03-18 17:46:32.000000000 +0100 |
38 +++ g10/seckey-cert.c 2009-02-18 21:25:25.508715635 +0100 |
38 +++ g10/seckey-cert.c 2009-02-18 21:25:25.508715635 +0100 |
39 @@ -209,6 +209,11 @@ |
39 @@ -209,6 +209,11 @@ |
40 csum += checksum (buffer, ndata); |
40 csum += checksum (buffer, ndata); |
41 gcry_mpi_release (sk->skey[i]); |
41 gcry_mpi_release (sk->skey[i]); |