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.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 74599158012 for ; Mon, 12 Sep 2022 16:51:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F5CFE0921; Mon, 12 Sep 2022 16:51:52 +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 3471DE0921 for ; Mon, 12 Sep 2022 16:51:52 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49E29340CC3 for ; Mon, 12 Sep 2022 16:51:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58DF3509 for ; Mon, 12 Sep 2022 16:51:49 +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: <1663000584.4ca5410ef9f7e96556900cc9e2240d856f913e7a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/files/, net-analyzer/tcpdump/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild net-analyzer/tcpdump/tcpdump-9999.ebuild X-VCS-Directories: net-analyzer/tcpdump/ net-analyzer/tcpdump/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4ca5410ef9f7e96556900cc9e2240d856f913e7a X-VCS-Branch: master Date: Mon, 12 Sep 2022 16:51:49 +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: 7c7b8ff9-f93f-4037-8c49-13e964e9489f X-Archives-Hash: a76e086e1190272cd33894249f11c875 commit: 4ca5410ef9f7e96556900cc9e2240d856f913e7a Author: Sam James gentoo org> AuthorDate: Mon Sep 12 16:36:24 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 12 16:36:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca5410e net-analyzer/tcpdump: fix configure tests with Clang 15 Signed-off-by: Sam James gentoo.org> .../files/tcpdump-4.99.1-clang15-configure.patch | 57 ++++++++++++++++++++++ ...cpdump-9999.ebuild => tcpdump-4.99.1-r1.ebuild} | 14 ++++-- net-analyzer/tcpdump/tcpdump-9999.ebuild | 2 +- 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch new file mode 100644 index 000000000000..ed8a353d8c98 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch @@ -0,0 +1,57 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1007 + +From 4fa4e8db882b6298f5504d866665441ba7594df3 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 12 Sep 2022 17:28:58 +0100 +Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15 + (implicit function declarations) + +Clang 15 makes implicit function declarations fatal by default which +leads to some of tcpdump's configure tests silently failing/returning +the wrong result. + +This adds the needed #includes to various tests for the functions used, +resolving the following errors: +``` +net-analyzer/tcpdump-4.99.1/clang15.log:47:error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +net-analyzer/tcpdump-4.99.1/clang15.log:51:error: call to undeclared library function 'strcmp' with type 'int (const char *, const char *)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:55:error: call to undeclared library function 'sscanf' with type 'int (const char *restrict, const char *restrict, ...)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:68:error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:112:error: call to undeclared function 'ether_ntohost'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:115:error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +``` + +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -87,8 +87,11 @@ if test "x$with_smi" != "xno" ; then + AC_TRY_RUN( + [ + /* libsmi available check */ ++#include ++#include ++#include + #include +-main() ++int main() + { + int current, revision, age, n; + const int required = 2; +@@ -264,6 +267,7 @@ AC_COMPILE_IFELSE( + [ + AC_LANG_SOURCE( + [[ ++#include + /* AF_INET6 available check */ + #include + #ifdef _WIN32 +@@ -473,6 +477,8 @@ AC_CHECK_FUNCS(ether_ntohost, [ + AC_CACHE_CHECK(for buggy ether_ntohost, ac_cv_buggy_ether_ntohost, [ + AC_TRY_RUN([ + #include ++ #include ++ #include + #include + #include + #include + diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild similarity index 80% copy from net-analyzer/tcpdump/tcpdump-9999.ebuild copy to net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild index ac9b01e80aa8..9f6735a93cdc 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -16,10 +16,12 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc inherit verify-sig - SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" - SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + # Note: drop -upstream on bump, this is just because we switched to the official + # distfiles for verify-sig + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="BSD" @@ -27,8 +29,9 @@ SLOT="0" IUSE="+drop-root +smi +ssl +samba suid test" REQUIRED_USE="test? ( samba )" +RESTRICT="!test? ( test )" # Assorted failures: bug #768498 -RESTRICT="test" +#RESTRICT="test" RDEPEND=" >=net-libs/libpcap-1.10.1 @@ -60,6 +63,7 @@ fi PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch + "${FILESDIR}"/${PN}-4.99.1-clang15-configure.patch ) src_prepare() { diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index ac9b01e80aa8..63bf6ed96b92 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools