Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (0b942f1ce9325eef75591d3560617892b9cbcf9f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (0b942f1ce9325eef75591d3560617892b9cbcf9f)
  • Date: Wed, 1 Nov 2006 14:33:56 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

kernels/lm_sensors/HISTORY | 3
kernels/lm_sensors/PRE_BUILD | 3
libs/glibc/DETAILS | 43 +++++----
libs/glibc/HISTORY | 29 ++++++
libs/glibc/INSTALL | 67 ++++----------
libs/glibc/PRE_BUILD | 9 +
libs/glibc/TESTS | 10 ++
libs/glibc/nisplus_fix.diff | 204
+++++++++++++++++++++++++++++++++++++++++++
8 files changed, 303 insertions(+), 65 deletions(-)

New commits:
commit 8c395737b8fa2b185abe5d1de3ada574a576caf3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

lm_sensors: fix man path #10230

commit 6cd443243285c45d508b959d0fdbe986119bb5f5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

glibc: hand merge to 2.4 from devel, people have had it working for a
long time

diff --git a/kernels/lm_sensors/HISTORY b/kernels/lm_sensors/HISTORY
index a86194d..2f9cba6 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,3 +1,6 @@
+2006-11-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: added to fix man path #10230
+
2006-09-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10.1, new WEB_SITE and SOURCE_URLs

diff --git a/kernels/lm_sensors/PRE_BUILD b/kernels/lm_sensors/PRE_BUILD
new file mode 100755
index 0000000..97bece3
--- /dev/null
+++ b/kernels/lm_sensors/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's,MANDIR := $(PREFIX)/man,MANDIR := $(PREFIX)/share/man,' Makefile
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index f10897a..63b14ec 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,33 +1,44 @@
SPELL=glibc
- VERSION=2.3.6
if [ "$GLIBC_NPTL" = "y" ]; then
+ VERSION=2.4
HEADERS_VERSION=2.6.12.0
- SOURCE2=linux-libc-headers-$HEADERS_VERSION.tar.bz2
-
SOURCE2_URL[0]=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/$SOURCE2
-
SOURCE2_HASH=sha512:e7ee7a09880d19dea3d2c0d498631ee9d269738e7acdeba0a346da3b8bd0629628582973de33e6ac0c913e8c691806a50e07d520d6f6d078b76a3e74b9b61fd7
- PATCHLEVEL=2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE3=linux-libc-headers-$HEADERS_VERSION.tar.bz2
+ SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+
SOURCE3_URL[0]=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/$SOURCE3
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+
SOURCE3_HASH=sha512:e7ee7a09880d19dea3d2c0d498631ee9d269738e7acdeba0a346da3b8bd0629628582973de33e6ac0c913e8c691806a50e07d520d6f6d078b76a3e74b9b61fd7
else
+ VERSION=2.3.6
HEADERS_VERSION=2.4.24
- SOURCE2=glibc-linuxthreads-$VERSION.tar.bz2
- SOURCE3=$HEADERS_VERSION-kernel-headers.tar.bz2
- SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
- SOURCE2_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE2
- SOURCE3_URL[0]=http://download.sourcemage.org/mirror/$SOURCE3
-
SOURCE2_HASH=sha512:d51281df3baab7f600fffd4053048447e0d53b66319f5c6aebcdab8025c706a3990d826e0c175f5a0a8ab5db35545b5180bc15dcb21c66824bd8f0402204a188
-
SOURCE3_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE3=glibc-linuxthreads-$VERSION.tar.bz2
+ SOURCE4=$SOURCE3.sig
+ SOURCE5=$HEADERS_VERSION-kernel-headers.tar.bz2
+ SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE3_URL[0]=$GNU_URL/$SPELL/$SOURCE3
+ SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
+ SOURCE5_URL[0]=http://download.sourcemage.org/mirror/$SOURCE5
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
+ SOURCE4_IGNORE=signature
+
SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=ftp://sources.redhat.com/pub/$SPELL/releases/$SOURCE
-
SOURCE_HASH=sha512:e92c15b33c80cbbfee83289840de904f5d795f375daf60dd10bb9cbc3701f3c13f35c46063a4359cd662742a9ced5aca62d20eceb580d29c8e02fb5e3845348b
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
LICENSE[1]=LGPL
LICENSE[2]=GPL
- DISTCC_HOSTS=
STAGED_INSTALL=off
ENTERED=20010922
+ KEYWORDS="libs"
SHORT="C library for use with GNU/Hurd and GNU/Linux"
cat << EOF
glibc - Library for use with GNU/Hurd and GNU/Linux.
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 9151589..16e7f54 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2006-11-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS, INSTALL, PRE_BUILD, nisplus_fix.diff: merge from devel; 2.4
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

@@ -37,6 +40,28 @@
* PRE_INSTALL: removed explicit check of HOST for check against
SMGL_COMPAT_ARCHS

+2006-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, nisplus_fix.diff: fix for upstream bug
+ http://sourceware.org/bugzilla/show_bug.cgi?id=2429,
+ set PATCHLEVEL=1 for glibc 2.4
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-03-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated NPTL glibc to 2.4 (linuxthreads has to stay at
+ 2.3.6 as linxuthread/kernel 2.4 support has been dropped).
+ Removed DISTCC_HOSTS, make_single in BUILD takes care of that.
+ Seperate 2.3.6 and 2.4 SOURCE*, use upstream signatures where
+ applicable.
+ * PRE_BUILD, kd.h.patch: removed, not necessary with 2.4 headers,
+ already applied in 2.4
+ * CONFIGURE, DETAILS, INSTALL, locales: removed locale generation,
done
+ by the locale spell now, updated PATCHLEVEL for 2.3.6 in DETAILS
+ * INSTALL: install kernel headers before running 'make install', as
+ glibc 2.4 decides to recompile some stuff during install which fails
+ otherwise
+
2006-02-22 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
* DETAILS: patchlevel downgraded to previous value, no need to
recompile
@@ -53,6 +78,10 @@
2006-02-06 Eric Sandall <eric AT sandall.us>
* DEPENDS: Depends on gnupg (for SOURCE verification)

+2005-12-23 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: bump PATCHLEVEL
+ * PRE_BUILD: apply kd.h.patch
+
2005-12-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: fix linux/agpgart.h header
* DETAILS: set PATCHLEVEL=1 for NPTL glibc
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index d6b59b1..35d8acc 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -1,28 +1,28 @@
-cd $SOURCE_DIRECTORY.bld &&
-
#
-# the following conditional is commented out because the
-# make install install_root="${INSTALL_ROOT}"
-# does what it does already.
+# install kernel headers first so that gcc doesn't fail to find them if
+# glibc decides to compile stuff during 'make install', which it does in 2.4
#
+install -d ${INSTALL_ROOT}/usr/include &&
+cd $GLIBC_HEADERS_DIR/include &&
+
+if [ ! "$GLIBC_NPTL" = "y" ]; then
+ echo "installing asm-generic headers" &&
+ install -d ${INSTALL_ROOT}/usr/include/asm-generic &&
+ cp -fa asm-generic/* ${INSTALL_ROOT}/usr/include/asm-generic
+fi &&
+
+echo "installing glibc linux headers" &&
+install -d ${INSTALL_ROOT}/usr/include/linux &&
+cp -fa linux/* ${INSTALL_ROOT}/usr/include/linux &&

-#if [ "$CROSS_INSTALL" = "on" ]; then
-# echo "prefix = ${INSTALL_ROOT}/usr" > configparms
&&
-# echo "slibdir = ${INSTALL_ROOT}/lib" >> configparms
&&
-# echo "rootsbindir = ${INSTALL_ROOT}/sbin" >> configparms
&&
-# echo "sysconfdir = ${INSTALL_ROOT}/etc" >> configparms
&&
-# echo "infodir = ${INSTALL_ROOT}/usr/share/info" >> configparms
&&
-# sedit "s/\$(slibdir)/\/lib/g" $SOURCE_DIRECTORY/Makerules
&&
-# sedit "s/\$(libdir)/\/usr\/lib/g" $SOURCE_DIRECTORY/Makerules
&&
+echo "installing asm-$GLIBC_ARCH headers to /usr/include/asm" &&
+#
+# asm is a symlink to asm-$GLIBC-ARCH
#
-# if [ "$GLIBC_NPTL" = "y" ]; then
-# sedit "s/\$(slibdir)/\/lib/g" $SOURCE_DIRECTORY/nptl/Makefile &&
-# sedit "s/\$(libdir)/\/usr\/lib/g" $SOURCE_DIRECTORY/nptl/Makefile
-# else
-# sedit "s/\$(slibdir)/\/lib/g"
$SOURCE_DIRECTORY/linuxthreads/Makefile &&
-# sedit "s/\$(libdir)/\/usr\/lib/g"
$SOURCE_DIRECTORY/linuxthreads/Makefile
-# fi
-#fi &&
+install -d ${INSTALL_ROOT}/usr/include/asm &&
+cp -fa asm/* ${INSTALL_ROOT}/usr/include/asm &&
+
+cd $SOURCE_DIRECTORY.bld &&

#
# glibc only installs these if the file differs
@@ -49,31 +49,6 @@ fi &&
( ldconfig || true ) &&

#
-# Now install sanitised glibc-kernel-headers
-#
-install -d ${INSTALL_ROOT}/usr/include &&
-cd $GLIBC_HEADERS_DIR/include &&
-
-if [ ! "$GLIBC_NPTL" = "y" ]; then
- echo "installing asm-generic headers" &&
- install -d ${INSTALL_ROOT}/usr/include/asm-generic &&
- cp -fa asm-generic/* ${INSTALL_ROOT}/usr/include/asm-generic
-fi &&
-
-echo "installing glibc linux headers" &&
-install -d ${INSTALL_ROOT}/usr/include/linux &&
-cp -fa linux/* ${INSTALL_ROOT}/usr/include/linux &&
-
-echo "installing asm-$GLIBC_ARCH headers to /usr/include/asm" &&
-# workaround the 0.9.3 iso installing broken glibc-kernel-headers
-rm -rf ${INSTALL_ROOT}/usr/include/asm/mach-* &&
-#
-# asm is a symlink to asm-$GLIBC-ARCH
-#
-install -d ${INSTALL_ROOT}/usr/include/asm &&
-cp -fa asm/* ${INSTALL_ROOT}/usr/include/asm &&
-
-#
# In case this is a "new" system, setup INSTALL_ROOT/etc/ld.so.conf
#
if ! grep -q "/usr/lib" $INSTALL_ROOT/etc/ld.so.conf; then
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 1633f70..c2c9628 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -8,10 +8,13 @@ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linu

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 &&
+
#
# Unpack glibc-kernel-headers
#
- unpack_file 2 &&
+ unpack_file 3 &&
cd $GLIBC_HEADERS_DIR &&
patch -p1 < $SCRIPT_DIRECTORY/config.h.patch &&
cd $GLIBC_HEADERS_DIR/include &&
@@ -24,13 +27,13 @@ else
#
# Now unpack the rest of glibc fixes in the normal location
#
- unpack_file 2 &&
+ unpack_file 3 &&
#
# Unpack glibc-kernel-headers
#
mkdir -p $GLIBC_HEADERS_DIR/include &&
cd $GLIBC_HEADERS_DIR/include &&
- unpack_file 3
+ unpack_file 5
fi &&

#
diff --git a/libs/glibc/TESTS b/libs/glibc/TESTS
index d0884c9..28a2e0f 100644
--- a/libs/glibc/TESTS
+++ b/libs/glibc/TESTS
@@ -9,3 +9,13 @@ athlon | tiny
pentium4 | tiny | 2.6.13+nptl | gcc 3.4.4 |
p3pilot
athlon-xp | combreloc prelink speedy strip | 2.6.14+nptl | gcc 3.4.4 |
public
pentium4 | combreloc prelink speedy strip | 2.6.13+nptl | gcc 4.0.2 |
astsmtl
+
+2.4 Works fine on (2.3.6 on kernel 2.4 unchanged, so doesn't need testing):
+ARCH | Flags | compiler | tester |
note
+---------------------------------------------------------------------------------------------------------------
+athlon | tiny strip | gcc 4.1.0 | alley_cat |
+PIV | strip | gcc 4.0.3 | p3pilot |
+athlon-xp | combreloc prelink speedy | gcc 4.1.0 | ruskie |
withouth -mfpmath=sse and always -g
+athlon-tbird | combreloc speedy strip | gcc 4.1.0 | treeve |
+pentium4m | combreloc speedy strip | gcc 4.1.0 | treeve |
+athlon-xp | combreloc speedy strip | gcc 4.0.3 | lynx |
diff --git a/libs/glibc/nisplus_fix.diff b/libs/glibc/nisplus_fix.diff
new file mode 100644
index 0000000..16ec31e
--- /dev/null
+++ b/libs/glibc/nisplus_fix.diff
@@ -0,0 +1,204 @@
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-alias.c,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- libc/nis/nss_nisplus/nisplus-alias.c 2005/12/03 17:01:45 1.17
++++ libc/nis/nss_nisplus/nisplus-alias.c 2006/03/25 20:59:19 1.18
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1998,2001,2002,2003,2005 Free Software Foundation,
Inc.
++/* Copyright (C) 1997, 1998, 2001, 2002, 2003, 2005, 2006
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT vt.uni-paderborn.de>, 1997.
+
+@@ -51,7 +52,7 @@
+ static const char prefix[] = "mail_aliases.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-ethers.c,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- libc/nis/nss_nisplus/nisplus-ethers.c 2005/12/03 21:45:55 1.21
++++ libc/nis/nss_nisplus/nisplus-ethers.c 2006/03/25 20:59:19 1.22
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1997,1998,2000-2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997,1998,2000-2003,2005,2006 Free Software Foundation,
Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT suse.de>, 1997.
+
+@@ -94,7 +94,7 @@
+ static const char prefix[] = "ethers.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-grp.c,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- libc/nis/nss_nisplus/nisplus-grp.c 2005/12/03 05:04:16 1.18
++++ libc/nis/nss_nisplus/nisplus-grp.c 2006/03/25 20:59:19 1.19
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 2001, 2002, 2003, 2005, 2006
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT vt.uni-paderborn.de>, 1997.
+
+@@ -47,7 +48,7 @@
+ static const char prefix[] = "group.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-hosts.c,v
+retrieving revision 1.28
+retrieving revision 1.29
+diff -u -r1.28 -r1.29
+--- libc/nis/nss_nisplus/nisplus-hosts.c 2005/12/03 17:47:33 1.28
++++ libc/nis/nss_nisplus/nisplus-hosts.c 2006/03/25 20:59:19 1.29
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1997-2002, 2003, 2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT suse.de>, 1997.
+
+@@ -186,7 +186,7 @@
+ static const char prefix[] = "hosts.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-network.c,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- libc/nis/nss_nisplus/nisplus-network.c 2005/12/03 22:35:12 1.21
++++ libc/nis/nss_nisplus/nisplus-network.c 2006/03/25 20:59:19 1.22
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1997,1998,2000-2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997,1998,2000-2003,2005,2006 Free Software Foundation,
Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT vt.uni-paderborn.de>, 1997.
+
+@@ -148,7 +148,7 @@
+ static const char prefix[] = "networks.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-proto.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libc/nis/nss_nisplus/nisplus-proto.c 2005/12/03 19:33:09 1.20
++++ libc/nis/nss_nisplus/nisplus-proto.c 2006/03/25 20:59:19 1.21
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1998,2001,2002,2003,2005 Free Software Foundation,
Inc.
++/* Copyright (C) 1997, 1998, 2001, 2002, 2003, 2005, 2006
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT vt.uni-paderborn.de>, 1997.
+
+@@ -147,7 +148,7 @@
+ static const char prefix[] = "protocols.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-pwd.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libc/nis/nss_nisplus/nisplus-pwd.c 2005/12/03 20:39:34 1.20
++++ libc/nis/nss_nisplus/nisplus-pwd.c 2006/03/25 20:59:19 1.21
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1999,2001,2002,2003,2005 Free Software Foundation,
Inc.
++/* Copyright (C) 1997, 1999, 2001, 2002, 2003, 2005, 2006
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT vt.uni-paderborn.de>, 1997.
+
+@@ -44,7 +45,7 @@
+ static const char prefix[] = "passwd.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (pwd_tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-rpc.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libc/nis/nss_nisplus/nisplus-rpc.c 2005/12/03 19:54:38 1.20
++++ libc/nis/nss_nisplus/nisplus-rpc.c 2006/03/25 20:59:19 1.21
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1998,2001,2002,2003,2005 Free Software Foundation,
Inc.
++/* Copyright (C) 1997, 1998, 2001, 2002, 2003, 2005, 2006
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT vt.uni-paderborn.de>, 1997.
+
+@@ -144,7 +145,7 @@
+ static const char prefix[] = "rpc.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-service.c,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -r1.22 -r1.23
+--- libc/nis/nss_nisplus/nisplus-service.c 2005/12/03 20:11:34 1.22
++++ libc/nis/nss_nisplus/nisplus-service.c 2006/03/25 20:59:19 1.23
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997-1999,2001,2002,2003,2005 Free Software Foundation,
Inc.
++/* Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2006
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk AT suse.de>, 1997.
+
+@@ -151,7 +152,7 @@
+ static const char prefix[] = "services.org_dir.";
+
+ char *p = malloc (sizeof (prefix) + local_dir_len);
+- if (tablename_val == NULL)
++ if (p == NULL)
+ {
+ *errnop = errno;
+ return NSS_STATUS_TRYAGAIN;



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (0b942f1ce9325eef75591d3560617892b9cbcf9f), Jaka Kranjc, 11/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page