r2606 - in glibc-package/branches/glibc-2.7/debian: . patches patches/any
Author: madcoder
Date: 2007-10-27 08:30:16 +0000 (Sat, 27 Oct 2007)
New Revision: 2606
Removed:
glibc-package/branches/glibc-2.7/debian/patches/any/local-iconv-fix-trampoline.diff
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
Remove local-ifonv-fix-trampoline: obsolete.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 08:30:12 UTC (rev 2605)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 08:30:16 UTC (rev 2606)
@@ -1,3 +1,9 @@
+glibc (2.7-0exp2) UNRELEASED; urgency=low
+
+ * Remove any/local-iconv-fix-trampoline.diff (obsolete).
+
+ -- Pierre Habouzit <madcoder@debian.org> Sat, 27 Oct 2007 10:29:01 +0200
+
glibc (2.7-0exp1) experimental; urgency=low
[ Clint Adams ]
Deleted: glibc-package/branches/glibc-2.7/debian/patches/any/local-iconv-fix-trampoline.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/any/local-iconv-fix-trampoline.diff 2007-10-27 08:30:12 UTC (rev 2605)
+++ glibc-package/branches/glibc-2.7/debian/patches/any/local-iconv-fix-trampoline.diff 2007-10-27 08:30:16 UTC (rev 2606)
@@ -1,87 +0,0 @@
-# DP: Description: Fix iconvconfig segfault when run under exec-shield,
-# PaX or similar. (#397020)
-# DP: Patch Author: Robert Connolly <robert at linuxfromscratch dot org>
-# DP: Upstream status: rejected (non-upstream kernels not supported)
-# DP: Date: 2006-10-11
-
---- glibc-2.6.orig/iconv/iconvconfig.c
-+++ glibc-2.6/iconv/iconvconfig.c
-@@ -1011,6 +1011,38 @@
- module name offset
- (following last entry with step count 0)
- */
-+
-+/* Function to insert the names. */
-+/* Made non-nested to avoid trampoline.
-+ * Requires hash_table and hash_size to be made global,
-+ * but since the caller (write_output) is called once
-+ * in the only thread there should be no problem */
-+static struct hash_entry *hash_table;
-+static size_t hash_size;
-+static void
-+name_insert (const void *nodep, VISIT value, int level)
-+ {
-+ struct name *name;
-+ unsigned int idx;
-+ unsigned int hval2;
-+
-+ if (value != leaf && value != postorder)
-+ return;
-+
-+ name = *(struct name **) nodep;
-+ idx = name->hashval % hash_size;
-+ hval2 = 1 + name->hashval % (hash_size - 2);
-+
-+ while (hash_table[idx].string_offset != 0)
-+ if ((idx += hval2) >= hash_size)
-+ idx -= hash_size;
-+
-+ hash_table[idx].string_offset = strtaboffset (name->strent);
-+
-+ assert (name->module_idx != -1);
-+ hash_table[idx].module_idx = name->module_idx;
-+ }
-+
- static int
- write_output (void)
- {
-@@ -1018,8 +1050,6 @@
- char *string_table;
- size_t string_table_size;
- struct gconvcache_header header;
-- struct hash_entry *hash_table;
-- size_t hash_size;
- struct module_entry *module_table;
- char *extra_table;
- char *cur_extra_table;
-@@ -1032,30 +1062,6 @@
- char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1)
- + strlen (".XXXXXX")];
-
-- /* Function to insert the names. */
-- auto void
-- name_insert (const void *nodep, VISIT value, int level)
-- {
-- struct name *name;
-- unsigned int idx;
-- unsigned int hval2;
--
-- if (value != leaf && value != postorder)
-- return;
--
-- name = *(struct name **) nodep;
-- idx = name->hashval % hash_size;
-- hval2 = 1 + name->hashval % (hash_size - 2);
--
-- while (hash_table[idx].string_offset != 0)
-- if ((idx += hval2) >= hash_size)
-- idx -= hash_size;
--
-- hash_table[idx].string_offset = strtaboffset (name->strent);
--
-- assert (name->module_idx != -1);
-- hash_table[idx].module_idx = name->module_idx;
-- }
-
- /* Open the output file. */
- if (output_file == NULL)
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 08:30:12 UTC (rev 2605)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 08:30:16 UTC (rev 2606)
@@ -116,8 +116,7 @@
any/local-dl-execstack.diff -p0
any/local-fhs-linux-paths.diff -p0
any/local-gcc4-wcstol_l.diff
-#any/local-iconv-fix-trampoline.diff
-#any/local-ipv6-lookup.diff -p1
+# any/local-ipv6-lookup.diff -p1 # has issues
any/local-ld-multiarch.diff -p0
any/local-ldd.diff -p0
any/local-ldso-disable-hwcap.diff -p0
Reply to: