Author: archaic Date: 2005-02-23 14:21:16 -0700 (Wed, 23 Feb 2005) New Revision: 849
Removed: trunk/coreutils/coreutils-5.2.1-nopie_uname-1.patch trunk/gcc/gcc-3.4.3-piespecs_x86-2.patch trunk/glibc/glibc-2.3.4-ssp_frandom-6.patch trunk/hlfs/coreutils-5.2.1-nopie_uname-1.patch trunk/hlfs/coreutils-5.2.1-uname-2.patch trunk/hlfs/gcc-3.4.3-piespecs_x86-2.patch trunk/hlfs/glibc-2.3.4-ssp_frandom-6.patch trunk/hlfs/man-1.5o1-80cols-1.patch trunk/hlfs/texinfo-4.7-segfault-1.patch trunk/hlfs/uClibc-0.9.27-ssp-2.patch trunk/uClibc/uClibc-0.9.27-ssp-2.patch trunk/util-linux/util-linux-2.12q-fPIC-1.patch Log: Cleaning out deprecated HLFS patches. Deleted: trunk/coreutils/coreutils-5.2.1-nopie_uname-1.patch =================================================================== --- trunk/coreutils/coreutils-5.2.1-nopie_uname-1.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/coreutils/coreutils-5.2.1-nopie_uname-1.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../hlfs/coreutils-5.2.1-nopie_uname-1.patch \ No newline at end of file Deleted: trunk/gcc/gcc-3.4.3-piespecs_x86-2.patch =================================================================== --- trunk/gcc/gcc-3.4.3-piespecs_x86-2.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/gcc/gcc-3.4.3-piespecs_x86-2.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../hlfs/gcc-3.4.3-piespecs_x86-2.patch \ No newline at end of file Deleted: trunk/glibc/glibc-2.3.4-ssp_frandom-6.patch =================================================================== --- trunk/glibc/glibc-2.3.4-ssp_frandom-6.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/glibc/glibc-2.3.4-ssp_frandom-6.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../hlfs/glibc-2.3.4-ssp_frandom-6.patch \ No newline at end of file Deleted: trunk/hlfs/coreutils-5.2.1-nopie_uname-1.patch =================================================================== --- trunk/hlfs/coreutils-5.2.1-nopie_uname-1.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/coreutils-5.2.1-nopie_uname-1.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1,44 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2004-12-26 -Initial Package Version: 5.2.1 -Upstream Status: Not Submitted -Origin: None -Description: This patch is needed if you are building uname with the uname -patch and a compiler that is PIC by default. The uname patch uses non-PIC -assembly code and will not build with -fPIC. This patch will pass -no-pie -when compiling uname. - ---- coreutils-5.2.1.orig/src/Makefile.in 2004-03-11 08:59:23.000000000 +0000 -+++ coreutils-5.2.1/src/Makefile.in 2004-12-05 02:02:23.878212024 +0000 -@@ -862,6 +862,8 @@ - tail_LDADD = $(nanosec_libs) - uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) - su_LDADD = $(LDADD) $(LIB_CRYPT) -+uname_CFLAGS = $(CFLAGS) -no-pie -+uname_LDFLAGS = $(LDFLAGS) - SUFFIXES = .sh - installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` - setuid_root_mode = a=rx,u+s -@@ -1415,6 +1417,22 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+uname.o: uname.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uname_CFLAGS) $(CFLAGS) -MT uname.o -MD -MP -MF "$(DEPDIR)/uname.Tpo" -c -o uname.o `test -f 'uname.c' || echo '$(srcdir)/'`uname.c; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/uname.Tpo" "$(DEPDIR)/uname.Po"; else rm -f "$(DEPDIR)/uname.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='uname.c' object='uname.o' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/uname.Po' tmpdepfile='$(DEPDIR)/uname.TPo' @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uname_CFLAGS) $(CFLAGS) -c -o uname.o `test -f 'uname.c' || echo '$(srcdir)/'`uname.c -+ -+uname.obj: uname.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uname_CFLAGS) $(CFLAGS) -MT uname.obj -MD -MP -MF "$(DEPDIR)/uname.Tpo" -c -o uname.obj `if test -f 'uname.c'; then $(CYGPATH_W) 'uname.c'; else $(CYGPATH_W) '$(srcdir)/uname.c'; fi`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/uname.Tpo" "$(DEPDIR)/uname.Po"; else rm -f "$(DEPDIR)/uname.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='uname.c' object='uname.obj' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/uname.Po' tmpdepfile='$(DEPDIR)/uname.TPo' @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uname_CFLAGS) $(CFLAGS) -c -o uname.obj `if test -f 'uname.c'; then $(CYGPATH_W) 'uname.c'; else $(CYGPATH_W) '$(srcdir)/uname.c'; fi` - uninstall-info-am: - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) Deleted: trunk/hlfs/coreutils-5.2.1-uname-2.patch =================================================================== --- trunk/hlfs/coreutils-5.2.1-uname-2.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/coreutils-5.2.1-uname-2.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../coreutils/coreutils-5.2.1-uname-2.patch \ No newline at end of file Deleted: trunk/hlfs/gcc-3.4.3-piespecs_x86-2.patch =================================================================== --- trunk/hlfs/gcc-3.4.3-piespecs_x86-2.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/gcc-3.4.3-piespecs_x86-2.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1,336 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2004-11-12 -Initial Package Version: 3.4 -Upstream Status: Not submitted - Task specific -Origin: gcc-3.3-autopie_x86-1.patch -Description: This patch will enable gcc -pie by default for x86, as well -as ld -z relro and ld -z now. - -Also see: -http://www.linuxfromscratch.org/hlfs/ - -diff -Naur gcc-3.4.2.orig/gcc/config/i386/linux.h gcc-3.4.2.piespecs/gcc/config/i386/linux.h ---- gcc-3.4.2.orig/gcc/config/i386/linux.h 2003-11-29 03:08:10.000000000 +0000 -+++ gcc-3.4.2.piespecs/gcc/config/i386/linux.h 2004-10-17 05:33:17.029248104 +0000 -@@ -85,12 +85,20 @@ - #undef CPP_SPEC - #ifdef USE_GNULIBC_1 - #define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" -+#elif defined HAVE_LD_PIE -+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} \ -+ %{!D__KERNEL__:%{!static:%{!no-pie|pie:%{!DPIC:-D__PIC__ -DPIC}}}}" - #else - #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" - #endif - - #undef CC1_SPEC -+#if defined HAVE_LD_PIE -+#define CC1_SPEC "%(cc1_cpu) %{profile:-p} \ -+ %{!D__KERNEL__:%{!static:%{!no-pie|pie:%{!DPIC: -fPIC}}}}" -+#else - #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" -+#endif - - /* Provide a LINK_SPEC appropriate for Linux. Here we provide support - for the special GCC options -static and -shared, which allow us to -diff -Naur gcc-3.4.2.orig/gcc/config/linux.h gcc-3.4.2.piespecs/gcc/config/linux.h ---- gcc-3.4.2.orig/gcc/config/linux.h 2003-11-29 03:08:10.000000000 +0000 -+++ gcc-3.4.2.piespecs/gcc/config/linux.h 2004-10-17 05:33:17.032247648 +0000 -@@ -48,8 +48,10 @@ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}" - #elif defined HAVE_LD_PIE - #define STARTFILE_SPEC \ -- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ -- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}" -+ "%{!shared: %{pg|p|profile:gcrt1.o%s;!no-pie|pie:%{!static:%{!D__KERNEL__:Scrt1.o%s}}}} \ -+ %{static|no-pie:crt1.o%s} crti.o%s %{static:crtbeginT.o%s} \ -+ %{!no-pie|pie:%{!static:%{!D__KERNEL__:crtbeginS.o%s}}} \ -+ %{!static:%{!shared:%{no-pie:crtbegin.o%s}}}" - #else - #define STARTFILE_SPEC \ - "%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \ -@@ -63,8 +65,14 @@ - GNU/Linux "finalizer" file, `crtn.o'. */ - - #undef ENDFILE_SPEC -+#if defined HAVE_LD_PIE -+#define ENDFILE_SPEC \ -+ "%{!no-pie|pie:%{!static:%{!D__KERNEL__:crtendS.o%s}}} \ -+ %{static|no-pie|D__KERNEL__:crtend.o%s} crtn.o%s" -+#else - #define ENDFILE_SPEC \ - "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" -+#endif - - /* This is for -profile to use -lc_p instead of -lc. */ - #ifndef CC1_SPEC -diff -Naur gcc-3.4.2.orig/gcc/gcc-3.4.2-generic_i686-specs_chap5-pass2 gcc-3.4.2.piespecs/gcc/gcc-3.4.2-generic_i686-specs_chap5-pass2 ---- gcc-3.4.2.orig/gcc/gcc-3.4.2-generic_i686-specs_chap5-pass2 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-3.4.2.piespecs/gcc/gcc-3.4.2-generic_i686-specs_chap5-pass2 2004-10-17 05:33:17.035247192 +0000 -@@ -0,0 +1,124 @@ -+*asm: -+%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} -+ -+*asm_debug: -+%{gstabs*:--gstabs}%{!gstabs*:%{g*:--gdwarf2}} -+ -+*asm_final: -+ -+ -+*asm_options: -+%a %Y %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O} -+ -+*invoke_as: -+%{!S:-o %|.s | -+ as %(asm_options) %|.s %A } -+ -+*cpp: -+%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} -+ -+*cpp_options: -+%(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*} %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef} -+ -+*cpp_debug_options: -+%{d*} -+ -+*cpp_unique_options: -+%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}} %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*} %{P} %I %{MD:-MD %{!o:%b.d}%{o*:%.d%*}} %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}} %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*} %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}} %{trigraphs} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i %{E|M|MM:%W{o*}} -+ -+*trad_capable_cpp: -+cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp} -+ -+*cc1: -+%(cc1_cpu) %{profile:-p} -+ -+*cc1_options: -+%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*} %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi} %{v:-version} %{pg:-p} %{p} %{f*} %{undef} %{Qn:-fno-ident} %{--help:--help} %{--target-help:--target-help} %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}} %{fsyntax-only:-o %j} %{-param*} -+ -+*cc1plus: -+ -+ -+*link_gcc_c_sequence: -+%{static:--start-group} %G %L %{static:--end-group}%{!static:%G} -+ -+*endfile: -+%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s -+ -+*link: -+%{!static:--eh-frame-hdr} -m elf_i386 %{shared:-shared} %{!shared: %{!ibcs: %{!static: %{rdynamic:-export-dynamic} %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} %{static:-static}}} -+ -+*lib: -+%{pthread:-lpthread} %{shared:-lc} %{!shared:%{mieee-fp:-lieee} %{profile:-lc_p}%{!profile:-lc}} -+ -+*libgcc: -+%{static|static-libgcc:-lgcc -lgcc_eh}%{!static:%{!static-libgcc:%{!shared-libgcc:-lgcc --as-needed -lgcc_s%M --no-as-needed}%{shared-libgcc:-lgcc_s%M%{!shared: -lgcc}}}} -+ -+*startfile: -+%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} -+ -+*switches_need_spaces: -+ -+ -+*cross_compile: -+0 -+ -+*version: -+3.4.2 -+ -+*multilib: -+. ; -+ -+*multilib_defaults: -+ -+ -+*multilib_extra: -+ -+ -+*multilib_matches: -+ -+ -+*multilib_exclusions: -+ -+ -+*multilib_options: -+ -+ -+*linker: -+collect2 -+ -+*link_libgcc: -+%D -+ -+*md_exec_prefix: -+ -+ -+*md_startfile_prefix: -+ -+ -+*md_startfile_prefix_1: -+ -+ -+*startfile_prefix_spec: -+ -+ -+*sysroot_suffix_spec: -+ -+ -+*sysroot_hdrs_suffix_spec: -+ -+ -+*cc1_cpu: -+%{!mtune*: %{m386:mtune=i386 %n`-m386' is deprecated. Use `-march=i386' or `-mtune=i386' instead. -+} %{m486:-mtune=i486 %n`-m486' is deprecated. Use `-march=i486' or `-mtune=i486' instead. -+} %{mpentium:-mtune=pentium %n`-mpentium' is deprecated. Use `-march=pentium' or `-mtune=pentium' instead. -+} %{mpentiumpro:-mtune=pentiumpro %n`-mpentiumpro' is deprecated. Use `-march=pentiumpro' or `-mtune=pentiumpro' instead. -+} %{mcpu=*:-mtune=%* %n`-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead. -+}} %<mcpu=* %{mpni:-msse3 %n`-mpni' is deprecated. Use `-msse3' instead. -+} %{mno-pni:-mno-sse3 %n`-mno-pni' is deprecated. Use `-mno-sse3' instead. -+} %{mintel-syntax:-masm=intel %n`-mintel-syntax' is deprecated. Use `-masm=intel' instead. -+} %{mno-intel-syntax:-masm=att %n`-mno-intel-syntax' is deprecated. Use `-masm=att' instead. -+} -+ -+*link_command: -+%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S: %(linker) %l %{pie:-pie} %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r} %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}} %{static:} %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate:-lgcov} %{!nostdlib:%{!nodefaultlibs:%(link_gcc_c_sequence)}} %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}} -+ -diff -Naur gcc-3.4.2.orig/gcc/gcc-3.4.2-generic_i686-specs_chap6 gcc-3.4.2.piespecs/gcc/gcc-3.4.2-generic_i686-specs_chap6 ---- gcc-3.4.2.orig/gcc/gcc-3.4.2-generic_i686-specs_chap6 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-3.4.2.piespecs/gcc/gcc-3.4.2-generic_i686-specs_chap6 2004-10-17 05:35:11.465851096 +0000 -@@ -0,0 +1,124 @@ -+*asm: -+%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} -+ -+*asm_debug: -+%{gstabs*:--gstabs}%{!gstabs*:%{g*:--gdwarf2}} -+ -+*asm_final: -+ -+ -+*asm_options: -+%a %Y %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O} -+ -+*invoke_as: -+%{!S:-o %|.s | -+ as %(asm_options) %|.s %A } -+ -+*cpp: -+%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} -+ -+*cpp_options: -+%(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*} %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef} -+ -+*cpp_debug_options: -+%{d*} -+ -+*cpp_unique_options: -+%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}} %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*} %{P} %I %{MD:-MD %{!o:%b.d}%{o*:%.d%*}} %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}} %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*} %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}} %{trigraphs} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i %{E|M|MM:%W{o*}} -+ -+*trad_capable_cpp: -+cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp} -+ -+*cc1: -+%(cc1_cpu) %{profile:-p} -+ -+*cc1_options: -+%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*} %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi} %{v:-version} %{pg:-p} %{p} %{f*} %{undef} %{Qn:-fno-ident} %{--help:--help} %{--target-help:--target-help} %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}} %{fsyntax-only:-o %j} %{-param*} -+ -+*cc1plus: -+ -+ -+*link_gcc_c_sequence: -+%{static:--start-group} %G %L %{static:--end-group}%{!static:%G} -+ -+*endfile: -+%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s -+ -+*link: -+%{!static:--eh-frame-hdr} -m elf_i386 %{shared:-shared} %{!shared: %{!ibcs: %{!static: %{rdynamic:-export-dynamic} %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} %{static:-static}}} -+ -+*lib: -+%{pthread:-lpthread} %{shared:-lc} %{!shared:%{mieee-fp:-lieee} %{profile:-lc_p}%{!profile:-lc}} -+ -+*libgcc: -+%{static|static-libgcc:-lgcc -lgcc_eh}%{!static:%{!static-libgcc:%{!shared-libgcc:-lgcc --as-needed -lgcc_s%M --no-as-needed}%{shared-libgcc:-lgcc_s%M%{!shared: -lgcc}}}} -+ -+*startfile: -+%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} -+ -+*switches_need_spaces: -+ -+ -+*cross_compile: -+0 -+ -+*version: -+3.4.2 -+ -+*multilib: -+. ; -+ -+*multilib_defaults: -+ -+ -+*multilib_extra: -+ -+ -+*multilib_matches: -+ -+ -+*multilib_exclusions: -+ -+ -+*multilib_options: -+ -+ -+*linker: -+collect2 -+ -+*link_libgcc: -+%D -+ -+*md_exec_prefix: -+ -+ -+*md_startfile_prefix: -+ -+ -+*md_startfile_prefix_1: -+ -+ -+*startfile_prefix_spec: -+ -+ -+*sysroot_suffix_spec: -+ -+ -+*sysroot_hdrs_suffix_spec: -+ -+ -+*cc1_cpu: -+%{!mtune*: %{m386:mtune=i386 %n`-m386' is deprecated. Use `-march=i386' or `-mtune=i386' instead. -+} %{m486:-mtune=i486 %n`-m486' is deprecated. Use `-march=i486' or `-mtune=i486' instead. -+} %{mpentium:-mtune=pentium %n`-mpentium' is deprecated. Use `-march=pentium' or `-mtune=pentium' instead. -+} %{mpentiumpro:-mtune=pentiumpro %n`-mpentiumpro' is deprecated. Use `-march=pentiumpro' or `-mtune=pentiumpro' instead. -+} %{mcpu=*:-mtune=%* %n`-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead. -+}} %<mcpu=* %{mpni:-msse3 %n`-mpni' is deprecated. Use `-msse3' instead. -+} %{mno-pni:-mno-sse3 %n`-mno-pni' is deprecated. Use `-mno-sse3' instead. -+} %{mintel-syntax:-masm=intel %n`-mintel-syntax' is deprecated. Use `-masm=intel' instead. -+} %{mno-intel-syntax:-masm=att %n`-mno-intel-syntax' is deprecated. Use `-masm=att' instead. -+} -+ -+*link_command: -+%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S: %(linker) %l %{pie:-pie} %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r} %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}} %{static:} %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate:-lgcov} %{!nostdlib:%{!nodefaultlibs:%(link_gcc_c_sequence)}} %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}} -+ -diff -Naur gcc-3.4.2.orig/gcc/gcc.c gcc-3.4.2.piespecs/gcc/gcc.c ---- gcc-3.4.2.orig/gcc/gcc.c 2004-04-18 23:45:11.000000000 +0000 -+++ gcc-3.4.2.piespecs/gcc/gcc.c 2004-10-17 05:33:17.111235640 +0000 -@@ -660,7 +660,9 @@ - - #ifndef LINK_PIE_SPEC - #ifdef HAVE_LD_PIE --#define LINK_PIE_SPEC "%{pie:-pie} " -+#define LINK_PIE_SPEC "%{!no-pie|pie:%{!static:%{!D__KERNEL__:%{!A:%{!i:%{!r:%{!Bstatic: \ -+ %{!shared: -pie %{!no-now: -z now} %{!no-relro: -z relro} }}}}}}}} %{no-pie:} \ -+ %{no-now:} %{no-relro:}" - #else - #define LINK_PIE_SPEC "%{pie:} " - #endif Deleted: trunk/hlfs/glibc-2.3.4-ssp_frandom-6.patch =================================================================== --- trunk/hlfs/glibc-2.3.4-ssp_frandom-6.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/glibc-2.3.4-ssp_frandom-6.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1,178 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2004-12-02 -Initial Package Version: 2.3.4 -Upstream Status: Not submitted - They will reject it. -Origin: http://www.research.ibm.com/trl/projects/security/ssp/ - http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/sys/stack_protector.c -Description: Smashing Stack Protector - This patch adds guard functions to -Glibc. This patch works for glibc-2.3.3 too. - -This patch depends on erandom sysctl from: -http://frandom.sourceforge.net/ -http://www.linuxfromscratch.org/hints/downloads/files/entropy.txt - -Also see: -http://www.research.ibm.com/trl/projects/security/ssp/ -http://www.linuxfromscratch.org/hlfs/ -http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt - -diff -Naur glibc-20041129.orig/sysdeps/generic/libc-start.c glibc-20041129/sysdeps/generic/libc-start.c ---- glibc-20041129.orig/sysdeps/generic/libc-start.c 2004-03-31 01:46:43.000000000 +0000 -+++ glibc-20041129/sysdeps/generic/libc-start.c 2004-12-02 15:08:43.099366664 +0000 -@@ -188,6 +188,9 @@ - GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]); - #endif - -+ void __guard_setup(void) __attribute__ ((constructor)); -+ __guard_setup (); -+ - #ifdef HAVE_CLEANUP_JMP_BUF - /* Memory for the cancellation buffer. */ - struct pthread_unwind_buf unwind_buf; -diff -Naur glibc-20041129.orig/sysdeps/unix/sysv/linux/Dist glibc-20041129/sysdeps/unix/sysv/linux/Dist ---- glibc-20041129.orig/sysdeps/unix/sysv/linux/Dist 2004-06-30 07:58:38.000000000 +0000 -+++ glibc-20041129/sysdeps/unix/sysv/linux/Dist 2004-12-02 15:04:22.000000000 +0000 -@@ -1,3 +1,4 @@ -+stack_protector.c - bits/initspin.h - cmsg_nxthdr.c - dl-brk.c -diff -Naur glibc-20041129.orig/sysdeps/unix/sysv/linux/Makefile glibc-20041129/sysdeps/unix/sysv/linux/Makefile ---- glibc-20041129.orig/sysdeps/unix/sysv/linux/Makefile 2004-10-04 23:29:06.000000000 +0000 -+++ glibc-20041129/sysdeps/unix/sysv/linux/Makefile 2004-12-02 15:04:22.000000000 +0000 -@@ -1,5 +1,5 @@ - ifeq ($(subdir),csu) --sysdep_routines += errno-loc -+sysdep_routines += errno-loc stack_protector - endif - - ifeq ($(subdir),assert) -diff -Naur glibc-20041129.orig/sysdeps/unix/sysv/linux/Versions glibc-20041129/sysdeps/unix/sysv/linux/Versions ---- glibc-20041129.orig/sysdeps/unix/sysv/linux/Versions 2004-10-22 19:57:45.000000000 +0000 -+++ glibc-20041129/sysdeps/unix/sysv/linux/Versions 2004-12-02 15:04:22.000000000 +0000 -@@ -108,6 +108,7 @@ - GLIBC_2.3.2 { - # New kernel interfaces. - epoll_create; epoll_ctl; epoll_wait; -+ __guard; __guard_setup; __stack_smash_handler; - } - GLIBC_2.3.3 { - gnu_dev_major; gnu_dev_minor; gnu_dev_makedev; -diff -Naur glibc-20041129.orig/sysdeps/unix/sysv/linux/stack_protector.c glibc-20041129/sysdeps/unix/sysv/linux/stack_protector.c ---- glibc-20041129.orig/sysdeps/unix/sysv/linux/stack_protector.c 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-20041129/sysdeps/unix/sysv/linux/stack_protector.c 2004-12-02 15:04:22.000000000 +0000 -@@ -0,0 +1,114 @@ -+/* $hlfs: stack_protector.c,v 1.5 2004/11/21 00:00:00 robert Exp $ */ -+ -+/* -+ * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ * -+ */ -+ -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <sys/time.h> -+#include <stdio.h> -+#include <signal.h> -+#include <string.h> -+#include <syslog.h> -+#include <unistd.h> -+#include <fcntl.h> -+ -+long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; -+void __guard_setup(void) __attribute__ ((constructor)); -+void __stack_smash_handler(char func[], int damaged __attribute__((unused))); -+ -+void __guard_setup (void) -+{ -+ int i, mib[3]; -+ size_t len; -+ -+ if (__guard[0] != 0) -+ return; -+ -+ /* Random is another depth in Linux, hence an array of 3. */ -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_RANDOM; -+ mib[2] = RANDOM_ERANDOM; -+ -+ len = 4; -+ for (i = 0; i < sizeof(__guard) / 4; i++) { -+ if (sysctl(mib, 3, (char *)&((int *)__guard)[i], -+ &len, NULL, 0) == -1) -+ break; -+ } -+ -+ if (i < sizeof(__guard) / 4) { -+ int fd; -+ size_t size; -+ /* Sysctl Erandom doesn't work? Try /dev/urandom */ -+ fd = open ("/dev/urandom", O_RDONLY); -+ if (fd != -1) { -+ size = read (fd, (char*)&__guard, sizeof(__guard)); -+ close (fd) ; -+ if (size == sizeof(__guard)) -+ return; -+ } else { -+ -+ /* If above was unsuccessful, use the time. */ -+ struct timeval tv; -+ gettimeofday (&tv, NULL); -+ ((unsigned char *)__guard)[0] ^= tv.tv_usec ^ tv.tv_sec; -+ ((unsigned char *)__guard)[1] = 0; -+ ((unsigned char *)__guard)[2] = '\n'; -+ ((unsigned char *)__guard)[3] = 255; -+ } -+ } -+} -+ -+void __stack_smash_handler (char func[], int damaged) -+{ -+ extern char *__progname; -+ const char message[] = ": stack overflow in function "; -+ struct sigaction sa; -+ sigset_t mask; -+ -+ /* Immediately block all signal handlers from running code */ -+ sigfillset(&mask); -+ sigdelset(&mask, SIGABRT); -+ sigprocmask(SIG_BLOCK, &mask, NULL); -+ -+ /* Print error message to stderr. */ -+ fprintf(stderr, "%s%s%s()\n", __progname, message, func); -+ /* Then to syslog. This may fail on a chroot jail... */ -+ syslog(LOG_CRIT, "%s%s%s()", __progname, message, func); -+ -+ bzero(&sa, sizeof(struct sigaction)); -+ sigemptyset(&sa.sa_mask); -+ sa.sa_flags = 0; -+ sa.sa_handler = SIG_DFL; -+ sigaction(SIGABRT, &sa, NULL); -+ -+ kill(getpid(), SIGABRT); -+ -+ _exit(127); -+} -+ Deleted: trunk/hlfs/man-1.5o1-80cols-1.patch =================================================================== --- trunk/hlfs/man-1.5o1-80cols-1.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/man-1.5o1-80cols-1.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../man/man-1.5o1-80cols-1.patch \ No newline at end of file Deleted: trunk/hlfs/texinfo-4.7-segfault-1.patch =================================================================== --- trunk/hlfs/texinfo-4.7-segfault-1.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/texinfo-4.7-segfault-1.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../texinfo/texinfo-4.7-segfault-1.patch \ No newline at end of file Deleted: trunk/hlfs/uClibc-0.9.27-ssp-2.patch =================================================================== --- trunk/hlfs/uClibc-0.9.27-ssp-2.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/hlfs/uClibc-0.9.27-ssp-2.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1,76 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2005-01-12 -Initial Package Version: 0.9.27 -Upstream Status: Not submitted -Origin: http://www.research.ibm.com/trl/projects/security/ssp/ - http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/sys/stack_protector.c -Description: Smashing Stack Protector - This patch modifies guard functions in -uClibc. - -This patch depends on erandom sysctl from: -http://frandom.sourceforge.net/ -http://www.linuxfromscratch.org/hints/downloads/files/entropy.txt - -Also see: -http://www.research.ibm.com/trl/projects/security/ssp/ -http://www.linuxfromscratch.org/hlfs/ -http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt - -diff -Naur uClibc-0.9.27.orig/libc/sysdeps/linux/common/ssp.c uClibc-0.9.27/libc/sysdeps/linux/common/ssp.c ---- uClibc-0.9.27.orig/libc/sysdeps/linux/common/ssp.c 2005-01-12 20:28:20.963665271 +0000 -+++ uClibc-0.9.27/libc/sysdeps/linux/common/ssp.c 2005-01-12 20:31:57.683918718 +0000 -@@ -29,9 +29,7 @@ - #include <sys/un.h> - #include <sys/syslog.h> - #include <sys/time.h> --#ifdef HAVE_DEV_ERANDOM - #include <sys/sysctl.h> --#endif - - #ifdef __PROPOLICE_BLOCK_SEGV__ - #define SSP_SIGTYPE SIGSEGV -@@ -48,25 +46,20 @@ - size_t size; - struct timeval tv; - --#ifdef HAVE_DEV_ERANDOM - int mib[3]; --#endif - - if (__guard != 0UL) - return; - --#ifndef __SSP_QUICK_CANARY__ --#ifdef HAVE_DEV_ERANDOM - /* Random is another depth in Linux, hence an array of 3. */ - mib[0] = CTL_KERN; - mib[1] = KERN_RANDOM; - mib[2] = RANDOM_ERANDOM; - - size = sizeof(unsigned long); -- if (__sysctl(mib, 3, &__guard, &size, NULL, 0) != (-1)) -+ if (sysctl(mib, 3, &__guard, &size, NULL, 0) != (-1)) - if (__guard != 0UL) - return; --#endif - /* - * Attempt to open kernel pseudo random device if one exists before - * opening urandom to avoid system entropy depletion. -@@ -74,9 +67,7 @@ - { - int fd; - --#ifdef HAVE_DEV_ERANDOM - if ((fd = open("/dev/erandom", O_RDONLY)) == (-1)) --#endif - fd = open("/dev/urandom", O_RDONLY); - if (fd != (-1)) { - size = read(fd, (char *) &__guard, sizeof(__guard)); -@@ -85,7 +76,6 @@ - return; - } - } --#endif - /* If sysctl was unsuccessful, use the "terminator canary". */ - __guard = 0xFF0A0D00UL; - Deleted: trunk/uClibc/uClibc-0.9.27-ssp-2.patch =================================================================== --- trunk/uClibc/uClibc-0.9.27-ssp-2.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/uClibc/uClibc-0.9.27-ssp-2.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../hlfs/uClibc-0.9.27-ssp-2.patch \ No newline at end of file Deleted: trunk/util-linux/util-linux-2.12q-fPIC-1.patch =================================================================== --- trunk/util-linux/util-linux-2.12q-fPIC-1.patch 2005-02-23 00:02:49 UTC (rev 848) +++ trunk/util-linux/util-linux-2.12q-fPIC-1.patch 2005-02-23 21:21:16 UTC (rev 849) @@ -1 +0,0 @@ -link ../hlfs/util-linux-2.12q-fPIC-1.patch \ No newline at end of file -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
