gentoo xmass resync : 25.12.2021

4 files changed, 27 insertions, 15 deletions

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index 395e75ee11a9..e1341fc5a6f4 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,6 +1,6 @@
 AUX tboot-1.10.3-disable-Werror.patch 522 BLAKE2B e25832b544ffc81d83d963061c35432f454590b02f3c9d10ceff60f977b9b022e39193a41ded7f96c71681f7219204809dd4156bcf7ad37ea8738155b6c0469e SHA512 a219e4f1dd637fb93cd05e827ab7d1a9bbcc99b87a3f6e9e8b902d0ab08f150ad87d8804f0d506c5ac721be4d1a85a14466e036c09643601a705be0fb07e4ed4
 AUX tboot-1.10.3-disable-strip.patch 343 BLAKE2B 65d5e7f4e97504ace2d42123701de8f6e27e3ffc196b69a0afc8057ed8fe75c8274c427d858cb316d5712505381a5a109ddc5301eedc0f93c34d3ed0551deaff SHA512 f86f595d8883d433327eb906ee5fbe0c277180c7a993ae47e26c23ea8b406e59cbad28509ca399286ba306949b0d5de5dc9420242706c7affcba12d86e3f183b
-AUX tboot-1.10.3-dont-call-strip-directly.patch 328 BLAKE2B f1fe38f44a9d207034ec471b98fe81e92d9b9068e3a1ab05034aa21b83d87df6a6d0f53eee3436d440b8f8514d09bdde4155061b1979aaa304f9974d5eddba32 SHA512 cb2c1bc37368cad9448142393c84da5327d3b4a976ae73d0116b20d1eca7ca0dba399f3fb419e4fb02d41ede8aabb3f3b12af10bb734627975087c352ff4d29b
+AUX tboot-1.10.3-dont-call-toolchain-directly.patch 1884 BLAKE2B 80a029eb34f3088ccb772b5e9b092b60f35516659c74d149c0ff6bc6afb7578d35e3063beadaf0dd61407f84f78f20d782c3b64c33ab566751a2317fee14aeb9 SHA512 02dd09eb4b4a65802206c066f32959ab8150933dbc37458e888dcec4cf40b25681e3f0463cd8df62149f7764956d04259c05be36aeed8d9a243d758d3a2225a2
 DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77
-EBUILD tboot-1.10.3.ebuild 1563 BLAKE2B 92fa20a13f07fc0ebc25348f7e9126973990b2cdffc57f0e50a4f82798409d46b12c66d06aff4078b09a1eb9650c8edf788f9e01b949b8f9700ce811b7bb6b4c SHA512 b81ab541974649a8df4d577062cf937b258b1f2ed21749827122d110a6622eca05c34e0f1dc80e5308d4a4ce49833cdbda47452461247f3611b8a7c98d6f86b5
+EBUILD tboot-1.10.3.ebuild 1567 BLAKE2B a39d03c73be6792b6a1eae8d7bf08d21f56ba3f2a0e34371ea79ae023ceb450a064099a130941a880fb33cf4fba83ed292cd8b706f62233a8911ec1dc507c0aa SHA512 c0277eeb997b35fdd16363f63f21fb1090c434a33ae918b7646060a244c5743ce218687c75a8e45512e1a790a09d0ad2b1c3507f9e87c06f2f4c90d03504731e
 MISC metadata.xml 508 BLAKE2B c28a3b0e46c57c91011bbee5ff6769ace24ab4e7b3355536b8e8c3bdb33b0be4ee1fedd60f00e2bfe8957570f763e8e85f3a1786f7a470bc5b4c855e57f7b8a2 SHA512 e45960df2560d82cb914db1f661d739b5d6747b7fb433152fef849d36d6bb4cc812def3cbafa4b362056c4d96e37980e65f8bc163b2021d5827ffd6ee9afca4d
