Add pread/pwrite stubs that newer ext2 libs use #527974 by Agostino Sarubbo.

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

4 files changed, 68 insertions, 40 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 5ade98f6d90d..fc582d76f7ab 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.52 2015/05/17 04:33:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.53 2015/05/17 05:02:02 vapier Exp $
+
+  17 May 2015; Mike Frysinger <vapier@gentoo.org> files/yaboot-stubfuncs.patch,
+  yaboot-1.3.17-r2.ebuild:
+  Add pread/pwrite stubs that newer ext2 libs use #527974 by Agostino Sarubbo.
 
   17 May 2015; Mike Frysinger <vapier@gentoo.org>
   files/yaboot-1.3.17-nopiessp-gcc4.patch, files/yaboot-nopiessp-gcc4.patch:
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 4ea3b42b1386..42a8a678d822 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -8,30 +8,30 @@ AUX sysfs-ofpath.patch 3432 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e
 AUX yaboot-1.3.16-memalign.patch 889 SHA256 babf5a43e40197a234cb4c637e8f542b89c26ab801175f1977aaf05882d8592f SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c WHIRLPOOL 94606fabdbcb854141642e2bb7c6a5b7d0a571dedc489b22b3de658bd2c3e74118cdfbb44f100faaacb48b34b7162fd4313e8f66d3b389efff317b1f93b693ac
 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 yaboot-stubfuncs.patch 4493 SHA256 f2873d33cb2c34389e05e20fb5380546d2beb6704b9a788c6c7dbde92bab3267 SHA512 567efe277509ceff8ce88d756337eb81579bb2946abe9c569da4749d5f021c9fd4f4bf25ffae389e6ae2f31c24a75197b2b116f7e0604b45d29c568b006f0de8 WHIRLPOOL 2d26971babb91c50c4a953736ade28f9b1944b44d1b3e844bc082083f80813be1a08e878ce2394519717e17aa06e17ac39270b7111231e86a2bf4cd00b072f14
 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
 DIST yaboot-1.3.16.tar.gz 220360 SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650 SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14 WHIRLPOOL 5cd42ff0c041135c53cdd852ca227aba75e154cd557fdc6a740218982f5033da6f4428bda5934b6227dd726f31d2d97e2c37d3706076ecad77969678fe7c8eb4
 DIST yaboot-1.3.17.tar.gz 224325 SHA256 2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de WHIRLPOOL 8440faadd955aae0484a2d05c4b712d40b9f438224bbf26b2cf9e178944a007aeac779ae7a9ef2431f2404b24440930d34a63b36f46d8c58d4b7ce98af5c92bc
 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 12482 SHA256 a25a67a21f4490d3f17e15dd2c3a9e1227a3b3f17a058931c8aa9da738296355 SHA512 e0876589866cd60a8f1ea70f8e712b764ad65434e9286caf087ada9deacbd1fe1aa56fb2f1bc1f32d5f459ee8693fae728e21e87735ca685f0032d4c11c3ad68 WHIRLPOOL 6e4a72e437397ead968ab6aa9d6cceabf5e8a4acb4994cfa477536774364ec563eb76ca26a5f84b28ce8636c9b731382b9444ac42968862bec89d141782a9362
+EBUILD yaboot-1.3.17-r2.ebuild 1536 SHA256 004b20b0c2b1f666d5daf6d2ac1b0802c9c264fe9c33f3987c2d57a134720924 SHA512 3120cbeaff68ba8506934b572cdba2a5cd83d1ef0ea99e726149a1527616769e73aec8b9f23627077cf93cc33c912a3d0fc7f83421ba5d71b5432d33378c5a2c WHIRLPOOL e1e6fc96f2dd700b296a4d82ce0d6148c4dc103816c84cb7548e639add2cea85343f2f3a53bed31a4e333b175ffab72b2b80b457519e85dd32ccb7bcf299e498
+MISC ChangeLog 12669 SHA256 3d42ab82ef0586f55be43851f872d9f90a1c4931a6277e58b7cc82cdfd6d3aa4 SHA512 68ba59278affdaccedcc57ab3ffeee7751032ece1f64e2af444af70db54cc1112cfa6b75d11770a1432db55ad8bd3ffa1ef87d3d3f49f19c58af5f10c7b115c2 WHIRLPOOL 39038fb9301516f5ee3989812cdeb49d639bee06f16961fb31bccbbed54a22e799fa87ee124106c863df7eade6f6b704c6a60a703ab09a23efe77b9ef712b0ff
 MISC metadata.xml 175 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a SHA512 9933194f53703c4f34f6b7145e9236acfa60669c9a036c2c9da309f1adec5f4addf508040b7be6b935dfc36ed652dd3b2cefc5e48bc48f0e01c9def0022ca7e2 WHIRLPOOL edb132936f3b6adc3944344b9e2b57de7a126febbc799869e3838933eebd307d02c99f3466aeaf2ebe7d3fd4c9cab66c56fbff0e8b02734314c20926b4a11e46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJVWCDMAAoJEPGu1DbS6WIA8g8P/iX58ByfZ+j5MLOxUnDbUd+L
