Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (858da8c17f16b135f5dde88b59ee1be330e2cbc9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (858da8c17f16b135f5dde88b59ee1be330e2cbc9)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (858da8c17f16b135f5dde88b59ee1be330e2cbc9)
  • Date: Fri, 21 Sep 2012 20:10:55 -0500
GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

dev/null |binary
libs/glibc/BUILD | 17 +-
libs/glibc/DETAILS | 8
libs/glibc/HISTORY | 35 ++++
libs/glibc/PREPARE | 2
libs/glibc/PRE_BUILD | 30 +--
libs/glibc/as_fn_executable_p.patch | 17 ++
libs/glibc/config.h.patch | 8
libs/glibc/do-not-install-timezones-2.patch | 20 --
libs/glibc/do-not-install-timezones.patch | 124 ---------------
libs/glibc/fix-res_query-assert.patch | 51 ++++++
libs/glibc/gcc45.patch | 49 ------
libs/glibc/glibc-2.3-20050725.tar.bz2.sig | 0
libs/glibc/glibc.gpg |binary
libs/glibc/revert-c5a0802a.patch | 226
++++++++++++++++++++++++++++
libs/glibc/test-installation.pl.patch | 4
16 files changed, 358 insertions(+), 233 deletions(-)

New commits:
commit 452ce123a0ba001b11d64f8d7cc91e4a25afd6a2
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

Revert "Revert "Merge branch 'master' into glibc""

This reverts commit bf3712c1a0f29b0c8904099637cf8d26fcf51ff4.

commit d5b0f4e428819dd012e1caa066404d0f74e42b8b
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

glibc: checkout head for scm, instead of a release branch
PREPARE: scm-2.13 renamed to scm

It doesn't make sense to me to checkout a release branch when basically
the same files are provided by the tarball.

commit 582f1314a78fc0a8c6155c1cb7bb08e92a7cdbe9
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

glibc: specify slibdir to force install all libs to /lib (fixes #411)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index f9c2ec6..cbb8b4b 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -4,14 +4,6 @@ make_single &&
sedit "s/lib64/lib/" sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed &&

-# this causes configure to be run again where it fails for some people on
PIII and for me on Alpha
-# the error is about no working grep found...
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
-# install x86_64 libraries to lib instead of lib64
-sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure &&
-sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure.in
-fi &&
-
#
# bug#5570 ccache sometimes has trouble correctly recognising minor
differences
# in configurations and doesn't force recompile when it should. This stops
it from
@@ -140,12 +132,20 @@ ln -s /usr/include/sys/capability.h
$SOURCE_DIRECTORY/nscd/sys/capability.h &&
cd $SOURCE_DIRECTORY.bld &&

#
+# Install all libs into /lib
+# Fixes installing glibc on x86_64 without a lib64 symlink/dir
+# Bug #441
+#
+echo -e "slibdir=/lib" > configparms
+
+#
# Configure glibc to use the sanitised headers
# http://bugs.sourcemage.org/show_bug.cgi?id=7560
#
$SOURCE_DIRECTORY/configure --host=$HOST \
--build=$BUILD \
--prefix=/usr \
+ --libdir=/usr/lib \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--sysconfdir=/etc \
@@ -154,5 +154,6 @@ $SOURCE_DIRECTORY/configure --host=$HOST
\
--disable-profile \
--with-headers=$GLIBC_HEADERS_DIR/usr/include \
--disable-multi-arch \
+ --enable-obsolete-rpc \
$OPTS &&
make
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 44689a8..98eac80 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -18,9 +18,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
SOURCE4_IGNORE=signature

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
- PATCHLEVEL=2
else
- if [[ "${GLIBC_BRANCH/-*}" == "scm" ]]; then
+ if [[ "${GLIBC_BRANCH}" == "scm" ]]; then
if [[ "${GLIBC_AUTOUPDATE}" == "y" ]]; then
VERSION=${GLIBC_BRANCH}-$(date +%Y%m%d)
else
@@ -29,10 +28,10 @@ else
FORCE_DOWNLOAD=on
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
-
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_BRANCH#scm-}/master"
+ SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.13
+ VERSION=2.16.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
@@ -41,7 +40,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SECURITY_PATCH=1
- PATCHLEVEL=2
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.38
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 82e6650..6ebca03 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,38 @@
+2012-09-06 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: specify slibdir to force install libs to /lib (fixes #411)
+ * PREPARE: scm-2.13 renamed to scm
+ * DETAILS: checkout head for scm, instead of a release branch
+
+2012-07-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: specify libdir so libs install to /usr/lib on all archs
+ * PRE_BUILD: remove fixing ieee754 function names. This would break
the
+ build on my box.
+ Re-enable libgd detection
+ Added patch to fix res_query assertion and another to fix various
hangs
+ * fix-res_query-assert.patch: added, fix assertion in res_query
+ * revert-c5a0802a.patch: added, revert to fix various hangs
+ * removed unused files
+
+2012-07-10 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply as_fn_executable_p.patch
+ * as_fn_executable_p.patch: add as_fn_executable_p() to configure
+ so it can detect grep. I have no idea why or how its missing though.
+
+2012-07-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.16.0
+ * BUILD: --enable-obsolete-rpc added
+ * PRE_BUILD, glibc-2.15-fixes-1.patch, gcc45.patch,
+ do-not-install-timezones.patch, do-not-install-timezones-2.patch,
+ test-installation.pl.patch: patches removed
+ * PRE_BUILD: removed scripts/test-installation.pl, broken for me
+
+2012-06-26 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.15
+ * PRE_BUILD: added gcc specific fixes, added patch to fix segfaults
+ in some programs
+ * glibc-2.15-fixes-1.patch: added LFS patch
+ * glibc.gpg: deleted old key, replaced with 6C2A4AFF Carlos
O'Donell's key
+
2012-05-17 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: PATCHLEVEL=2
* DEPENDS: added runtime_depends tzdata
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 5387658..3b664ef 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -6,7 +6,7 @@ if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.*
]]; then
else
config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) kernel, would you like to use the new nptl (Native Posix Thread
Libary)?" y &&
if [[ "$GLIBC_NPTL" == "y" ]]; then
- prepare_select_branch stable scm-2.13
+ prepare_select_branch stable scm
fi &&
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux
kernel headers from the latest stable release" n
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 8e50e2f..0e7cd49 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,11 +1,10 @@
default_pre_build &&

