Update the stub functions to work with e2fsprogs-1.42.0.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 39 insertions, 22 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index d3915d6dd758..ab9a2e1e4f82 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.40 2012/05/02 06:20:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.41 2012/05/05 12:38:15 josejx Exp $
+
+  05 May 2012; Joseph Jezak <josejx@gentoo.org> files/yaboot-stubfuncs.patch:
+  Update the stub functions to work with e2fsprogs-1.42.0.
 
   02 May 2012; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.17-r1.ebuild:
   Change to EAPI-2, move the patching to src_prepare, add e2fsprogs static-libs
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index baaa533d6d47..36e374606996 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -8,7 +8,7 @@ AUX yaboot-1.3.16-memalign.patch 889 RMD160 e5ed2a0b6f0c9262ba9a9d3469c4a0c16e77
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 RMD160 e79f715a1aff784b9fee789c41a8fa6deeab7b89 SHA1 e35d0c217ec5ff16fb293814fe95bca9009ff333 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d
 AUX yaboot-nopiessp-gcc4.patch 1623 RMD160 2c5cd0e61acf01bc82a5f49cf07838f143c49f99 SHA1 4a783fbb82f35f0d2792ff5a83dd480326677752 SHA256 61775623e47719ee0dfce343fa86957e17b4e40c6e695c254b1862cefa428fa1
 AUX yaboot-nopiessp.patch 1885 RMD160 ad6bc10b7f9eca86a155691ed11e7e8b234ff6bf SHA1 6adb7f426fede91e9f2a5276bf87b6f2ad0bea1d SHA256 69fcfa7a6c464304b8a9c68da8331909948686955f4a9e10d23505f700bee1ab
-AUX yaboot-stubfuncs.patch 3106 RMD160 abc64847706adb22c5ce4b990b7b0377a32410d5 SHA1 1143b8918545cf40d2333d5627075f931f57e731 SHA256 f5bf0256269b1865ee794dd1f04ed3fcba329fc881c6efc53ed2657050c0d82e
+AUX yaboot-stubfuncs.patch 3349 RMD160 022435554f2e517c6a2c6f3d7821401d41083b55 SHA1 d54b77dc3d3ba5ae5aa78ade98618517ef1d55ea SHA256 3b6f6447368e46bff61b0c8acbee0d95f8cf076d7cd33541c725fa006b003784
 AUX yabootconfig-1.3.13.patch 1655 RMD160 fd3e62c5cddbe359df3f2abee225392e0ff86144 SHA1 c50bd7dabe553e00c466cfa63cbdb9f20257a74b SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20
 DIST yaboot-1.3.14.tar.gz 219089 RMD160 dd46fc044732c5bdf3dc23b3faa1dd746895cdd5 SHA1 2bf7594a921075371acf468a46776d0f93e315a6 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933
 DIST yaboot-1.3.16.tar.gz 220360 RMD160 738118a5f12ab39c24c2e5983d8852e1b439c846 SHA1 6c87bb041e8dc569b624d99ec5a5d53c8911319f SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650
@@ -17,12 +17,12 @@ EBUILD yaboot-1.3.14-r2.ebuild 1268 RMD160 dddd538a19b1720f3410f0c3d7089d64895ce
 EBUILD yaboot-1.3.16.ebuild 1341 RMD160 4b2126940730b0b9741c598426bea086cd7826e6 SHA1 853d744db363364f0c5b9af85b24b0f2f9a63192 SHA256 6a21594179712ca4819fdb7265cc6aa259a69a108f82de6529e7fa97c86bef7c
 EBUILD yaboot-1.3.17-r1.ebuild 1488 RMD160 83212670ff0c43be96bec56cae6853994533d39a SHA1 7bc235469a41e9f40d1c54e91555e2f604feef01 SHA256 6e33d3551c269fa56651de2dd96c55a53747dd269ecb8db12037e0b4a8e6b661
 EBUILD yaboot-1.3.17.ebuild 1382 RMD160 a72b1e10eb053cadbb91ce70798fb3a8a6a39a4d SHA1 69456b6a0525fec2ff2b826f18f6b16f7b9abe8e SHA256 6193823e37ae89c66d483848b660f91ffd41189c14173a0995299cc3e1287c89