diff --git a/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch b/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch
deleted file mode 100644
index 83adeda6d5ac..000000000000
--- a/sys-boot/tboot/files/tboot-1.10.3-dont-call-strip-directly.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 5a30b6b09e77 tboot/Makefile
---- a/tboot/Makefile	Fri Dec 10 15:35:42 2021 +0100
-+++ b/tboot/Makefile	Mon Dec 20 13:06:09 2021 -0600
-@@ -34,7 +34,7 @@
- TARGET_LDS := $(CURDIR)/common/tboot.lds
- 
- $(TARGET).strip : $(TARGET)
--	strip $< -o $@
-+	$(STRIP) $< -o $@
- 
- $(TARGET).gz : $(TARGET).strip
- 	gzip -n -f -9 < $< > $@
diff --git a/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch b/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch
new file mode 100644
index 000000000000..29840e9113e4
--- /dev/null
+++ b/sys-boot/tboot/files/tboot-1.10.3-dont-call-toolchain-directly.patch
@@ -0,0 +1,24 @@
+diff -r 5a30b6b09e77 safestringlib/makefile
+--- a/safestringlib/makefile	Fri Dec 10 15:35:42 2021 +0100
++++ b/safestringlib/makefile	Tue Dec 21 12:40:01 2021 -0600
+@@ -29,7 +29,7 @@
+ 	$(CC) $(LDFLAGS) -c -o $@ $< $(CFLAGS)
+ 
+ libsafestring.a: $(OBJ)
+-	ar rcs $@ $^ 
++	$(AR) rcs $@ $^ 
+ 
+ 
+ _TESTFUNCS = Safe_String_UnitTestMain.c test_strcmp_s.c test_strnlen_s.c test_memcmp16_s.c test_strcpyfldin_s.c test_strnterminate_s.c test_memcmp32_s.c test_strcpyfldout_s.c  test_strpbrk_s.c test_memcmp_s.c test_strcpyfld_s.c test_strprefix_s.c test_memcpy16_s.c test_strcpy_s.c test_strremovews_s.c test_memcpy32_s.c  test_strcspn_s.c test_strspn_s.c test_memcpy_s.c test_strfirstchar_s.c test_strstr_s.c test_memmove16_s.c test_strfirstdiff_s.c test_strtok_s.c test_memmove32_s.c test_strfirstsame_s.c test_strtolowercase_s.c test_memmove_s.c test_strisalphanumeric_s.c test_strtouppercase_s.c test_memset16_s.c test_strisascii_s.c test_strzero_s.c test_memset32_s.c test_strisdigit_s.c test_wcpcpy_s.c test_memset_s.c test_strishex_s.c test_wcscat_s.c test_memzero16_s.c test_strislowercase_s.c  test_wcscpy_s.c test_memzero32_s.c test_strismixed_s.c test_wcsncat_s.c test_memzero_s.c test_strispassword_s.c test_wcsncpy_s.c test_strisuppercase_s.c test_wcsnlen_s.c test_stpcpy_s.c test_strlastchar_s.c test_wmemcmp_s.c test_stpncpy_s.c test_strlastdiff_s.c test_wmemcpy_s.c test_strcasecmp_s.c test_strlastsame_s.c test_wmemmove_s.c test_strcasestr_s.c test_strljustify_s.c test_wmemset_s.c test_strcat_s.c test_strncat_s.c test_strcmpfld_s.c test_strncpy_s.c
+diff -r 5a30b6b09e77 tboot/Makefile
+--- a/tboot/Makefile	Fri Dec 10 15:35:42 2021 +0100
++++ b/tboot/Makefile	Tue Dec 21 12:40:01 2021 -0600
+@@ -34,7 +34,7 @@
+ TARGET_LDS := $(CURDIR)/common/tboot.lds
+ 
+ $(TARGET).strip : $(TARGET)
+-	strip $< -o $@
++	$(STRIP) $< -o $@
+ 
+ $(TARGET).gz : $(TARGET).strip
+ 	gzip -n -f -9 < $< > $@
diff --git a/sys-boot/tboot/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild
index 1c4693a6e37b..cdb682a949ff 100644
--- a/sys-boot/tboot/tboot-1.10.3.ebuild
+++ b/sys-boot/tboot/tboot-1.10.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
 DOCS=( README.md COPYING CHANGELOG )
 PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch"
 	  "${FILESDIR}/${PN}-1.10.3-disable-strip.patch"
-	  "${FILESDIR}/${PN}-1.10.3-dont-call-strip-directly.patch" )
+	  "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" )
 
 src_configure() {
 	tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP