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 D68DD1382C5 for ; Wed, 27 Jan 2021 07:33:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 215EFE0ACD; Wed, 27 Jan 2021 07:33:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 EAD70E0ACD for ; Wed, 27 Jan 2021 07:33:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BB60B340D8E for ; Wed, 27 Jan 2021 07:33:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AD204A6 for ; Wed, 27 Jan 2021 07:33:23 +0000 (UTC) From: "Sam James" 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" Message-ID: <1611732801.c46cfcc8d9e2917be6e128b5bad005dff1651d3e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/socat/Manifest net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch net-misc/socat/socat-1.7.4.0.ebuild X-VCS-Directories: net-misc/socat/ net-misc/socat/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c46cfcc8d9e2917be6e128b5bad005dff1651d3e X-VCS-Branch: master Date: Wed, 27 Jan 2021 07:33:23 +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: 21a9f66e-644d-4b61-9bb5-a4d924ab2e37 X-Archives-Hash: f99ccf23524120271444be7d507cb700 commit: c46cfcc8d9e2917be6e128b5bad005dff1651d3e Author: Sam James gentoo org> AuthorDate: Wed Jan 27 07:33:16 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 27 07:33:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c46cfcc8 net-misc/socat: cleanup old Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-misc/socat/Manifest | 1 - .../files/socat-1.7.4.0-32bit_build_fix.patch | 42 -------------- net-misc/socat/socat-1.7.4.0.ebuild | 67 ---------------------- 3 files changed, 110 deletions(-) diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 22d39d91ac3..a47d4af7a88 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,4 +1,3 @@ DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123 -DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f SHA512 c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch deleted file mode 100644 index 0b391ed8929..00000000000 --- a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -2021-01-08: Quick fix to a compilation failure especially on 32 bit systems - ---- socat-1.7.4.0/compat.h -+++ socat-1.7.4.0/compat.h -@@ -134,6 +134,8 @@ - # define F_uint64_t "%u" - # elif HAVE_BASIC_UINT64_T==6 - # define F_uint64_t "%lu" -+# elif HAVE_BASIC_UINT64_T==8 -+# define F_uint64_t "%llu" - # else - # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T - # endif -@@ -147,7 +149,7 @@ - # elif HAVE_BASIC_INT16_T==3 - # define F_int16_t "%d" - # elif HAVE_BASIC_INT16_T==5 --# define F_int16_t "%l" -+# define F_int16_t "%ld" - # else - # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T - # endif -@@ -161,7 +163,7 @@ - # elif HAVE_BASIC_INT32_T==3 - # define F_int32_t "%d" - # elif HAVE_BASIC_INT32_T==5 --# define F_int32_t "%l" -+# define F_int32_t "%ld" - # else - # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T - # endif -@@ -175,7 +177,9 @@ - # elif HAVE_BASIC_INT64_T==3 - # define F_int64_t "%d" - # elif HAVE_BASIC_INT64_T==5 --# define F_int64_t "%l" -+# define F_int64_t "%ld" -+# elif HAVE_BASIC_INT64_T==7 -+# define F_int64_t "%lld" - # else - # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T - # endif diff --git a/net-misc/socat/socat-1.7.4.0.ebuild b/net-misc/socat/socat-1.7.4.0.ebuild deleted file mode 100644 index 4b62fa74485..00000000000 --- a/net-misc/socat/socat-1.7.4.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist libressl ssl readline ipv6 tcpd" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( - "${FILESDIR}/${P}-32bit_build_fix.patch" -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_configure() { - filter-flags '-Wno-error*' #293324 - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -}