Add stub func for newer ssp builds #527974 by Agostino Sarubbo.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 51 insertions, 55 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 3de0087c45d4..5ade98f6d90d 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.51 2015/05/17 04:27:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.52 2015/05/17 04:33:12 vapier Exp $
+
+  17 May 2015; Mike Frysinger <vapier@gentoo.org>
+  files/yaboot-1.3.17-nopiessp-gcc4.patch, files/yaboot-nopiessp-gcc4.patch:
+  Add stub func for newer ssp builds #527974 by Agostino Sarubbo.
 
   17 May 2015; Mike Frysinger <vapier@gentoo.org> -files/yaboot-nopiessp.patch,
   yaboot-1.3.14-r2.ebuild, yaboot-1.3.16.ebuild, yaboot-1.3.17-r2.ebuild:
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 97bd3f6f7bdf..4ea3b42b1386 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -6,8 +6,8 @@ AUX new-ofpath 4319 SHA256 7a20474bdb92f0f99b1142c45583883932807bcb3534cdc14c123
 AUX new-ofpath-devspec.patch 936 SHA256 dc01e8fbfcd90a6361ee77c7d8e21a8f94e415155c2101dbd0d381bee1559e5b SHA512 4848ebb10a3879224a5748741ed7134c3ae54f7425b786eae7ab6a9f13bdc893c70c15c2e1986a4a2d1f3f26fdc20c0da92c81c9f47e42c061670963d5cb82f0 WHIRLPOOL 367370688c1f79e00879c4fcd36c959c4487a24736a5533276615752e1c34b198ebda187fd2f90bbb852eee789cde9314f2f7c43b12cf1071b82bbf0ceddfaa5
 AUX sysfs-ofpath.patch 3432 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e30d9591618dc22a1f0e SHA512 e99946565708581ac0c606b4490f129eb7fd3687ef30350c4fd5a184a296cf8803d9ea4429a8c00011e7a491040ac2369185bd56cc327437755ce533e4749e38 WHIRLPOOL 08620422b67f26bbe79b755d026c2b3c07d88ed46c677981b136ffc077e1ce656b675bbc804ef033d107cabc7c8a9085153338664229a1c4b5de78714078382e
 AUX yaboot-1.3.16-memalign.patch 889 SHA256 babf5a43e40197a234cb4c637e8f542b89c26ab801175f1977aaf05882d8592f SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c WHIRLPOOL 94606fabdbcb854141642e2bb7c6a5b7d0a571dedc489b22b3de658bd2c3e74118cdfbb44f100faaacb48b34b7162fd4313e8f66d3b389efff317b1f93b693ac
-AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d SHA512 30020247039f29e78799b5fa3e2054510294d266feb2014e02c3129dfccf67e7a9da3f565b1b3b9bcebb81d359dd15bc45fdec5f3fa37d15e913fb634409324b WHIRLPOOL 6c871e84e5f29bab65d29c2a355be9e88795330f8ea921e8ac1bfce6909dc30fc8b99b81306143937c14c256f042a371f4b2558b73fd540a4741dd0a676534ac
-AUX yaboot-nopiessp-gcc4.patch 1623 SHA256 61775623e47719ee0dfce343fa86957e17b4e40c6e695c254b1862cefa428fa1 SHA512 02e44f87a4c82bd218ba3e51cd76fe08b47552251193e9da8c39fe79b736387e7deceb4b4687b28924271e6f673cec1050084cfd85fde365c61ecd3a81eead77 WHIRLPOOL dc26c7135091deaf1779b1e45853e7ef869f3d44cf978ac9e331da57254ada63abc3932f1d948732035ef2e7e59bcf9ed33bc0a818e67b046c1f07facf3f22e9
+AUX yaboot-1.3.17-nopiessp-gcc4.patch 1229 SHA256 0c00ec6c191723d2bd5621ee193ab4b0483cb3bb2443d7ac4b7f8ba859952917 SHA512 32e41b33a1e7109ec0a7ba9ca97ff0d45144d9499aa7657bc93a8007c6c6fa8206a6b406729cbb27407c84ef004b4cdb85e4664d9a4666cbde7700e7b3e82231 WHIRLPOOL cb1f12289c4217b01b6810b5ba21b44a57f450eb734b3af37293b0668934f1973261cd7aee73d2c3cbd2f62319cd7c43acd63878a15333085c04a43191d19f65
+AUX yaboot-nopiessp-gcc4.patch 1355 SHA256 b877f5e21ca658fbfe23ecf7c0053c0db585df72c18348e8aeb249048353bb0e SHA512 413b2353735d82a81e2831d1e51a995096eadfb3c17feb51b6b75035057557ed8c9adebd58fa1635fcaae36fd25c1783e491b85b4437dfb73e1569cf48a51359 WHIRLPOOL 14b8531069c1af0eb19291f0425544254ca3737df8eb74fa79d7beba83b4045fad6f0451de20b8424e7b6e9a457289a9674ca348d3d95ae593425ac9d21ff80c
 AUX yaboot-stubfuncs.patch 3803 SHA256 58af65c19cb6f464bc32eaae1266eebbe1ff0a27857a984edc725a036c7ceecc SHA512 43e4adf2cb788e70b9245449cb4e116bf8511c6cfb66a22ab580f184bd9daaa7e79b96b442b119a0e8a6d1c8404dd69caa5a158153902c670723823ab1811bf1 WHIRLPOOL 44ae7403c0d88f98b76c3b887ddc8d694c615e85527907feb30afb1d7f4f2c7b7b566d31f4fce16b2893c373d3888a9e9abd93ca569b521031d55e3fafc56705
 AUX yabootconfig-1.3.13.patch 1655 SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20 SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98 WHIRLPOOL 28fb906a0de9bab0d383de289d25ab5be5941c1be51d2348f2c4bd12ee7c6259785eb948b5239be5d19a0c32c3962f05cfa7bad52fad1b889dfa09ea2633f5cd
 DIST yaboot-1.3.14.tar.gz 219089 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74 WHIRLPOOL 5eb364684b5628ea241719f2ac8c18ef2ee3daa7355da91fc69992187c01b1decce95144eb0d7cbd3a481124a3ff81880261b8e5e5aedf6f87499c3c3c95940c
@@ -16,22 +16,22 @@ DIST yaboot-1.3.17.tar.gz 224325 SHA256 2fb738d8fd48b94ab2534a4fdf63738ad02c1a30
 EBUILD yaboot-1.3.14-r2.ebuild 1174 SHA256 f2adaa2089a4f9d092579e8c61cff2a447d7f829a37bb2a13c0496e2f10acc0c SHA512 2bd93d8d482bfb6eeb6ce109a6c13b5b8284a480edae5a517f1d44b812a4b595fa2627edc2d4354d28cf06b7c5be57910a43ae5c110d1b59e35b43adadeb08e0 WHIRLPOOL e85cafb141aa7a6522fea86a6d11f2c8711e8d6b7c8597890e7e1fee38d7aab9f028a9ded43f1b0c64e5734b301b70a0d5d4b3097f3a0b978ca66aed1fb97d4f
 EBUILD yaboot-1.3.16.ebuild 1339 SHA256 365c28de2517b29af608897c4fb24a1297bece03dabb270403dfebca2b2800dd SHA512 76c0205ae93d06cc00e69553fc38f574ea2b38303f2bea7363e68d79d6f96a6f0b76b3485f916003fd1e51fca5ea25c139e0017e727c461a103adbb5a1d28d06 WHIRLPOOL e4439409ba22bc3cd1c1d3e933ecc761c078ee05b57f4f97ef7b1ad19c05e7686cebbcdca0cc751595ea03eca9ecb9d379a9c245bf86b4894bd5b66aae6e735e
 EBUILD yaboot-1.3.17-r2.ebuild 1611 SHA256 42b1fab1ee0dacc278b6cd82444e1a6ab180764f3dfbd4535b3fd9677c30a754 SHA512 1b8e3023708a36b551552c107eac3a3672e3b2fd64dcc6aca23b1a53d57cfc3a2cdf36655d053fae4a8b94dd3a50de59ec2c7def92dbd506bd5f5f08da1fde82 WHIRLPOOL 97337984466cdda204e4aaffec3fdb1928b13efab3454cac57613bbb15d47f2d3dea1662af7902000ec92bf564a7e2ccdb3c2807090365c5e6429537e326f1d4
-MISC ChangeLog 12288 SHA256 24f59f5ad7151e51f924a5f3077695c30b5b7abb114d51ac2c6216e465eca64c SHA512 99f57f0d7f35ecfd637020440a240378c72438a02672e2eef1e432c30c7626377cb95df60a09dde04b3bce31fb8a836e7912e096ab9a69b74ee1a1facc8c4522 WHIRLPOOL fd7c81950788c5bb2df3df666d2a2c95f2473b1c9935121c7866d43219fdee4bcd6dc423528e26de9247d7f2bb701324e7637e894d88866156a7160610ccd1c2
+MISC ChangeLog 12482 SHA256 a25a67a21f4490d3f17e15dd2c3a9e1227a3b3f17a058931c8aa9da738296355 SHA512 e0876589866cd60a8f1ea70f8e712b764ad65434e9286caf087ada9deacbd1fe1aa56fb2f1bc1f32d5f459ee8693fae728e21e87735ca685f0032d4c11c3ad68 WHIRLPOOL 6e4a72e437397ead968ab6aa9d6cceabf5e8a4acb4994cfa477536774364ec563eb76ca26a5f84b28ce8636c9b731382b9444ac42968862bec89d141782a9362
 MISC metadata.xml 175 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a SHA512 9933194f53703c4f34f6b7145e9236acfa60669c9a036c2c9da309f1adec5f4addf508040b7be6b935dfc36ed652dd3b2cefc5e48bc48f0e01c9def0022ca7e2 WHIRLPOOL edb132936f3b6adc3944344b9e2b57de7a126febbc799869e3838933eebd307d02c99f3466aeaf2ebe7d3fd4c9cab66c56fbff0e8b02734314c20926b4a11e46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWBi4AAoJEPGu1DbS6WIAduIP/iSW6GGdBZGmkWxR4cv1D4Ya
-kiuO4aiBgIolcMjbLMBBR7hLPPSQas/MVqneNLtL8Mt/QKfd1gnetJur/7BzdiH7
-nMDhqMfIWNlrFcswp2EubBvUxhvmnPPKTWIfSA79plN7z5/shiG3SMklDBADuBfO
-XR5LtNz+q3/Q/dmNABCxoNy6ECKcYnmHjpaw2fDah3xzls2qShZOYnelA7W7GCg3
-ZGsq2H23EVNeRf4w/1jX2/pVpKNGRltN8G6vEWHUm/FfPsC4GyhONJg1TizR6ICG
-VEKgEsYnG8eJ3lUmX/JYl5yLoWOCKgmLqilY7KBkFIqiqf291h9lhDKH3rudOVou
-4NJRAGHGSq5kLKDUKXVtYlkJ5EM7CzvUBMoHYiLlLoPB8uBwCRupKo/zXTDniru9
-QIh68pTZRC98tv5cix6XOtPos3I3+e+nSal62kbUp/aOJblUkvq5cas/5pgsb2/l
-7R6MamiW/qWRPTv8VsTKziZFELMQUEqoqc2GIbkMnpNgEMm7gM0ah53LWv7TTqpu
-1KfQfE50R5HKgdczvvm7bM2PmK1dwbbitBzq7BgM6Cfg+zjnDmPq634d0ezmy2Zz
-3MGFcw4HmSMhQQyF1Wg2J1blCB7u6bTQLksvA+dBjqJCcLysh+Newq1UlU5ifuE5
-dK1OHB9/Deus0G2FyX4+
-=BZ1l
+iQIcBAEBCAAGBQJVWBoJAAoJEPGu1DbS6WIAa2gP/0f3E4Wt54Btnr1+nt0qz/t7
+KmjvYDZuRzvhZJ3RtXoSd8IUdTTx/K3E96FbswwdSm85pjeUeDxA2HkRc+D0VyBs
+T0rxdmEMnoiqkQZc+ioFwHqqWy7l7A3UZQ1gF5O/9A9EnNDQETV9cpaj2FmT1oLE
+26nvTxnEYZOL6rrFCLV5gil5vKZhL+Nz+2xtSvp8C12XQy5no5A+XFS3A29cS/B1
+vGq4ONiLPtwiKEQBMtZ9wZcb7Xd2Bt2RSKKUE6ykkCNKP1kZKbvQisSgSU9zanuM
+31SmtzoM4FPVxAg6XnE7HIXixbIdk5OylWfn0niUDtYpqzO70ndhGxcDW2OQp56b
+0jNlNucDLcqXvjMUTYWBbyA3y0/0C5hmkY+67M1N/7KhWbltlIijuXybSeymyb52
+6ycph3jfmHR96xMT8WeclLQaEAsAZrjIYaBOCL4s1AJk7iBuxf9KkSaQmU5OSLdD
+ycFcrnbfLUB4m0gUxJu3V9+ghEXFrsPY505I2kVOjb0pYbnFg/kmsDplaIrx8hTt
+V8ktix4REjthQD8HE62NLLmc6rTJTLQPGg7QxzzTWj2oKXhUEn7lIUfsYRfnNkGQ
+GhbqOxLJwvX/HdRRW9Vk3V8W32EWpkcZyQJcCFh4733KtgZnRR3JLlyQM2vhubQN
+nvXpjwA0m728AtC+m47s
+=2Gp3
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch
index 8e060e54c2e8..1ab2a3eecc3e 100644
--- a/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch
+++ b/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch
@@ -1,6 +1,10 @@
-diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
---- yaboot-1.3.13.orig/Config.gentoo	1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.13/Config.gentoo	2005-06-12 00:41:14.889576152 +0000
+disable ssp usage in yaboot itself
+
+unfortunately, since we link against external libs that themselves were built
+with ssp turned on, we have to provide stubs to keep the linking from failing
+
+--- yaboot-1.3.13/Config.gentoo
++++ yaboot-1.3.13/Config.gentoo
 @@ -0,0 +1,6 @@
 +check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
 +	then echo "$(1)"; else echo "$(2)"; fi)
