Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (331c97db3ed51fa17516203ffcff8ae34b71a17b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (331c97db3ed51fa17516203ffcff8ae34b71a17b)
  • Date: Fri, 10 Jun 2011 01:43:01 -0500

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

libs/glibc/DETAILS | 6 +--
libs/glibc/HISTORY | 8 ----
libs/glibc/PRE_BUILD | 7 ---
libs/glibc/glibc-2.14-1.patch | 74
------------------------------------------
libs/glibc/glibc-2.14-2.patch | 39 ----------------------
libs/glibc/glibc-2.14-3.patch | 38 ---------------------
6 files changed, 3 insertions(+), 169 deletions(-)

New commits:
commit 331c97db3ed51fa17516203ffcff8ae34b71a17b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

Reverted until libtirpc drop-in replace glibc's rpc

Revert "glibc 2.14"

This reverts commit 142b46482762b0941007b70178eea5d2436682a8.

commit cc1bc2db7c0a926004b2968d031de973f175067e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

Reverted until libtirpc drop-in replace glibc's rpc

Revert "glibc: #15991"

This reverts commit b195e086035e24ee5423af873d48ad32c21759af.

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 2505374..1aed58f 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.14
+ GLIBC_VERSION=2.13
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.14
+ VERSION=2.13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
@@ -42,7 +42,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SECURITY_PATCH=1
- PATCHLEVEL=1
+ PATCHLEVEL=0
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.38
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 2fa945a..5965ca4 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,11 +1,3 @@
-2011-06-05 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: PATCHLEVEL=1
- * PRE_BUILD, glibc-2.14-3.patch: patch added, #15991
-
-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 b7ae224..3ff8bad 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -65,13 +65,6 @@ 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 &&
-
-echo Bug 15991
-patch --reverse -p1 < $SPELL_DIRECTORY/glibc-2.14-3.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
deleted file mode 100644
index 1f3a744..0000000
--- a/libs/glibc/glibc-2.14-1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index fb4374a..0000000
--- a/libs/glibc/glibc-2.14-2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-
diff --git a/libs/glibc/glibc-2.14-3.patch b/libs/glibc/glibc-2.14-3.patch
deleted file mode 100644
index 145092e..0000000
--- a/libs/glibc/glibc-2.14-3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h
-index 4345bed..b5d4702 100644
---- a/inet/protocols/timed.h
-+++ b/inet/protocols/timed.h
-@@ -32,7 +32,8 @@
- #ifndef _PROTOCOLS_TIMED_H
- #define _PROTOCOLS_TIMED_H 1
-
--#include <rpc/types.h>
-+#include <sys/types.h>
-+#include <sys/time.h>
-
- /*
- * Time Synchronization Protocol
-@@ -40,6 +41,7 @@
-
- #define TSPVERSION 1
- #define ANYADDR NULL
-+#define MAXHOSTNAMELEN 64
-
- struct tsp {
- u_char tsp_type;
-diff --git a/nis/Makefile b/nis/Makefile
-index f63ada6..e7e5f0c 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir := nis
-
- aux := nis_hash
-
--headers := $(wildcard rpcsvc/*.[h])
- distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-- nisplus-parser.h nis_xdr.h nss
-+ nisplus-parser.h nis_xdr.h nss \
-+ $(wildcard rpcsvc/*.[hx])
-
- # These are the databases available for the nis (and perhaps later nisplus)
- # service. This must be a superset of the services in nss.



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (331c97db3ed51fa17516203ffcff8ae34b71a17b), Ladislav Hagara, 06/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page