From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1476665-garchives=archives.gentoo.org@lists.gentoo.org>
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 9C18E15800F
for <garchives@archives.gentoo.org>; Fri, 13 Jan 2023 10:24:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E9900E0825;
Fri, 13 Jan 2023 10:24:12 +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 D0C27E0825
for <gentoo-commits@lists.gentoo.org>; Fri, 13 Jan 2023 10:24:12 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C1BCB340C15
for <gentoo-commits@lists.gentoo.org>; Fri, 13 Jan 2023 10:24:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 39A4C7F2
for <gentoo-commits@lists.gentoo.org>; Fri, 13 Jan 2023 10:24:10 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1673605441.de78decd557db68c05c7b57875acf77c04281a79.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/, dev-util/bpftool/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/bpftool/bpftool-6.0.12.ebuild dev-util/bpftool/files/6.0.12-no-stack-protector.patch
X-VCS-Directories: dev-util/bpftool/ dev-util/bpftool/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: de78decd557db68c05c7b57875acf77c04281a79
X-VCS-Branch: master
Date: Fri, 13 Jan 2023 10:24:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 915d8586-65b0-41c1-8be2-95ba2ffef2aa
X-Archives-Hash: 771739df1826e7f767c9f0ded95e4d37
commit: de78decd557db68c05c7b57875acf77c04281a79
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 10:24:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 10:24:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de78decd
dev-util/bpftool: avoid duplicate patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/bpftool/bpftool-6.0.12.ebuild | 2 +-
dev-util/bpftool/files/6.0.12-no-stack-protector.patch | 14 --------------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 5e3c53bae36d..0ea6f12c98cd 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
pushd "${S_K}" >/dev/null || die
# bug #890638
- eapply "${FILESDIR}"/${PV}-no-stack-protector.patch
+ eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
popd || die
# dev-python/docutils installs rst2man.py, not rst2man
diff --git a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch b/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
deleted file mode 100644
index c9ae115ac20d..000000000000
--- a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-https://bugs.gentoo.org/890638
-
---- a/tools/bpf/bpftool/Makefile 2022-12-11 23:15:18.000000000 +0100
-+++ b/tools/bpf/bpftool/Makefile 2023-01-13 10:32:09.615048492 +0100
-@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
- -I$(or $(OUTPUT),.) \
- -I$(srctree)/tools/include/uapi/ \
- -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
-- -g -O2 -Wall -target bpf -c $< -o $@
-+ -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
- $(Q)$(LLVM_STRIP) -g $@
-
- $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)