components/gnupg/patches/common-estream.c.patch
author Petr Nyc <Petr.Nyc@Oracle.COM>
Wed, 12 Nov 2014 23:21:07 -0800
branchs11u2-sru
changeset 3465 286faccbf469
parent 2967 4f3c932b6bc8
permissions -rw-r--r--
ips-buildinfo.mk for S11.2SRU5.2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2967
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Changes needed to get GnuPG estream.c to compile with the Studio C compiler.
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
These were legitimate bugs in GnuPG version 2.0.22, but looking at the
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
latest version of estream.c in the GnuPG git repository, the problems have
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
been resolved by redefining ESTREAM_MUTEX_UNLOCK and ESTREAM_MUTEX_INITIALIZE
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
to no longer test against estream_pth_killed and therefore no need for the
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
bogusly defined dummy routines.
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
--- gnupg-2.0.22/common/estream.c.orig	2014-01-15 08:38:06.978672664 -0800
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
+++ gnupg-2.0.22/common/estream.c	2014-01-15 09:02:39.386197974 -0800
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
@@ -181,13 +181,13 @@
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
   (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
    : (void)pth_mutex_acquire (&(mutex), 0, NULL))
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
 # define ESTREAM_MUTEX_UNLOCK(mutex)                            \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
-  (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
+  (estream_pth_killed ? dummy_mutex_call_int ((mutex))         \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
    : pth_mutex_release (&(mutex)))
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 # define ESTREAM_MUTEX_TRYLOCK(mutex)                                   \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
   (estream_pth_killed ? dummy_mutex_call_int ((mutex))                  \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
    : ((pth_mutex_acquire (&(mutex), 1, NULL) == TRUE)? 0:-1))
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
 # define ESTREAM_MUTEX_INITIALIZE(mutex)                        \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
-  (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
+  (estream_pth_killed ? dummy_mutex_call_int ((mutex))         \
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
    : pth_mutex_init (&(mutex)))
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
 
4f3c932b6bc8 PSARC/2014/012 GnuPG version 2.0.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
 #else /*!HAVE_PTH*/