Minor update bug fixes, some patches now incorporated upstream. Builds on amd64.
Ok?
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/socat/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 2 Feb 2016 10:40:32 -0000 1.20 +++ Makefile 29 Mar 2017 20:31:40 -0000 @@ -2,7 +2,7 @@ COMMENT= relay for bidirectional data transfer -DISTNAME= socat-1.7.3.1 +DISTNAME= socat-1.7.3.2 CATEGORIES= net HOMEPAGE= http://www.dest-unreach.org/socat/ Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/socat/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 2 Feb 2016 10:40:32 -0000 1.14 +++ distinfo 29 Mar 2017 20:31:46 -0000 @@ -1,2 +1,2 @@ -SHA256 (socat-1.7.3.1.tar.gz) = qMsHsSvNBMmPT/wcaLeVR/XdTiPdzLEylA9tVVZcf3k= -SIZE (socat-1.7.3.1.tar.gz) = 606049 +SHA256 (socat-1.7.3.2.tar.gz) = zj78F+PlRIduvOfNbIWzwnn9oFeyhX/Kr2e5q4va8DQ= +SIZE (socat-1.7.3.2.tar.gz) = 611707 Index: patches/patch-doc_socat_1 =================================================================== RCS file: /home/cvs/ports/net/socat/patches/patch-doc_socat_1,v retrieving revision 1.7 diff -u -p -r1.7 patch-doc_socat_1 --- patches/patch-doc_socat_1 13 Apr 2015 14:43:28 -0000 1.7 +++ patches/patch-doc_socat_1 29 Aug 2017 20:52:00 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-doc_socat_1,v 1.7 2015/04/13 14:43:28 jasper Exp $ ---- doc/socat.1.orig Sat Jan 24 17:30:52 2015 -+++ doc/socat.1 Mon Apr 13 14:58:09 2015 -@@ -2904,10 +2904,6 @@ in this file\&. +--- doc/socat.1.orig Sun Jan 22 18:35:15 2017 ++++ doc/socat.1 Wed Mar 29 21:56:32 2017 +@@ -2905,10 +2905,6 @@ in this file\&. Specifies the directory with the trusted (root) certificates\&. The directory must contain certificates in PEM format and their hashes (see OpenSSL documentation) @@ -12,7 +12,7 @@ $OpenBSD: patch-doc_socat_1,v 1.7 2015/0 .IP "\fB\f(CWpseudo\fP\fP" On systems where openssl cannot find an entropy source and where no entropy gathering daemon can be utilized, this option activates a mechanism for -@@ -3397,11 +3393,11 @@ connection, invokes a shell\&. This shell has its stdi +@@ -3398,11 +3394,11 @@ connection, invokes a shell\&. This shell has its stdi connected to the TCP socket (nofork)\&. The shell starts filan and lets it print the socket addresses to stderr (your terminal window)\&. .IP @@ -26,7 +26,7 @@ $OpenBSD: patch-doc_socat_1,v 1.7 2015/0 to make the squid executable from Cygwin run under Windows, actual per May 2004)\&. .IP .IP "\fB\f(CWsocat \- tcp:www\&.blackhat\&.org:31337,readbytes=1000\fP\fP" -@@ -3524,11 +3520,11 @@ error\&. +@@ -3525,11 +3521,11 @@ error\&. .SH "FILES" .PP Index: patches/patch-doc_socat_html =================================================================== RCS file: /home/cvs/ports/net/socat/patches/patch-doc_socat_html,v retrieving revision 1.2 diff -u -p -r1.2 patch-doc_socat_html --- patches/patch-doc_socat_html 13 Apr 2015 14:43:28 -0000 1.2 +++ patches/patch-doc_socat_html 29 Aug 2017 20:53:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-doc_socat_html,v 1.2 2015/04/13 14:43:28 jasper Exp $ ---- doc/socat.html.orig Sat Jan 24 17:31:04 2015 -+++ doc/socat.html Mon Apr 13 14:58:09 2015 -@@ -2781,10 +2781,6 @@ These options apply to the <a href="socat.html#ADDRESS +--- doc/socat.html.orig Mon Jan 23 06:29:19 2017 ++++ doc/socat.html Wed Mar 29 21:56:32 2017 +@@ -2782,10 +2782,6 @@ These options apply to the <a href="socat.html#ADDRESS Specifies the directory with the trusted (root) certificates. The directory must contain certificates in PEM format and their hashes (see OpenSSL documentation) @@ -12,7 +12,7 @@ $OpenBSD: patch-doc_socat_html,v 1.2 201 <a name="OPTION_OPENSSL_PSEUDO"></a><p><dt><strong><strong><code>pseudo</code></strong></strong><dd> On systems where openssl cannot find an entropy source and where no entropy gathering daemon can be utilized, this option activates a mechanism for -@@ -3309,10 +3305,10 @@ connection, invokes a shell. This shell has its stdin +@@ -3310,10 +3306,10 @@ connection, invokes a shell. This shell has its stdin connected to the TCP socket (<a href="socat.html#OPTION_NOFORK">nofork</a>). The shell starts filan and lets it print the socket addresses to stderr (your terminal window). <p> @@ -25,7 +25,7 @@ $OpenBSD: patch-doc_socat_html,v 1.2 201 to make the squid executable from Cygwin run under Windows, actual per May 2004). <p> <p><dt><strong><strong><code>socat - tcp:www.blackhat.org:31337,readbytes=1000</code></strong></strong><dd> -@@ -3430,9 +3426,9 @@ error. +@@ -3431,9 +3427,9 @@ error. <a name="FILES"></a> <h2>FILES</h2> <p> Index: patches/patch-sslcls_c =================================================================== RCS file: patches/patch-sslcls_c diff -N patches/patch-sslcls_c --- patches/patch-sslcls_c 20 Jul 2015 01:12:09 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,53 +0,0 @@ -$OpenBSD: patch-sslcls_c,v 1.4 2015/07/20 01:12:09 jca Exp $ ---- sslcls.c.orig Sat Jan 24 03:15:22 2015 -+++ sslcls.c Sat Jul 18 20:01:59 2015 -@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) { - } - #endif - -+#ifdef HAVE_SSLv3_client_method - const SSL_METHOD *sycSSLv3_client_method(void) { - const SSL_METHOD *result; - Debug("SSLv3_client_method()"); -@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) { - Debug1("SSLv3_client_method() -> %p", result); - return result; - } -+#endif - -+#ifdef HAVE_SSLv3_server_method - const SSL_METHOD *sycSSLv3_server_method(void) { - const SSL_METHOD *result; - Debug("SSLv3_server_method()"); -@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) { - Debug1("SSLv3_server_method() -> %p", result); - return result; - } -+#endif - - const SSL_METHOD *sycSSLv23_client_method(void) { - const SSL_METHOD *result; -@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) { - return; - } - --int sycRAND_egd(const char *path) { -- int result; -- Debug1("RAND_egd(\"%s\")", path); -- result = RAND_egd(path); -- Debug1("RAND_egd() -> %d", result); -- return result; --} -- - DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) { - DH *result; - Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)", -@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) { - } - #endif /* WITH_FIPS */ - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) { - const COMP_METHOD *result; - Debug1("SSL_get_current_compression(%p)", ssl); Index: patches/patch-sslcls_h =================================================================== RCS file: /home/cvs/ports/net/socat/patches/patch-sslcls_h,v retrieving revision 1.3 diff -u -p -r1.3 patch-sslcls_h --- patches/patch-sslcls_h 13 Apr 2015 14:43:28 -0000 1.3 +++ patches/patch-sslcls_h 29 Mar 2017 20:53:02 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-sslcls_h,v 1.3 2015/04/13 14:43:28 jasper Exp $ ---- sslcls.h.orig Sat Jan 24 11:15:22 2015 -+++ sslcls.h Mon Apr 13 14:58:09 2015 +--- sslcls.h.orig Fri Jan 6 21:51:24 2017 ++++ sslcls.h Wed Mar 29 21:34:21 2017 @@ -47,7 +47,6 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl); int sycSSL_shutdown(SSL *ssl); void sycSSL_CTX_free(SSL_CTX *ctx); @@ -9,16 +9,7 @@ $OpenBSD: patch-sslcls_h,v 1.3 2015/04/1 DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u); -@@ -55,7 +54,7 @@ BIO *sycBIO_new_file(const char *filename, const char - - int sycFIPS_mode_set(int onoff); - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl); - const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl); - const char *sycSSL_COMP_get_name(const COMP_METHOD *comp); -@@ -98,7 +97,6 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *co +@@ -104,7 +103,6 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *co #define sycSSL_shutdown(s) SSL_shutdown(s) #define sycSSL_CTX_free(c) SSL_CTX_free(c) #define sycSSL_free(s) SSL_free(s) Index: patches/patch-test_sh =================================================================== RCS file: /home/cvs/ports/net/socat/patches/patch-test_sh,v retrieving revision 1.2 diff -u -p -r1.2 patch-test_sh --- patches/patch-test_sh 13 Apr 2015 14:43:28 -0000 1.2 +++ patches/patch-test_sh 29 Mar 2017 20:53:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-test_sh,v 1.2 2015/04/13 14:43:28 jasper Exp $ ---- test.sh.orig Sat Jan 24 11:15:22 2015 -+++ test.sh Mon Apr 13 14:58:09 2015 -@@ -576,9 +576,6 @@ filloptionvalues() { +--- test.sh.orig Sun Jan 22 18:07:10 2017 ++++ test.sh Wed Mar 29 21:34:21 2017 +@@ -577,9 +577,6 @@ filloptionvalues() { *,dh,*) OPTS=$(echo "$OPTS" |sed "s/,dh,/,dh=/tmp/hugo,/g");; esac case "$OPTS" in Index: patches/patch-xio-openssl_c =================================================================== RCS file: /home/cvs/ports/net/socat/patches/patch-xio-openssl_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-xio-openssl_c --- patches/patch-xio-openssl_c 2 Feb 2016 10:40:32 -0000 1.4 +++ patches/patch-xio-openssl_c 29 Mar 2017 20:53:02 -0000 @@ -1,23 +1,14 @@ $OpenBSD: patch-xio-openssl_c,v 1.4 2016/02/02 10:40:32 sthen Exp $ ---- xio-openssl.c.orig Fri Jan 29 10:28:38 2016 -+++ xio-openssl.c Mon Feb 1 16:30:57 2016 +--- xio-openssl.c.orig Sun Jan 8 10:39:56 2017 ++++ xio-openssl.c Wed Mar 29 21:50:33 2017 @@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key = { "open const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; -const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC }; - #if OPENSSL_VERSION_NUMBER >= 0x00908000L + #if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; -@@ -147,7 +146,7 @@ int xio_reset_fips_mode(void) { - static void openssl_conn_loginfo(SSL *ssl) { - Notice1("SSL connection using %s", SSL_get_cipher(ssl)); - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - { - const COMP_METHOD *comp, *expansion; - @@ -722,7 +721,6 @@ int char *opt_dhparam = NULL; /* file name of DH params */ char *opt_cafile = NULL; /* certificate authority file */ @@ -34,21 +25,24 @@ $OpenBSD: patch-xio-openssl_c,v 1.4 2016 retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); #if OPENSSL_VERSION_NUMBER >= 0x00908000L retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); -@@ -877,10 +874,6 @@ int +@@ -877,13 +874,6 @@ int } } - if (opt_egd) { +-#if !defined(OPENSSL_NO_EGD) && HAVE_RAND_egd - sycRAND_egd(opt_egd); +-#else +- Debug("RAND_egd() is not available by OpenSSL"); +-#endif - } -- + if (opt_pseudo) { long int randdata; - /* initialize libc random from actual microseconds */ -@@ -1105,7 +1098,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char - if (e == ((ERR_LIB_RAND<<24)| - (RAND_F_SSLEAY_RAND_BYTES<<12)| - (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) { +@@ -1136,7 +1126,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char + #endif + ) + { - Error("too few entropy; use options \"egd\" or \"pseudo\""); + Error("too few entropy; use option \"pseudo\""); stat = STAT_NORETRY; Index: patches/patch-xioopts_c =================================================================== RCS file: /home/cvs/ports/net/socat/patches/patch-xioopts_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-xioopts_c --- patches/patch-xioopts_c 13 Apr 2015 14:43:28 -0000 1.2 +++ patches/patch-xioopts_c 29 Mar 2017 20:53:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-xioopts_c,v 1.2 2015/04/13 14:43:28 jasper Exp $ ---- xioopts.c.orig Sat Jan 24 11:15:22 2015 -+++ xioopts.c Mon Apr 13 14:58:09 2015 -@@ -412,7 +412,6 @@ const struct optname optionnames[] = { +--- xioopts.c.orig Sun Jan 22 17:48:22 2017 ++++ xioopts.c Wed Mar 29 21:52:09 2017 +@@ -413,7 +413,6 @@ const struct optname optionnames[] = { #ifdef ECHOPRT IF_TERMIOS("echoprt", &opt_echoprt) #endif @@ -9,10 +9,10 @@ $OpenBSD: patch-xioopts_c,v 1.2 2015/04/ IF_ANY ("end-close", &opt_end_close) IF_TERMIOS("eof", &opt_veof) IF_TERMIOS("eol", &opt_veol) -@@ -1102,7 +1101,6 @@ const struct optname optionnames[] = { - IF_OPENSSL("openssl-compress", &opt_openssl_compress) +@@ -1104,7 +1103,6 @@ const struct optname optionnames[] = { #endif IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) + IF_OPENSSL("openssl-dhparams", &opt_openssl_dhparam) - IF_OPENSSL("openssl-egd", &opt_openssl_egd) #if WITH_FIPS IF_OPENSSL("openssl-fips", &opt_openssl_fips)
