From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1459471-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2075E158021
for <garchives@archives.gentoo.org>; Wed, 23 Nov 2022 01:45:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 59037E0BFC;
Wed, 23 Nov 2022 01:45:20 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 27C5FE0BFD
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Nov 2022 01:45:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6AF0934017A
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Nov 2022 01:45:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A1E2B766
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Nov 2022 01:45:16 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1669167762.f335bad455c9308a8a4df5997f9e772b6288f056.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/socat/socat-1.7.4.4.ebuild
X-VCS-Directories: net-misc/socat/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: f335bad455c9308a8a4df5997f9e772b6288f056
X-VCS-Branch: master
Date: Wed, 23 Nov 2022 01:45:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ee4d2787-d9f7-4cc7-913f-959a02e97db0
X-Archives-Hash: 849b3bd8750ef016111ee0e8f7cba3ff
commit: f335bad455c9308a8a4df5997f9e772b6288f056
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Nov 21 08:03:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 01:42:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f335bad4
net-misc/socat: fix 1.7.4.4 build on musl
The issue with undefined reference to getprotobynumber_r for musl was
fixed in 1.7.4.4 in commit [1]. It is no longer wanted to treat musl
configuration specially.
[1] https://repo.or.cz/socat.git/commitdiff/75cb44bc90577c3487458564ca803163681319f1
Bug: https://bugs.gentoo.org/831016
Closes: https://bugs.gentoo.org/879601
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28358
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/socat/socat-1.7.4.4.ebuild | 6 ------
1 file changed, 6 deletions(-)
diff --git a/net-misc/socat/socat-1.7.4.4.ebuild b/net-misc/socat/socat-1.7.4.4.ebuild
index 2c36251c7698..8693b3348e41 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -43,12 +43,6 @@ src_configure() {
tc-export AR
- # getprotobynumber_r doesn't exist on musl, so avoid probing for it
- # and possibly getting it wrong. TODO: fix configure?
- # (Grabbed from Alpine Linux: https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11)
- # bug #831016
- use elibc_musl && export sc_cv_getprotobynumber_r=2
-
econf \
$(use_enable ssl openssl) \
$(use_enable readline) \