From a3e7d4ccd31d23d49ae387e148fd5b6e99bc2836 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 1 Feb 2005 22:15:56 +0000 Subject: [PATCH] - obsolete Changed files: glibc-LD_DEBUG.patch -> 1.3 glibc-ia64_unwind.patch -> 1.2 --- glibc-LD_DEBUG.patch | 79 -------------------------------------- glibc-ia64_unwind.patch | 85 ----------------------------------------- 2 files changed, 164 deletions(-) delete mode 100644 glibc-LD_DEBUG.patch delete mode 100644 glibc-ia64_unwind.patch diff --git a/glibc-LD_DEBUG.patch b/glibc-LD_DEBUG.patch deleted file mode 100644 index f2f9dfc..0000000 --- a/glibc-LD_DEBUG.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- sysdeps/generic/unsecvars.h 2004-08-03 18:13:13 -0400 -+++ sysdeps/generic/unsecvars.h 2004-08-03 18:11:41 -0400 -@@ -3,6 +3,8 @@ - with a '\0' explicitly. */ - #define UNSECURE_ENVVARS \ - "LD_PRELOAD\0" \ -+ "LD_DEBUG\0" \ -+ "LD_TRACE_PRELINKING\0" \ - "LD_LIBRARY_PATH\0" \ - "LD_ORIGIN_PATH\0" \ - "LD_DEBUG_OUTPUT\0" \ ---- elf/rtld.c 2003-01-07 13:47:35 -0500 -+++ elf/rtld.c 2004-08-03 22:15:51 -0400 -@@ -1762,6 +1762,30 @@ - GL(dl_profile_output) - = &"/var/tmp\0/var/profile"[INTUSE(__libc_enable_secure) ? 9 : 0]; - -+ /* Extra security for SUID binaries. Remove all dangerous environment -+ variables. */ -+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0)) -+ { -+ static const char unsecure_envvars[] = -+#ifdef EXTRA_UNSECURE_ENVVARS -+ EXTRA_UNSECURE_ENVVARS -+#endif -+ UNSECURE_ENVVARS; -+ const char *nextp; -+ -+ nextp = unsecure_envvars; -+ do -+ { -+ unsetenv (nextp); -+ /* We could use rawmemchr but this need not be fast. */ -+ nextp = (char *) (strchr) (nextp, '\0') + 1; -+ } -+ while (*nextp != '\0'); -+ -+ if (__access ("/etc/suid-debug", F_OK) != 0) -+ unsetenv ("MALLOC_CHECK_"); -+ } -+ - while ((envline = _dl_next_ld_env_entry (&runp)) != NULL) - { - size_t len = 0; -@@ -1897,33 +1921,10 @@ - /* The caller wants this information. */ - *modep = mode; - -- /* Extra security for SUID binaries. Remove all dangerous environment -- variables. */ -- if (__builtin_expect (INTUSE(__libc_enable_secure), 0)) -- { -- static const char unsecure_envvars[] = --#ifdef EXTRA_UNSECURE_ENVVARS -- EXTRA_UNSECURE_ENVVARS --#endif -- UNSECURE_ENVVARS; -- const char *nextp; -- -- nextp = unsecure_envvars; -- do -- { -- unsetenv (nextp); -- /* We could use rawmemchr but this need not be fast. */ -- nextp = (char *) (strchr) (nextp, '\0') + 1; -- } -- while (*nextp != '\0'); -- -- if (__access ("/etc/suid-debug", F_OK) != 0) -- unsetenv ("MALLOC_CHECK_"); -- } - /* If we have to run the dynamic linker in debugging mode and the - LD_DEBUG_OUTPUT environment variable is given, we write the debug - messages to this file. */ -- else if (any_debug && debug_output != NULL) -+ if (any_debug && debug_output != NULL) - { - #ifdef O_NOFOLLOW - const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW; diff --git a/glibc-ia64_unwind.patch b/glibc-ia64_unwind.patch deleted file mode 100644 index 3c6aac9..0000000 --- a/glibc-ia64_unwind.patch +++ /dev/null @@ -1,85 +0,0 @@ -2004-09-08 H.J. Lu - - * Makeconfig (libunwind): New. - (libgcc_eh): Add $(libunwind). - (gnulib): Always set to -lgcc $(libgcc_eh). - (static-gnulib): Always set to -lgcc -lgcc_eh $(libunwind). - (libc.so-gnulib): New. - - * Makerules (LDLIBS-c.so): Use $(libc.so-gnulib) instead of - $(static-gnulib). - - * configure.in (libc_cv_cc_with_libunwind): Set to yes if gcc - uses -lunwind for static binaries. - * configure: Regenerated. - ---- libc/Makeconfig.unwind 2004-08-11 14:23:00.000000000 -0700 -+++ libc/Makeconfig 2004-09-08 10:07:59.512198328 -0700 -@@ -521,18 +521,19 @@ link-libc-bounded = $(common-objpfx)libc - link-extra-libs-bounded = $(foreach lib,$(LDLIBS-$(@F:%-bp=%)),$(common-objpfx)$(lib)_b.a) - - ifndef gnulib --ifneq ($(have-as-needed),yes) -- libgcc_eh := -lgcc_eh -+ifneq ($(have-cc-with-libunwind),yes) -+ libunwind = - else -- libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) -Wl,--no-as-needed -+ libunwind = -lunwind - endif --ifneq ($(have-cc-with-libunwind),yes) -- gnulib := -lgcc $(libgcc_eh) -- static-gnulib := -lgcc -lgcc_eh -+ifneq ($(have-as-needed),yes) -+ libgcc_eh := -lgcc_eh $(libunwind) - else -- gnulib := -lgcc $(libgcc_eh) -lunwind -- static-gnulib := -lgcc -lgcc_eh -lunwind -+ libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed - endif -+gnulib := -lgcc $(libgcc_eh) -+static-gnulib := -lgcc -lgcc_eh $(libunwind) -+libc.so-gnulib := -lgcc - endif - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) ---- libc/Makerules.unwind 2004-09-01 15:44:48.000000000 -0700 -+++ libc/Makerules 2004-09-08 09:12:53.000000000 -0700 -@@ -581,8 +581,8 @@ build-shlib-objlist = $(build-module-hel - # Also omits crti.o and crtn.o, which we do not want - # since we define our own `.init' section specially. - LDFLAGS-c.so = -nostdlib -nostartfiles --# But we still want to link libc.so against $(static-gnulib). --LDLIBS-c.so += $(static-gnulib) -+# But we still want to link libc.so against $(libc.so-gnulib). -+LDLIBS-c.so += $(libc.so-gnulib) - # Give libc.so an entry point and make it directly runnable itself. - LDFLAGS-c.so += -e __libc_main - # If lazy relocation is disabled add the -z now flag. ---- libc/configure.in.unwind 2004-09-08 09:12:53.000000000 -0700 -+++ libc/configure.in 2004-09-08 09:12:53.000000000 -0700 -@@ -1309,13 +1309,17 @@ EOF - fi - - AC_CACHE_CHECK(for libunwind-support in compiler, -- libc_cv_cc_with_libunwind, [dnl -- AC_TRY_LINK([#include ], [ -- unw_context_t uc; -- unw_cursor_t c; -- unw_getcontext (&uc); -- unw_init_local (&c, &uc)], -- libc_cv_cc_with_libunwind=yes, libc_cv_cc_with_libunwind=no)]) -+ libc_cv_cc_with_libunwind, [ -+ cat > conftest.c <&1 >/dev/null | grep -q " -lunwind "; then -+ libc_cv_cc_with_libunwind=yes -+ else -+ libc_cv_cc_with_libunwind=no -+ fi -+ rm -f conftest*]) - AC_SUBST(libc_cv_cc_with_libunwind) - if test $libc_cv_cc_with_libunwind = yes; then - AC_DEFINE(HAVE_CC_WITH_LIBUNWIND) -- 2.44.0