@@ -8,9 +12,8 @@ diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
 +CFLAGS     += $(call check_gcc, -fno-stack-protector)
 +CFLAGS     += $(call check_gcc, --nopie)
 +
-diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
---- yaboot-1.3.13.orig/Makefile	2004-07-11 20:12:03.000000000 +0000
-+++ yaboot-1.3.13/Makefile	2005-06-12 00:41:14.890576000 +0000
+--- yaboot-1.3.13/Makefile
++++ yaboot-1.3.13/Makefile
 @@ -1,6 +1,7 @@
  ## Setup
  
@@ -21,22 +24,15 @@ diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
  # Debug mode (spam/verbose)
 @@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
  	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
-	second/iso_util.o \
-	lib/nonstd.o \
+ 	second/iso_util.o \
+ 	lib/nonstd.o \
 -	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
 +	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o
  
  ifeq ($(USE_MD5_PASSWORDS),y)
  OBJS += second/md5.o
-diff -Naur yaboot-1.3.14.orig/lib/ssp.c yaboot-1.3.14/lib/ssp.c
---- yaboot-1.3.14.orig/lib/ssp.c	1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.14/lib/ssp.c	2010-06-20 18:50:57.000000000 +0000
-@@ -0,0 +1,7 @@
-+extern void __stack_chk_fail_local (void) ;
-+
-+void
-+__stack_chk_fail_local (void)
-+{
-+  return;
-+}
-
+--- yaboot-1.3.14/lib/ssp.c
++++ yaboot-1.3.14/lib/ssp.c
+@@ -0,0 +1,2 @@
++void __stack_chk_fail(void) {}
++void __stack_chk_fail_local(void) {}
diff --git a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
index 1016d8f5621d..ed1755b72b33 100644
--- a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
+++ b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
@@ -1,6 +1,10 @@
-diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
---- yaboot-1.3.13.orig/Config.gentoo	1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.13/Config.gentoo	2005-06-12 00:41:14.889576152 +0000
+disable ssp usage in yaboot itself
+
+unfortunately, since we link against external libs that themselves were built
+with ssp turned on, we have to provide stubs to keep the linking from failing
+
+--- yaboot-1.3.13/Config.gentoo
++++ yaboot-1.3.13/Config.gentoo
 @@ -0,0 +1,6 @@
 +check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
 +	then echo "$(1)"; else echo "$(2)"; fi)
@@ -8,9 +12,8 @@ diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
 +CFLAGS     += $(call check_gcc, -fno-stack-protector)
 +CFLAGS     += $(call check_gcc, --nopie)
 +
-diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
---- yaboot-1.3.13.orig/Makefile	2004-07-11 20:12:03.000000000 +0000
-+++ yaboot-1.3.13/Makefile	2005-06-12 00:41:14.890576000 +0000
+--- yaboot-1.3.13/Makefile
++++ yaboot-1.3.13/Makefile
 @@ -1,6 +1,7 @@
  ## Setup
  
@@ -28,15 +31,8 @@ diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
  
  ifeq ($(USE_MD5_PASSWORDS),y)
  OBJS += second/md5.o
-diff -Naur yaboot-1.3.14.orig/lib/ssp.c yaboot-1.3.14/lib/ssp.c
---- yaboot-1.3.14.orig/lib/ssp.c	1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.14/lib/ssp.c	2010-06-20 18:50:57.000000000 +0000
-@@ -0,0 +1,7 @@
-+extern void __stack_chk_fail_local (void) ;
-+
-+void
-+__stack_chk_fail_local (void)
-+{
-+  return;
-+}
-
+--- yaboot-1.3.14/lib/ssp.c
++++ yaboot-1.3.14/lib/ssp.c
+@@ -0,0 +1,2 @@
++void __stack_chk_fail(void) {}
++void __stack_chk_fail_local(void) {}