From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23197138350 for ; Mon, 27 Jan 2020 11:05:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CA8AE08DB; Mon, 27 Jan 2020 11:05:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F079E08DB for ; Mon, 27 Jan 2020 11:05:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A2D934E395 for ; Mon, 27 Jan 2020 11:05:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9BBD35 for ; Mon, 27 Jan 2020 11:05:15 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1580123114.a4e3d5b9b0af743e295fd5fe1ec2021950d7a4cd.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/socat/files/socat-1.7.3.4-fno-common.patch net-misc/socat/socat-1.7.3.4.ebuild net-misc/socat/socat-2.0.0_beta9.ebuild net-misc/socat/socat-9999.ebuild X-VCS-Directories: net-misc/socat/files/ net-misc/socat/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: a4e3d5b9b0af743e295fd5fe1ec2021950d7a4cd X-VCS-Branch: master Date: Mon, 27 Jan 2020 11:05:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fec68f3a-847e-47f2-a0a5-ff0c4bc5146e X-Archives-Hash: 441d08c22eab76446024671908e4cfe4 commit: a4e3d5b9b0af743e295fd5fe1ec2021950d7a4cd Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jan 27 11:04:03 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jan 27 11:05:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e3d5b9 net-misc/socat: Fix CFLAGS=-fno-common USE=tcpd Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> .../socat/files/socat-1.7.3.4-fno-common.patch | 24 ++++++++++++++++++++++ net-misc/socat/socat-1.7.3.4.ebuild | 3 +++ net-misc/socat/socat-2.0.0_beta9.ebuild | 6 +++--- net-misc/socat/socat-9999.ebuild | 3 ++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/net-misc/socat/files/socat-1.7.3.4-fno-common.patch b/net-misc/socat/files/socat-1.7.3.4-fno-common.patch new file mode 100644 index 00000000000..a7dcf71c376 --- /dev/null +++ b/net-misc/socat/files/socat-1.7.3.4-fno-common.patch @@ -0,0 +1,24 @@ +--- a/filan.c ++++ b/filan.c +@@ -30,7 +30,9 @@ + + /* dirty workaround so we dont get an error on AIX when being linked with + libwrap */ ++#if _AIX + int allow_severity, deny_severity; ++#endif + + /* global variables for configuring filan */ + bool filan_followsymlinks; +--- a/procan.c ++++ b/procan.c +@@ -21,7 +21,9 @@ + + /* dirty workaround so we dont get an error on AIX when getting linked with + libwrap */ ++#if _AIX + int allow_severity, deny_severity; ++#endif + + + int procan(FILE *outfile) { diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild index 5c208be530b..d964ea01444 100644 --- a/net-misc/socat/socat-1.7.3.4.ebuild +++ b/net-misc/socat/socat-1.7.3.4.ebuild @@ -33,6 +33,9 @@ RESTRICT=" DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch +) pkg_setup() { # bug #587740 diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild index f8881af9ed2..d5d7fe26557 100644 --- a/net-misc/socat/socat-2.0.0_beta9.ebuild +++ b/net-misc/socat/socat-2.0.0_beta9.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=7 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Multipurpose relay (SOcket CAT)" @@ -36,6 +35,7 @@ DOCS=( PATCHES=( "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch + "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch "${FILESDIR}"/${PN}-2.0.0_beta9-libressl.patch ) diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild index dfc7752ca39..2c12dbc3dc4 100644 --- a/net-misc/socat/socat-9999.ebuild +++ b/net-misc/socat/socat-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,6 +34,7 @@ DOCS=( ) PATCHES=( + "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch "${FILESDIR}"/${PN}-9999-stddef_h.patch )