From a4e3d5b9b0af743e295fd5fe1ec2021950d7a4cd Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 27 Jan 2020 12:04:03 +0100 Subject: [PATCH] net-misc/socat: Fix CFLAGS=-fno-common USE=tcpd Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Jeroen Roovers --- .../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(-) create mode 100644 net-misc/socat/files/socat-1.7.3.4-fno-common.patch 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 000000000000..a7dcf71c376a --- /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 5c208be530b6..d964ea01444c 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 f8881af9ed21..d5d7fe265575 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 dfc7752ca396..2c12dbc3dc4f 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 ) -- 2.26.2