+# seems perl script scripts/test-installation.pl is broken now
+sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl
$(common-objpfx)::' $SOURCE_DIRECTORY/Makefile &&
+
if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
-
#http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4dae91cf9a288284072d1a299868db7a634
- patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/do-not-install-timezones.patch &&
-
#http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe3835b8a3bcac5a54733af45cc06fc0da
- patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/do-not-install-timezones-2.patch &&
#
# Unpack glibc-kernel-headers
#
@@ -91,14 +90,21 @@ rm -rf $GLIBC_HEADERS_DIR/include/drm &&
#
# Now fixup the normal glibc
#
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
-patch -p1 < $SPELL_DIRECTORY/gcc45.patch &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/Makefile.patch &&
+patch -p1 < $SPELL_DIRECTORY/as-test-x.patch &&
+# no idea why or how this is missing from configure
+patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&
+
+# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+patch -p1 < $SPELL_DIRECTORY/fix-res_query-assert.patch &&
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=552960
+patch -p1 < $SPELL_DIRECTORY/revert-c5a0802a.patch &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
-sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/configure &&
+#sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/configure &&

#
# Create the build directory
@@ -109,8 +115,4 @@ mk_source_dir $SOURCE_DIRECTORY.bld &&
local test_path=$SOURCE_DIRECTORY.bld/test-installation &&
mkdir $test_path &&
sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl &&
-sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile &&
-
-# CC="gcc" /usr/bin/perl scripts/test-installation.pl
/usr/src/glibc-2.13.bld/
-# /usr/lib/gcc/i686-pc-linux-gnu/4.4.3/../../../../i686-pc-linux-gnu/bin/ld:
cannot find -lnss_test1
-patch scripts/test-installation.pl <
$SPELL_DIRECTORY/test-installation.pl.patch
+sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile
diff --git a/libs/glibc/as_fn_executable_p.patch
b/libs/glibc/as_fn_executable_p.patch
new file mode 100644
index 0000000..bc5b896
--- /dev/null
+++ b/libs/glibc/as_fn_executable_p.patch
@@ -0,0 +1,17 @@
+--- configure 2012-07-10 01:17:03.777702901 -0400
++++ configure.patched 2012-07-10 01:29:06.658727860 -0400
+@@ -284,6 +284,14 @@
+ exit $1
+ } # as_fn_exit
+
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.
diff --git a/libs/glibc/config.h.patch b/libs/glibc/config.h.patch
deleted file mode 100644
index 2055042..0000000
--- a/libs/glibc/config.h.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/usr/include/linux/config.h 2004-11-29 21:24:16.893466608 -0800
-+++ b/usr/include/linux/config.h 2004-11-29 21:24:46.574954336 -0800
-@@ -1,3 +1,3 @@
--#error "Compilation aborted. Please read the FAQ for linux-libc-headers
package."
--#error "(can be found at
http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/)"
-+#warning "Compilation would have been aborted. Please read the FAQ for
linux-libc-headers package."
-+#warning "(can be found at
http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/)"
-
diff --git a/libs/glibc/do-not-install-timezones-2.patch
b/libs/glibc/do-not-install-timezones-2.patch
deleted file mode 100644
index 13b6ddc..0000000
--- a/libs/glibc/do-not-install-timezones-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 00bfba6..9e55a6a 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -45,7 +45,6 @@ include ../Makeconfig # Get objpfx defined so we
can use it below.
- CPPFLAGS-zic = -DNOT_IN_libc
-
- ifeq ($(have-ksh),yes)
--install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
- generated += tzselect
- endif
-@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh
$(common-objpfx)config.make
- -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- chmod 555 $@.new
- mv -f $@.new $@
--
--$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \
-- $(inst_zonedir)/%: % $(+force)
-- $(do-install)
diff --git a/libs/glibc/do-not-install-timezones.patch
b/libs/glibc/do-not-install-timezones.patch
deleted file mode 100644
index 61b8226..0000000
--- a/libs/glibc/do-not-install-timezones.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index e8fb716..d5ea538 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2000,2002,2005,2007,2012 Free Software Foundation, Inc.
- # This file is part of the GNU C Library.
-
- # The GNU C Library is free software; you can redistribute it and/or
-@@ -49,33 +49,6 @@ include ../Makeconfig # Get objpfx defined so we
can use it below.
-
- CPPFLAGS-zic = -DNOT_IN_libc
-
--# z.* use this variable.
--define nl
--
--
--endef
--ifndef avoid-generated
--ifndef inhibit_timezone_rules
---include $(addprefix $(objpfx)z.,$(tzfiles))
--endif
--endif
--
--# Make these absolute file names.
--installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file))
\
-- $(addprefix $(inst_zonedir)/, \
-- $(localtime-file)))
--installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
-- $(addprefix $(inst_zonedir)/, \
-- $(posixrules-file)))
--
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
-- $(zonenames:%=posix/%) \
-- $(zonenames:%=right/%)) \
-- $(installed-localtime-file) $(installed-posixrules-file)
--endif
--
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
-@@ -85,79 +58,6 @@ endif
- include ../Rules
-
-
--$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
--# Kludge alert: we use an implicit rule (in what we are generating here)
--# because that is the only way to tell Make that the one command builds all
--# the files.
--# The extra kludge for the $(tzlinks) files is necessary since running zic
--# this file requires all other files to exist. Blech!
-- $(make-target-directory)
-- (echo 'define $*-zones' ;\
-- $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^
;\
-- echo 'endef' ;\
-- echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))' ;\
-- echo 'ifdef $*-zones' ;\
-- if test x$(findstring $*, $(tzlinks)) != x; then \
-- echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\
-- echo '$$(foreach t,$$(tzbases),$$(addprefix
$$(inst_zonedir)/right/,$$($$t-zones)))' ;\
-- echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\
-- echo '$$(foreach t,$$(tzbases),$$(addprefix
$$(inst_zonedir)/posix/,$$($$t-zones)))' ;\
-- echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \' ;\
-- echo '$$(foreach t,$$(tzbases),$$(addprefix
$$(inst_zonedir)/,$$($$t-zones)))' ;\
-- fi ;\
-- echo '$$(addprefix $$(dir
$$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
-- echo '$< $$(objpfx)zic leapseconds yearistype' ;\
-- echo ' $$(tzcompile)' ;\
-- echo '$$(addprefix $$(dir
$$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
-- echo '$< $$(objpfx)zic /dev/null yearistype' ;\
-- echo ' $$(tzcompile)' ;\
-- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \'
;\
-- echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;\
-- echo ' $$(tzcompile)' ;\
-- echo 'endif' ;\
-- echo 'zonenames := $$(zonenames) $$($*-zones)' ;\
-- ) > $@.new
-- mv $@.new $@
--
--.PHONY: echo-zonenames
--echo-zonenames:
-- @echo 'Known zones: $(zonenames)'
--
--
--# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
--# place the output files although $(zonedir) is compiled in. But the
--# user might have set $(install_root) on the command line of `make install'.
--zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
--tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
-- -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
--
--# The source files specify the zone names relative to the -d directory,
--# so for the posix/ and right/ flavors we need to pass -d
$(inst_zonedir)/posix
--# and the like. This magic extracts /posix or /right if it's the first
--# component after $(inst_zonedir) in the target name $@.
--target-zone-flavor = $(filter /posix /right, \
-- /$(firstword $(subst /, , \
-- $(patsubst
$(inst_zonedir)/%,%,$@))))
--
--ifdef localtime
--$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
-- $(+force)
-- $(make-target-directory)
-- if test -r $@; then \
-- echo Site timezone NOT reset to Factory.; \
-- else \
-- rm -f $@T; \
-- $(SHELL) $(..)scripts/rellns-sh $< $@T; \
-- mv -f $@T $@; \
-- fi
--endif
--ifdef posixrules
--$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \
-- $(+force)
-- $(zic-cmd) -p $(posixrules)
--endif
--
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
-
- tz-cflags = -DTZDIR='"$(zonedir)"' \
diff --git a/libs/glibc/fix-res_query-assert.patch
b/libs/glibc/fix-res_query-assert.patch
new file mode 100644
index 0000000..522c16f
--- /dev/null
+++ b/libs/glibc/fix-res_query-assert.patch
@@ -0,0 +1,51 @@
+--- a/resolv/res_query.c
++++ a/resolv/res_query.c
+@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
+ int *resplen2)
+ {
+ HEADER *hp = (HEADER *) answer;
++ HEADER *hp2;
+ int n, use_malloc = 0;
+ u_int oflags = statp->_flags;
+
+@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
+ /* __libc_res_nsend might have reallocated the buffer. */
+ hp = (HEADER *) *answerp;
+
+- /* We simplify the following tests by assigning HP to HP2. It
+- is easy to verify that this is the same as ignoring all
+- tests of HP2. */
+- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
+-
+- if (n < (int) sizeof (HEADER) && answerp2 != NULL
+- && *resplen2 > (int) sizeof (HEADER))
++ /* We simplify the following tests by assigning HP to HP2 or
++ vice versa. It is easy to verify that this is the same as
++ ignoring all tests of HP or HP2. */
++ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
+ {
+- /* Special case of partial answer. */
+- assert (hp != hp2);
+- hp = hp2;
++ hp2 = hp;
+ }
+- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+- && n > (int) sizeof (HEADER))
++ else
+ {
+- /* Special case of partial answer. */
+- assert (hp != hp2);
+- hp2 = hp;
++ hp2 = (HEADER *) *answerp2;
++ if (n < (int) sizeof (HEADER))
++ {
++ hp = hp2;
++ }
+ }
+
++ /* Make sure both hp and hp2 are defined */
++ assert((hp != NULL) && (hp2 != NULL));
++
+ if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
+ && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
+ #ifdef DEBUG
diff --git a/libs/glibc/gcc45.patch b/libs/glibc/gcc45.patch
deleted file mode 100644
index 02920c1..0000000
--- a/libs/glibc/gcc45.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date: 2010-04-18
-Initial Package Version: 2.11.1
-Upstream Status: Not Submitted
-Origin: http://www.eglibc.org/archives/patches/msg00073.html
-Description: Fixes the following build problem with GCC-4.5.0:
-
-/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT
/mnt/lfs/sources/libc-build/math/s_frexp.os
-./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
-./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first
unrecognized character is `.'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in
.size directive
-./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after
expression
-make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
-
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c
glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08
20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17
11:34:06.882681001 +0000
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h
glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08
20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17
11:34:06.882681001 +0000
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
- /usr/include/asm/unistd.h
diff --git a/libs/glibc/glibc-2.3-20050725.tar.bz2.sig
b/libs/glibc/glibc-2.3-20050725.tar.bz2.sig
deleted file mode 100644
index 93072c5..0000000
Binary files a/libs/glibc/glibc-2.3-20050725.tar.bz2.sig and /dev/null differ
diff --git a/libs/glibc/glibc.gpg b/libs/glibc/glibc.gpg
index e535cb4..304df4b 100644
Binary files a/libs/glibc/glibc.gpg and b/libs/glibc/glibc.gpg differ
diff --git a/libs/glibc/revert-c5a0802a.patch
b/libs/glibc/revert-c5a0802a.patch
new file mode 100644
index 0000000..ad4413a
--- /dev/null
+++ b/libs/glibc/revert-c5a0802a.patch
@@ -0,0 +1,226 @@
+diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
2011-12-22 18:04:12.937212834 +0000
++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
2011-12-22 18:04:42.104222278 +0000
+@@ -137,7 +137,6 @@ __pthread_cond_wait:
+ cmpl $PI_BIT, %eax
+ jne 18f
+
+-90:
+ movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
+ movl %ebp, %edx
+ xorl %esi, %esi
+@@ -151,9 +150,6 @@ __pthread_cond_wait:
+ sete 16(%esp)
+ je 19f
+
+- cmpl $-EAGAIN, %eax
+- je 91f
+-
+ /* Normal and PI futexes dont mix. Use normal futex functions only
+ if the kernel does not support the PI futex functions. */
+ cmpl $-ENOSYS, %eax
+@@ -398,78 +394,6 @@ __pthread_cond_wait:
+ #endif
+ call __lll_unlock_wake
+ jmp 11b
+-
+-91:
+-.LcleanupSTART2:
+- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
+- call it again. */
+-
+- /* Get internal lock. */
+- movl $1, %edx
+- xorl %eax, %eax
+- LOCK
+-#if cond_lock == 0
+- cmpxchgl %edx, (%ebx)
+-#else
+- cmpxchgl %edx, cond_lock(%ebx)
+-#endif
+- jz 92f
+-
+-#if cond_lock == 0
+- movl %ebx, %edx
+-#else
+- leal cond_lock(%ebx), %edx
+-#endif
+-#if (LLL_SHARED-LLL_PRIVATE) > 255
+- xorl %ecx, %ecx
+-#endif
+- cmpl $-1, dep_mutex(%ebx)
+- setne %cl
+- subl $1, %ecx
+- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
+-#if LLL_PRIVATE != 0
+- addl $LLL_PRIVATE, %ecx
+-#endif
+- call __lll_lock_wait
+-
+-92:
+- /* Increment the cond_futex value again, so it can be used as a new
+- expected value. */
+- addl $1, cond_futex(%ebx)
+- movl cond_futex(%ebx), %ebp
+-
+- /* Unlock. */
+- LOCK
+-#if cond_lock == 0
+- subl $1, (%ebx)
+-#else
+- subl $1, cond_lock(%ebx)
+-#endif
+- je 93f
+-#if cond_lock == 0
+- movl %ebx, %eax
+-#else
+- leal cond_lock(%ebx), %eax
+-#endif
+-#if (LLL_SHARED-LLL_PRIVATE) > 255
+- xorl %ecx, %ecx
+-#endif
+- cmpl $-1, dep_mutex(%ebx)
+- setne %cl
+- subl $1, %ecx
+- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
+-#if LLL_PRIVATE != 0
+- addl $LLL_PRIVATE, %ecx
+-#endif
+- call __lll_unlock_wake
+-
+-93:
+- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
+- xorl %ecx, %ecx
+- movl dep_mutex(%ebx), %edi
+- jmp 90b
+-.LcleanupEND2:
+-
+ .size __pthread_cond_wait, .-__pthread_cond_wait
+ versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2)
+@@ -642,10 +566,6 @@ __condvar_w_cleanup:
+ .long .LcleanupEND-.Lsub_cond_futex
+ .long __condvar_w_cleanup-.LSTARTCODE
+ .uleb128 0
+- .long .LcleanupSTART2-.LSTARTCODE
+- .long .LcleanupEND2-.LcleanupSTART2
+- .long __condvar_w_cleanup-.LSTARTCODE
+- .uleb128 0
+ .long .LcallUR-.LSTARTCODE
+ .long .LENDCODE-.LcallUR
+ .long 0
+Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
+diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22
18:04:12.941212837 +0000
++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22
18:05:05.155229737 +0000
+@@ -23,7 +23,6 @@
+ #include <lowlevelcond.h>
+ #include <tcb-offsets.h>
+ #include <pthread-pi-defines.h>
+-#include <pthread-errnos.h>
+ #include <stap-probe.h>
+
+ #include <kernel-features.h>
+@@ -137,14 +136,11 @@ __pthread_cond_wait:
+ cmpl $PI_BIT, %eax
+ jne 61f
+
+-90:
+ movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
+ movl $SYS_futex, %eax
+ syscall
+
+ movl $1, %r8d
+- cmpq $-EAGAIN, %rax
+- je 91f
+ #ifdef __ASSUME_REQUEUE_PI
+ jmp 62f
+ #else
+@@ -331,70 +327,6 @@ __pthread_cond_wait:
+
+ 13: movq %r10, %rax
+ jmp 14b
+-
+-91:
+-.LcleanupSTART2:
+- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
+- call it again. */
+- movq 8(%rsp), %rdi
+-
+- /* Get internal lock. */
+- movl $1, %esi
+- xorl %eax, %eax
+- LOCK
+-#if cond_lock == 0
+- cmpxchgl %esi, (%rdi)
+-#else
+- cmpxchgl %esi, cond_lock(%rdi)
+-#endif
+- jz 92f
+-
+-#if cond_lock != 0
+- addq $cond_lock, %rdi
+-#endif
+- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
+- movl $LLL_PRIVATE, %eax
+- movl $LLL_SHARED, %esi
+- cmovne %eax, %esi
+- callq __lll_lock_wait
+-#if cond_lock != 0
+- subq $cond_lock, %rdi
+-#endif
+-92:
+- /* Increment the cond_futex value again, so it can be used as a new
+- expected value. */
+- incl cond_futex(%rdi)
+- movl cond_futex(%rdi), %edx
+-
+- /* Release internal lock. */
+- LOCK
+-#if cond_lock == 0
+- decl (%rdi)
+-#else
+- decl cond_lock(%rdi)
+-#endif
+- jz 93f
+-
+-#if cond_lock != 0
+- addq $cond_lock, %rdi
+-#endif
+- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
+- movl $LLL_PRIVATE, %eax
+- movl $LLL_SHARED, %esi
+- cmovne %eax, %esi
+- /* The call preserves %rdx. */
+- callq __lll_unlock_wake
+-#if cond_lock != 0
+- subq $cond_lock, %rdi
+-#endif
+-93:
+- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
+- xorq %r10, %r10
+- mov dep_mutex(%rdi), %R8_LP
+- leaq cond_futex(%rdi), %rdi
+- jmp 90b
+-.LcleanupEND2:
+-
+ .size __pthread_cond_wait, .-__pthread_cond_wait
+ versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2)
+@@ -547,15 +479,11 @@ __condvar_cleanup1:
+ .uleb128 .LcleanupSTART-.LSTARTCODE
+ .uleb128 .LcleanupEND-.LcleanupSTART
+ .uleb128 __condvar_cleanup1-.LSTARTCODE
+- .uleb128 0
+- .uleb128 .LcleanupSTART2-.LSTARTCODE
+- .uleb128 .LcleanupEND2-.LcleanupSTART2
+- .uleb128 __condvar_cleanup1-.LSTARTCODE
+- .uleb128 0
++ .uleb128 0
+ .uleb128 .LcallUR-.LSTARTCODE
+ .uleb128 .LENDCODE-.LcallUR
+ .uleb128 0
+- .uleb128 0
++ .uleb128 0
+ .Lcstend:
+
diff --git a/libs/glibc/test-installation.pl.patch
b/libs/glibc/test-installation.pl.patch
deleted file mode 100644
index cc5a891..0000000
--- a/libs/glibc/test-installation.pl.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-108c108
-< if ($name ne "nss_ldap" && $name ne "db1"
----
-> if ($name ne "nss_ldap" && $name ne "db1" && $name ne "nss_test1"


  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (858da8c17f16b135f5dde88b59ee1be330e2cbc9), Sukneet Basuta, 09/21/2012

Archive powered by MHonArc 2.6.24.

Top of Page