socat: update to 1.8.0.0

void-linux · May 22, 2024 · 0f052eb · 0f052eb
1 parent 00abde7
commit 0f052eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/srcpkgs/socat/patches/patch-doc_xio_help.diff b/srcpkgs/socat/patches/patch-doc_xio_help.diff
diff --git a/srcpkgs/socat/patches/patch-xio-openssl_c.diff b/srcpkgs/socat/patches/patch-xio-openssl_c.diff
@@ -1,16 +1,18 @@
+diff --git a/xio-openssl.c b/xio-openssl.c
+index 0205146c37a..56b72e8cf69 100644
 --- a/xio-openssl.c
 +++ b/xio-openssl.c
-@@ -108,7 +108,9 @@
+@@ -122,7 +122,9 @@ const struct optdesc opt_openssl_key         = { "openssl-key",         "key",
  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 };
 +#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 && !defined(OPENSSL_NO_COMP)
- const struct optdesc opt_openssl_compress    = { "openssl-compress",   "compress", OPT_OPENSSL_COMPRESS,  GROUP_OPENSSL, PH_SPEC, TYPE_STRING,   OFUNC_SPEC };
-@@ -741,7 +743,9 @@
+ #if HAVE_SSL_CTX_set_tlsext_max_fragment_length || defined(SSL_CTX_set_tlsext_max_fragment_length)
+ const struct optdesc opt_openssl_maxfraglen  = { "openssl-maxfraglen",  "maxfraglen",  OPT_OPENSSL_MAXFRAGLEN,  GROUP_OPENSSL, PH_SPEC, TYPE_INT, OFUNC_SPEC };
+ #endif
+@@ -1008,7 +1010,9 @@ 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);

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
@@ -1,7 +1,7 @@
 # Template file for 'socat'
 pkgname=socat
-version=1.7.4.4
-revision=2
+version=1.8.0.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
@@ -10,9 +10,9 @@ short_desc="Relay for bidirectional data transfer between two independent channe
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
-changelog="http://www.dest-unreach.org/socat/doc/CHANGES"
+changelog="http://www.dest-unreach.org/socat/CHANGES"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
-checksum=fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac
+checksum=e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H"