This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.12.90-6-223-ga4b3e92
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Dec 2010 09:24:17 -0000
- Subject: GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.12.90-6-223-ga4b3e92
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, fedora/master has been updated
via a4b3e923e8ed391580c9c591d181454099fbd2f0 (commit)
via 782173537028feffaa551291de6d049aa22b26fa (commit)
via 96611391ad8823ba58405325d78cefeae5cdf699 (commit)
via dbb0472f054a4241feec09af30db850dd4d18a7b (commit)
via 4f1972374a080e823c4ead7c0496827dfc013837 (commit)
via eaea92f137762dd754fdf858a2cd600f15005884 (commit)
via fb88ac72c2dcbbd979c8798e4ea497818bb3e171 (commit)
via 42acbb92c861e97a6e1293ea853db88342a1bf53 (commit)
via 4ec999d63edfca96d946e5e2447484a57b229278 (commit)
via ee4be42247d53e25d60817fddc33c9545a9b5946 (commit)
via 4c341dbe2a3217348107817037d066343c8cef39 (commit)
via a5b913e299027a799ae5435d66e3f20e95859654 (commit)
via c038d98d63ccf0da892f2147c6d92a7d2badd87d (commit)
via 3a4a2499ec9c87d05a0d7d1522dad3df73c6c9dd (commit)
via 1e24cf6e6e8f6999e8fa188ece41e23f54330743 (commit)
via a769081960837719ea79c2b6f1c962318f23865c (commit)
via 3bf8d1b10c66bfd58d8f24ea9e31d9fc0d24553b (commit)
via 6db52fbb272979bdcd5d5dd7ab187e1893eda9e3 (commit)
via eaca75697fdc5c21195935eca2f0b149a75c0316 (commit)
via 3056dcdb783a177158a5617657d1a33f872358d6 (commit)
via cf7c9078a5acdbb435498ace92cd81009637a971 (commit)
via 7e8ff763f14a0414a0f1eee92011abaaefa4fc46 (commit)
via a1fb5e3ebe9d38b5ae6c5bfbfaa04882d52355bc (commit)
via a05e008fe5230397fe03b738f0aef5c13831267c (commit)
from a1fc81a2a5f79b2e1a24033be9d89efcfda8b00f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a4b3e923e8ed391580c9c591d181454099fbd2f0
commit a4b3e923e8ed391580c9c591d181454099fbd2f0
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Dec 13 16:20:35 2010 +0100
2.12.90-20
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index f9eb564..532d721 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -20,7 +20,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 19
+Release: 20
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1030,6 +1030,20 @@ rm -f *.filelist*
%endif
%changelog
+* Mon Dec 13 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-20
+- Update from master
+ - Declare wcpcpy and wcpncpy only under _GNU_SOURCE
+ - Fix use of restrict in wchar.h and string.h
+ - Fix race in qsort_r initialization (BZ#11655)
+ - Don't ignore zero TTL in DNS answers
+ - Allow aux_cache_file open()ing to fail silently even in the chroot
+ mode (BZ#11149)
+ - Fix multiple nss_compat initgroups() bugs (BZ#10085)
+ - Define MAP_HUGETLB and SWAP_FLAG_DISCARD
+- Remove .UTF-8 suffix from locale names when it is the only supported
+ codeset (#657556)
+- Don't ignore $ORIGIN in libraries
+
* Fri Nov 12 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-19
- Update from master
- Fix memory leak in fnmatch
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=782173537028feffaa551291de6d049aa22b26fa
commit 782173537028feffaa551291de6d049aa22b26fa
Merge: 9661139 dbb0472
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Dec 13 16:14:47 2010 +0100
Merge remote branch 'origin/master' into fedora/master
diff --cc ChangeLog
index c973806,7cd6d64..25d7673
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,73 +1,78 @@@
+ 2010-12-10 Andreas Schwab <schwab@redhat.com>
+
+ * wcsmbs/wchar.h (wcpcpy, wcpncpy): Only declare under
+ _GNU_SOURCE.
+
+ * wcsmbs/wchar.h (wcpcpy, wcpncpy): Add __restrict.
+ * wcsmbs/bits/wchar2.h (__wmemmove_chk_warn, wmemmove, wmemset):
+ Remove __restrict.
+ (wcscpy, __wcpcpy_chk, __wcpcpy_alias, wcpcpy, wcsncpy, wcpncpy)
+ (wcscat, wcsncat, __wcrtomb_chk, wcrtomb): Add __restrict.
+
+ 2010-12-09 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #11655]
+ * stdlib/msort.c (qsort_r): Make sure both phys_pages and pagesize
+ are initialized.
+
+ 2010-12-09 Jakub Jelinek <jakub@redhat.com>
+
+ * string/bits/string3.h (memmove, bcopy): Remove __restrict.
+
+ 2010-12-03 Ulrich Drepper <drepper@gmail.com>
+
+ * po/it.po: Update from translation team.
+
+ 2010-12-01 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/i386/i686/multiarch/strcmp-ssse3.S (STRCMP): Remove
+ unused codes.
+
+ 2010-11-30 Ulrich Drepper <drepper@gmail.com>
+
+ * sysdeps/i386/fpu/libm-test-ulps: Relax ynf(10,0.75) test expectations.
+
+ 2010-11-24 Andreas Schwab <schwab@redhat.com>
+
+ * resolv/nss_dns/dns-host.c (getanswer_r): Don't handle ttl == 0
+ specially.
+ (gaih_getanswer_slice): Likewise.
+
+ 2010-10-20 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/ieee754/ldbl-128/s_fmal.c (__fmal): Fix up inline asm.
+
+ 2010-05-31 Petr Baudis <pasky@suse.cz>
+
+ [BZ #11149]
+ * elf/ldconfig.c (main): Allow aux_cache_file open()ing to fail
+ silently even in the chroot mode.
+
+ 2010-11-22 Ulrich Drepper <drepper@gmail.com>
+
+ * nis/nss_compat/compat-initgroups.c (internal_getgrent_r): Optimize
+ last patch a bit. Pretty printing
+
+ 2010-05-31 Petr Baudis <pasky@suse.cz>
+
+ [BZ #10085]
+ * nis/nss_compat/compat-initgroups.c (internal_getgrent_r): Fix
+ initialization of skip_initgroups_dyn.
+
+ 2010-11-19 Ulrich Drepper <drepper@gmail.com>
+
+ * sysdeps/unix/sysv/linux/i386/bits/mman.h: Define MAP_HUGETLB.
+ * sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Likewise.
+
+ 2010-11-16 Ulrich Drepper <drepper@gmail.com>
+
+ * sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
+
+2010-12-13 Andreas Schwab <schwab@redhat.com>
+
+ * elf/dl-object.c (_dl_new_object): Ignore origin of privileged
+ program.
+
2010-11-11 Andreas Schwab <schwab@redhat.com>
* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=96611391ad8823ba58405325d78cefeae5cdf699
commit 96611391ad8823ba58405325d78cefeae5cdf699
Author: Andreas Schwab <schwab@redhat.com>
Date: Thu Dec 9 15:00:59 2010 +0100
Ignore origin of privileged program
diff --git a/ChangeLog b/ChangeLog
index 445600e..c973806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-13 Andreas Schwab <schwab@redhat.com>
+
+ * elf/dl-object.c (_dl_new_object): Ignore origin of privileged
+ program.
+
2010-11-11 Andreas Schwab <schwab@redhat.com>
* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 5d15ce1..a34e902 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type,
out:
new->l_origin = origin;
}
+ else if (INTUSE(__libc_enable_secure) && type == lt_executable)
+ /* The origin of a privileged program cannot be trusted. */
+ new->l_origin = (char *) -1;
return new;
}
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4ec999d63edfca96d946e5e2447484a57b229278
commit 4ec999d63edfca96d946e5e2447484a57b229278
Author: Andreas Schwab <schwab@redhat.com>
Date: Thu Dec 9 14:26:02 2010 +0100
Revert "Never expand $ORIGIN in privileged programs"
This reverts commit 4b646a51f13fd6816c483fb24c308a13264c6d1a.
diff --git a/ChangeLog b/ChangeLog
index f293a1a..445600e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -214,12 +214,6 @@
* scripts/data/localplt-s390-linux-gnu.data: New file.
* scripts/data/localplt-s390x-linux-gnu.data: New file.
-2010-10-18 Andreas Schwab <schwab@redhat.com>
-
- * elf/dl-load.c (is_dst): Remove last parameter.
- (_dl_dst_count): Ignore $ORIGIN in privileged programs.
- (_dl_dst_substitute): Likewise.
-
2010-10-13 Jakub Jelinek <jakub@redhat.com>
[BZ #3268]
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 3b09079..4c14f08 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -169,7 +169,8 @@ local_strdup (const char *s)
static size_t
-is_dst (const char *start, const char *name, const char *str, int is_path)
+is_dst (const char *start, const char *name, const char *str,
+ int is_path, int secure)
{
size_t len;
bool is_curly = false;
@@ -198,6 +199,11 @@ is_dst (const char *start, const char *name, const char *str, int is_path)
&& (!is_path || name[len] != ':'))
return 0;
+ if (__builtin_expect (secure, 0)
+ && ((name[len] != '\0' && (!is_path || name[len] != ':'))
+ || (name != start + 1 && (!is_path || name[-2] != ':'))))
+ return 0;
+
return len;
}
@@ -212,12 +218,13 @@ _dl_dst_count (const char *name, int is_path)
{
size_t len;
- /* $ORIGIN is not expanded for SUID/GUID programs. */
+ /* $ORIGIN is not expanded for SUID/GUID programs (except if it
+ is $ORIGIN alone) and it must always appear first in path. */
++name;
- if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0
- && !INTUSE(__libc_enable_secure))
- || (len = is_dst (start, name, "PLATFORM", is_path)) != 0
- || (len = is_dst (start, name, "LIB", is_path)) != 0)
+ if ((len = is_dst (start, name, "ORIGIN", is_path,
+ INTUSE(__libc_enable_secure))) != 0
+ || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
+ || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
++cnt;
name = strchr (name + len, '$');
@@ -249,12 +256,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
size_t len;
++name;
- if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
+ if ((len = is_dst (start, name, "ORIGIN", is_path,
+ INTUSE(__libc_enable_secure))) != 0)
{
- /* Ignore this path element in SUID/SGID programs. */
- if (INTUSE(__libc_enable_secure))
- repl = (const char *) -1;
- else
#ifndef SHARED
if (l == NULL)
repl = _dl_get_origin ();
@@ -262,9 +266,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
#endif
repl = l->l_origin;
}
- else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)
+ else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
repl = GLRO(dl_platform);
- else if ((len = is_dst (start, name, "LIB", is_path)) != 0)
+ else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
repl = DL_DST_LIB;
if (repl != NULL && repl != (const char *) -1)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ee4be42247d53e25d60817fddc33c9545a9b5946
commit ee4be42247d53e25d60817fddc33c9545a9b5946
Author: Andreas Schwab <schwab@redhat.com>
Date: Thu Dec 2 16:29:03 2010 +0100
Remove .UTF-8 suffix from locale names when it is the only supported codeset
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 6b48eb7..191d135 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-08 Andreas Schwab <schwab@redhat.com>
+
+ * SUPPORTED: Remove .UTF-8 suffix from az_AZ, as_IN, tt_RU locale
+ names.
+
2010-05-17 Andreas Schwab <schwab@redhat.com>
* locales/es_CR (LC_ADDRESS): Fix character names in lang_ab.
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 63b2a1c..f88f53c 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \
ar_TN/ISO-8859-6 \
ar_YE.UTF-8/UTF-8 \
ar_YE/ISO-8859-6 \
-az_AZ.UTF-8/UTF-8 \
-as_IN.UTF-8/UTF-8 \
+az_AZ/UTF-8 \
+as_IN/UTF-8 \
ast_ES.UTF-8/UTF-8 \
ast_ES/ISO-8859-15 \
be_BY.UTF-8/UTF-8 \
@@ -391,8 +391,8 @@ tr_CY/ISO-8859-9 \
tr_TR.UTF-8/UTF-8 \
tr_TR/ISO-8859-9 \
ts_ZA/UTF-8 \
-tt_RU.UTF-8/UTF-8 \
-tt_RU.UTF-8@iqtelif/UTF-8 \
+tt_RU/UTF-8 \
+tt_RU@iqtelif/UTF-8 \
ug_CN/UTF-8 \
uk_UA.UTF-8/UTF-8 \
uk_UA/KOI8-U \
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4c341dbe2a3217348107817037d066343c8cef39
commit 4c341dbe2a3217348107817037d066343c8cef39
Author: Andreas Schwab <schwab@redhat.com>
Date: Wed Dec 8 11:37:40 2010 +0100
Remove obsolete CVS rules
diff --git a/fedora/Makefile b/fedora/Makefile
index 297fd59..f0c2818 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -180,35 +180,3 @@ $(spec-nvr).src.rpm: glibc.spec $(archives)
--define "_rpmdir %{_topdir}" \
--define "_builddir %{_topdir}" \
--nodeps -bs $<
-
-###
-# These rules are for dealing with the Fedora package repository
-# and build system.
-#
-# To use this, put in ~/.cvspkgsrc at least a line:
-# COMMON_DIR ?= /some/checkout/of/pkgs/common
-# We will find cvs-import.sh there and use its CVS/Root for where to commit.
-
-.PHONY: dist-import
-
--include ~/.cvspkgsrc
-
-ifdef COMMON_DIR
-DIST_BRANCH ?= devel
-
-pkgs-baseurl := cvs://cvs.fedoraproject.org/cvs/pkgs?rpms
-pkgs-url = $(pkgs-baseurl)/glibc/$(DIST_BRANCH)\#$(spec-tag)
-
-pkgs-import: $(spec-nvr).src.rpm
- cd $(COMMON_DIR) && cvs -q update
- $(COMMON_DIR)/cvs-import.sh -b $(DIST_BRANCH) $<
- rpm -qp $< --queryformat '[%{FILEMD5S} %{FILENAMES}\n]' > $@.new
- mv -f $@.new $@
-
-build: pkgs-import
- cd $(COMMON_DIR)/../glibc/$(DIST_BRANCH) && \
- cvs -q update && \
- $(MAKE) build
-
-endif
-###
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7e8ff763f14a0414a0f1eee92011abaaefa4fc46
commit 7e8ff763f14a0414a0f1eee92011abaaefa4fc46
Author: Andreas Schwab <schwab@redhat.com>
Date: Wed Nov 17 16:20:50 2010 +0100
Simplify check for running kernel
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 14a6e27..f9eb564 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -863,21 +863,9 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig
%pre -p <lua>
-- Check that the running kernel is new enough
required = '%{enablekernel}'
-f = io.open("/proc/sys/kernel/osrelease")
-if f then
- rel = {}
- for v in string.gmatch(f:read(), '%%d+') do
- table.insert(rel, tonumber(v))
- end
- i = 1
- for r in string.gmatch(required, '%%d+') do
- if rel[i] == nil or tonumber(r) > rel[i] then
- print("FATAL: kernel too old")
- os.exit(1)
- end
- if tonumber(r) < rel[i] then break end
- i = i + 1
- end
+rel = posix.uname("%r")
+if rpm.vercmp(rel, required) < 0 then
+ error("FATAL: kernel too old", 0)
end
%post -p /usr/sbin/glibc_post_upgrade.%{_target_cpu}
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a05e008fe5230397fe03b738f0aef5c13831267c
commit a05e008fe5230397fe03b738f0aef5c13831267c
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Nov 16 16:42:33 2010 +0100
Avoid unpackaged files
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index c09924e..14a6e27 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -537,10 +537,12 @@ install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_c
strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
+%if 0%{?_enable_debug_packages}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}
cp -a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.a \
$RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/
rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/*_p.a
+%endif
# rquota.x and rquota.h are now provided by quota
rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 81 +-
elf/dl-load.c | 30 +-
elf/dl-object.c | 3 +
elf/ldconfig.c | 12 +-
fedora/Makefile | 32 -
fedora/glibc.spec.in | 36 +-
include/atomic.h | 2 +-
localedata/ChangeLog | 5 +
localedata/SUPPORTED | 8 +-
nis/nss_compat/compat-initgroups.c | 37 +-
po/it.po | 8195 ++++++++++++++++++++++------
resolv/nss_dns/dns-host.c | 7 +-
stdlib/msort.c | 6 +-
string/bits/string3.h | 8 +-
sysdeps/i386/fpu/libm-test-ulps | 4 +-
sysdeps/i386/i686/multiarch/strcmp-ssse3.S | 9 +-
sysdeps/i386/i686/multiarch/strcmp.S | 55 +-
sysdeps/ieee754/ldbl-128/s_fmal.c | 2 +-
sysdeps/unix/sysv/linux/i386/bits/mman.h | 4 +-
sysdeps/unix/sysv/linux/sys/swap.h | 3 +-
sysdeps/unix/sysv/linux/x86_64/bits/mman.h | 3 +-
wcsmbs/bits/wchar2.h | 44 +-
wcsmbs/wchar.h | 8 +-
23 files changed, 6863 insertions(+), 1731 deletions(-)
hooks/post-receive
--
GNU C Library master sources