++u+dolrOBIEw/ngo4N45lw52LmfrUzR/zGsU/6IdRsRfvqcodUjUdEBxa71dTIIX
+LhVZbcdIZumWitOJjM1KNQs7YOWThm1yDRxAPiN+oY/+EzWy22BqwFw8x5/yJkTU
+K7ovXwaEeUB0OXEUFLVNWwYQWvwgjQH+AaTXaFpruaIo6HCR71PP0D+r1cdriRp4
+3InQRpWrqTh82fWT9uXI9E/tipGX0IMtWkkwmkrc36RZfaH6BgWpoGbB3O6ZE6Lc
+QZFoSzoiu/z04LJSn2QZUqVDAE4oo+/sl4xSCyTt2SEIxUG3ncJdo1A9xxNwMjCy
+hgHnBHcWW0feZW3alvy2uYtDt0fA47L+K3YrbLyA1eMUWgxTuM5dKi3DTZ1FKoWu
+sAjOJlXUhH/PIqUVNevsVvPQIcP61LCPLeQJ3PxumGBt6aGva3fPrZKfAroq53dc
+Sg5jXlA2veOACjjFqQd2NBus2ZQc9Kdt8vVbHTOA17U9SZcCk5UXT7m3c0OW7krA
+k4uHUZTGXqmiPOoY3heX3v2+8dVIqohjGAFyY2FbKAugcWGOLVM5V+cjN5J5VMrm
+wQJQ8GhhIYLnR0A/oBidXymSoD3+hdjHOzQxfQj83HAZ2w2GkJilqj1z5/JtLCXh
+pgfruxuTiaKFqwTRj1G6
+=U4Va
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/yaboot-stubfuncs.patch b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
index 55724c3edda2..6b1d5218251f 100644
--- a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
+++ b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
@@ -1,3 +1,5 @@
+Stub out some functions that are not provided (and unneeded)
+
 --- lib/malloc.c
 +++ lib/malloc.c
 @@ -64,6 +64,15 @@ void *malloc (unsigned int size)
@@ -16,32 +18,41 @@
  /* Do not fall back to the malloc above as posix_memalign is needed by
   * external libraries not yaboot */
  int posix_memalign(void **memptr, size_t alignment, size_t size)
---- lib/nonstd.c	2012-06-20 09:38:54.000000000 -0400
-+++ lib/nonstd.c	2012-06-20 09:38:57.000000000 -0400
-@@ -65,3 +65,178 @@
+--- lib/nonstd.c
++++ lib/nonstd.c
+@@ -65,3 +65,203 @@
  {
  	return NULL;
  }
 +
-+// I tried to use prom functions for these...
++int lseek(int fd, int offset, int whence) {
++	// XXX: This whence addition seems wrong ..
++	return prom_lseek((void *)fd, whence + offset);
++}
++
++int lseek64(int fd, int64_t offset, int whence) {
++	return lseek(fd, offset, whence);
++}
++
 +int open(const char *pathname, int flags) {
 +	return (int) prom_open((char *)pathname);
 +}
 +
 +int open64(const char *pathname, int flags) {
-+	return (int) prom_open((char *)pathname);
++	return open(pathname, flags);
 +}
 +
-+int __open64_2 (__const char *__path, int __oflag) {
-+	return (int) prom_open((char *)__path);
++// Internal glibc fortify calls.
++int __open64_2(const char *path, int flags) {
++	return open64(path, flags);
 +}
 +
 +int read(int fd, void *buf, size_t count) {
 +	return prom_read((void *)fd, buf, count);
 +}
 +
-+int write(int fd, void *buf, size_t count) {
-+	return prom_write((void *)fd, buf, count);
++int write(int fd, const void *buf, size_t count) {
++	return prom_write((void *)fd, (void *)buf, count);
 +}
 +
 +int close(int fd) {
@@ -49,6 +60,30 @@
 +	return 0;
 +}
 +
++int pread(int fd, void *buf, size_t count, int32_t offset) {
++	int curr = lseek(fd, 0, 0 /*SEEK_CUR*/);
++	lseek(fd, offset, 0 /*SEEK_SET*/);
++	int ret = read(fd, buf, count);
++	lseek(fd, curr, 0 /*SEEK_SET*/);
++	return ret;
++}
++
++int pread64(int fd, void *buf, int64_t count, int64_t offset) {
++	return pread(fd, buf, count, offset);
++}
++
++int pwrite(int fd, const void *buf, size_t count, int32_t offset) {
++	int curr = lseek(fd, 0, 0 /*SEEK_CUR*/);
++	lseek(fd, offset, 0 /*SEEK_SET*/);
++	int ret = write(fd, buf, count);
++	lseek(fd, curr, 0 /*SEEK_SET*/);
++	return ret;
++}
++
++int pwrite64(int fd, const void *buf, int64_t count, int64_t offset) {
++	return pwrite(fd, buf, count, offset);
++}
++
 +// No fsync, just assume we've sync'd
 +int fsync(int fd) {
 +	return 0;
@@ -159,14 +194,6 @@
 +	return 0;
 +}
 +
-+int lseek(int fd, int offset, int whence) {
-+	return prom_lseek ((void *)fd, whence + offset);
-+}
-+
-+int lseek64(int fd, int offset, int whence) {
-+	return prom_lseek ((void *)fd, whence + offset);
-+}
-+
 +size_t fwrite(const void *ptr, size_t size, size_t nmemb, void *stream) {
 +	return 0;
 +}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
index ad93a575bbc7..224b23f67270 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.8 2015/05/17 04:27:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.9 2015/05/17 05:02:02 vapier Exp $
 
 EAPI="5"
 
@@ -32,19 +32,16 @@ src_unpack() {
 
 src_prepare() {
 	# No need to hardcode this path -- the compiler already knows to use it.
+	# Error only on real errors, for prom printing format compile failure.
 	sed -i \
 		-e 's:-I/usr/include::' \
+		-e 's:-Werror:-Wno-error:g' \
 		Makefile || die
 
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"
 	epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
-
-	# Error only on real errors, for prom printing format compile failure
-	sed -i "s:-Werror:-Wno-error:g" Makefile
-
-	# Stub out some functions that are not provided (and unneeded)
 	epatch "${FILESDIR}/${PN}-stubfuncs.patch"
 
 	# Fix the devspec path on newer kernels