Skip to Content.
Sympa Menu

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

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 (b195e086035e24ee5423af873d48ad32c21759af)
  • Date: Sun, 5 Jun 2011 14:18:47 -0500

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

libs/glibc/DETAILS | 2 +-
libs/glibc/HISTORY | 4 ++++
libs/glibc/PRE_BUILD | 3 +++
libs/glibc/glibc-2.14-3.patch | 38 ++++++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+), 1 deletion(-)

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

glibc: #15991

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index e957b52..2505374 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -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=0
+ PATCHLEVEL=1
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.38
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 887b759..2fa945a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+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
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index b6428f4..b7ae224 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -69,6 +69,9 @@ 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-3.patch b/libs/glibc/glibc-2.14-3.patch
new file mode 100644
index 0000000..145092e
--- /dev/null
+++ b/libs/glibc/glibc-2.14-3.patch
@@ -0,0 +1,38 @@
+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 (b195e086035e24ee5423af873d48ad32c21759af), Ladislav Hagara, 06/05/2011

Archive powered by MHonArc 2.6.24.

Top of Page