[PR PATCH] socat: update to 1.8.0.0

[PR PATCH] socat: update to 1.8.0.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages socat
https://github.com/void-linux/void-packages/pull/50379

socat: update to 1.8.0.0
#### Testing the changes
- I tested the changes in this PR: **YES**



A patch file from https://github.com/void-linux/void-packages/pull/50379.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-socat-50379.patch --]
[-- Type: text/x-diff, Size: 4340 bytes --]

From d2ccf178ac89efda4437d67b3792cc9726a0e888 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 16 May 2024 21:16:12 -0400
Subject: [PATCH] socat: update to 1.8.0.0

---
 srcpkgs/socat/patches/patch-doc_xio_help.diff | 23 -------------------
 .../socat/patches/patch-xio-openssl_c.diff    | 12 ++++++----
 srcpkgs/socat/template                        |  6 ++---
 3 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/socat/patches/patch-doc_xio_help.diff

diff --git a/srcpkgs/socat/patches/patch-doc_xio_help.diff b/srcpkgs/socat/patches/patch-doc_xio_help.diff
deleted file mode 100644
index 47caa127b34f8d..00000000000000
--- a/srcpkgs/socat/patches/patch-doc_xio_help.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-doc_xio_help,v 1.1 2014/04/24 15:17:08 sthen Exp $
---- a/doc/xio.help	Sun Jun 23 07:16:48 2013
-+++ b/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-xio-openssl_c.diff b/srcpkgs/socat/patches/patch-xio-openssl_c.diff
index 9a25301aa13b49..c7ec339035972b 100644
--- 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
index f062b8c3111b37..1ea691f5d6e7a8 100644
--- 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"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 changelog="http://www.dest-unreach.org/socat/doc/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"

Re: socat: update to 1.8.0.0

[balejk]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by balejk on void-packages repository

https://github.com/void-linux/void-packages/pull/50379#issuecomment-2117287628

Comment:
The changelog location seems to have changed to http://www.dest-unreach.org/socat/CHANGES.

Re: [PR PATCH] [Updated] socat: update to 1.8.0.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages socat
https://github.com/void-linux/void-packages/pull/50379

socat: update to 1.8.0.0
#### Testing the changes
- I tested the changes in this PR: **YES**



A patch file from https://github.com/void-linux/void-packages/pull/50379.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-socat-50379.patch --]
[-- Type: text/x-diff, Size: 4525 bytes --]

From d983faf77e6b42110d6b4d0f6dc835cbcad72592 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 May 2024 21:04:09 -0400
Subject: [PATCH] socat: update to 1.8.0.0

---
 srcpkgs/socat/patches/patch-doc_xio_help.diff | 23 -------------------
 .../socat/patches/patch-xio-openssl_c.diff    | 12 ++++++----
 srcpkgs/socat/template                        |  8 +++----
 3 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/socat/patches/patch-doc_xio_help.diff

diff --git a/srcpkgs/socat/patches/patch-doc_xio_help.diff b/srcpkgs/socat/patches/patch-doc_xio_help.diff
deleted file mode 100644
index 47caa127b34f8d..00000000000000
--- a/srcpkgs/socat/patches/patch-doc_xio_help.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-doc_xio_help,v 1.1 2014/04/24 15:17:08 sthen Exp $
---- a/doc/xio.help	Sun Jun 23 07:16:48 2013
-+++ b/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-xio-openssl_c.diff b/srcpkgs/socat/patches/patch-xio-openssl_c.diff
index 9a25301aa13b49..c7ec339035972b 100644
--- 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
index f062b8c3111b37..d3ca9e3fb6b29a 100644
--- 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"

Re: [PR PATCH] [Merged]: socat: update to 1.8.0.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

There's a merged pull request on the void-packages repository

socat: update to 1.8.0.0
https://github.com/void-linux/void-packages/pull/50379

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**