From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- net-misc/socat/Manifest | 9 ++++---- .../socat/files/socat-1.7.3.4-fno-common.patch | 24 ++++++++++++++++++++++ net-misc/socat/socat-1.7.3.2.ebuild | 2 +- 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 ++- 6 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 net-misc/socat/files/socat-1.7.3.4-fno-common.patch (limited to 'net-misc/socat') diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 4284d10fb370..0d1a084a3e50 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,14 +1,15 @@ AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf +AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed AUX socat-9999-stddef_h.patch 1272 BLAKE2B c6ab67b4aba676387b3d1584b03741ff829d5455991e67a5a0262cb529b965545e2935fa733a7c9a01a8c36cb2378d6d3e443a978a8993cab55bdf06d724d260 SHA512 b951fbc1d8fe26babe69fde1acc779907e00866c1a6bba85e37a4e173948ad2ade9aa7835a0e9ea1ec8902d0b181ebb11ace57ff0f8ab570301d8d35849e939d DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293 DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce SHA512 6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 -EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbec99df447668b0eff67d82eaa1cb513c74e6f58d927969f110baa38b5055c2015e6dc837064e3e2f1dbb63b214 SHA512 9c60d66cf7b190cb41d2d2afb2bba5bb3982c301df5f8e989013d4d7e32a2b15ddccbb26a4d2ef84f65412e24efbe85530e7178d03b2ad86d78d7addec9a8c63 +EBUILD socat-1.7.3.2.ebuild 1526 BLAKE2B e4fc6ae1f88dd9bbe5526a3dc7a2fb25c1297074c802d61bcdf421043f97b8965a082bb4245e9fde3b5d9e97d6d1d107fd7997bfa6f12fdb0be21a8356b5a6cd SHA512 6a91b9ef9ff2d5d46ad4321f3db9cb51b479ee7110f20673bb87eee18e6b7fc12dde6e30adc03aca33c41619f1714bd89495e62b6a4963a0318cefa0137a8255 EBUILD socat-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f -EBUILD socat-1.7.3.4.ebuild 1423 BLAKE2B 277ffa091d4aafda88ffc74bb72b3b86aae32972b08210d78671daf39407cc8c3dc9de2ecc2308e3e32349ebebb276f27f70265b125c454a7df385c811c04644 SHA512 01654151affdacd45431288e2e36e7cd2a08596b9a6979083e1c725e3ee552c3fc2d59e218bdbbf1bf4ac1112b23202c6cc7b11fadae266f8cf5074d697843b3 -EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705 -EBUILD socat-9999.ebuild 1337 BLAKE2B 63b3a50ba7f79887bd0769cde62604b61322c8f8ff0ec14dddc6cd6a7e271600914f6ef17ba37f68677f247e4567343b0f18ca4ffe757416f190ba703ea1dbd0 SHA512 d3153b16916abff983b91525eea488945585a6817561aa5471528741af6ef0cbdc440ddbce3086ef238f7056d053e209b451daab098299b98d185b6df3037c8c +EBUILD socat-1.7.3.4.ebuild 1481 BLAKE2B ab96720ec89007301e4be9e8fad56b0101df043243b63355675dd2213862e780c270b530f85f8a806acb2ef392a41132732c93354319dca7567b6cd2ede4cf9a SHA512 fb9606c2dc6ed267cc5e52694c1ba740cacfcafe151e00366eb8aa1b7060b164c6e6945ff12ca44f1a7f6e3b4f70f6bf3c8bf913de69d9faa9d675e8f447b74a +EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18 +EBUILD socat-9999.ebuild 1383 BLAKE2B 03bc6cab87aa5f55110b3d2421961b81d02389eedbcb1dcc6f942ef1fdc5171204da8caca26e9e388008dd33f702378d7be00abcacaa37c1e28211e19fddc6df SHA512 308a2f4dda32700072c3812e4226f1e3d356b015c6988aba0d220cac0d6c9cbcfeba2d49a5c55c9149eb068493bd5b31e5eafd34ba036a9b901002e29a8c969a MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601 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.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild index d60e4c3ea1de..e869de841c99 100644 --- a/net-misc/socat/socat-1.7.3.2.ebuild +++ b/net-misc/socat/socat-1.7.3.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="bindist libressl ssl readline ipv6 tcpd" DEPEND=" 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 ) -- cgit v1.2.3