Changeset 175f4d65

Timestamp:

Sep 22, 2008, 4:59:21 AM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

ea11059

Parents:

8aa6f1c2

Message:

Commit missing patches.

Location:

patches

Files:

• glibc-2.7-branch_update-1A.patch (deleted)
• glibc-2.7-i586_chk-2.patch (deleted)
• glibc-2.7-include_fixed-1.patch (deleted)
• glibc-2.8-alpha_PTR_MANGLE_fix-1.patch (moved) (moved from patches/glibc-2.7-alpha_PTR_MANGLE_fix-1.patch)
• glibc-2.8-libgcc_eh-1.patch (moved) (moved from patches/glibc-2.7-libgcc_eh-1.patch) (7 diffs)
• glibc-2.8-localedef_segfault-1.patch (moved) (moved from patches/glibc-2.7-localedef_segfault-1.patch) (1 diff)
• glibc-2.8-mawk_fix-1.patch (moved) (moved from patches/glibc-2.7-mawk_fix-1.patch)

patches/glibc-2.8-libgcc_eh-1.patch

@@ -7 +7 @@
              the glibc will attempt to link to it.
 
-             Rediffed for 2.7 by Jim Gifford
+             Rediffed for 2.7 by Jim Gifford
+             Rediffed for 2.8 by Joe Ciccone
 
-diff -Naur glibc-2.7.orig/Makeconfig glibc-2.7/Makeconfig
---- glibc-2.7.orig/Makeconfig   2007-07-05 15:03:47.000000000 -0700
-+++ glibc-2.7/Makeconfig        2007-10-20 15:23:21.000000000 -0700
-@@ -524,12 +524,20 @@
+diff -Naur glibc-2.8.orig/configure.in glibc-2.8/configure.in
+--- glibc-2.8.orig/configure.in 2008-04-11 13:52:55.000000000 -0400
++++ glibc-2.8/configure.in      2008-09-20 12:06:26.000000000 -0400
+@@ -1395,6 +1395,23 @@
+     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
+   fi
+ 
++  AC_CACHE_CHECK(whether to link against libgcc_eh,
++                 libc_cv_cc_with_libgcc_eh, [
++    cat > conftest.c <<EOF
++int main (void) { return 0; }
++EOF
++    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
++       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
++      libc_cv_cc_with_libgcc_eh=yes
++    else
++      libc_cv_cc_with_libgcc_eh=no
++    fi
++    rm -f conftest*])
++  AC_SUBST(libc_cv_cc_with_libgcc_eh)
++  if test $libc_cv_cc_with_libgcc_eh = yes; then
++    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
++  fi
++
+   AC_CACHE_CHECK(for -z nodelete option,
+                 libc_cv_z_nodelete, [dnl
+   cat > conftest.c <<EOF
+diff -Naur glibc-2.8.orig/Makeconfig glibc-2.8/Makeconfig
+--- glibc-2.8.orig/Makeconfig   2008-01-31 19:01:12.000000000 -0500
++++ glibc-2.8/Makeconfig        2008-09-20 12:06:26.000000000 -0400
+@@ -525,12 +525,20 @@
    libunwind = -lunwind
  endif
@@ -34 +62 @@
  endif
  ifeq ($(elf),yes)
-diff -Naur glibc-2.7.orig/config.make.in glibc-2.7/config.make.in
---- glibc-2.7.orig/config.make.in       2007-08-25 15:25:24.000000000 -0700
-+++ glibc-2.7/config.make.in    2007-10-20 15:23:21.000000000 -0700
+diff -Naur glibc-2.8.orig/config.make.in glibc-2.8/config.make.in
+--- glibc-2.8.orig/config.make.in       2007-08-25 18:25:24.000000000 -0400
++++ glibc-2.8/config.make.in    2008-09-20 12:06:26.000000000 -0400
 @@ -60,6 +60,7 @@
  have-libaudit = @have_libaudit@
@@ -45 +73 @@
  bind-now = @bindnow@
  have-hash-style = @libc_cv_hashstyle@
-diff -Naur glibc-2.7.orig/configure glibc-2.7/configure
---- glibc-2.7.orig/configure    2007-10-18 04:22:23.000000000 -0700
-+++ glibc-2.7/configure 2007-10-20 21:26:18.000000000 -0700
+diff -Naur glibc-2.8.orig/configure glibc-2.8/configure
+--- glibc-2.8.orig/configure    2008-09-01 16:01:43.000000000 -0400
++++ glibc-2.8/configure 2008-09-20 12:06:26.000000000 -0400
 @@ -716,6 +716,7 @@
  BISON
@@ -56 +84 @@
  libc_cv_libgcc_s_suffix
  libc_cv_as_needed
-@@ -6045,6 +6046,33 @@
+@@ -6052,6 +6053,33 @@
  
    fi
@@ -90 +118 @@
  echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
  if test "${libc_cv_z_nodelete+set}" = set; then
-@@ -9243,6 +9271,7 @@
+@@ -9250,6 +9278,7 @@
  BISON!$BISON$ac_delim
  VERSIONING!$VERSIONING$ac_delim
@@ -98 +126 @@
  libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
  libc_cv_as_needed!$libc_cv_as_needed$ac_delim
-@@ -9294,7 +9323,7 @@
+@@ -9301,7 +9330,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
@@ -107 +135 @@
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Naur glibc-2.7.orig/configure.in glibc-2.7/configure.in
---- glibc-2.7.orig/configure.in 2007-06-07 20:16:36.000000000 -0700
-+++ glibc-2.7/configure.in      2007-10-20 15:23:21.000000000 -0700
-@@ -1388,6 +1388,23 @@
-     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
-   fi
- 
-+  AC_CACHE_CHECK(whether to link against libgcc_eh,
-+                 libc_cv_cc_with_libgcc_eh, [
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*])
-+  AC_SUBST(libc_cv_cc_with_libgcc_eh)
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
-+  fi
-+
-   AC_CACHE_CHECK(for -z nodelete option,
-                 libc_cv_z_nodelete, [dnl
-   cat > conftest.c <<EOF
-

patches/glibc-2.8-localedef_segfault-1.patch

@@ -7 +7 @@
              This problem is only noticed when using PaX
              and some architectures besides x86.
-             See debian bug # 231438
+             See debian bug # 231438
 
-diff -Naur glibc-2.6.orig/locale/programs/3level.h glibc-2.6/locale/programs/3level.h
---- glibc-2.6.orig/locale/programs/3level.h     2005-12-06 21:47:27.000000000 -0800
-+++ glibc-2.6/locale/programs/3level.h  2007-05-19 13:38:01.000000000 -0700
-@@ -202,6 +202,42 @@
+             Rediffed for 2.8 by Joe Ciccone
+
+diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h
+--- glibc-2.8.orig/locale/programs/3level.h     2007-07-15 20:54:59.000000000 -0400
++++ glibc-2.8/locale/programs/3level.h  2008-09-20 12:09:34.000000000 -0400
+@@ -203,6 +203,42 @@
         }
      }