From 6c30cc2d5bd48ddbdbe8d75544899cd5dbfcaba4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:18:26 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/boehm-gc/Manifest | 2 - dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch | 83 ---------------------- .../files/gc6.6-builtin-backtrace-uclibc.patch | 13 ---- 3 files changed, 98 deletions(-) delete mode 100644 dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch delete mode 100644 dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch (limited to 'dev-libs/boehm-gc') diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest index f12c0452215b..6bc82171c4da 100644 --- a/dev-libs/boehm-gc/Manifest +++ b/dev-libs/boehm-gc/Manifest @@ -1,6 +1,4 @@ -AUX boehm-gc-6.5-gentoo.patch 2815 BLAKE2B f8d853bcd7f7aff56ae246653feecea291451ab82c946f6ba4d7e981ee1252fddb6455231ff0aca0f7342b93c1b5bbc133b954394b6d0bde766c1b3c39a9f12a SHA512 ba006dda2d3ab295cb14e80f8b7e0908acbde89dbdae46b12b91b111ee1ebc1340ac0b91db8eec18a130a59fe27eda2f7d48f9ea35280c1e9ce3513d3a72779b AUX boehm-gc-7.2e-automake-1.13.patch 372 BLAKE2B 5e385b21e4868cee8928d5137c7eb6a5f9acfd20883ea116bc2fe974a35ea4d62866573dc414beec72439d8a1e128b9a4d3e9d9b358c79ebab7ed0f0ec3c3f2b SHA512 19efd52b91b985b31e190b77e5370fb510ad582a54868bb1a7fe54ae57e0625df113ad059a6d636a10f314624137704af8e193460b55c8ba422b9255aadae020 -AUX gc6.6-builtin-backtrace-uclibc.patch 425 BLAKE2B 24bc5443353681d3aa5b4ba592535d5905bc6feded1e8e80927d9aaf8928411e37529cf0cfea5e7a22fff630bda26540ee55ccf68d787018f34024049f1acfb5 SHA512 614dbce788a8e559c25966f9c82343d7ff2b26069f6f77bfa6d91abb755a8d4a46958e9b95f14d1e7e20349dc4df5b32a9e5bdd3eee9e5009a30003214e5f87f DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72 DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e diff --git a/dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch b/dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch deleted file mode 100644 index 72eb881eef7d..000000000000 --- a/dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -ur gc6.5.orig/include/private/gcconfig.h gc6.5/include/private/gcconfig.h ---- gc6.5.orig/include/private/gcconfig.h 2005-08-05 00:03:00.000000000 +0200 -+++ gc6.5/include/private/gcconfig.h 2005-08-05 00:08:42.000000000 +0200 -@@ -1100,6 +1100,9 @@ - # endif - # define OS_TYPE "LINUX" - # define LINUX_STACKBOTTOM -+ /* On I386 Linux, enable HEURISTIC2 as a backup to /proc data */ -+ /* for the case where /proc is missing or nobbled (grsec) */ -+# define HEURISTIC2 - # if 0 - # define HEURISTIC1 - # undef STACK_GRAN -@@ -1901,6 +1904,9 @@ - # ifdef LINUX - # define OS_TYPE "LINUX" - # define LINUX_STACKBOTTOM -+ /* On x86_64 Linux, enable HEURISTIC2 as a backup to /proc data */ -+ /* for the case where /proc is missing or nobbled (grsec) */ -+# define HEURISTIC2 - # if !defined(GC_LINUX_THREADS) || !defined(REDIRECT_MALLOC) - # define MPROTECT_VDB - # else -diff -ur gc6.5.orig/os_dep.c gc6.5/os_dep.c ---- gc6.5.orig/os_dep.c 2005-08-05 00:03:00.000000000 +0200 -+++ gc6.5/os_dep.c 2005-08-05 00:07:56.000000000 +0200 -@@ -967,7 +967,13 @@ - # endif - f = open("/proc/self/stat", O_RDONLY); - if (f < 0 || STAT_READ(f, stat_buf, STAT_BUF_SIZE) < 2 * STAT_SKIP) { -+ /* if /proc/self/stat isn't available, and HEURISTIC2 is possible, */ -+ /* return NULL so that HEURISTIC2 will be tried. Otherwise bail. */ -+# ifdef HEURISTIC2 -+ return (ptr_t)NULL; -+# else - ABORT("Couldn't read /proc/self/stat"); -+# endif - } - c = stat_buf[buf_offset++]; - /* Skip the required number of fields. This number is hopefully */ -@@ -983,7 +989,16 @@ - c = stat_buf[buf_offset++]; - } - close(f); -- if (result < 0x10000000) ABORT("Absurd stack bottom value"); -+ if (result < 0x10000000) { -+ /* if stack base result is silly (e.g. is 0 due to grsec), and */ -+ /* HEURISTIC2 is enabled, return NULL so that HEURISTIC2 will be */ -+ /* tried. Otherwise bail. */ -+# ifdef HEURISTIC2 -+ return (ptr_t)NULL; -+# else -+ ABORT("Absurd stack bottom value"); -+# endif -+ } - return (ptr_t)result; - } - -@@ -1045,6 +1060,12 @@ - result = GC_freebsd_stack_base(); - # endif - # ifdef HEURISTIC2 -+/* if both LINUX_STACKBOTTOM and HEURISTIC2 are enabled, try HEURISTIC2 */ -+/* when the LINUX_STACKBOTTOM returns NULL (indicating failure to get */ -+/* a sensible result from /proc/self/stat) */ -+# ifdef LINUX_STACKBOTTOM -+ if (result == (ptr_t)NULL) { -+# endif - # ifdef STACK_GROWS_DOWN - result = GC_find_limit((ptr_t)(&dummy), TRUE); - # ifdef HEURISTIC2_LIMIT -@@ -1062,6 +1083,11 @@ - } - # endif - # endif -+/* tail of extra 'if' condition when both LINUX_STACKBOTTOM and */ -+/* HEURISTIC are configured. */ -+# ifdef LINUX_STACKBOTTOM -+ } -+# endif - - # endif /* HEURISTIC2 */ - # ifdef STACK_GROWS_DOWN diff --git a/dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch b/dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch deleted file mode 100644 index 1d3e5780e74d..000000000000 --- a/dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- include/gc.h 2006-02-25 15:49:52 +0000 -+++ include/gc.h 2006-02-25 15:50:00 +0000 -@@ -473,7 +473,9 @@ - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ - && !defined(__ia64__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE --# define GC_HAVE_BUILTIN_BACKTRACE -+# ifndef __UCLIBC__ -+# define GC_HAVE_BUILTIN_BACKTRACE -+# endif - # endif - # endif - # if defined(__i386__) || defined(__x86_64__) -- cgit v1.2.3