gnupg/gnupg.patch

Wed, 14 Jan 2009 15:59:12 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 14 Jan 2009 15:59:12 +0100
changeset 86
78e7deb1d6ab
child 107
2f8ffdf7658b
permissions
-rw-r--r--

Correct and improve many buildconf and code logic blocks. In particular:
1. Document potential problems building with current binutils releases.
2. Document the flawed webkit and explain its temporary exclusion.
3. Document the edition of Qt which is built and installed.
4. Remove the Solaris x11_supdir logic as it is no longer found.
5. Correct several .pr[io] files including QMAKE_CXXFLAGS and INCPATH,
which previously caused preexisting Qt installations to deliver
erroneous old include and library logic instead of relying on
that of the currently building package. -I/opkg/include is now
placed at the end of the compile statements.
6. Don't trust the QMAKE_[INC|LIB]DIR_X11 identifiers in qmake.conf.
7. Allow more 64-bit builds and more properly identify the platform.
8. Place plugins (which are shared objects) in lib instead of share.
9. Build components as plugins when possible if with_shared is enabled.
10. Translate German text to English to be more consistent.
11. Instead of removing the pkgconfig directory of with_shared builds,
place it in a child directory useful for shared building.
12. Document the nonstandard shared build directory structure,
including using the hidden pkgconfig directory (PKG_CONFIG_PATH.)
13. Change %doc to specify files rather than directories in the RPM DB.

     1 Index: agent/genkey.c
     2 --- agent/genkey.c.orig	2007-11-19 16:11:31 +0100
     3 +++ agent/genkey.c	2007-12-21 09:17:46 +0100
     4 @@ -188,11 +188,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	2007-12-20 09:40:04 +0100
    20 +++ configure	2007-12-21 09:08:55 +0100
    21 @@ -6909,13 +6909,13 @@
    22  # Check wether it is necessary to link against libdl.
    23  #
    24  gnupg_dlopen_save_libs="$LIBS"
    25 -LIBS=""
    26  { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
    27  echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
    28  if test "${ac_cv_search_dlopen+set}" = set; then
    29    echo $ECHO_N "(cached) $ECHO_C" >&6
    30  else
    31    ac_func_search_save_LIBS=$LIBS
    32 +  LIBS=""
    33  cat >conftest.$ac_ext <<_ACEOF
    34  /* confdefs.h.  */
    35  _ACEOF

mercurial