socat: Update from 1.7.3.0 to 1.7.3.2

diff --git a/packages/socat/build.sh b/packages/socat/build.sh
index cddb935..9ec09c6 100644 (file)
--- a/packages/socat/build.sh
+++ b/packages/socat/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://www.dest-unreach.org/socat/
 TERMUX_PKG_DESCRIPTION="Relay for bidirectional data transfer between two independent data channels"
 TERMUX_PKG_DEPENDS="openssl, readline, libutil"
-TERMUX_PKG_VERSION=1.7.3.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.7.3.2
 TERMUX_PKG_SRCURL=http://www.dest-unreach.org/socat/download/socat-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes ac_compiler_gnu=yes" # sc_cv_sys_crdly_shift=9 sc_cv_sys_csize_shift=4 sc_cv_sys_tabdly_shift=11"
 TERMUX_PKG_BUILD_IN_SRC=yes
 #TERMUX_PKG_HOSTBUILD=yes

diff --git a/packages/socat/sslcls.c.patch b/packages/socat/sslcls.c.patch
deleted file mode 100644 (file)
index f01461d..0000000
--- a/packages/socat/sslcls.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../socat-1.7.3.0/sslcls.c ./sslcls.c
---- ../socat-1.7.3.0/sslcls.c  2015-01-24 05:15:22.000000000 -0500
-+++ ./sslcls.c 2015-03-06 15:30:30.168143538 -0500
-@@ -375,7 +375,7 @@
- }
- #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/packages/socat/sslcls.h.patch b/packages/socat/sslcls.h.patch
deleted file mode 100644 (file)
index 57e9af7..0000000
--- a/packages/socat/sslcls.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../socat-1.7.3.0/sslcls.h ./sslcls.h
---- ../socat-1.7.3.0/sslcls.h  2015-01-24 05:15:22.000000000 -0500
-+++ ./sslcls.h 2015-03-06 15:30:17.128143529 -0500
-@@ -55,7 +55,7 @@
- 
- 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);

diff --git a/packages/socat/xio-openssl.c.patch b/packages/socat/xio-openssl.c.patch
deleted file mode 100644 (file)
index 542024f..0000000
--- a/packages/socat/xio-openssl.c.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -u -r ../socat-1.7.3.0/xio-openssl.c ./xio-openssl.c
---- ../socat-1.7.3.0/xio-openssl.c     2015-01-24 09:33:42.000000000 -0500
-+++ ./xio-openssl.c    2015-03-06 15:28:09.652143441 -0500
-@@ -110,7 +110,7 @@
- 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 };
- #endif
- #if WITH_FIPS
-@@ -147,7 +147,7 @@
- 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;
- 
-@@ -651,7 +651,7 @@
- #endif /* WITH_LISTEN */
- 
- 
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- /* In OpenSSL 0.9.7 compression methods could be added using
-  * SSL_COMP_add_compression_method(3), but the implemntation is not compatible
-  * with the standard (RFC3749).
-@@ -723,7 +723,7 @@
-    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
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
-    char *opt_compress = NULL; /* compression method */
- #endif
-    bool opt_pseudo = false;   /* use pseudo entropy if nothing else */
-@@ -743,7 +743,7 @@
-    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
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
-    retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
- #endif
- #if WITH_FIPS
-@@ -984,7 +984,7 @@
-    }
- #endif /* !defined(EC_KEY) */
- 
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
-    if (opt_compress) {
-       int result;
-       result = openssl_setup_compression(*ctx, opt_compress);

diff --git a/packages/socat/xioopts.c.patch b/packages/socat/xioopts.c.patch
deleted file mode 100644 (file)
index 7f779a0..0000000
--- a/packages/socat/xioopts.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r ../socat-1.7.3.0/xioopts.c ./xioopts.c
---- ../socat-1.7.3.0/xioopts.c 2015-01-24 05:15:22.000000000 -0500
-+++ ./xioopts.c        2015-03-06 15:33:38.792143669 -0500
-@@ -296,7 +296,7 @@
- #if WITH_EXT2 && defined(EXT2_COMPR_FL)
-       IF_ANY    ("compr",     &opt_ext2_compr)
- #endif
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
-       IF_OPENSSL("compress",  &opt_openssl_compress)
- #endif
- #ifdef TCP_CONN_ABORT_THRESHOLD  /* HP_UX */
-@@ -1098,7 +1098,7 @@
-       IF_OPENSSL("openssl-certificate",       &opt_openssl_certificate)
-       IF_OPENSSL("openssl-cipherlist",        &opt_openssl_cipherlist)
-       IF_OPENSSL("openssl-commonname",        &opt_openssl_commonname)
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
-       IF_OPENSSL("openssl-compress",  &opt_openssl_compress)
- #endif
-       IF_OPENSSL("openssl-dhparam",   &opt_openssl_dhparam)