Mon May 18 11:19:13 2020 UTC ()
socat: Update to 1.7.3.4

####################### 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.


(nia)
diff -r1.43 -r1.44 pkgsrc/net/socat/Makefile
diff -r1.27 -r1.28 pkgsrc/net/socat/distinfo
diff -r1.1 -r0 pkgsrc/net/socat/patches/patch-xio-termios.h
cvs diff -r1.43 -r1.44 pkgsrc/net/socat/Makefile (switch to unified diff)

--- pkgsrc/net/socat/Makefile 2020/02/09 13:19:10 1.43
+++ pkgsrc/net/socat/Makefile 2020/05/18 11:19:13 1.44
@@ -1,42 +1,41 @@ @@ -1,42 +1,41 @@
1# $NetBSD: Makefile,v 1.43 2020/02/09 13:19:10 jdolecek Exp $ 1# $NetBSD: Makefile,v 1.44 2020/05/18 11:19:13 nia Exp $
2 2
3DISTNAME= socat-1.7.3.3 3DISTNAME= socat-1.7.3.4
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= http://www.dest-unreach.org/socat/download/ 5MASTER_SITES= http://www.dest-unreach.org/socat/download/
7 6
8MAINTAINER= leot@NetBSD.org 7MAINTAINER= leot@NetBSD.org
9HOMEPAGE= http://www.dest-unreach.org/socat/ 8HOMEPAGE= http://www.dest-unreach.org/socat/
10COMMENT= "netcat++" (extended design, new implementation) 9COMMENT= "netcat++" (extended design, new implementation)
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13GNU_CONFIGURE= YES 12GNU_CONFIGURE= YES
14 13
15USE_TOOLS+= bash:test 14USE_TOOLS+= bash:test
16REPLACE_BASH+= *.sh 15REPLACE_BASH+= *.sh
17 16
18TEST_TARGET= test 17TEST_TARGET= test
19 18
20.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
21 20
22CONFIGURE_ARGS+= --disable-libwrap 21CONFIGURE_ARGS+= --disable-libwrap
23 22
24.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD" 23.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
25# XXX Kludge -- the right fix is to make socat not depend on these constants. 24# XXX Kludge -- the right fix is to make socat not depend on these constants.
26CONFIGURE_ENV+= sc_cv_sys_crdly_shift=-1 25CONFIGURE_ENV+= sc_cv_sys_crdly_shift=-1
27CONFIGURE_ENV+= sc_cv_sys_tabdly_shift=-1 26CONFIGURE_ENV+= sc_cv_sys_tabdly_shift=-1
28CONFIGURE_ENV+= sc_cv_sys_csize_shift=8 27CONFIGURE_ENV+= sc_cv_sys_csize_shift=8
29CONFIGURE_ENV+= ac_cv_ispeed_offset=9 28CONFIGURE_ENV+= ac_cv_ispeed_offset=9
30.endif 29.endif
31 30
32SUBST_CLASSES+= paths 31SUBST_CLASSES+= paths
33SUBST_MESSAGE.paths= Fixing hardcoded paths. 32SUBST_MESSAGE.paths= Fixing hardcoded paths.
34SUBST_STAGE.paths= pre-configure 33SUBST_STAGE.paths= pre-configure
35SUBST_FILES.paths= doc/socat.1 34SUBST_FILES.paths= doc/socat.1
36SUBST_SED.paths= -e 's,/usr/,${PREFIX}/,g' 35SUBST_SED.paths= -e 's,/usr/,${PREFIX}/,g'
37 36
38.include "options.mk" 37.include "options.mk"
39 38
40.include "../../security/openssl/buildlink3.mk" 39.include "../../security/openssl/buildlink3.mk"
41.include "../../devel/readline/buildlink3.mk" 40.include "../../devel/readline/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/net/socat/distinfo (switch to unified diff)

--- pkgsrc/net/socat/distinfo 2019/06/25 16:43:47 1.27
+++ pkgsrc/net/socat/distinfo 2020/05/18 11:19:13 1.28
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.27 2019/06/25 16:43:47 schmonz Exp $ 1$NetBSD: distinfo,v 1.28 2020/05/18 11:19:13 nia Exp $
2 2
3SHA1 (socat-1.7.3.3.tar.gz) = acbb6c4c303a9bd8428c7846545849f25d92bd76 3SHA1 (socat-1.7.3.4.tar.gz) = 2fa45073df61dd01b7ccbf2f8a8cc78580de7144
4RMD160 (socat-1.7.3.3.tar.gz) = ed1e304fe3e0c7cffdab6dbb1f5f752c3dd53ca4 4RMD160 (socat-1.7.3.4.tar.gz) = b1cd5a3b893422b470d6a347a677f39835c7124d
5SHA512 (socat-1.7.3.3.tar.gz) = b3ea4cb6081f7778a0281a3ec36ea7e5daf07dc19f2e0de08f767417112776e96e1bcac7962ebb6dd8b960ad91fc4a452f0da8327736d50e215e4ab43947ff78 5SHA512 (socat-1.7.3.4.tar.gz) = c5699fd1a703e90927076599d02323b85722d49e86bc2f627b4301a41d3df72c634af629f378425ff201cde78343da5cd0cad1044bf857665176c91357401fdd
6Size (socat-1.7.3.3.tar.gz) = 614101 bytes 6Size (socat-1.7.3.4.tar.gz) = 615381 bytes
7SHA1 (patch-xio-termios.h) = dd07f9bbf96d0943e1a22fe4851f2f2336e7b828 
File Deleted: pkgsrc/net/socat/patches/Attic/patch-xio-termios.h