Clifford Wolf
17 years ago
6 changed files with 164 additions and 7 deletions
Split View
Diff Options
-
+3 -2package/base/glibc/config-400.in
-
+8 -4package/base/glibc/glibc.conf
-
+7 -1package/base/glibc/glibc.desc
-
+37 -0package/base/glibc/glibc26/gcc_eh.patch.cross
-
+99 -0package/base/glibc/glibc26/ldconfig-glob.patch
-
+10 -0package/base/glibc/glibc26/zrelrocheck.patch
@ -0,0 +1,37 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/glibc/glibc23/gcc_eh.patch.cross |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
diff -ruN glibc-2.3.4/Makeconfig glibc-2.3.4-new/Makeconfig |
|||
--- glibc-2.3.4/Makeconfig 2004-12-15 19:51:47.000000000 +0100 |
|||
+++ glibc-2.3.4-new/Makeconfig 2005-03-27 15:47:19.000000000 +0200 |
|||
@@ -514,12 +514,12 @@ |
|||
libunwind = -lunwind |
|||
endif |
|||
ifneq ($(have-as-needed),yes) |
|||
- libgcc_eh := -lgcc_eh $(libunwind) |
|||
+ libgcc_eh := $(libunwind) |
|||
else |
|||
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) |
|||
+static-gnulib := -lgcc $(libunwind) |
|||
libc.so-gnulib := -lgcc |
|||
endif |
|||
ifeq ($(elf),yes) |
|||
@ -0,0 +1,99 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/glibc/glibc23/ldconfig-glob.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
|
|||
This is an alternative ldconfig wildcard expansion (glob) patch for |
|||
recent glibc's. |
|||
|
|||
- Valentin Ziegler <valentin@rocklinux-consulting.de> |
|||
|
|||
--- ./elf/ldconfig.c.orig 2004-09-14 13:28:34.000000000 +0200
|
|||
+++ ./elf/ldconfig.c 2004-09-14 14:19:07.000000000 +0200
|
|||
@@ -359,21 +359,57 @@
|
|||
if (opt_chroot) |
|||
path = chroot_canon (opt_chroot, path); |
|||
|
|||
- struct stat64 stat_buf;
|
|||
- if (path == NULL || stat64 (path, &stat_buf))
|
|||
- {
|
|||
- if (opt_verbose)
|
|||
- error (0, errno, _("Can't stat %s"), entry->path);
|
|||
- free (entry->path);
|
|||
- free (entry);
|
|||
- }
|
|||
- else
|
|||
- {
|
|||
- entry->ino = stat_buf.st_ino;
|
|||
- entry->dev = stat_buf.st_dev;
|
|||
+ /* assume path is a pattern. - Valentin */
|
|||
|
|||
- add_single_dir (entry, 1);
|
|||
- }
|
|||
+ glob_t result;
|
|||
+ if (glob(path, GLOB_ONLYDIR, NULL, &result) == 0) {
|
|||
+
|
|||
+ for (int j = 0; j < result.gl_pathc; j++)
|
|||
+ {
|
|||
+ /* create a copy entry with expanded path */
|
|||
+ struct dir_entry *real_entry = xmalloc (sizeof (struct dir_entry));
|
|||
+ memcpy (real_entry, entry, sizeof (struct dir_entry));
|
|||
+ real_entry->path = xstrdup (result.gl_pathv[j]);
|
|||
+
|
|||
+ struct stat64 stat_buf;
|
|||
+ if (real_entry -> path == NULL || stat64 (real_entry -> path, &stat_buf))
|
|||
+ {
|
|||
+ if (opt_verbose)
|
|||
+ error (0, errno, _("Can't stat %s"), real_entry->path);
|
|||
+ free (real_entry->path);
|
|||
+ free (real_entry);
|
|||
+ }
|
|||
+ else
|
|||
+ {
|
|||
+ real_entry->ino = stat_buf.st_ino;
|
|||
+ real_entry->dev = stat_buf.st_dev;
|
|||
+
|
|||
+ add_single_dir (real_entry, 1);
|
|||
+ }
|
|||
+ }
|
|||
+
|
|||
+ } else {
|
|||
+ /* fallback to code from glibc with orig. error handling */
|
|||
+ struct stat64 stat_buf;
|
|||
+ if (path == NULL || stat64 (path, &stat_buf))
|
|||
+ {
|
|||
+ if (opt_verbose)
|
|||
+ error (0, errno, _("Can't stat %s"), entry->path);
|
|||
+ free (entry->path);
|
|||
+ free (entry);
|
|||
+ }
|
|||
+ else
|
|||
+ {
|
|||
+ entry->ino = stat_buf.st_ino;
|
|||
+ entry->dev = stat_buf.st_dev;
|
|||
+
|
|||
+ add_single_dir (entry, 1);
|
|||
+ }
|
|||
+ }
|
|||
+
|
|||
+ globfree (&result);
|
|||
+
|
|||
+ /* ******************************* */
|
|||
|
|||
if (opt_chroot) |
|||
free (path); |
|||
@ -0,0 +1,10 @@ |
|||
--- ./configure.orig 2007-05-18 04:07:18.000000000 +0200
|
|||
+++ ./configure 2007-05-31 00:09:59.000000000 +0200
|
|||
@@ -5631,6 +5631,7 @@
|
|||
|
|||
case "$base_machine" in |
|||
i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) |
|||
+ libc_cv_z_relro=yes
|
|||
echo "$as_me:$LINENO: checking for -z relro option" >&5 |
|||
echo $ECHO_N "checking for -z relro option... $ECHO_C" >&6 |
|||
if test "${libc_cv_z_relro+set}" = set; then |
|||