gnupg/gnupg.patch

Sun, 29 May 2011 16:29:06 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sun, 29 May 2011 16:29:06 +0200
changeset 344
e33c1efbd60f
parent 107
2f8ffdf7658b
child 373
b8e8f9dbbfd3
permissions
-rw-r--r--

Update, correct, improve build configuration and packaging logic.
Update to new version of vendor software, bump copyright date, remove implicit
gcc dependency, add comments for Trolltech bug tracking, correct enforced
dynamic library linkage, and install mysterious process stub binary.

     1 Index: agent/genkey.c
     2 --- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
     3 +++ agent/genkey.c	2009-09-06 22:59:18 +0200
     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 Index: configure
    19 --- configure.orig	2009-09-04 18:09:14 +0200
    20 +++ configure	2009-09-06 23:05:29 +0200
    21 @@ -7992,13 +7992,13 @@
    22  # Check wether it is necessary to link against libdl.
    23  #
    24  gnupg_dlopen_save_libs="$LIBS"
    25 -LIBS=""
    26  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
    27  $as_echo_n "checking for library containing dlopen... " >&6; }
    28  if test "${ac_cv_search_dlopen+set}" = set; then :
    29    $as_echo_n "(cached) " >&6
    30  else
    31    ac_func_search_save_LIBS=$LIBS
    32 +  LIBS=""
    33  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    34  /* end confdefs.h.  */
    36 Index: g10/seckey-cert.c
    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
    39 @@ -209,6 +209,11 @@
    40                  csum += checksum (buffer, ndata);
    41                  gcry_mpi_release (sk->skey[i]);
    43 +        if (sk->protect.algo==CIPHER_ALGO_IDEA) {
    44 +            buffer[0] = 0;
    45 +            buffer[1] = 0;
    46 +        }
    47 +
    48  		err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP,
    49  				     buffer, ndata, &ndata );
    50  		xfree (buffer);

mercurial