Sun, 02 Sep 2012 18:18:43 +0200
Introduce new version of tcpdump, reorder taglib and cryptbreaker to
the end because they fail to build on Linux, and correct flawed URLs
probably copied from the doxygen build entry.
1 Index: agent/genkey.c
2 --- agent/genkey.c.orig 2011-08-04 11:59:33.000000000 +0200
3 +++ agent/genkey.c 2011-12-11 12:25:38.000000000 +0100
4 @@ -190,11 +190,9 @@
5 return gpg_error (GPG_ERR_INV_PASSPHRASE);
7 desc = xtryasprintf
8 - ( ngettext ("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.",
11 - "Warning: You have entered an insecure passphrase.%%0A"
12 - "A passphrase should be at least %u characters long.",
13 - minlen), minlen );
14 + minlen);
15 if (!desc)
16 return gpg_error_from_syserror ();
17 err = take_this_one_anyway (ctrl, desc);
18 @@ -211,13 +209,10 @@
19 return gpg_error (GPG_ERR_INV_PASSPHRASE);
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);
34 Index: configure
35 --- configure.orig 2011-08-04 16:27:00.000000000 +0200
36 +++ configure 2011-12-11 12:26:25.000000000 +0100
37 @@ -7908,13 +7908,13 @@
38 # Check wether it is necessary to link against libdl.
39 #
40 gnupg_dlopen_save_libs="$LIBS"
41 -LIBS=""
42 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
43 $as_echo_n "checking for library containing dlopen... " >&6; }
44 if ${ac_cv_search_dlopen+:} false; then :
45 $as_echo_n "(cached) " >&6
46 else
47 ac_func_search_save_LIBS=$LIBS
48 + LIBS=""
49 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
50 /* end confdefs.h. */
52 Index: g10/seckey-cert.c
53 --- g10/seckey-cert.c.orig 2008-03-18 17:46:32.000000000 +0100
54 +++ g10/seckey-cert.c 2009-02-18 21:25:25.508715635 +0100
55 @@ -209,6 +209,11 @@
56 csum += checksum (buffer, ndata);
57 gcry_mpi_release (sk->skey[i]);
59 + if (sk->protect.algo==CIPHER_ALGO_IDEA) {
60 + buffer[0] = 0;
61 + buffer[1] = 0;
62 + }
63 +
64 err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP,
65 buffer, ndata, &ndata );
66 xfree (buffer);