[git] GnuPG - branch, master, updated. gnupg-2.1.15-97-geddcba0
by Ben Kibbey
cvs at cvs.gnupg.org
Sat Sep 10 20:09:12 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via eddcba038025cdbd58aaf67cafd6d83f0ea042d5 (commit)
via 937ec53eff290c3d916faebc23218c9272671c02 (commit)
from d757009a24eb856770fc3a3729e2f21f54d2a618 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eddcba038025cdbd58aaf67cafd6d83f0ea042d5
Author: Ben Kibbey <bjk at luxsci.net>
Date: Sat Sep 10 13:42:09 2016 -0400
Portability build fix.
* kbx/Makefile.am: Add NETLIBS.
* dirmngr/Makefile.am: Ditto for dirmngr_ldap.
--
Fixes OpenIndiana (Solaris) builds.
Signed-off-by: Ben Kibbey <bjk at luxsci.net>
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 6b0a1e1..b7bc21d 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -95,7 +95,7 @@ dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
dirmngr_ldap_LDFLAGS =
dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \
$(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
- $(LBER_LIBS) $(LIBINTL) $(LIBICONV)
+ $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
endif
dirmngr_client_SOURCES = dirmngr-client.c
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 95138e0..912dd76 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -61,6 +61,7 @@ kbxutil_SOURCES = kbxutil.c $(common_sources)
kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
kbxutil_LDADD = ../common/libcommon.a \
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
- $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) \
+ $(NETLIBS)
$(PROGRAMS) : ../common/libcommon.a
commit 937ec53eff290c3d916faebc23218c9272671c02
Author: Ben Kibbey <bjk at luxsci.net>
Date: Sat Sep 10 13:42:09 2016 -0400
Fix symbol conflict.
* g10/gpgcompose.c: Rename struct siginfo to signinfo.
--
Fixes android-ndk and OpenIndiana (Solaris) builds.
Signed-off-by: Ben Kibbey <bjk at luxsci.net>
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index e3bb013..6c44e32 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -710,7 +710,7 @@ public_key (const char *option, int argc, char *argv[], void *cookie)
return processed;
}
-struct siginfo
+struct signinfo
{
/* Key with which to sign. */
kbnode_t issuer_kb;
@@ -789,7 +789,7 @@ sig_issuer (const char *option, int argc, char *argv[], void *cookie)
gpg_error_t err;
KEYDB_HANDLE hd;
KEYDB_SEARCH_DESC desc;
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
if (argc == 0)
log_fatal ("Usage: %s KEYID\n", option);
@@ -824,7 +824,7 @@ sig_issuer_keyid (const char *option, int argc, char *argv[], void *cookie)
{
gpg_error_t err;
KEYDB_SEARCH_DESC desc;
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
if (argc == 0)
log_fatal ("Usage: %s KEYID|self\n", option);
@@ -853,7 +853,7 @@ sig_issuer_keyid (const char *option, int argc, char *argv[], void *cookie)
static int
sig_pk (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int i;
char *tail = NULL;
@@ -893,7 +893,7 @@ sig_pk (const char *option, int argc, char *argv[], void *cookie)
static int
sig_user_id (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int i;
char *tail = NULL;
@@ -922,7 +922,7 @@ sig_user_id (const char *option, int argc, char *argv[], void *cookie)
static int
sig_class (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int i;
char *tail = NULL;
@@ -942,7 +942,7 @@ sig_class (const char *option, int argc, char *argv[], void *cookie)
static int
sig_digest (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int i;
char *tail = NULL;
@@ -962,7 +962,7 @@ sig_digest (const char *option, int argc, char *argv[], void *cookie)
static int
sig_timestamp (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
char *tail = NULL;
if (argc == 0)
@@ -979,7 +979,7 @@ sig_timestamp (const char *option, int argc, char *argv[], void *cookie)
static int
sig_expiration (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int is_expiration = strcmp (option, "--expiration") == 0;
u32 *i = is_expiration ? &si->expiration : &si->key_expiration;
@@ -999,7 +999,7 @@ sig_expiration (const char *option, int argc, char *argv[], void *cookie)
static int
sig_int_list (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int nvalues = 1;
char *values = xmalloc (nvalues * sizeof (values[0]));
char *tail = argv[0];
@@ -1069,7 +1069,7 @@ sig_int_list (const char *option, int argc, char *argv[], void *cookie)
static int
sig_flag (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int range[2] = {0, 255};
char *tail;
int v;
@@ -1115,7 +1115,7 @@ sig_flag (const char *option, int argc, char *argv[], void *cookie)
static int
sig_trust_level (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int i;
char *tail;
@@ -1143,7 +1143,7 @@ sig_trust_level (const char *option, int argc, char *argv[], void *cookie)
static int
sig_string_arg (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
char *p = argv[0];
char **s;
@@ -1173,7 +1173,7 @@ static int
sig_revocation_key (const char *option, int argc, char *argv[], void *cookie)
{
gpg_error_t err;
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int v;
char *tail;
PKT_public_key pk;
@@ -1213,7 +1213,7 @@ sig_revocation_key (const char *option, int argc, char *argv[], void *cookie)
static int
sig_notation (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int is_blob = strcmp (option, "--notation") != 0;
struct notation *notation;
char *p = argv[0];
@@ -1330,7 +1330,7 @@ sig_notation (const char *option, int argc, char *argv[], void *cookie)
static int
sig_big_endian_arg (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
char *p = argv[0];
int i;
int l;
@@ -1385,7 +1385,7 @@ sig_big_endian_arg (const char *option, int argc, char *argv[], void *cookie)
static int
sig_reason_for_revocation (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int v;
char *tail;
@@ -1410,7 +1410,7 @@ sig_reason_for_revocation (const char *option, int argc, char *argv[], void *coo
static int
sig_corrupt (const char *option, int argc, char *argv[], void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
(void) option;
(void) argc;
@@ -1560,7 +1560,7 @@ static struct option sig_options[] = {
static int
mksubpkt_callback (PKT_signature *sig, void *cookie)
{
- struct siginfo *si = cookie;
+ struct signinfo *si = cookie;
int i;
if (si->key_expiration)
@@ -1675,7 +1675,7 @@ signature (const char *option, int argc, char *argv[], void *cookie)
{
gpg_error_t err;
iobuf_t out = cookie;
- struct siginfo si;
+ struct signinfo si;
int processed;
PKT_public_key *pk;
PKT_signature *sig;
-----------------------------------------------------------------------
Summary of changes:
dirmngr/Makefile.am | 2 +-
g10/gpgcompose.c | 40 ++++++++++++++++++++--------------------
kbx/Makefile.am | 3 ++-
3 files changed, 23 insertions(+), 22 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list