diff options
| author |   Maxim Koltsov <maksbotan@gentoo.org> | 2011-12-19 13:14:03 +0000 |
|---|---|---|
| committer | Maxim Koltsov <maksbotan@gentoo.org> | 2011-12-19 13:14:03 +0000 |
| commit | da140fda1470c5413b6cd90c7f17caece67ebba2 (patch) | |
| tree | f3aebc540c575b98b6b979402aa78f8015581bf4 /sys-apps/fakechroot | |
| parent | Version bump (diff) | |
| download | historical-da140fda1470c5413b6cd90c7f17caece67ebba2.tar.gz historical-da140fda1470c5413b6cd90c7f17caece67ebba2.tar.bz2 historical-da140fda1470c5413b6cd90c7f17caece67ebba2.zip | |
Bump patch too
Package-Manager: portage-2.1.10.40/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/fakechroot')
| -rw-r--r-- | sys-apps/fakechroot/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/fakechroot/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch | 25 |
3 files changed, 32 insertions, 2 deletions
diff --git a/sys-apps/fakechroot/ChangeLog b/sys-apps/fakechroot/ChangeLog index c89cd0eb71b5..94182ffb512b 100644 --- a/sys-apps/fakechroot/ChangeLog +++ b/sys-apps/fakechroot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/fakechroot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/ChangeLog,v 1.17 2011/12/18 19:42:51 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/ChangeLog,v 1.18 2011/12/19 13:14:03 maksbotan Exp $ + + 19 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> + +files/fakechroot-2.15-fix_chk_fail.patch: + Bump patch too *fakechroot-2.15 (18 Dec 2011) diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest index 43ce5fd88b99..3d131f51b63b 100644 --- a/sys-apps/fakechroot/Manifest +++ b/sys-apps/fakechroot/Manifest @@ -1,4 +1,5 @@ AUX fakechroot-2.14-fix_chk_fail.patch 732 RMD160 0379c47d28c43feeae94c18158721fe76b631ea7 SHA1 358dcb04be06dd700e2784429a7d4d81e151d744 SHA256 f3d01578720cefd1f01ce52c8a987e5a7be614e7a7ffd9d1e24ee6668e60a5f6 +AUX fakechroot-2.15-fix_chk_fail.patch 732 RMD160 0379c47d28c43feeae94c18158721fe76b631ea7 SHA1 358dcb04be06dd700e2784429a7d4d81e151d744 SHA256 f3d01578720cefd1f01ce52c8a987e5a7be614e7a7ffd9d1e24ee6668e60a5f6 AUX fakechroot-2.9-glibc-2.10-compat.patch 6436 RMD160 1e4c7ce7ee7db24bd22abe647c0c405a0c9d1648 SHA1 ff05265d90abeea5ef0bf683a660b43d5f39c271 SHA256 1535409f5ad0e5049239007615631191399801f021f4365805eee21d8926ad4c DIST fakechroot_2.11.orig.tar.gz 350533 RMD160 eec763ece1685c7c926748cb9978a7178f9684a9 SHA1 8f6036a890225f091e46d38a99c3efbb00426ef6 SHA256 305476ed07090d373e79dea396017d65b6019cafd7e66d9b3ba4e60eb9224d76 DIST fakechroot_2.12.orig.tar.gz 352298 RMD160 34a8068f360720032c82c6c6635c165da4a7d89b SHA1 b2e32c4de64ba2f2d83f3ac7947f502afbaa1cd9 SHA256 05174cc9caa3ec84cd7515caeafd809a9411e13498f972a617bf3616463b5d2b @@ -10,5 +11,5 @@ EBUILD fakechroot-2.12.ebuild 722 RMD160 338fb0602af80042017691bcf03b7a536fabafd EBUILD fakechroot-2.14.ebuild 794 RMD160 bd739c8644944e6927659b231aec0b2aa9ce6ab5 SHA1 4e58df99a18b6caf33b62c58bbffde928171d389 SHA256 6fd04fa776f15e37995d4a88a6b45e5f8b5980b1b1afd277e74ca6ce8da0fae0 EBUILD fakechroot-2.15.ebuild 797 RMD160 6585c8fb0c855609358b2b79f5a49c3f88e75e94 SHA1 ec1e06dd4bd492b1e6e7750033abd515f517810c SHA256 efea6d42c9e0218e3206800d9202bf75b3b2a65d217f7b2ad1231a80421a7693 EBUILD fakechroot-2.9.ebuild 746 RMD160 e864da9ee7db45337ad5a9f9206d7e8e2240b854 SHA1 19d2a443de2e2fc64b6219fec861ccd71a81f3fa SHA256 3fff70413a355ed71a30e01b264dec5cfb8d6c20bc9d3e029c976d6ace418e2f -MISC ChangeLog 2473 RMD160 27509e5d6baedef23e7d607d9379668d9a3e9e34 SHA1 b819d21ee283e806edafc606ab9e428308bfcce9 SHA256 d693aaf34f512cf8a8da2cf664492bada4fd597ad90a7ddb900e496cc037884f +MISC ChangeLog 2588 RMD160 c830656ec46c8ecd73378d11560d9e3c6435ce70 SHA1 41e7b8f996821c976e9bdc91dd4ded8e19906893 SHA256 9b391a78c77d79a91d0e194748cb6bdfb99edaf9e9fab6305b76d247951d14f4 MISC metadata.xml 546 RMD160 2fe95972a9d1449ab3b325a4f57e8e18abfc3f8e SHA1 679be518f44c0a66378cba6123585635a7ccd456 SHA256 c54e480a899f0a987272ba4fc83a0955f1021c354f4b283fb8459035cf986e6e diff --git a/sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch b/sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch new file mode 100644 index 000000000000..a714d02a59c4 --- /dev/null +++ b/sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch @@ -0,0 +1,25 @@ +# This patch fix the availablity of __chk_fail function. +# patch from blueness@gentoo.org + +diff -ur fakechroot-2.14.orig//src/__realpath_chk.c fakechroot-2.14/src/__realpath_chk.c +--- fakechroot-2.14.orig//src/__realpath_chk.c 2011-07-04 16:59:16.176441002 +0200 ++++ fakechroot-2.14/src/__realpath_chk.c 2011-07-04 17:00:23.718441000 +0200 +@@ -24,10 +24,18 @@ + + #define _FORTIFY_SOURCE 2 + #include <stddef.h> ++#include <stdlib.h> + #include "libfakechroot.h" + + ++#ifdef HAVE___CHK_FAIL + extern void __chk_fail (void) __attribute__((__noreturn__)); ++#else ++__attribute__((__noreturn__)) void __chk_fail (void) ++{ ++ exit(-1); ++} ++#endif + + wrapper(__realpath_chk, char *, (const char * path, char * resolved, size_t resolvedlen)) + { |