[git] Assuan - branch, master, updated. libassuan-2.4.0-6-g7d836d5
by Werner Koch
cvs at cvs.gnupg.org
Mon Nov 23 15:51:06 CET 2015
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 "IPC library used by GnuPG".
The branch, master has been updated
via 7d836d5126b5399f3d76f5fa2d7ede7905b39304 (commit)
via add6953a916dafa93ae152bffc937a93ab5b55f8 (commit)
via 429ff31fe72db8afedaad3f2d089c9c3b5dae41e (commit)
via 5b927b3dcffa2918e6b503c4907923aadbad0865 (commit)
via cef28d96debcf94003f94f3ea2181e80aff0b665 (commit)
from c2fca26e2d9fb9ba7a9d87300e735a53e2615a7a (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 7d836d5126b5399f3d76f5fa2d7ede7905b39304
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 23 15:47:16 2015 +0100
Post release updates
--
diff --git a/NEWS b/NEWS
index 314c8d7..786297b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.4.2 (unreleased) [C7/A7/R_]
+------------------------------------------------
+
+
Noteworthy changes in version 2.4.1 (2015-11-23) [C7/A7/R1]
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index fa02ba7..6f47d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ min_automake_version="1.14"
m4_define([mym4_package],[libassuan])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [4])
-m4_define([mym4_micro], [1])
+m4_define([mym4_micro], [2])
# To start a new development series, i.e a new major or minor number
# you need to mark an arbitrary commit before the first beta release
commit add6953a916dafa93ae152bffc937a93ab5b55f8
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 23 15:42:51 2015 +0100
Release 2.4.1.
* configure.ac: Bump LT version to C7/A7/R1.
diff --git a/NEWS b/NEWS
index 63b6e64..314c8d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Noteworthy changes in version 2.4.1 (unreleased) [C7/A7/R_]
+Noteworthy changes in version 2.4.1 (2015-11-23) [C7/A7/R1]
------------------------------------------------
+ * In Tor mode fallback to port 9150 if 9050 is not listening.
+
+ * Allow building with older mingw-w64 versions.
+
Noteworthy changes in version 2.4.0 (2015-11-03) [C7/A7/R0]
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 313dafc..fa02ba7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
#
LIBASSUAN_LT_CURRENT=7
LIBASSUAN_LT_AGE=7
-LIBASSUAN_LT_REVISION=0
+LIBASSUAN_LT_REVISION=1
# If the API is changed in an incompatible way: increment the next counter.
LIBASSUAN_CONFIG_API_VERSION=2
commit 429ff31fe72db8afedaad3f2d089c9c3b5dae41e
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 23 15:04:11 2015 +0100
Make socks5 test case a bit more robust.
* tests/socks5.c (main): Call gpgrt_init. Check for write and read
errors. Allow building of some parts even w/o getaddrinfo.
diff --git a/tests/socks5.c b/tests/socks5.c
index 68659fc..7ab0438 100644
--- a/tests/socks5.c
+++ b/tests/socks5.c
@@ -39,16 +39,7 @@
#include "../src/assuan.h"
#include "common.h"
-#ifndef HAVE_GETADDRINFO
-int
-main (void)
-{
- fputs ("socks5: getaddrinfo not supported\n", stderr);
- return 77; /* Skip test. */
-}
-#else /* HAVE_GETADDRINFO */
-
/*
M A I N
@@ -71,6 +62,7 @@ main (int argc, char **argv)
int c;
int lf_seen;
+ gpgrt_init ();
if (argc)
{
log_set_prefix (*argv);
@@ -210,6 +202,7 @@ main (int argc, char **argv)
}
else
{
+#ifdef HAVE_GETADDRINFO
struct addrinfo hints, *res, *ai;
int ret;
int anyok = 0;
@@ -262,6 +255,12 @@ main (int argc, char **argv)
freeaddrinfo (res);
if (!anyok)
exit (1);
+#else /*!HAVE_GETADDRINFO*/
+ (void)only_v4;
+ (void)only_v6;
+ fputs ("socks5: getaddrinfo not supported\n", stderr);
+ exit (77); /* Skip test. */
+#endif /*!HAVE_GETADDRINFO*/
}
infp = es_fdopen_nc (sock, "rb");
@@ -279,9 +278,12 @@ main (int argc, char **argv)
assuan_sock_close (sock);
log_fatal ("opening outbound stream failed: %s\n", gpg_strerror (err));
}
-
es_fputs ("GET / HTTP/1.0\r\n\r\n", outfp);
- es_fflush (outfp);
+ if (es_fflush (outfp))
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("es_fflush failed: %s\n", gpg_strerror (err));
+ }
lf_seen = 0;
while ((c = es_fgetc (infp)) != EOF)
{
@@ -297,9 +299,13 @@ main (int argc, char **argv)
else
lf_seen = 0;
}
+ if (es_ferror (infp))
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("es_fgetc failed: %s\n", gpg_strerror (err));
+ }
es_fclose (infp);
es_fclose (outfp);
return errorcount ? 1 : 0;
}
-#endif /*HAVE_GETADDRINFO*/
commit 5b927b3dcffa2918e6b503c4907923aadbad0865
Author: Werner Koch <wk at gnupg.org>
Date: Sat Nov 21 13:13:52 2015 +0100
Also try port 9150 in Tor mode.
* src/assuan-socket.c (TOR_PORT2): New.
(_assuan_sock_wsa2errno): Map WSAECONNREFUSED.
(socks5_connect): Fall back to TOR_PORT2.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index 5ad7299..9f9f155 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -110,6 +110,7 @@
/* The standard SOCKS and TOR port. */
#define SOCKS_PORT 1080
#define TOR_PORT 9050
+#define TOR_PORT2 9150 /* The Tor browser is listening there. */
/* In the future, we can allow access to sock_ctx, if that context's
hook functions need to be overridden. There can only be one global
@@ -300,6 +301,8 @@ _assuan_sock_wsa2errno (int err)
return EPIPE;
case WSANOTINITIALISED:
return ENOSYS;
+ case WSAECONNREFUSED:
+ return ECONNREFUSED;
default:
return EIO;
}
@@ -730,6 +733,13 @@ socks5_connect (assuan_context_t ctx, assuan_fd_t sock,
proxyaddr = (struct sockaddr *)&proxyaddr_in;
proxyaddrlen = sizeof proxyaddr_in;
ret = _assuan_connect (ctx, HANDLE2SOCKET (sock), proxyaddr, proxyaddrlen);
+ if (ret && socksport == TOR_PORT && errno == ECONNREFUSED)
+ {
+ /* Standard Tor port failed - try the Tor browser port. */
+ proxyaddr_in.sin_port = htons (TOR_PORT2);
+ ret = _assuan_connect (ctx, HANDLE2SOCKET (sock),
+ proxyaddr, proxyaddrlen);
+ }
if (ret)
return ret;
buffer[0] = 5; /* RFC-1928 VER field. */
commit cef28d96debcf94003f94f3ea2181e80aff0b665
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 13 15:53:00 2015 +0100
Fix windows build with mingw-w64 2.0.x
* src/assuan-socket.c: Add errno values not defined by mingw-w64 2.0
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index 89723b3..5ad7299 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -70,6 +70,30 @@
# define S_IRGRP 0
# define S_IWGRP 0
#endif
+#ifndef ENOTSUP
+#define ENOTSUP 129
+#endif
+#ifndef EPROTO
+#define EPROTO 134
+#endif
+#ifndef EPROTONOSUPPORT
+#define EPROTONOSUPPORT 135
+#endif
+#ifndef ENETDOWN
+#define ENETDOWN 116
+#endif
+#ifndef ENETUNREACH
+#define ENETUNREACH 118
+#endif
+#ifndef EHOSTUNREACH
+#define EHOSTUNREACH 110
+#endif
+#ifndef ECONNREFUSED
+#define ECONNREFUSED 107
+#endif
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 138
+#endif
#endif
#ifndef ENAMETOOLONG
-----------------------------------------------------------------------
Summary of changes:
NEWS | 10 +++++++++-
configure.ac | 4 ++--
src/assuan-socket.c | 34 ++++++++++++++++++++++++++++++++++
tests/socks5.c | 30 ++++++++++++++++++------------
4 files changed, 63 insertions(+), 15 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list