gnupg/gnupg.patch@2289d64c2123 (annotated)
gnupg/gnupg.patch
Mon, 28 Mar 2011 19:41:02 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 28 Mar 2011 19:41:02 +0200
- changeset 332
- 2289d64c2123
- parent 107
- 2f8ffdf7658b
- child 373
- b8e8f9dbbfd3
- permissions
- -rw-r--r--
Completely rework package including...
Simpify 64-bit -fPIC logic, instruct make to build in parallel,
force error condition on failed profile dependency, build the
standard 'bootstrap' target as suggested, correct grammar, wording,
and punctuation in general, upgrade to latest upstream vendor version,
rearrange package dependencies mpc, mpfr, and gmp, correct buildconf
thanks to new lto-plugin forced, avoid failed platform specific stage
comparison, adjust patch code to reflect new version update, and most
importantly adjust optimization flags to platform. Please note that
block 'correct hardcoded paths' is likely no yet complete.
| michael@30 | 1 | Index: agent/genkey.c |
| michael@286 | 2 | --- agent/genkey.c.orig 2009-06-29 08:20:15 +0200 |
| michael@286 | 3 | +++ agent/genkey.c 2009-09-06 22:59:18 +0200 |
| michael@286 | 4 | @@ -190,11 +190,9 @@ |
| michael@30 | 5 | return gpg_error (GPG_ERR_INV_PASSPHRASE); |
| michael@30 | 6 | |
| michael@30 | 7 | desc = xtryasprintf |
| michael@30 | 8 | - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" |
| michael@30 | 9 | + ( "Warning: You have entered an insecure passphrase.%%0A" |
| michael@30 | 10 | "A passphrase should be at least %u character long.", |
| michael@30 | 11 | - "Warning: You have entered an insecure passphrase.%%0A" |
| michael@30 | 12 | - "A passphrase should be at least %u characters long.", |
| michael@30 | 13 | - minlen), minlen ); |
| michael@30 | 14 | + minlen); |
| michael@30 | 15 | if (!desc) |
| michael@30 | 16 | return gpg_error_from_syserror (); |
| michael@30 | 17 | err = take_this_one_anyway (ctrl, desc); |
| michael@30 | 18 | Index: configure |
| michael@286 | 19 | --- configure.orig 2009-09-04 18:09:14 +0200 |
| michael@286 | 20 | +++ configure 2009-09-06 23:05:29 +0200 |
| michael@286 | 21 | @@ -7992,13 +7992,13 @@ |
| michael@30 | 22 | # Check wether it is necessary to link against libdl. |
| michael@30 | 23 | # |
| michael@30 | 24 | gnupg_dlopen_save_libs="$LIBS" |
| michael@30 | 25 | -LIBS="" |
| michael@286 | 26 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 |
| michael@286 | 27 | $as_echo_n "checking for library containing dlopen... " >&6; } |
| michael@286 | 28 | if test "${ac_cv_search_dlopen+set}" = set; then : |
| michael@286 | 29 | $as_echo_n "(cached) " >&6 |
| michael@30 | 30 | else |
| michael@30 | 31 | ac_func_search_save_LIBS=$LIBS |
| michael@30 | 32 | + LIBS="" |
| michael@286 | 33 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@286 | 34 | /* end confdefs.h. */ |
| michael@286 | 35 | |
| michael@286 | 36 | Index: g10/seckey-cert.c |
| michael@107 | 37 | --- g10/seckey-cert.c.orig 2008-03-18 17:46:32.000000000 +0100 |
| michael@107 | 38 | +++ g10/seckey-cert.c 2009-02-18 21:25:25.508715635 +0100 |
| michael@107 | 39 | @@ -209,6 +209,11 @@ |
| michael@107 | 40 | csum += checksum (buffer, ndata); |
| michael@107 | 41 | gcry_mpi_release (sk->skey[i]); |
| michael@107 | 42 | |
| michael@107 | 43 | + if (sk->protect.algo==CIPHER_ALGO_IDEA) { |
| michael@107 | 44 | + buffer[0] = 0; |
| michael@107 | 45 | + buffer[1] = 0; |
| michael@107 | 46 | + } |
| michael@107 | 47 | + |
| michael@107 | 48 | err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP, |
| michael@107 | 49 | buffer, ndata, &ndata ); |
| michael@107 | 50 | xfree (buffer); |
