sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (142b46482762b0941007b70178eea5d2436682a8)

From: Ladislav Hagara <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (142b46482762b0941007b70178eea5d2436682a8)
Date: Wed, 1 Jun 2011 20:48:12 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

libs/glibc/DETAILS | 4 +-
libs/glibc/HISTORY | 4 ++
libs/glibc/PRE_BUILD | 4 ++
libs/glibc/glibc-2.14-1.patch | 74
++++++++++++++++++++++++++++++++++++++++++
libs/glibc/glibc-2.14-2.patch | 39 ++++++++++++++++++++++
5 files changed, 123 insertions(+), 2 deletions(-)

New commits:
commit 142b46482762b0941007b70178eea5d2436682a8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

glibc 2.14

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 1aed58f..e957b52 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
if [[ "$GLIBC_CVS" == "y" ]]; then
local GLIBC_VERSION
- GLIBC_VERSION=2.13
+ GLIBC_VERSION=2.14
if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else
@@ -33,7 +33,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}

SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
SOURCE_IGNORE=volatile
else
- VERSION=2.13
+ VERSION=2.14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5965ca4..887b759 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2011-06-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.14
+ * PRE_BUILD, glibc-2.14-1.patch, glibc-2.14-2.patch: patches added
+
2011-05-10 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated default kernel headers to 2.6.38

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 3ff8bad..b6428f4 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -65,6 +65,10 @@ rm -rf $GLIBC_HEADERS_DIR/include/drm &&
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/glibc-2.14-1.patch &&
+patch -p1 < $SPELL_DIRECTORY/glibc-2.14-2.patch &&
+
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
patch -p1 < $SPELL_DIRECTORY/gcc45.patch &&
diff --git a/libs/glibc/glibc-2.14-1.patch b/libs/glibc/glibc-2.14-1.patch
new file mode 100644
index 0000000..1f3a744
--- /dev/null
+++ b/libs/glibc/glibc-2.14-1.patch
@@ -0,0 +1,74 @@
+From c8fc0c91695b1c7003c7170861274161f9224817 Mon Sep 17 00:00:00 2001
+From: Ulrich Drepper <drepper AT gmail.com>
+Date: Tue, 31 May 2011 08:45:44 -0400
+Subject: [PATCH] Don't free non-malloced memory and fix memory leak
+
+---
+ ChangeLog | 5 +++++
+ nscd/nscd_getserv_r.c | 16 ++++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 3a6abda..eee3d1b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2011-05-31 Andreas Schwab <schwab AT redhat.com>
++
++ * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced
++ memory. Use alloca_account. Fix memory leak when retrying.
++
+ 2011-05-31 Ulrich Drepper <drepper AT gmail.com>
+
+ * version.h (RELEASE): Bump for 2.14 release.
+diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c
+index de96a57..f9ef056 100644
+--- a/nscd/nscd_getserv_r.c
++++ b/nscd/nscd_getserv_r.c
+@@ -124,6 +124,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ s_name = (char *) (&found->data[0].servdata + 1);
+ serv_resp = found->data[0].servdata;
+ s_proto = s_name + serv_resp.s_name_len;
++ alloca_aliases_len = 1;
+ aliases_len = (uint32_t *) (s_proto + serv_resp.s_proto_len);
+ aliases_list = ((char *) aliases_len
+ + serv_resp.s_aliases_cnt * sizeof (uint32_t));
+@@ -154,7 +155,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ + (serv_resp.s_aliases_cnt
+ * sizeof (uint32_t)));
+ if (alloca_aliases_len)
+- tmp = __alloca (serv_resp.s_aliases_cnt * sizeof (uint32_t));
++ tmp = alloca_account (serv_resp.s_aliases_cnt
++ * sizeof (uint32_t),
++ alloca_used);
+ else
+ {
+ tmp = malloc (serv_resp.s_aliases_cnt * sizeof (uint32_t));
+@@ -249,8 +252,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ + (serv_resp.s_aliases_cnt
+ * sizeof (uint32_t)));
+ if (alloca_aliases_len)
+- aliases_len = alloca (serv_resp.s_aliases_cnt
+- * sizeof (uint32_t));
++ aliases_len = alloca_account (serv_resp.s_aliases_cnt
++ * sizeof (uint32_t),
++ alloca_used);
+ else
+ {
+ aliases_len = malloc (serv_resp.s_aliases_cnt
+@@ -368,7 +372,11 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ }
+
+ if (retval != -1)
+- goto retry;
++ {
++ if (!alloca_aliases_len)
++ free (aliases_len);
++ goto retry;
++ }
+ }
+
+ if (!alloca_aliases_len)
+--
+1.7.3.4
+
diff --git a/libs/glibc/glibc-2.14-2.patch b/libs/glibc/glibc-2.14-2.patch
new file mode 100644
index 0000000..fb4374a
--- /dev/null
+++ b/libs/glibc/glibc-2.14-2.patch
@@ -0,0 +1,39 @@
+From 8c29731192565b9c917d6b97db78dcd302283df8 Mon Sep 17 00:00:00 2001
+From: Ulrich Drepper <drepper AT gmail.com>
+Date: Tue, 31 May 2011 14:23:01 -0400
+Subject: [PATCH] Fix typo in stack guard setup code for old kernels
+
+---
+ ChangeLog | 5 +++++
+ sysdeps/unix/sysv/linux/dl-osinfo.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index eee3d1b..2aca74a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2011-05-31 Ulrich Drepper <drepper AT gmail.com>
++
++ * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Fix
++ typo.
++
+ 2011-05-31 Andreas Schwab <schwab AT redhat.com>
+
+ * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced
+diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h
b/sysdeps/unix/sysv/linux/dl-osinfo.h
+index eb7fedc..28fce4f 100644
+--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
+@@ -81,7 +81,7 @@ _dl_setup_stack_chk_guard (void *dl_random)
+ {
+ ssize_t reslen = read_not_cancel (fd, ret.bytes + 1, filllen);
+ close_not_cancel_no_status (fd);
+- if (reslen == (ssize_) filllen)
++ if (reslen == (ssize_t) filllen)
+ return ret.num;
+ }
+ # endif
+--
+1.7.3.4
+

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (142b46482762b0941007b70178eea5d2436682a8), Ladislav Hagara, 06/01/2011