Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (0fea11f119ae7338c550b3b342768290a3323872)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (0fea11f119ae7338c550b3b342768290a3323872)
  • Date: Thu, 9 Nov 2006 23:50:42 -0600

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

libs/glibc/DETAILS | 1
libs/glibc/HISTORY | 5 ++
libs/glibc/PRE_BUILD | 2
libs/glibc/glibc-2.4-iconv_open.patch | 82
++++++++++++++++++++++++++++++++++
4 files changed, 90 insertions(+)

New commits:
commit 0fea11f119ae7338c550b3b342768290a3323872
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc fixed bug in glibc causing samba to segfault see history and
pre_build for url

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 63b14ec..0040ce1 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -11,6 +11,7 @@ if [ "$GLIBC_NPTL" = "y" ]; then
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature

SOURCE3_HASH=sha512:e7ee7a09880d19dea3d2c0d498631ee9d269738e7acdeba0a346da3b8bd0629628582973de33e6ac0c913e8c691806a50e07d520d6f6d078b76a3e74b9b61fd7
+ PATCHLEVEL=1
else
VERSION=2.3.6
HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 16e7f54..5d21b55 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2006-11-09 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added patch from upstream bug
+ https://bugzilla.samba.org/show_bug.cgi?id=3678
+ * glibc-2.4-iconv_open.patch: fix for the iconv_open function
+
2006-11-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS, INSTALL, PRE_BUILD, nisplus_fix.diff: merge from devel; 2.4

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index c2c9628..ceac922 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -10,6 +10,8 @@ if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
# fix for upstream bug http://sourceware.org/bugzilla/show_bug.cgi?id=2429
patch -p1 < $SCRIPT_DIRECTORY/nisplus_fix.diff &&
+ # fix for upstream bug https://bugzilla.samba.org/show_bug.cgi?id=3678
+ patch -p1 < $SCRIPT_DIRECTORY/glibc-2.4-iconv_open.patch &&

#
# Unpack glibc-kernel-headers
diff --git a/libs/glibc/glibc-2.4-iconv_open.patch
b/libs/glibc/glibc-2.4-iconv_open.patch
new file mode 100644
index 0000000..4847879
--- /dev/null
+++ b/libs/glibc/glibc-2.4-iconv_open.patch
@@ -0,0 +1,82 @@
+Submitted By: Joe Ciccone <<a
href="http://linuxfromscratch.org/mailman/listinfo/patches";>jciccone at
gmail.com</a>>
+Date: 2006-06-19
+Initial Package Version: 2.4
+Upstream Status: In CVS
+Origin: <a
href="https://bugzilla.samba.org/show_bug.cgi?id=3678";>https://bugzilla.samba.org/show_bug.cgi?id=3678</a>
+Description: Fixes a problem that showed up in samba. It would fail to
+ start with the following error.
+
+smbd: gconv_db.c:232: __gconv_release_step: Assertion `step->__end_fct ==
+((void *)0)' failed.
+
+diff -Naur glibc-2.4.orig/iconv/gconv_db.c glibc-2.4/iconv/gconv_db.c
+--- glibc-2.4.orig/iconv/gconv_db.c 2005-12-19 02:25:25.000000000 -0500
++++ glibc-2.4/iconv/gconv_db.c 2006-06-19 11:42:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* Provide access to the collection of available transformation modules.
+- Copyright (C) 1997-2003, 2004, 2005 Free Software Foundation, Inc.
++ Copyright (C) 1997-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper AT cygnus.com>, 1997.
+
+@@ -227,7 +227,7 @@
+ step->__shlib_handle = NULL;
+ #endif
+ }
+- else
++ else if (step->__shlib_handle == NULL)
+ /* Builtin modules should not have end functions. */
+ assert (step->__end_fct == NULL);
+ }
+diff -Naur glibc-2.4.orig/iconvdata/Makefile glibc-2.4/iconvdata/Makefile
+--- glibc-2.4.orig/iconvdata/Makefile 2005-11-16 03:15:54.000000000 -0500
++++ glibc-2.4/iconvdata/Makefile 2006-06-19 11:38:42.000000000 -0400
+@@ -65,7 +65,8 @@
+ include ../Makeconfig
+
+ ifeq (yes,$(build-shared))
+-tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4
++tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
++ tst-iconv6
+ ifeq ($(have-thread-library),yes)
+ tests += bug-iconv3
+ endif
+diff -Naur glibc-2.4.orig/iconvdata/tst-iconv6.c
glibc-2.4/iconvdata/tst-iconv6.c
+--- glibc-2.4.orig/iconvdata/tst-iconv6.c 1969-12-31 19:00:00.000000000
-0500
++++ glibc-2.4/iconvdata/tst-iconv6.c 2006-06-19 11:38:42.000000000 -0400
+@@ -0,0 +1,35 @@
++/* BZ #2569 */
++
++#include <iconv.h>
++#include <stdio.h>
++
++static int
++do_test (void)
++{
++ iconv_t cd0 = iconv_open ("ISO-8859-7", "UTF-16LE");
++ if (cd0 == (iconv_t) -1)
++ {
++ puts ("first iconv_open failed");
++ return 1;
++ }
++ iconv_t cd1 = iconv_open ("ISO-8859-7", "UTF-16LE");
++ if (cd1 == (iconv_t) -1)
++ {
++ puts ("second iconv_open failed");
++ return 1;
++ }
++ if (iconv_close (cd0) != 0)
++ {
++ puts ("first iconv_close failed");
++ return 1;
++ }
++ if (iconv_close (cd1) != 0)
++ {
++ puts ("second iconv_close failed");
++ return 1;
++ }
++ return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"




Archive powered by MHonArc 2.6.24.

Top of Page