gnupg/gnupg.patch@300d43423c2e (annotated)
gnupg/gnupg.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- parent 373
- b8e8f9dbbfd3
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@30 | 1 | Index: agent/genkey.c |
| michael@462 | 2 | --- agent/genkey.c.orig 2011-08-04 11:59:33.000000000 +0200 |
| michael@462 | 3 | +++ agent/genkey.c 2011-12-11 12:25:38.000000000 +0100 |
| michael@286 | 4 | @@ -190,11 +190,9 @@ |
| michael@30 | 5 | return gpg_error (GPG_ERR_INV_PASSPHRASE); |
| michael@30 | 6 | |
| michael@462 | 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@462 | 10 | "A passphrase should be at least %u character long.", |
| michael@30 | 11 | - "Warning: You have entered an insecure passphrase.%%0A" |
| michael@462 | 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@462 | 18 | @@ -211,13 +209,10 @@ |
| michael@462 | 19 | return gpg_error (GPG_ERR_INV_PASSPHRASE); |
| michael@462 | 20 | |
| michael@462 | 21 | desc = xtryasprintf |
| michael@462 | 22 | - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" |
| michael@462 | 23 | + ( "Warning: You have entered an insecure passphrase.%%0A" |
| michael@462 | 24 | "A passphrase should contain at least %u digit or%%0A" |
| michael@462 | 25 | "special character.", |
| michael@462 | 26 | - "Warning: You have entered an insecure passphrase.%%0A" |
| michael@462 | 27 | - "A passphrase should contain at least %u digits or%%0A" |
| michael@462 | 28 | - "special characters.", |
| michael@462 | 29 | - minnonalpha), minnonalpha ); |
| michael@462 | 30 | + minnonalpha); |
| michael@462 | 31 | if (!desc) |
| michael@462 | 32 | return gpg_error_from_syserror (); |
| michael@462 | 33 | err = take_this_one_anyway (ctrl, desc); |
| michael@30 | 34 | Index: configure |
| michael@462 | 35 | --- configure.orig 2011-08-04 16:27:00.000000000 +0200 |
| michael@462 | 36 | +++ configure 2011-12-11 12:26:25.000000000 +0100 |
| michael@462 | 37 | @@ -7908,13 +7908,13 @@ |
| michael@30 | 38 | # Check wether it is necessary to link against libdl. |
| michael@30 | 39 | # |
| michael@30 | 40 | gnupg_dlopen_save_libs="$LIBS" |
| michael@30 | 41 | -LIBS="" |
| michael@286 | 42 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 |
| michael@286 | 43 | $as_echo_n "checking for library containing dlopen... " >&6; } |
| michael@462 | 44 | if ${ac_cv_search_dlopen+:} false; then : |
| michael@286 | 45 | $as_echo_n "(cached) " >&6 |
| michael@30 | 46 | else |
| michael@30 | 47 | ac_func_search_save_LIBS=$LIBS |
| michael@30 | 48 | + LIBS="" |
| michael@286 | 49 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@286 | 50 | /* end confdefs.h. */ |
| michael@286 | 51 | |
| michael@286 | 52 | Index: g10/seckey-cert.c |
| michael@107 | 53 | --- g10/seckey-cert.c.orig 2008-03-18 17:46:32.000000000 +0100 |
| michael@107 | 54 | +++ g10/seckey-cert.c 2009-02-18 21:25:25.508715635 +0100 |
| michael@107 | 55 | @@ -209,6 +209,11 @@ |
| michael@107 | 56 | csum += checksum (buffer, ndata); |
| michael@107 | 57 | gcry_mpi_release (sk->skey[i]); |
| michael@107 | 58 | |
| michael@107 | 59 | + if (sk->protect.algo==CIPHER_ALGO_IDEA) { |
| michael@107 | 60 | + buffer[0] = 0; |
| michael@107 | 61 | + buffer[1] = 0; |
| michael@107 | 62 | + } |
| michael@107 | 63 | + |
| michael@107 | 64 | err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP, |
| michael@107 | 65 | buffer, ndata, &ndata ); |
| michael@107 | 66 | xfree (buffer); |
