r4017 - in glibc-package/branches/eglibc-2.11/debian: . control.in debhelper.in patches patches/any patches/hppa patches/localedata
Author: aurel32
Date: 2009-11-24 19:48:05 +0000 (Tue, 24 Nov 2009)
New Revision: 4017
Added:
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff
glibc-package/branches/eglibc-2.11/debian/patches/hppa/cvs-nptl-compat.diff
glibc-package/branches/eglibc-2.11/debian/patches/localedata/submitted-pt_BR.diff
Modified:
glibc-package/branches/eglibc-2.11/debian/changelog
glibc-package/branches/eglibc-2.11/debian/control
glibc-package/branches/eglibc-2.11/debian/control.in/main
glibc-package/branches/eglibc-2.11/debian/debhelper.in/libc.postinst
glibc-package/branches/eglibc-2.11/debian/debhelper.in/locales.postinst
glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
Merge from trunk, revisions 4007-4016
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2009-11-24 15:11:53 UTC (rev 4016)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2009-11-24 19:48:05 UTC (rev 4017)
@@ -14,7 +14,7 @@
- Update debian/patches/any/local-libgcc-compat-main.diff
- Remove debian/patches/any/submitted-getent-gshadow.diff (merged)
- Update debian/patches/any/submitted-missing-etc-hosts.diff.
- - Remove debian/patches/hppa/cvs-nptl-compat.diff (merged)
+ - Update debian/patches/hppa/cvs-nptl-compat.diff.
- Remove debian/patches/hurd-i386/cvs-termios-IXANY.patch (merged)
- Update debian/patches/hurd-i386/submitted-readlinkat.diff
- Update debian/patches/localedata/first_weekday.diff
@@ -29,6 +29,31 @@
-- Clint Adams <schizo@debian.org> Mon, 23 Nov 2009 12:44:27 +0100
+eglibc (2.10.2-3) UNRELEASED; urgency=low
+
+ * debhelper.in/libc.postinst: also restart incron on upgrade. Closes:
+ #557801.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 24 Nov 2009 16:09:58 +0100
+
+eglibc (2.10.2-2) unstable; urgency=low
+
+ [ Carlos O'Donell]
+ * debian/patches/hppa/cvs-nptl-compat.diff: new version to fix
+ pthread structures alignment on hppa.
+
+ [ Aurelien Jarno ]
+ * debian/control: bump libc-bin breaks on libc0.1/0.3/6/6.1 to (<< 2.10).
+ Closes: #556945.
+ * patches/localedata/submitted-pt_BR.diff: new patch to fix the thousand
+ separator on pt_BR locale. Closes: #474479.
+ * debhelper.in/locales.postinst: if an selected entry is present more than
+ once, only uncomment the first one. Closes: #529368.
+ * patches/any/submitted-gethostbyname3.diff: return an error if the
+ nameserver timeouts. Closes: #499781.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 24 Nov 2009 06:12:57 +0100
+
eglibc (2.10.2-1) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.11/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control 2009-11-24 15:11:53 UTC (rev 4016)
+++ glibc-package/branches/eglibc-2.11/debian/control 2009-11-24 19:48:05 UTC (rev 4017)
@@ -20,7 +20,7 @@
Architecture: any
Section: libs
Priority: required
-Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
+Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
This package contains utility programs related to the GNU C Library.
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/main 2009-11-24 15:11:53 UTC (rev 4016)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/main 2009-11-24 19:48:05 UTC (rev 4017)
@@ -20,7 +20,7 @@
Architecture: any
Section: libs
Priority: required
-Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
+Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
This package contains utility programs related to the GNU C Library.
Modified: glibc-package/branches/eglibc-2.11/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/debhelper.in/libc.postinst 2009-11-24 15:11:53 UTC (rev 4016)
+++ glibc-package/branches/eglibc-2.11/debian/debhelper.in/libc.postinst 2009-11-24 19:48:05 UTC (rev 4017)
@@ -93,7 +93,7 @@
if dpkg --compare-versions "$preversion" lt 2.11-1; then
check="apache2-common apache apache-ssl apache-perl autofs at"
check="$check boa cucipop courier-authdaemon cron cups exim"
- check="$check exim4-base dovecot-common cucipop lprng lpr"
+ check="$check exim4-base dovecot-common cucipop incron lprng lpr"
check="$check lpr-ppd mysql-server nis openbsd-inetd"
check="$check openldapd proftpd postfix postfix-tls rsync samba"
check="$check sasl2-bin slapd smail sendmail snmpd ssh"
Modified: glibc-package/branches/eglibc-2.11/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/debhelper.in/locales.postinst 2009-11-24 15:11:53 UTC (rev 4016)
+++ glibc-package/branches/eglibc-2.11/debian/debhelper.in/locales.postinst 2009-11-24 19:48:05 UTC (rev 4017)
@@ -53,7 +53,7 @@
# Uncomment selected locales
echo "$SELECTED_LOCALES" | while read locale ; do
- sed -i -e "s/^[# ]*$locale *$/$locale/" $LG
+ sed -i -e "0,/^[# ]*$locale *$/ s/^[# ]*$locale *$/$locale/" $LG
done
fi
Added: glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff 2009-11-24 19:48:05 UTC (rev 4017)
@@ -0,0 +1,18 @@
+2009-11-24 Aurelien Jarno <aurelien@aurel32.net>
+
+ * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r): Return an
+ error for ETIMEDOUT.
+
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index 818a40a..1eba413 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -204,7 +204,7 @@ _nss_dns_gethostbyname3_r (const char *name, int af, struct hostent *result,
+ h_errno = TRY_AGAIN;
+ }
+ else
+- status = (errno == ECONNREFUSED
++ status = ((errno == ECONNREFUSED || errno == ETIMEDOUT)
+ ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND);
+ *h_errnop = h_errno;
+ if (h_errno == TRY_AGAIN)
Added: glibc-package/branches/eglibc-2.11/debian/patches/hppa/cvs-nptl-compat.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hppa/cvs-nptl-compat.diff (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hppa/cvs-nptl-compat.diff 2009-11-24 19:48:05 UTC (rev 4017)
@@ -0,0 +1,32 @@
+--- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
+@@ -64,7 +64,10 @@ typedef union
+ {
+ struct __pthread_mutex_s
+ {
+- int __lock;
++ /* Ensure that the entire structure when embedded in another
++ structure retains the same alignment requirements as it
++ did in LinuxThreads, thus add aligned 16 here. */
++ int __lock __attribute__ ((aligned(16)));
+ unsigned int __count;
+ int __owner;
+ /* KIND must stay at this position in the structure to maintain
+@@ -113,7 +116,7 @@ typedef union
+ start of the 4-word lock structure, the next four words
+ are set all to 1 by the Linuxthreads
+ PTHREAD_COND_INITIALIZER. */
+- int __lock;
++ int __lock __attribute__ ((aligned(16)));
+ /* Tracks the initialization of this structure:
+ 0 initialized with NPTL PTHREAD_COND_INITIALIZER.
+ 1 initialized with Linuxthreads PTHREAD_COND_INITIALIZER.
+@@ -161,7 +164,7 @@ typedef union
+ start of the 4-word 16-byte aligned lock structure. The
+ next four words are all set to 1 by the Linuxthreads
+ PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL. */
+- int __compat_padding[4];
++ int __compat_padding[4] __attribute__ ((aligned(16)));
+ int __lock;
+ unsigned int __nr_readers;
+ unsigned int __readers_wakeup;
Added: glibc-package/branches/eglibc-2.11/debian/patches/localedata/submitted-pt_BR.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/localedata/submitted-pt_BR.diff (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/localedata/submitted-pt_BR.diff 2009-11-24 19:48:05 UTC (rev 4017)
@@ -0,0 +1,16 @@
+2009-11-23 Aurelien Jarno <aurelien@aurel32.net>
+
+ * locales/pt_BR: Change thousand separator to dot.
+
+diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
+index 8dbc14e..eac6c76 100644
+--- a/localedata/locales/pt_BR
++++ b/localedata/locales/pt_BR
+@@ -79,7 +79,7 @@ END LC_CTYPE
+
+ LC_NUMERIC
+ decimal_point "<U002C>"
+-thousands_sep ""
++thousands_sep "<U002E>"
+ grouping 0;0
+ END LC_NUMERIC
Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series 2009-11-24 15:11:53 UTC (rev 4016)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series 2009-11-24 19:48:05 UTC (rev 4017)
@@ -37,6 +37,7 @@
localedata/submitted-bz9725-locale-sv_SE.diff
localedata/first_weekday.diff
localedata/submitted-bz9912-locale-ru_UA.diff
+localedata/submitted-pt_BR.diff
alpha/local-gcc4.1.diff
alpha/submitted-creat64.diff
@@ -65,6 +66,7 @@
hppa/submitted-fadvise64_64.diff
hppa/submitted-lt.diff
hppa/submitted-nptl-carlos.diff
+hppa/cvs-nptl-compat.diff
hppa/local-stack-grows-up.diff
hurd-i386/local-dl-dynamic-weak.diff
@@ -195,3 +197,4 @@
any/submitted-bits-fcntl_h-at.diff
any/submitted-nis-not-configured.diff
any/submitted-getaddrinfo-nodata.diff
+any/submitted-gethostbyname3.diff
Reply to: