diff --git a/srcpkgs/socat/patches/patch-sslcls_c b/srcpkgs/socat/patches/patch-sslcls_c deleted file mode 100644 index fa20a08b1ca..00000000000 --- a/srcpkgs/socat/patches/patch-sslcls_c +++ /dev/null @@ -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); diff --git a/srcpkgs/socat/patches/patch-sslcls_h b/srcpkgs/socat/patches/patch-sslcls_h deleted file mode 100644 index 2a0626d351b..00000000000 --- a/srcpkgs/socat/patches/patch-sslcls_h +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-sslcls_h,v 1.2 2014/07/12 14:30:20 pascal Exp $ ---- sslcls.h.orig Sun Jun 23 08:16:48 2013 -+++ sslcls.h Sat Jul 12 15:59:58 2014 -@@ -41,7 +41,6 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl); - int sycSSL_shutdown(SSL *ssl); - void sycSSL_CTX_free(SSL_CTX *ctx); - void sycSSL_free(SSL *ssl); --int sycRAND_egd(const char *path); - - DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u); - -@@ -49,7 +48,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); -@@ -92,7 +91,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) --#define sycRAND_egd(p) RAND_egd(p) - - #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u) - diff --git a/srcpkgs/socat/patches/patch-xio-openssl_c b/srcpkgs/socat/patches/patch-xio-openssl_c index 56f0d3e0503..c1fa3f1928e 100644 --- a/srcpkgs/socat/patches/patch-xio-openssl_c +++ b/srcpkgs/socat/patches/patch-xio-openssl_c @@ -1,56 +1,22 @@ -$OpenBSD: patch-xio-openssl_c,v 1.3.4.1 2016/02/02 10:41:06 sthen Exp $ ---- xio-openssl.c.orig Fri Jan 29 10:28:38 2016 -+++ xio-openssl.c Mon Feb 1 16:30:57 2016 -@@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key = { "open +--- xio-openssl.c.orig ++++ xio-openssl.c +@@ -108,7 +108,9 @@ 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 }; ++#if !defined(OPENSSL_NO_EGD) + const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; ++#endif 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 */ - char *opt_capath = NULL; /* certificate authority directory */ -- char *opt_egd = NULL; /* entropy gathering daemon socket path */ - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - char *opt_compress = NULL; /* compression method */ - #endif -@@ -741,7 +739,6 @@ int +@@ -741,7 +743,9 @@ retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); -- retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); ++#if !defined(OPENSSL_NO_EGD) + retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); ++#endif 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 - } - } - -- if (opt_egd) { -- sycRAND_egd(opt_egd); -- } -- - 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*/) { -- Error("too few entropy; use options \"egd\" or \"pseudo\""); -+ Error("too few entropy; use option \"pseudo\""); - stat = STAT_NORETRY; - } else { - Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf)); diff --git a/srcpkgs/socat/patches/patch-xio-openssl_h b/srcpkgs/socat/patches/patch-xio-openssl_h deleted file mode 100644 index d2372d0d329..00000000000 --- a/srcpkgs/socat/patches/patch-xio-openssl_h +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-xio-openssl_h,v 1.1 2014/04/24 15:17:08 sthen Exp $ ---- xio-openssl.h.orig Sun Jun 23 07:16:48 2013 -+++ xio-openssl.h Sat Apr 19 15:58:21 2014 -@@ -21,7 +21,6 @@ extern const struct optdesc opt_openssl_key; - extern const struct optdesc opt_openssl_dhparam; - extern const struct optdesc opt_openssl_cafile; - extern const struct optdesc opt_openssl_capath; --extern const struct optdesc opt_openssl_egd; - extern const struct optdesc opt_openssl_pseudo; - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - extern const struct optdesc opt_openssl_compress; diff --git a/srcpkgs/socat/patches/patch-xioopts_c b/srcpkgs/socat/patches/patch-xioopts_c index 0feb9717a43..088f67c67ce 100644 --- a/srcpkgs/socat/patches/patch-xioopts_c +++ b/srcpkgs/socat/patches/patch-xioopts_c @@ -1,7 +1,6 @@ -$OpenBSD: patch-xioopts_c,v 1.1 2014/04/24 15:17:08 sthen Exp $ ---- xioopts.c.orig Sun Mar 9 14:51:39 2014 -+++ xioopts.c Sat Apr 19 15:43:29 2014 -@@ -409,7 +409,6 @@ const struct optname optionnames[] = { +--- xioopts.c.orig ++++ xioopts.c +@@ -413,7 +413,6 @@ #ifdef ECHOPRT IF_TERMIOS("echoprt", &opt_echoprt) #endif @@ -9,10 +8,10 @@ $OpenBSD: patch-xioopts_c,v 1.1 2014/04/24 15:17:08 sthen Exp $ IF_ANY ("end-close", &opt_end_close) IF_TERMIOS("eof", &opt_veof) IF_TERMIOS("eol", &opt_veol) -@@ -1098,7 +1097,6 @@ const struct optname optionnames[] = { - IF_OPENSSL("openssl-compress", &opt_openssl_compress) +@@ -1104,7 +1103,6 @@ #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) diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index 7c12798be06..aa356551161 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -1,7 +1,7 @@ # Template file for 'socat' pkgname=socat -version=1.7.3.1 -revision=5 +version=1.7.3.2 +revision=1 build_style=gnu-configure configure_args="--disable-libwrap --enable-fips ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.dest-unreach.org/socat/" distfiles="http://www.dest-unreach.org/socat/download/socat-$version.tar.bz2" -checksum=d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa +checksum=e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 case "$XBPS_TARGET_MACHINE" in aarch64-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;