gentoo resync : 16.01.2021

5 files changed, 238 insertions, 3 deletions

diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest
index d95764c1cfcc..6d3344835e59 100644
--- a/dev-embedded/sunxi-tools/Manifest
+++ b/dev-embedded/sunxi-tools/Manifest
@@ -1,3 +1,7 @@
+AUX sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch 1485 BLAKE2B bbb0a18d84eb5a7d5994c51e721ee9507c353f5568ba1897b865883e0b3db4c1b834eb78d6c8073cadc98f568b1f364b87a954e6cddecab67de936522e17780d SHA512 cc511e21552dd914df8a3e11d041c43e5c7b56b025e26180c9d421c5430cc1fbd9db2b8e789b0c365289e158b59a067352a8bd9b00fd9a34cf0fe5e10436d920
+AUX sunxi-tools-1.4.1-respect-user-supplied-cflags.patch 5900 BLAKE2B 8cf7a6e4a3c75d69e4ebafba3302cd7fd479b35a0e4740259111fb28265fb29336a9ab6cff857e46eb482a05480d421f7f268ca4e4a81212f3256dc16a3e824c SHA512 7a84cfa2b054bb955cf1cf763e5758233fbbfa92911c42cc385318e35850628ff66f588b54d2b360afc86cd635ad308240a9ba286f6783653357a82bfcd2eff9
 DIST sunxi-tools-1.3.tar.gz 52608 BLAKE2B e8c3ed7276f705273598e38a0cc469225de1ee4eb8177b78be63b78ebc584c4fdf2362e21b895f61b4c5e84df98bfd5ccf6d3965ffa9338c98027c9ce4635626 SHA512 954c95963013aee8a38b3583ba1b7ec7e7049c7e09c5fa9ec564dfc33f304d3669fdf68c2fa5e4b5a6265640a3d1ee8bc13bcd71d804c714884b6a780d193615
-EBUILD sunxi-tools-1.3-r1.ebuild 712 BLAKE2B af080aab20035e7d885ccd53ff8ff5d80a0a690e6a15ef4b4aef945ba4b991773f9307aa78e0624c48636a1a60f565925bea0e44ff5fa419b2d31a5896671168 SHA512 ff97830302796fb902f404644428ad9cc47cdeef99d9ca6a38387c9d9efa2ff06c3a31ab438d2e007df274270beb304bb7c1e43924226c6ad20d2c95e5d8b506
+DIST sunxi-tools-1.4.1.tar.gz 78878 BLAKE2B f50b14e79d4880a076f8b25869eea44e34cfc50c91ce7f9e4adc831bb2ac2238c930623677bacb399e52faadba20c9ba21ea212915c50941af825d0579804153 SHA512 b66f5caaabec016a0d2f1ccc88ee7f37cd26a511ac81c270e2de6bf0b967e8dfda2b510d5306daffb33ec8855c3c6be99a29bfd1efd5bd0cf3431494b092a52b
+EBUILD sunxi-tools-1.3-r1.ebuild 712 BLAKE2B 6cecb0174cf62fd297ed0681e7d80f681039df50402352b6d5597da208bf2e3b0db24968163d6db9632263a512655f41cf815db528990b7408a209729ae16cd6 SHA512 91536ca44ae58971bb1c86bba0cb195b6538b1303bf2223d9f56e2d0e56b3195b3fcdf35eb707b4b7e5a2e94a098175954fda3496c7773e020123e90f89eed78
+EBUILD sunxi-tools-1.4.1.ebuild 776 BLAKE2B 399bdd6f4002d1f84f1e8a1eca2ae9302d1b46b68de227b09943c13cb333db8638bcc18e0ae32626162e3408e3011044e169252c25959be4ed85c3c2365c83a9 SHA512 88b72525a65ff362efb8df1c1a4f0e4b9d510ca3da6a75444d4c7c02ae5d6252d389dbef13d16d3de4e27540533a26309c6eb6d06a2b646c0fd08635c35d03eb
 MISC metadata.xml 340 BLAKE2B 576247e37e7212908e8e04cdf8ded79a9270c130760add714f11d0b1018db8670f07a60adf20ab4e06896e47a8795a05d9ee25de363c329e1c1a259f4c85f4ec SHA512 ae5a0ae8ed5d1e5d2942604d9f2b2fe134e9f719ae1bda055761a0acfd316f6710d111f9639a37256636ff478ec0b01cc3af31e151b78c53626bccc03158c9af
