Author: aurel32
Date: 2006-04-10 00:37:20 +0000 (Mon, 10 Apr 2006)
New Revision: 1372
Added:
glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff
glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff
glibc-package/branches/glibc-2.4/debian/patches/strfmon.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config
glibc-package/branches/glibc-2.4/debian/patches/forward-backward-collation.diff
glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-amd64.mk
Log:
Merge changes between revisions 1268 and 1299 (= 2.3.6-4) into the 2.4 branch
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-04-10 00:04:36 UTC
(rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-04-10 00:37:20 UTC
(rev 1372)
@@ -33,10 +33,14 @@
[ Michael Banck ]
* debian/sysdeps/hurd.mk: Only use libidn for add-ons.
+ [ Aurelien Jarno ]
+ - Remove argp_h.diff (merged upstream).
+
-- Clint Adams <[EMAIL PROTECTED]> Mon, 6 Mar 2006 16:49:38 -0500
-glibc (2.3.6-4) UNRELEASED; urgency=low
+glibc (2.3.6-4) unstable; urgency=low
+ [ Aurelien Jarno ]
* Set configure_build to the same value as configure_host for sparc
optimized libraries (as on i386). This way they will be tested.
* If the CPU has biarch support, run tests for cross-compiled libraries.
@@ -47,9 +51,29 @@
* Add tst-setcontext_c.diff (fix the arguments passed to setcontext during
test) from upstream.
* Create a link /usr/lib32 -> /emul/ia32-linux/usr/lib on amd64.
-
- -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 2 Mar 2006 05:10:12 +0100
+ * Add argp_h.diff fixes (Remove __NTH for __argp_usage inline function)
+ by Ulrich Drepper (patch from HEAD). (Closes: #355264)
+ * Add getcwd_ia64.diff (Remove the assertion so that the behaviour is the
+ same on all platforms, including ia64). This is a temporary fix to bug
+ #355109, until the upstream takes a decision.
+ * debian/sysdeps/kfreebsd-amd64.mk:
+ - s/libc6/libc0.1/g
+ - Change rtlddir from /lib64 to /lib
+ [ Denis Barbier ]
+ * locales.config: If $DEBCONF_IS_A_REGISTRY is set to a non-empty value,
+ the content of /etc/locale.gen does not override debconf values.
+ * Add strfmon.diff: the negative sign is not printed by strfmon when
+ current locale defines sign_posn == 4 (as in de_CH) and format
+ argument contains the ! modifier.
+ * Fix forward-backward-collation.diff: the change in strcoll_l.c has to
+ be applied at several places. (Closes: #357390)
+ * Update timezone data files to tzdata2006b (no data change, only comments).
+ * Fix resource_h.diff: there was a typo for mips:
+ s/_RLIMIT_RTPRIO/__RLIMIT_RTPRIO/ (Closes: #357419)
+
+ -- Denis Barbier <[EMAIL PROTECTED]> Sat, 18 Mar 2006 10:26:45 +0100
+
glibc (2.3.6-3) unstable; urgency=low
[ Aurelien Jarno]
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config
2006-04-10 00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config
2006-04-10 00:37:20 UTC (rev 1372)
@@ -33,8 +33,10 @@
__SUPPORTED_LOCALES__"
SUPPORTED_LOCALES=$( (cat $LG && echo "$SUPPORTED_LOCALES") | LC_ALL=C sed -e
'/^[a-zA-Z]/!d' | LC_ALL=C sort -u | tr '\n' ',' | sed -e 's/,/, /g' -e 's/,
*$//')
-db_set locales/locales_to_be_generated "${SELECTED_LOCALES}"
-db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
+if [ -z "$DEBCONF_IS_A_REGISTRY" ]; then
+ db_set locales/locales_to_be_generated "${SELECTED_LOCALES}"
+ db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
+fi
db_subst locales/locales_to_be_generated locales "${SUPPORTED_LOCALES}"
STATE=1
Added: glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff 2006-04-10
00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff 2006-04-10
00:37:20 UTC (rev 1372)
@@ -0,0 +1,21 @@
+2005-10-13 Ulrich Drepper <[EMAIL PROTECTED]>
+
+ [BZ #1373]
+ * argp/argp.h: Remove __NTH for __argp_usage inline function.
+
+===================================================================
+RCS file: /cvs/glibc/libc/argp/argp.h,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- libc/argp/argp.h 2004/09/07 22:23:45 1.30
++++ libc/argp/argp.h 2005/10/14 05:53:47 1.31
+@@ -561,7 +561,7 @@
+ # endif
+
+ ARGP_EI void
+-__NTH (__argp_usage (__const struct argp_state *__state))
++__argp_usage (__const struct argp_state *__state)
+ {
+ __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+ }
Modified:
glibc-package/branches/glibc-2.4/debian/patches/forward-backward-collation.diff
===================================================================
---
glibc-package/branches/glibc-2.4/debian/patches/forward-backward-collation.diff
2006-04-10 00:04:36 UTC (rev 1371)
+++
glibc-package/branches/glibc-2.4/debian/patches/forward-backward-collation.diff
2006-04-10 00:37:20 UTC (rev 1372)
@@ -9,11 +9,37 @@
# DP: Test case: the following command segfaults in en_US.UTF-8 locale
# DP: when BZ645 is fixed:
# DP: echo 2d d194 0a 2d d194 0a | xxd -r -p | sort
-# DP: Date: 2006-03-06
+# DP: Date: 2006-03-17
---- libc/string/strcoll_l.c 14 Mar 2004 20:52:47 -0000 1.4
-+++ libc/string/strcoll_l.c 23 May 2005 22:35:59 -0000
-@@ -370,7 +370,10 @@
+Index: glibc-2.3.6/string/strcoll_l.c
+===================================================================
+--- glibc-2.3.6.orig/string/strcoll_l.c
++++ glibc-2.3.6/string/strcoll_l.c
+@@ -186,7 +186,10 @@
+ /* The last pushed character was handled. Continue
+ with forward characters. */
+ if (idx1cnt < idx1max)
+- idx1now = idx1cnt;
++ {
++ idx1now = idx1cnt;
++ backw1_stop = ~0ul;
++ }
+ else
+ /* Nothing anymore. The backward sequence ended with
+ the last sequence in the string. Note that seq1len
+@@ -245,7 +248,10 @@
+ /* The last pushed character was handled. Continue
+ with forward characters. */
+ if (idx2cnt < idx2max)
+- idx2now = idx2cnt;
++ {
++ idx2now = idx2cnt;
++ backw2_stop = ~0ul;
++ }
+ else
+ /* Nothing anymore. The backward sequence ended with
+ the last sequence in the string. Note that seq2len
+@@ -370,7 +376,10 @@
/* The last pushed character was handled. Continue
with forward characters. */
if (idx1cnt < idx1max)
@@ -25,3 +51,15 @@
else
{
/* Nothing anymore. The backward sequence
+@@ -426,7 +435,10 @@
+ /* The last pushed character was handled. Continue
+ with forward characters. */
+ if (idx2cnt < idx2max)
+- idx2now = idx2cnt;
++ {
++ idx2now = idx2cnt;
++ backw2_stop = ~0ul;
++ }
+ else
+ {
+ /* Nothing anymore. The backward sequence
Added: glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff
2006-04-10 00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff
2006-04-10 00:37:20 UTC (rev 1372)
@@ -0,0 +1,11 @@
+--- libc/sysdeps/unix/sysv/linux/getcwd.c.orig 2006-03-10 17:42:19.000000000
+0100
++++ libc/sysdeps/unix/sysv/linux/getcwd.c 2006-03-10 17:45:39.000000000
+0100
+@@ -127,7 +127,7 @@
+ /* It should never happen that the `getcwd' syscall failed because
+ the buffer is too small if we allocated the buffer ourselves
+ large enough. */
+- assert (errno != ERANGE || buf != NULL || size != 0);
++/* assert (errno != ERANGE || buf != NULL || size != 0); */
+
+ # ifndef NO_ALLOCATION
+ if (buf == NULL)
Modified: glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff
2006-04-10 00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff
2006-04-10 00:37:20 UTC (rev 1372)
@@ -8,6 +8,11 @@
(RLIMIT_NICE, RLIMIT_RTPRIO): Add.
(RLIMIT_NLIMITS): Adjust.
+2006-03-18: Denis Barbier
+ There is a typo in CVS in the last chunk of
sysdeps/unix/sysv/linux/mips/bits/resource.h
+ s/_RLIMIT_RTPRIO/__RLIMIT_RTPRIO/
+
+libc/sysdeps/unix/sysv/linux/mips/bits/resource.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/resource.h,v
retrieving revision 1.17
@@ -138,7 +143,7 @@
+ /* Maximum realtime priority allowed for non-priviledged
+ processes. */
+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO _RLIMIT_RTPRIO
++#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
+
+ __RLIMIT_NLIMITS = 15,
__RLIM_NLIMITS = __RLIMIT_NLIMITS
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-10
00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-10
00:37:20 UTC (rev 1372)
@@ -119,3 +119,7 @@
#rtld.diff -p1
#resource_h.diff -p1
#hppa-inlining.diff -p1
+strfmon.diff
+#argp_h.diff -p1
+getcwd_ia64.diff -p1
+
Added: glibc-package/branches/glibc-2.4/debian/patches/strfmon.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/strfmon.diff
2006-04-10 00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/patches/strfmon.diff
2006-04-10 00:37:20 UTC (rev 1372)
@@ -0,0 +1,60 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: The negative sign is not printed by strfmon when
+# DP: current locale defines sign_posn == 4 (as in de_CH) and
+# DP: format argument contains the ! modifier.
+# DP: Note: upstream will fix indentation when applying this patch,
+# DP: it has intentionnally been kept this way for readability.
+# DP: Related bugs: BZ2420
+# DP: Dpatch author: Denis Barbier
+# DP: Patch author: Denis Barbier
+# DP: Upstream status:
+# DP: Status Details:
+
+Index: glibc-2.3.6/stdlib/strfmon_l.c
+===================================================================
+--- glibc-2.3.6.orig/stdlib/strfmon_l.c
++++ glibc-2.3.6/stdlib/strfmon_l.c
+@@ -491,12 +491,11 @@
+ }
+
+ if (print_curr_symbol)
+- {
+- out_string (currency_symbol);
++ out_string (currency_symbol);
+
+ if (sign_posn == 4)
+ {
+- if (sep_by_space == 2)
++ if (sep_by_space == 2 && print_curr_symbol)
+ out_char (space_char);
+ out_string (sign_string);
+ if (sep_by_space == 1)
+@@ -505,9 +504,8 @@
+ out_char (' ');
+ }
+ else
+- if (sep_by_space == 1)
++ if (sep_by_space == 1 && print_curr_symbol)
+ out_char (space_char);
+- }
+ }
+ else
+ if (sign_posn != 0 && sign_posn != 2 && sign_posn != 3
+@@ -583,13 +581,13 @@
+ || (sign_posn == 0 && sep_by_space == 1))
+ out_char (space_char);
+ out_nstring (currency_symbol, currency_symbol_len);
++ }
+ if (sign_posn == 4)
+ {
+- if (sep_by_space == 2)
++ if (sep_by_space == 2 && print_curr_symbol)
+ out_char (' ');
+ out_string (sign_string);
+ }
+- }
+ }
+
+ if (sign_posn == 2)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-amd64.mk
2006-04-10 00:04:36 UTC (rev 1371)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-amd64.mk
2006-04-10 00:37:20 UTC (rev 1372)
@@ -1,9 +1,9 @@
libc_slibdir = /lib
libc_libdir = /usr/lib
-libc_rtlddir = /lib64
+libc_rtlddir = /lib
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
-define libc6_extra_pkg_install
+define libc0.1_extra_pkg_install
ln -sf /lib debian/$(curpass)/lib64
ln -sf lib debian/$(curpass)/usr/lib64
endef
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
