* Re: [PR REVIEW] socat: update to 1.7.4.4.
2022-11-30 17:33 [PR PATCH] socat: update to 1.7.4.4 rhynix
@ 2022-12-02 3:28 ` classabbyamp
2022-12-02 10:19 ` [PR PATCH] [Updated] " rhynix
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-12-02 3:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40859#discussion_r1037754910
Comment:
```suggestion
homepage="http://www.dest-unreach.org/socat/"
changelog="http://www.dest-unreach.org/socat/doc/CHANGES"
```
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] socat: update to 1.7.4.4.
2022-11-30 17:33 [PR PATCH] socat: update to 1.7.4.4 rhynix
2022-12-02 3:28 ` [PR REVIEW] " classabbyamp
@ 2022-12-02 10:19 ` rhynix
2022-12-02 17:00 ` classabbyamp
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: rhynix @ 2022-12-02 10:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
There is an updated pull request by rhynix against master on the void-packages repository
https://github.com/rhynix/void-packages socat-1.7.4.4
https://github.com/void-linux/void-packages/pull/40859
socat: update to 1.7.4.4.
The extra `configure_args` for musl is no longer necessary since this has been fixed upstream.
See: https://repo.or.cz/socat.git/commit/75cb44bc90577c3487458564ca803163681319f1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- aarch64 (crossbuild)
- armv7l-musl (crossbuild)
- armv7l (crossbuild)
- x86_64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/40859.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-socat-1.7.4.4-40859.patch --]
[-- Type: text/x-diff, Size: 2231 bytes --]
From c98861383537e881032c4192653b99c4bdf3c783 Mon Sep 17 00:00:00 2001
From: Rik Tonnard <rik@tonnard.nl>
Date: Wed, 30 Nov 2022 18:23:48 +0100
Subject: [PATCH 1/2] socat: update to 1.7.4.4.
The extra configure_args for musl is no longer necessary since this has
been fixed upstream.
See: https://repo.or.cz/socat.git/commit/75cb44bc90577c3487458564ca803163681319f1
---
srcpkgs/socat/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 44fe3e4ce6d6..639ebf28042b 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,6 +1,6 @@
# Template file for 'socat'
pkgname=socat
-version=1.7.4.3
+version=1.7.4.4
revision=1
build_style=gnu-configure
configure_args="--disable-libwrap --enable-fips
@@ -11,11 +11,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.dest-unreach.org/socat/"
distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
-checksum=d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007
+checksum=fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac
case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS="-D_LINUX_IF_ETHER_H"
- configure_args+=" sc_cv_getprotobynumber_r=2"
;;
esac
From ef7605a03f2898af11a72fb0886ab9995cd096f8 Mon Sep 17 00:00:00 2001
From: Rik Tonnard <rik.tonnard@me.com>
Date: Fri, 2 Dec 2022 11:19:21 +0100
Subject: [PATCH 2/2] socat: add changelog url
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/socat/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 639ebf28042b..4fb85008f756 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -10,6 +10,7 @@ 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"
distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
checksum=fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: socat: update to 1.7.4.4.
2022-11-30 17:33 [PR PATCH] socat: update to 1.7.4.4 rhynix
2022-12-02 3:28 ` [PR REVIEW] " classabbyamp
2022-12-02 10:19 ` [PR PATCH] [Updated] " rhynix
@ 2022-12-02 17:00 ` classabbyamp
2022-12-02 17:05 ` [PR PATCH] [Updated] " rhynix
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-12-02 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40859#issuecomment-1335538873
Comment:
please squash into one commit
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] socat: update to 1.7.4.4.
2022-11-30 17:33 [PR PATCH] socat: update to 1.7.4.4 rhynix
` (2 preceding siblings ...)
2022-12-02 17:00 ` classabbyamp
@ 2022-12-02 17:05 ` rhynix
2022-12-02 17:06 ` rhynix
2022-12-02 17:36 ` [PR PATCH] [Merged]: " classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: rhynix @ 2022-12-02 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
There is an updated pull request by rhynix against master on the void-packages repository
https://github.com/rhynix/void-packages socat-1.7.4.4
https://github.com/void-linux/void-packages/pull/40859
socat: update to 1.7.4.4.
The extra `configure_args` for musl is no longer necessary since this has been fixed upstream.
See: https://repo.or.cz/socat.git/commit/75cb44bc90577c3487458564ca803163681319f1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- aarch64 (crossbuild)
- armv7l-musl (crossbuild)
- armv7l (crossbuild)
- x86_64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/40859.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-socat-1.7.4.4-40859.patch --]
[-- Type: text/x-diff, Size: 1438 bytes --]
From b2c37d2a901024232a0d26749f942e6434c1c8c0 Mon Sep 17 00:00:00 2001
From: Rik Tonnard <rik@tonnard.nl>
Date: Wed, 30 Nov 2022 18:23:48 +0100
Subject: [PATCH] socat: update to 1.7.4.4.
The extra configure_args for musl is no longer necessary since this has
been fixed upstream.
See: https://repo.or.cz/socat.git/commit/75cb44bc90577c3487458564ca803163681319f1
---
srcpkgs/socat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 44fe3e4ce6d6..4fb85008f756 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,6 +1,6 @@
# Template file for 'socat'
pkgname=socat
-version=1.7.4.3
+version=1.7.4.4
revision=1
build_style=gnu-configure
configure_args="--disable-libwrap --enable-fips
@@ -10,12 +10,12 @@ 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"
distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
-checksum=d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007
+checksum=fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac
case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS="-D_LINUX_IF_ETHER_H"
- configure_args+=" sc_cv_getprotobynumber_r=2"
;;
esac
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: socat: update to 1.7.4.4.
2022-11-30 17:33 [PR PATCH] socat: update to 1.7.4.4 rhynix
` (3 preceding siblings ...)
2022-12-02 17:05 ` [PR PATCH] [Updated] " rhynix
@ 2022-12-02 17:06 ` rhynix
2022-12-02 17:36 ` [PR PATCH] [Merged]: " classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: rhynix @ 2022-12-02 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by rhynix on void-packages repository
https://github.com/void-linux/void-packages/pull/40859#issuecomment-1335546513
Comment:
the commits have been squashed; also rebased on the latest master
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Merged]: socat: update to 1.7.4.4.
2022-11-30 17:33 [PR PATCH] socat: update to 1.7.4.4 rhynix
` (4 preceding siblings ...)
2022-12-02 17:06 ` rhynix
@ 2022-12-02 17:36 ` classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-12-02 17:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 733 bytes --]
There's a merged pull request on the void-packages repository
socat: update to 1.7.4.4.
https://github.com/void-linux/void-packages/pull/40859
Description:
The extra `configure_args` for musl is no longer necessary since this has been fixed upstream.
See: https://repo.or.cz/socat.git/commit/75cb44bc90577c3487458564ca803163681319f1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- aarch64 (crossbuild)
- armv7l-musl (crossbuild)
- armv7l (crossbuild)
- x86_64 (crossbuild)
^ permalink raw reply [flat|nested] 7+ messages in thread