From e45f0df9d7f9f5260e69235b8c7c6e00153747f0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 13 Jan 2023 11:48:35 +0000
Subject: gentoo auto-resync : 13:01:2023 - 11:48:35

---
 media-tv/Manifest.gz                               | Bin 3773 -> 3777 bytes
 media-tv/v4l-utils/Manifest                        |   3 ++-
 .../v4l-utils-1.22.1-no-stack-protector-bpf.patch  |  25 +++++++++++++++++++++
 media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild      |   6 ++++-
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch

(limited to 'media-tv')

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 3df32b78986b..34b54c35950d 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index e2b34d86ccc6..8ad8c460cd79 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,3 +1,4 @@
+AUX v4l-utils-1.22.1-no-stack-protector-bpf.patch 1010 BLAKE2B aa8475fd643b1736fe3ad41c77d2debf0fe19f501d8edc56562d39d3dfabea7910e324fdab3951e6bb0a6cdb22bfaea002824189e0189bdec4d66a5b3feda470 SHA512 b0737955b566354b047b296822ed1ba0f573ebd1667d9455d6a08e5f839920f08a1e8b0d98f2515fa93f11ff7f22e5ed7044b8f96b632803260349a3a6e3cf67
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-EBUILD v4l-utils-1.22.1-r1.ebuild 2807 BLAKE2B 18184ac1641150b40964d6f43fd9c0390399205f5416624883942e3f3607c51d01e45bed299cb0424ea99278c105164e222ef9da52e119430d0433c8b7a33c58 SHA512 6393f8baf7f748c9780b15982eb8554f0b7c75957f866efb1976f21f47fce57eafa7a90eb02c98287bc90d23d25a5230c13d6d737f14c82d13311a2d3121e613
+EBUILD v4l-utils-1.22.1-r1.ebuild 2877 BLAKE2B 7733fd090122d2661d314ef6db9841913229166bfb4e13e92414e2c29ef23fb0f162d71f8c69182ea2b297a7dc9880e9f26643932fdfaa146afddfb64d77c738 SHA512 28bb40f504b770cf79785bc843625a0ffc075ba7235db65c257ec5cc2a41145e83b666fb7df68cd22a5c34f488db4d89b2a016ab32fe14a28189ce1d23269fc7
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
new file mode 100644
index 000000000000..0ee28643ea1c
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
@@ -0,0 +1,25 @@
+SSP doesn't make sense for BPF.
+
+https://bugs.gentoo.org/889561
+--- a/utils/keytable/Makefile.am
++++ b/utils/keytable/Makefile.am
+@@ -22,7 +22,7 @@ ir_keytable_LDFLAGS = $(ARGP_LIBS)
+ 
+ if WITH_BPF
+ ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS)
+-ir_keytable_CFLAGS = $(LIBBPF_CFLAGS)
++ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) -fno-stack-protector
+ SUBDIRS = bpf_protocols
+ endif
+ 
+--- a/utils/keytable/bpf_protocols/Makefile.am
++++ b/utils/keytable/bpf_protocols/Makefile.am
+@@ -8,7 +8,7 @@ CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \
+         | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
+ 
+ %.o: %.c bpf_helpers.h
+-	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -c $<
++	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -fno-stack-protector -c $<
+ 
+ PROTOCOLS = grundig.o pulse_distance.o pulse_length.o rc_mm.o manchester.o xbox-dvd.o imon_rsc.o raw.o samsung36.o
+ 
diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
index 57f4e1a21e15..1294a25de248 100644
--- a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,10 @@ BDEPEND="
 # Not really prebuilt but BPF objects make our QA checks go crazy.
 QA_PREBUILT="*/rc_keymaps/protocols/*.o"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.22.1-no-stack-protector-bpf.patch
+)
+
 check_llvm() {
 	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
 		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
-- 
cgit v1.2.3