diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest index 9ed4a2f92b..ad64f13732 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest @@ -1,3 +1 @@ -DIST socat-1.8.0.3.tar.bz2 594396 BLAKE2B a152b1da6332ff925299deca2e39c09e7c3042e14a87b2d6f6fb6c263489291be54ed001d37908767b3164140de262b702a65833c792b1e607781dc5e89e0fdf SHA512 6425c42cf4a3cbe253d238213d11e7daae8f8a09fcce2634c8ce220bb3352a824a80ecfa36330007cf5c537f60fea057e9f68410bccb843ff4666e775c5dcd8e -DIST socat-1.8.1.0.tar.bz2 606066 BLAKE2B 616814d9da8fb0bd7b7e02a65e4e5c4d9d0a5380f85d8151af5a0146e1497c8c4829a7c10ee2e26239bbfa7fa29011c24f6bbf10e59374a9e9db872d3739c2e9 SHA512 d53ee4c881efd564a86a6224c061a634ec17b96ddf419cbbfe6966db537cd452ebe81f33e265855537c3e55de026720cd9f1a4359f6ec04c5d890b600aef3a58 DIST socat-1.8.1.1.tar.bz2 606348 BLAKE2B 877231c973e55e401637aee78edd637e0f66097eb472033d65be8f2ec07e26f6e7f8416e867ff2fa55be6c4dc52764bf3c340f14120322e5cdd04dead1e795ac SHA512 2e87225454365c1396da704a546566681076585a921847a2808d58c9ae8e5d7ad3ac28c321d2d0223b5711762a375dd84893dc67902c355fcce0e4a080909940 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.8.1.0-const.patch b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.8.1.0-const.patch deleted file mode 100644 index c6a7d0e292..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.8.1.0-const.patch +++ /dev/null @@ -1,28 +0,0 @@ -Bug: https://bugs.gentoo.org/969295 - -diff --git a/filan.c b/filan.c -index 101940a..85db9b4 100644 ---- a/filan.c -+++ b/filan.c -@@ -1105,7 +1105,7 @@ const char *getfiletypestring(int st_mode) { - } - - static int printtime(FILE *outfile, time_t time) { -- const char *s; -+ char *s; - - if (filan_rawoutput) { - fprintf(outfile, "\t"F_time, time); -diff --git a/xio-ip6.c b/xio-ip6.c -index 7d7e286..e66a3e4 100644 ---- a/xio-ip6.c -+++ b/xio-ip6.c -@@ -117,7 +117,7 @@ int xioparsenetwork_ip6( - struct xiorange *range, - const int ai_flags[2]) - { -- char *delimpos; /* absolute address of delimiter */ -+ const char *delimpos; /* absolute address of delimiter */ - size_t delimind; /* index of delimiter in string */ - unsigned int bits; /* netmask bits */ - char *endptr; diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.8.1.0-musl-fix.patch b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.8.1.0-musl-fix.patch deleted file mode 100644 index f5178c45bc..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.8.1.0-musl-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -From https://bugs.gentoo.org/968110 -From: Bobby Bingham -Date: Sun, 28 Dec 2025 11:03:28 -0600 -Subject: [PATCH] don't assume order of fields in struct msghdr - -Fixes compilation on musl. ---- a/xio-netlink.c -+++ b/xio-netlink.c -@@ -30,7 +30,7 @@ int xio_netlink_mtu( - struct nlmsghdr buf[8192/sizeof(struct nlmsghdr)]; - struct iovec iov = { buf, sizeof(buf) }; - struct sockaddr_nl sa; -- struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 }; -+ struct msghdr rtmsg = { .msg_name = &sa, .msg_namelen = sizeof(sa), .msg_iov = &iov, .msg_iovlen = 1 }; - struct nlmsghdr *nh; - - Info2("Setting interface %d MTU to %u using netlink", interface_index, mtu); --- -2.52.0 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.0.3.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.0.3.ebuild deleted file mode 100644 index 9597dea04d..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.0.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" -IUSE="ipv6 readline ssl tcpd" -# bug #946404 (and many others), whack-a-mole with timeouts and friends -# Try again in the future. -RESTRICT="test" - -DEPEND=" - ssl? ( >=dev-libs/openssl-3:= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - local myeconfargs=( - $(use_enable ssl openssl) - $(use_enable readline) - $(use_enable ipv6 ip6) - $(use_enable tcpd libwrap) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Most tests are skipped because they need network access or a TTY - # Some are for /dev permissions probing (bug #940740) - # 518 519 need extra permissions - edo ./test.sh -v --expect-fail 13,15,87,217,311,313,370,388,410,466,478,518,519,528 -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css - - if use elibc_musl; then - QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r ) - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.0-r1.ebuild deleted file mode 100644 index d5cdf8ed1c..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" -IUSE="ipv6 readline ssl tcpd" -# bug #946404 (and many others), whack-a-mole with timeouts and friends -# Try again in the future. -RESTRICT="test" - -DEPEND=" - ssl? ( >=dev-libs/openssl-3:= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.1.0-const.patch - "${FILESDIR}"/${PN}-1.8.1.0-musl-fix.patch # bug #968110 -) - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - local myeconfargs=( - $(use_enable ssl openssl) - $(use_enable readline) - $(use_enable ipv6 ip6) - $(use_enable tcpd libwrap) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Most tests are skipped because they need network access or a TTY - # Some are for /dev permissions probing (bug #940740) - # 518 519 need extra permissions - edo ./test.sh -v --expect-fail 13,15,87,217,311,313,370,388,410,466,478,518,519,528 -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css - - if use elibc_musl; then - QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r ) - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.0.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.0.ebuild deleted file mode 100644 index 7918fe323e..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" -IUSE="ipv6 readline ssl tcpd" -# bug #946404 (and many others), whack-a-mole with timeouts and friends -# Try again in the future. -RESTRICT="test" - -DEPEND=" - ssl? ( >=dev-libs/openssl-3:= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( "${FILESDIR}"/${PN}-1.8.1.0-const.patch ) - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - local myeconfargs=( - $(use_enable ssl openssl) - $(use_enable readline) - $(use_enable ipv6 ip6) - $(use_enable tcpd libwrap) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Most tests are skipped because they need network access or a TTY - # Some are for /dev permissions probing (bug #940740) - # 518 519 need extra permissions - edo ./test.sh -v --expect-fail 13,15,87,217,311,313,370,388,410,466,478,518,519,528 -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css - - if use elibc_musl; then - QA_CONFIG_IMPL_DECL_SKIP=( getprotobynumber_r ) - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.1.ebuild index 9d2e42d82c..abb836e44e 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.8.1.1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" IUSE="ipv6 readline ssl tcpd" # bug #946404 (and many others), whack-a-mole with timeouts and friends # Try again in the future.