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 DD6E7158020 for ; Tue, 6 Dec 2022 21:25:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 579BBE077C; Tue, 6 Dec 2022 21:25:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 31236E07D3 for ; Tue, 6 Dec 2022 21:25:54 +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 37434340EA7 for ; Tue, 6 Dec 2022 21:25:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ECE1777 for ; Tue, 6 Dec 2022 21:25:51 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1670361931.dee8bad893c1a600b59e6ab18b2a9d8474c03003.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/hexinject/, net-analyzer/hexinject/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch net-analyzer/hexinject/hexinject-1.6-r1.ebuild net-analyzer/hexinject/hexinject-1.6-r2.ebuild X-VCS-Directories: net-analyzer/hexinject/ net-analyzer/hexinject/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: dee8bad893c1a600b59e6ab18b2a9d8474c03003 X-VCS-Branch: master Date: Tue, 6 Dec 2022 21:25:51 +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: 101246e9-bf8e-4052-96e7-e17b042ff316 X-Archives-Hash: e9d083703a7ef88ca1bb9c3ee0fec0e0 commit: dee8bad893c1a600b59e6ab18b2a9d8474c03003 Author: David Seifert gentoo org> AuthorDate: Tue Dec 6 21:25:31 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Dec 6 21:25:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee8bad8 net-analyzer/hexinject: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/724862 Signed-off-by: David Seifert gentoo.org> .../files/hexinject-1.6-fix-build-system.patch | 22 +++++++++++++--------- ...nject-1.6-r1.ebuild => hexinject-1.6-r2.ebuild} | 9 +++------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch index fbe91199bbfa..9d22337afa93 100644 --- a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch +++ b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch @@ -1,18 +1,22 @@ Author: holgersson Date: Fri Oct 20 18:30:00 2017 +0200 -Don’t call gcc directly, and respect CFLAGS. As this project -is plain C I don’t care fore CXXFLAGS here. +Respect CC, CFLAGS, CPPFLAGS and LDFLAGS. ---- a/Makefile 2017-10-20 18:15:11.743805540 +0200 -+++ b/Makefile 2017-10-20 18:24:55.120009439 +0200 -@@ -1,6 +1,6 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,11 +1,7 @@ -CC = gcc -CFLAGS = -Wall -LDFLAGS = -lpcap -+CC ?= gcc +CFLAGS += -Wall -+LDFLAGS = -lpcap ++LDLIBS = -lpcap - all: - $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c +-all: +- $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c ++all: hexinject prettypacket hex2raw + + clean: + rm -f hexinject prettypacket hex2raw *~ diff --git a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild similarity index 91% rename from net-analyzer/hexinject/hexinject-1.6-r1.ebuild rename to net-analyzer/hexinject/hexinject-1.6-r2.ebuild index e36c1803461e..bfef01f88b8f 100644 --- a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild +++ b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit toolchain-funcs DESCRIPTION="Network packet sniffer and injector" HOMEPAGE="http://hexinject.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="BSD" SLOT="0" @@ -18,13 +19,9 @@ DEPEND="net-libs/libpcap" RDEPEND="${DEPEND} experimental? ( dev-lang/tcl )" -S="${WORKDIR}/${PN}" - PATCHES=( "${FILESDIR}"/${PN}-1.6-fix-build-system.patch ) src_configure() { - default - tc-export CC }