diff options
| author | leot <leot@pkgsrc.org> | 2022-07-23 15:40:33 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2022-07-23 15:40:33 +0000 |
| commit | c5837c3e56bcb51b956cb64064beeaa644b4c0d2 (patch) | |
| tree | 9932882dd337c2b2d3544244184465b8fa2b3294 /net/socat | |
| parent | 47b27c68e12b4ecb0bd6ce4ed747b93def6db053 (diff) | |
| download | pkgsrc-c5837c3e56bcb51b956cb64064beeaa644b4c0d2.tar.gz | |
socat: Update to 0.0.12
pkgsrc changes:
- Remove hopefully no longer needed patch-fdname.c, Solaris support should be
now properly handled by upstream too
Changes:
1.7.4.3
-------
Fixes the TCP_INFO issue that broke building on non-Linux platforms. Furthermore,
building on AIX works again. A few more corrections and improvements have been
added.
1.7.4.2
-------
Fixes a lot of bugs, e.g., for options -r and -R.
Diffstat (limited to 'net/socat')
| -rw-r--r-- | net/socat/Makefile | 5 | ||||
| -rw-r--r-- | net/socat/distinfo | 9 | ||||
| -rw-r--r-- | net/socat/patches/patch-fdname.c | 28 |
3 files changed, 6 insertions, 36 deletions
diff --git a/net/socat/Makefile b/net/socat/Makefile index 9be25f29a93..9c4fa7cbd41 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.47 2022/04/03 10:29:41 riastradh Exp $ +# $NetBSD: Makefile,v 1.48 2022/07/23 15:40:33 leot Exp $ -DISTNAME= socat-1.7.4.1 -PKGREVISION= 1 +DISTNAME= socat-1.7.4.3 CATEGORIES= net MASTER_SITES= http://www.dest-unreach.org/socat/download/ diff --git a/net/socat/distinfo b/net/socat/distinfo index 415560aa75b..e95f53ac9cc 100644 --- a/net/socat/distinfo +++ b/net/socat/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.34 2022/04/03 10:29:41 riastradh Exp $ +$NetBSD: distinfo,v 1.35 2022/07/23 15:40:33 leot Exp $ -BLAKE2s (socat-1.7.4.1.tar.gz) = 40fc322f89ca333a35c77cb25d71512404bfd116d36aecedb1773201f37b5d2e -SHA512 (socat-1.7.4.1.tar.gz) = e43c8b23a841aea5ecc3ac324185ee4ada552a8284ec41b99245def2d8b493bca9caea1af6f646f434a7eda67a1dd71e4e037eea65fce0444840236eadb126a6 -Size (socat-1.7.4.1.tar.gz) = 648888 bytes +BLAKE2s (socat-1.7.4.3.tar.gz) = 4fadaae253185c23ce27765d3bbe6744889d8b9f1cc660bc7ebff939916d1d9f +SHA512 (socat-1.7.4.3.tar.gz) = 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046 +Size (socat-1.7.4.3.tar.gz) = 655520 bytes SHA1 (patch-config.h.in) = e0cb8c4075ca96863e458f1c2384dc7a6b69e928 SHA1 (patch-configure) = ba75b5f192c1359220bea019fa50603b2b5c7c3a -SHA1 (patch-fdname.c) = c59bd921989e4d84375764fdd707b7cd6c49ceba SHA1 (patch-sysincludes.h) = d48307ade6bc82bea946920e7336bc5329714c08 SHA1 (patch-sysutils.c) = 03ae8b81f0277d8dbbdf82e5b215d7099b25cc36 SHA1 (patch-xio-openssl.c) = 26745eff5eab745ac45eb04b2243b0bc4bfd6b8d diff --git a/net/socat/patches/patch-fdname.c b/net/socat/patches/patch-fdname.c deleted file mode 100644 index eb5d97de69c..00000000000 --- a/net/socat/patches/patch-fdname.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-fdname.c,v 1.1 2021/01/08 08:47:29 otis Exp $ - -Use correct prototype for getprotobynumber_r() on SunOS - ---- fdname.c.orig 2021-01-03 18:23:22.000000000 +0000 -+++ fdname.c -@@ -232,7 +232,7 @@ int sockname(int fd, FILE *outfile, char - /*Linux struct ifreq ifc = {{{ 0 }}};*/ - struct ifreq ifc = {{ 0 }}; - #endif -- int rc; -+ int rc = 0; - - #if defined(SO_PROTOCOL) || defined(SO_PROTOTYPE) - optlen = sizeof(proto); -@@ -254,7 +254,12 @@ int sockname(int fd, FILE *outfile, char - - #if defined(SO_PROTOCOL) || defined(SO_PROTOTYPE) - #if HAVE_GETPROTOBYNUMBER_R -+#if defined(__sun) -+ protoentp = getprotobynumber_r(proto, &protoent, protoname, sizeof(protoname)); -+ rc = errno; -+#else - rc = getprotobynumber_r(proto, &protoent, protoname, sizeof(protoname), &protoentp); -+#endif - if (protoentp == NULL) { - Warn2("sockname(): getprotobynumber_r(proto=%d, ...): %s", - proto, strerror(rc)); |