[gentoo-commits] proj/hardened-dev:uclibc commit in: dev-libs/elfutils/files/, dev-libs/elfutils/

[Anthony G. Basile]

commit:     77b702738d68c216fcefb6e2bf7226be23178153
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 22:56:34 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 20 22:56:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=77b70273

dev-libs/elfutils: remove mtrace

Package-Manager: portage-2.1.11.62

---
 dev-libs/elfutils/elfutils-0.155.ebuild            |    1 +
 .../files/elfutils-0.155-remove-mtrace.patch       |  191 ++++++++++++++++++++
 2 files changed, 192 insertions(+), 0 deletions(-)

diff --git a/dev-libs/elfutils/elfutils-0.155.ebuild b/dev-libs/elfutils/elfutils-0.155.ebuild
index 173a297..0e46d90 100644
--- a/dev-libs/elfutils/elfutils-0.155.ebuild
+++ b/dev-libs/elfutils/elfutils-0.155.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.155-fallback-mempcpy.patch
 	epatch "${FILESDIR}"/${PN}-0.155-fallback-assert.patch
 	epatch "${FILESDIR}"/${PN}-0.155-link-argp-standalone.patch
+	epatch "${FILESDIR}"/${PN}-0.155-remove-mtrace.patch
 	eautoreconf
 
 	sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die

diff --git a/dev-libs/elfutils/files/elfutils-0.155-remove-mtrace.patch b/dev-libs/elfutils/files/elfutils-0.155-remove-mtrace.patch
new file mode 100644
index 0000000..3021180
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.155-remove-mtrace.patch
@@ -0,0 +1,191 @@
+diff -Naur elfutils-0.155.orig/src/addr2line.c elfutils-0.155/src/addr2line.c
+--- elfutils-0.155.orig/src/addr2line.c	2012-08-27 18:29:31.000000000 +0000
++++ elfutils-0.155/src/addr2line.c	2013-05-20 22:39:59.231647796 +0000
+@@ -30,7 +30,6 @@
+ #include <dwarf.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+@@ -121,9 +120,6 @@
+   int remaining;
+   int result = 0;
+ 
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+ 
+diff -Naur elfutils-0.155.orig/src/ar.c elfutils-0.155/src/ar.c
+--- elfutils-0.155.orig/src/ar.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/ar.c	2013-05-20 22:40:10.431647717 +0000
+@@ -28,7 +28,6 @@
+ #include <libintl.h>
+ #include <limits.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <search.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
+@@ -141,9 +140,6 @@
+ int
+ main (int argc, char *argv[])
+ {
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+diff -Naur elfutils-0.155.orig/src/ld.c elfutils-0.155/src/ld.c
+--- elfutils-0.155.orig/src/ld.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/ld.c	2013-05-20 22:41:25.431647187 +0000
+@@ -26,7 +26,6 @@
+ #include <libelf.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+ #include <stdlib.h>
+@@ -277,11 +276,6 @@
+   int remaining;
+   int err;
+ 
+-#ifndef NDEBUG
+-  /* Enable memory debugging.  */
+-  mtrace ();
+-#endif
+-
+   /* Sanity check.  We always want to use the LFS functionality.  */
+   if (sizeof (off_t) != sizeof (off64_t))
+     abort ();
+diff -Naur elfutils-0.155.orig/src/nm.c elfutils-0.155/src/nm.c
+--- elfutils-0.155.orig/src/nm.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/nm.c	2013-05-20 22:41:37.061647104 +0000
+@@ -33,7 +33,6 @@
+ #include <libdw.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <obstack.h>
+ #include <search.h>
+ #include <stdbool.h>
+@@ -217,9 +216,6 @@
+   int remaining;
+   int result = 0;
+ 
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+diff -Naur elfutils-0.155.orig/src/objdump.c elfutils-0.155/src/objdump.c
+--- elfutils-0.155.orig/src/objdump.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/objdump.c	2013-05-20 22:41:48.531647023 +0000
+@@ -26,7 +26,6 @@
+ #include <inttypes.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+@@ -131,9 +130,6 @@
+ int
+ main (int argc, char *argv[])
+ {
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+diff -Naur elfutils-0.155.orig/src/ranlib.c elfutils-0.155/src/ranlib.c
+--- elfutils-0.155.orig/src/ranlib.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/ranlib.c	2013-05-20 22:42:03.951646914 +0000
+@@ -29,7 +29,6 @@
+ #include <gelf.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <obstack.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -78,9 +77,6 @@
+ int
+ main (int argc, char *argv[])
+ {
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+diff -Naur elfutils-0.155.orig/src/size.c elfutils-0.155/src/size.c
+--- elfutils-0.155.orig/src/size.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/size.c	2013-05-20 22:42:16.271646827 +0000
+@@ -28,7 +28,6 @@
+ #include <libelf.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+@@ -160,9 +159,6 @@
+   int remaining;
+   int result = 0;
+ 
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+diff -Naur elfutils-0.155.orig/src/strip.c elfutils-0.155/src/strip.c
+--- elfutils-0.155.orig/src/strip.c	2012-08-27 18:29:31.000000000 +0000
++++ elfutils-0.155/src/strip.c	2013-05-20 22:42:28.781646739 +0000
+@@ -30,7 +30,6 @@
+ #include <libelf.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+@@ -155,9 +154,6 @@
+   int remaining;
+   int result = 0;
+ 
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   __fsetlocking (stdout, FSETLOCKING_BYCALLER);
+diff -Naur elfutils-0.155.orig/src/unstrip.c elfutils-0.155/src/unstrip.c
+--- elfutils-0.155.orig/src/unstrip.c	2012-08-27 18:27:31.000000000 +0000
++++ elfutils-0.155/src/unstrip.c	2013-05-20 22:42:44.201646629 +0000
+@@ -36,7 +36,6 @@
+ #include <fnmatch.h>
+ #include <libintl.h>
+ #include <locale.h>
+-#include <mcheck.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+@@ -2215,9 +2214,6 @@
+ int
+ main (int argc, char **argv)
+ {
+-  /* Make memory leak detection possible.  */
+-  mtrace ();
+-
+   /* We use no threads here which can interfere with handling a stream.  */
+   __fsetlocking (stdin, FSETLOCKING_BYCALLER);
+   __fsetlocking (stdout, FSETLOCKING_BYCALLER);