From 9c57e909961719504ef646957574eaa8a42bcbc5 Mon Sep 17 00:00:00 2001 From: nia Date: Mon, 18 May 2020 11:19:13 +0000 Subject: socat: Update to 1.7.3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ####################### V 1.7.3.4: Corrections: Header of xiotermios_speed() declared parameter unsigned int instead of speed_t, thus compiling failed on MacOS Thanks to Joe Strout and others for reporting this bug. Thanks to Andrew Childs and others for sending a patch. Under certain circumstances, termios options of the first address were applied to the second address, resulting in error "Inappropriate ioctl for device" This affected version 1.7.3.3 only. Test: TERMIOS_PH_ALL Thanks to Ivan J. for reporting this issue. Socat failed to compile when no poll() system call was found by configure. Thanks to Jason White for sending a patch. Due to use of SSL_CTX_clear_mode() Socat failed to compile on old systems with, e.g., OpenSSL-0.9.8. Thanks to Simon Matter and Moritz B. for reporting this problem and sending initial patches. getaddrinfo() in IP4-SENDTO and IP6-SENDTO addresses failed with "ai_socktype not supported" when protocol 6 was addressed. The fix removes the possibility to use service names with SCTP. Test: IP_SENDTO_6 Thanks to Sören for sending an initial patch. Under certain circumstances, Socat printed the "socket ... is at EOF" multiple times. Test: MULTIPLE_EOF Newer parts of test.sh used substitutions ${x,,*} or ${x^^*} that are not implemented in older bash versions. --- net/socat/Makefile | 5 ++--- net/socat/distinfo | 11 +++++------ net/socat/patches/patch-xio-termios.h | 15 --------------- 3 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 net/socat/patches/patch-xio-termios.h (limited to 'net') diff --git a/net/socat/Makefile b/net/socat/Makefile index 4cc156ada87..53a0cc52635 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.43 2020/02/09 13:19:10 jdolecek Exp $ +# $NetBSD: Makefile,v 1.44 2020/05/18 11:19:13 nia Exp $ -DISTNAME= socat-1.7.3.3 -PKGREVISION= 2 +DISTNAME= socat-1.7.3.4 CATEGORIES= net MASTER_SITES= http://www.dest-unreach.org/socat/download/ diff --git a/net/socat/distinfo b/net/socat/distinfo index e66493a2785..64943a4cbc6 100644 --- a/net/socat/distinfo +++ b/net/socat/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.27 2019/06/25 16:43:47 schmonz Exp $ +$NetBSD: distinfo,v 1.28 2020/05/18 11:19:13 nia Exp $ -SHA1 (socat-1.7.3.3.tar.gz) = acbb6c4c303a9bd8428c7846545849f25d92bd76 -RMD160 (socat-1.7.3.3.tar.gz) = ed1e304fe3e0c7cffdab6dbb1f5f752c3dd53ca4 -SHA512 (socat-1.7.3.3.tar.gz) = b3ea4cb6081f7778a0281a3ec36ea7e5daf07dc19f2e0de08f767417112776e96e1bcac7962ebb6dd8b960ad91fc4a452f0da8327736d50e215e4ab43947ff78 -Size (socat-1.7.3.3.tar.gz) = 614101 bytes -SHA1 (patch-xio-termios.h) = dd07f9bbf96d0943e1a22fe4851f2f2336e7b828 +SHA1 (socat-1.7.3.4.tar.gz) = 2fa45073df61dd01b7ccbf2f8a8cc78580de7144 +RMD160 (socat-1.7.3.4.tar.gz) = b1cd5a3b893422b470d6a347a677f39835c7124d +SHA512 (socat-1.7.3.4.tar.gz) = c5699fd1a703e90927076599d02323b85722d49e86bc2f627b4301a41d3df72c634af629f378425ff201cde78343da5cd0cad1044bf857665176c91357401fdd +Size (socat-1.7.3.4.tar.gz) = 615381 bytes diff --git a/net/socat/patches/patch-xio-termios.h b/net/socat/patches/patch-xio-termios.h deleted file mode 100644 index d2474a17f99..00000000000 --- a/net/socat/patches/patch-xio-termios.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xio-termios.h,v 1.1 2019/06/25 16:43:47 schmonz Exp $ - -Use speed_t to match definition, fixing at least OS X build. - ---- xio-termios.h.orig 2019-04-04 08:59:55.000000000 +0000 -+++ xio-termios.h -@@ -148,7 +148,7 @@ extern int xiotermiosflag_applyopt(int f - extern int xiotermios_value(int fd, int word, tcflag_t mask, tcflag_t value); - extern int xiotermios_char(int fd, int n, unsigned char c); - #ifdef HAVE_TERMIOS_ISPEED --extern int xiotermios_speed(int fd, int n, unsigned int speed); -+extern int xiotermios_speed(int fd, int n, speed_t speed); - #endif - extern int xiotermios_spec(int fd, int optcode); - extern int xiotermios_flush(int fd); -- cgit v1.2.3