From 73918f60c39641b8638054f207152a890533eee0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 24 Jul 2014 14:55:18 +0200 Subject: [PATCH] socat: switch to libressl with OpenBSD patches. --- srcpkgs/socat/patches/patch-doc_xio_help | 23 ++++++++++ srcpkgs/socat/patches/patch-sslcls_c | 27 +++++++++++ srcpkgs/socat/patches/patch-sslcls_h | 28 ++++++++++++ srcpkgs/socat/patches/patch-xio-openssl_c | 56 +++++++++++++++++++++++ srcpkgs/socat/patches/patch-xio-openssl_h | 11 +++++ srcpkgs/socat/patches/patch-xioopts_c | 19 ++++++++ srcpkgs/socat/patches/patch-xioopts_h | 11 +++++ srcpkgs/socat/template | 4 +- 8 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/socat/patches/patch-doc_xio_help create mode 100644 srcpkgs/socat/patches/patch-sslcls_c create mode 100644 srcpkgs/socat/patches/patch-sslcls_h create mode 100644 srcpkgs/socat/patches/patch-xio-openssl_c create mode 100644 srcpkgs/socat/patches/patch-xio-openssl_h create mode 100644 srcpkgs/socat/patches/patch-xioopts_c create mode 100644 srcpkgs/socat/patches/patch-xioopts_h diff --git a/srcpkgs/socat/patches/patch-doc_xio_help b/srcpkgs/socat/patches/patch-doc_xio_help new file mode 100644 index 0000000000..5a664d294f --- /dev/null +++ b/srcpkgs/socat/patches/patch-doc_xio_help @@ -0,0 +1,23 @@ +$OpenBSD: patch-doc_xio_help,v 1.1 2014/04/24 15:17:08 sthen Exp $ +--- doc/xio.help.orig Sun Jun 23 07:16:48 2013 ++++ doc/xio.help Sat Apr 19 15:47:37 2014 +@@ -4566,19 +4566,6 @@ must contain certificates in PEM format and their hash + documentation) + + +-Option: openssl-egd=file +-Aliases: egd +- +-Type: FILENAME +-Option group: OPENSSL +-Phase: SPEC +-Platforms: (depends on openssl installation) +- +-On some systems, openssl requires an explicit source of random data. Specify +-the socket name where an entropy gathering daemon like egd provides random +-data, e.g. /dev/egd-pool. +- +- + Option: openssl-pseudo + Aliases: pseudo + diff --git a/srcpkgs/socat/patches/patch-sslcls_c b/srcpkgs/socat/patches/patch-sslcls_c new file mode 100644 index 0000000000..1cc907bf7a --- /dev/null +++ b/srcpkgs/socat/patches/patch-sslcls_c @@ -0,0 +1,27 @@ +$OpenBSD: patch-sslcls_c,v 1.2 2014/07/12 14:30:20 pascal Exp $ +--- sslcls.c.orig Sat Feb 8 20:23:33 2014 ++++ sslcls.c Sat Jul 12 16:01:25 2014 +@@ -275,14 +275,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)", +@@ -319,7 +311,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 new file mode 100644 index 0000000000..2a0626d351 --- /dev/null +++ b/srcpkgs/socat/patches/patch-sslcls_h @@ -0,0 +1,28 @@ +$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 new file mode 100644 index 0000000000..c9e1706e3e --- /dev/null +++ b/srcpkgs/socat/patches/patch-xio-openssl_c @@ -0,0 +1,56 @@ +$OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $ +--- xio-openssl.c.orig Sun Mar 2 20:26:45 2014 ++++ xio-openssl.c Sat Jul 12 16:00:50 2014 +@@ -102,7 +102,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 + const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; +@@ -140,7 +139,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; + +@@ -697,7 +696,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 +@@ -716,7 +714,6 @@ int + 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); + retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); + #if OPENSSL_VERSION_NUMBER >= 0x00908000L + retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); +@@ -796,10 +793,6 @@ int + } + } + +- if (opt_egd) { +- sycRAND_egd(opt_egd); +- } +- + if (opt_pseudo) { + long int randdata; + /* initialize libc random from actual microseconds */ +@@ -979,7 +972,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 options \"pseudo\""); + return 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 new file mode 100644 index 0000000000..d2372d0d32 --- /dev/null +++ b/srcpkgs/socat/patches/patch-xio-openssl_h @@ -0,0 +1,11 @@ +$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 new file mode 100644 index 0000000000..0feb9717a4 --- /dev/null +++ b/srcpkgs/socat/patches/patch-xioopts_c @@ -0,0 +1,19 @@ +$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[] = { + #ifdef ECHOPRT + IF_TERMIOS("echoprt", &opt_echoprt) + #endif +- IF_OPENSSL("egd", &opt_openssl_egd) + 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) + #endif + IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) +- IF_OPENSSL("openssl-egd", &opt_openssl_egd) + #if WITH_FIPS + IF_OPENSSL("openssl-fips", &opt_openssl_fips) + #endif diff --git a/srcpkgs/socat/patches/patch-xioopts_h b/srcpkgs/socat/patches/patch-xioopts_h new file mode 100644 index 0000000000..07aea73a14 --- /dev/null +++ b/srcpkgs/socat/patches/patch-xioopts_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-xioopts_h,v 1.1 2014/04/24 15:17:08 sthen Exp $ +--- xioopts.h.orig Sun Jun 23 07:16:48 2013 ++++ xioopts.h Sat Apr 19 15:55:57 2014 +@@ -477,7 +477,6 @@ enum e_optcode { + OPT_OPENSSL_COMPRESS, + #endif + OPT_OPENSSL_DHPARAM, +- OPT_OPENSSL_EGD, + OPT_OPENSSL_FIPS, + OPT_OPENSSL_KEY, + OPT_OPENSSL_METHOD, diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index 884620fdf0..a851f9f6d1 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -1,13 +1,13 @@ # Template file for 'socat' pkgname=socat version=1.7.2.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-libwrap --enable-fips ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 ac_cv_ispeed_offset=13" -makedepends="readline-devel>=6.3 openssl-devel" +makedepends="readline-devel>=6.3 libressl-devel" short_desc="Relay for bidirectional data transfer between two independent data channels" maintainer="Juan RP " license="GPL-3"