diff --git a/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch
new file mode 100644
index 000000000000..a255e61f3f01
--- /dev/null
+++ b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch
@@ -0,0 +1,42 @@
+From 0825d9aaa6078ef283390662004797a9a1d939f3 Mon Sep 17 00:00:00 2001
+From: Andre Przywara <andre.przywara@arm.com>
+Date: Wed, 15 Dec 2021 23:04:14 +0000
+Subject: [PATCH 1/2] nandpart: fix strncpy compiler warning
+
+More recent versions of GCC warns about the usage of strncpy in
+nandpart.c: we actually only (need to) copy the stub string part of the
+magic string, without the terminating NUL character. This is fine in
+our particular case, but raises the compiler's eyebrows:
+===================
+nand-part.c: In function '_get_mbr':
+nand-part.c:93:4: warning: 'strncpy' output truncated before terminating
+                  nul copying 8 bytes from a string of the same length
+                  [-Wstringop-truncation]
+   93 |    strncpy((char *)mbr->magic, MBR_MAGIC, 8);
+      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+===================
+
+Switch to the more fitting memcpy() here to avoid the warning.
+
+Signed-off-by: Andre Przywara <andre.przywara@arm.com>
+Reported-by: slange-dev
+---
+ nand-part.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nand-part.c b/nand-part.c
+index a0d46c5..af2169d 100644
+--- a/nand-part.c
++++ b/nand-part.c
+@@ -90,7 +90,7 @@ static MBR *_get_mbr(int fd, int mbr_num, int force)
+ 		printf("check partition table copy %d: ", mbr_num);
+ 		printmbrheader(mbr);
+ 		if (force) {
+-			strncpy((char *)mbr->magic, MBR_MAGIC, 8);
++			memcpy(mbr->magic, MBR_MAGIC, 8);
+ 			mbr->version = MBR_VERSION;
+ 			return mbr;
+ 		}
+-- 
+2.32.0
+
diff --git a/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-respect-user-supplied-cflags.patch b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-respect-user-supplied-cflags.patch
new file mode 100644
index 000000000000..faa2ae606bea
--- /dev/null
+++ b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-respect-user-supplied-cflags.patch
@@ -0,0 +1,153 @@
+From 95d40f8fcfd97890c270d2987bd845c7a6bac428 Mon Sep 17 00:00:00 2001
+From: Bernhard Nortmann <bernhard.nortmann@web.de>
+Date: Sat, 29 Oct 2016 18:32:00 +0200
+Subject: [PATCH] Makefile: Ensure that user-supplied CFLAGS get respected
+
+Signed-off-by: Bernhard Nortmann <bernhard.nortmann@web.de>
+---
+ .travis.yml |  2 +-
+ Makefile    | 53 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 47aa891..c843fba 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -4,7 +4,7 @@ sudo: false
+ language: c
+ 
+ # treat all warnings as errors
+-env: EXTRA_CFLAGS=-Werror
++env: CFLAGS=-Werror
+ 
+ os:
+   - linux
+diff --git a/Makefile b/Makefile
+index 6e0471b..12f121c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,21 +17,21 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ CC ?= gcc
+-CFLAGS = -g -O0 -Wall -Wextra $(EXTRA_CFLAGS)
+-CFLAGS += -std=c99 $(DEFINES)
+-CFLAGS += -Iinclude/
++DEFAULT_CFLAGS := -g -O0 -Wall -Wextra -std=c99
+ 
+-DEFINES = -D_POSIX_C_SOURCE=200112L
++DEFAULT_CFLAGS += -D_POSIX_C_SOURCE=200112L
+ # Define _BSD_SOURCE, necessary to expose all endian conversions properly.
+ # See http://linux.die.net/man/3/endian
+-DEFINES += -D_BSD_SOURCE
++DEFAULT_CFLAGS += -D_BSD_SOURCE
+ # glibc 2.20+ also requires _DEFAULT_SOURCE
+-DEFINES += -D_DEFAULT_SOURCE
++DEFAULT_CFLAGS += -D_DEFAULT_SOURCE
+ ifeq (NetBSD,$(OS))
+ # add explicit _NETBSD_SOURCE, see https://github.com/linux-sunxi/sunxi-tools/pull/22
+-DEFINES += -D_NETBSD_SOURCE
++DEFAULT_CFLAGS += -D_NETBSD_SOURCE
+ endif
+ 
++DEFAULT_CFLAGS += -Iinclude/
++
+ # Tools useful on host and target
+ TOOLS = sunxi-fexc sunxi-bootinfo sunxi-fel sunxi-nand-part
+ 
+@@ -49,6 +49,7 @@ MISC_TOOLS = phoenix_info sunxi-nand-image-builder
+ BINFILES = fel-pio.bin jtag-loop.sunxi fel-sdboot.sunxi uart0-helloworld-sdboot.sunxi
+ 
+ CROSS_COMPILE ?= arm-none-eabi-
++CROSS_CC ?= $(CROSS_COMPILE)gcc
+ MKSUNXIBOOT ?= mksunxiboot
+ 
+ DESTDIR ?=
+@@ -110,24 +111,26 @@ LIBUSB_CFLAGS ?= `pkg-config --cflags $(LIBUSB)`
+ LIBUSB_LIBS ?= `pkg-config --libs $(LIBUSB)`
+ ifeq ($(OS),Windows_NT)
+ 	# Windows lacks mman.h / mmap()
+-	DEFINES += -DNO_MMAP
++	DEFAULT_CFLAGS += -DNO_MMAP
+ 	# portable_endian.h relies on winsock2
+ 	LIBS += -lws2_32
+ endif
+ 
++HOST_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
++
+ sunxi-fel: fel.c fel-to-spl-thunk.h progress.c progress.h
+-	$(CC) $(CFLAGS) $(LIBUSB_CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS) $(LIBUSB_LIBS)
++	$(CC) $(HOST_CFLAGS) $(LIBUSB_CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS) $(LIBUSB_LIBS)
+ 
+ sunxi-nand-part: nand-part-main.c nand-part.c nand-part-a10.h nand-part-a20.h
+-	$(CC) $(CFLAGS) -c -o nand-part-main.o nand-part-main.c
+-	$(CC) $(CFLAGS) -c -o nand-part-a10.o nand-part.c -D A10
+-	$(CC) $(CFLAGS) -c -o nand-part-a20.o nand-part.c -D A20
++	$(CC) $(HOST_CFLAGS) -c -o nand-part-main.o nand-part-main.c
++	$(CC) $(HOST_CFLAGS) -c -o nand-part-a10.o nand-part.c -D A10
++	$(CC) $(HOST_CFLAGS) -c -o nand-part-a20.o nand-part.c -D A20
+ 	$(CC) $(LDFLAGS) -o $@ nand-part-main.o nand-part-a10.o nand-part-a20.o $(LIBS)
+ 
+ sunxi-%: %.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
++	$(CC) $(HOST_CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
+ phoenix_info: phoenix_info.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
++	$(CC) $(HOST_CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ %.bin: %.elf
+ 	$(CROSS_COMPILE)objcopy -O binary $< $@
+@@ -143,39 +146,39 @@ ARM_ELF_FLAGS += -mno-thumb-interwork -fno-stack-protector -fno-toplevel-reorder
+ ARM_ELF_FLAGS += -Wstrict-prototypes -Wno-format-nonliteral -Wno-format-security
+ 
+ fel-pio.elf: fel-pio.c fel-pio.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T fel-pio.lds
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T fel-pio.lds
+ 
+ fel-pio.nm: fel-pio.elf
+ 	$(CROSS_COMPILE)nm $< | grep -v " _" >$@
+ 
+ jtag-loop.elf: jtag-loop.c jtag-loop.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T jtag-loop.lds -Wl,-N
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T jtag-loop.lds -Wl,-N
+ 
+ fel-sdboot.elf: fel-sdboot.S fel-sdboot.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T fel-sdboot.lds -Wl,-N
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T fel-sdboot.lds -Wl,-N
+ 
+ uart0-helloworld-sdboot.elf: uart0-helloworld-sdboot.c uart0-helloworld-sdboot.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T uart0-helloworld-sdboot.lds -Wl,-N
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T uart0-helloworld-sdboot.lds -Wl,-N
+ 
+ boot_head_sun3i.elf: boot_head.S boot_head.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1094
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1094
+ 
+ boot_head_sun4i.elf: boot_head.S boot_head.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1008
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1008
+ 
+ boot_head_sun5i.elf: boot_head.S boot_head.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x102A
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x102A
+ 
+ sunxi-bootinfo: bootinfo.c
+ 
+ # target tools
+-TARGET_CFLAGS = -g -O0 -Wall -Wextra -std=c99 $(DEFINES) -Iinclude/ -static
++TARGET_CFLAGS = $(DEFAULT_CFLAGS) -static $(CFLAGS)
+ sunxi-pio: pio.c
+-	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -o $@ $<
++	$(CROSS_CC) $(TARGET_CFLAGS) -o $@ $<
+ sunxi-meminfo: meminfo.c
+-	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -o $@ $<
++	$(CROSS_CC) $(TARGET_CFLAGS) -o $@ $<
+ sunxi-script_extractor: script_extractor.c
+-	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -o $@ $<
++	$(CROSS_CC) $(TARGET_CFLAGS) -o $@ $<
+ 
+ version.h:
+ 	@./autoversion.sh > $@
+-- 
+2.32.0
+
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
index 9da2f4453ad7..63cae3c5fd25 100644
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.4.1.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.4.1.ebuild
new file mode 100644
index 000000000000..24b37f3e50e0
--- /dev/null
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="v${PV}"
+SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Tools for Allwinner A10 devices."
+HOMEPAGE="http://linux-sunxi.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+DEPEND="virtual/libusb"
+
+PATCHES=(
+	"${FILESDIR}/${P}-respect-user-supplied-cflags.patch"
+	"${FILESDIR}/${P}-fix-strncpy-compiler-warning.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" tools misc
+}
+
+src_install() {
+	dobin bin2fex fex2bin phoenix_info sunxi-nand-image-builder
+	newbin sunxi-bootinfo bootinfo
+	newbin sunxi-fel fel
+	newbin sunxi-fexc fexc
+	newbin sunxi-nand-part nand-part
+}