-MISC ChangeLog 10312 RMD160 a836c0b9fb782e260fb9f4d2f8694104abce5187 SHA1 ff0b47ef74aa0ffa81e81d2af0e75ea4753cb4a3 SHA256 95a957a02a90b97ce176a3c4da42ca65be8242d03769b4c761588e83293fba42
+MISC ChangeLog 10450 RMD160 4629cf08f9bbc07cf896a8d0be6a8b9944af7ec4 SHA1 d4060aa9324ab46febfa733bdaf658f6ef5940b0 SHA256 06d7ffe832a921893176160676278fbbf8a53ba4b0b0fe8f1222ccb8f27674e3
 MISC metadata.xml 175 RMD160 a674189a82ea2172e0949ce49eb80dd5bc23ddf5 SHA1 c203d37a08bfb7b826b080650c3019705490bfb1 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+g0kwACgkQcsIHjyDViGTjzgCeJvFOT88fj59yadkm04GiKEan
-kygAoId17Hn7Xwnw75rzLN/p6ghXSy14
-=n/fA
+iEYEARECAAYFAk+lHzwACgkQcsIHjyDViGS8ewCgxSSDS0wnwVpXPMizFPQTIXoW
+R30An304WWJ7+VtO1GTaS+rqn5BmD4ta
+=B2OS
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/yaboot-stubfuncs.patch b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
index b315cc684c7d..ae78202bde37 100644
--- a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
+++ b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
@@ -1,8 +1,8 @@
 diff --git a/lib/malloc.c b/lib/malloc.c
-index 0121112..d077630 100644
+index 0121112..e6b29c4 100644
 --- a/lib/malloc.c
 +++ b/lib/malloc.c
-@@ -64,6 +64,17 @@ void *malloc (unsigned int size)
+@@ -64,6 +64,15 @@ void *malloc (unsigned int size)
      return caddr;
  }
  
@@ -15,20 +15,19 @@ index 0121112..d077630 100644
 +	return caddr;
 +}
 +
-+
-+
  /* 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)
 diff --git a/lib/nonstd.c b/lib/nonstd.c
-index 5aeb0cb..0a13246 100644
+index 5aeb0cb..b536180 100644
 --- a/lib/nonstd.c
 +++ b/lib/nonstd.c
-@@ -65,3 +65,131 @@ char *getenv(const char *name)
+@@ -65,3 +65,147 @@ char *getenv(const char *name)
  {
  	return NULL;
  }
 +
++// I tried to use prom functions for these...
 +int open(const char *pathname, int flags) {
 +	return (int) prom_open((char *)pathname);
 +}
@@ -41,14 +40,6 @@ index 5aeb0cb..0a13246 100644
 +	return (int) prom_open((char *)__path);
 +}
 +
-+int __xstat64 (int __ver, const char *__filename, struct stat64 *__stat_buf) {
-+	return 0;
-+}
-+
-+int __fxstat64 (int __ver, int __filedesc, struct stat64 *__stat_buf) {
-+	return 0;
-+}
-+
 +int read(int fd, void *buf, size_t count) {
 +	return prom_read((void *)fd, buf, count);
 +}
@@ -60,6 +51,7 @@ index 5aeb0cb..0a13246 100644
 +
 +void exit(int status) {
 +	prom_exit();
++	return;
 +}
 +
 +int __printf_chk(int flag, const char *format, ...) {
@@ -94,8 +86,23 @@ index 5aeb0cb..0a13246 100644
 +	return memcpy(dest, src, n);
 +}
 +
++// But these are all dummy functions
++int __xstat64 (int __ver, const char *__filename, void *__stat_buf) {
++	return 0;
++}
++
++int stat64(const char *path, void *stat_buf) {
++	return 0;
++}
++
++int fstat64(int fildes, void *stat_buf) {
++	return 0;
++}
++
++int __fxstat64 (int __ver, int __filedesc, void *__stat_buf) {
++	return 0;
++}
 +
-+// Dummy functions
 +signed int random(void) {
 +	return 0;
 +}
@@ -104,6 +111,14 @@ index 5aeb0cb..0a13246 100644
 +	return;
 +}
 +
++int rand(void) {
++	return 0;
++}
++
++void srand(unsigned int seed) {
++	return;
++}
++
 +unsigned int sleep(unsigned int seconds) {
 +	return 0;
 +}
@@ -148,7 +163,6 @@ index 5aeb0cb..0a13246 100644
 +	return prom_lseek ((void *)fd, whence + offset);
 +}
 +
-+// Stubbed ...
 +size_t fwrite(const void *ptr, size_t size, size_t nmemb, void *stream) {
 +	return 0;
 +}