r5382 - in glibc-package/branches/eglibc-2.16/debian: . control.in debhelper.in patches/hurd-i386 patches/kfreebsd patches/localedata
Author: aurel32
Date: 2012-11-18 23:44:00 +0000 (Sun, 18 Nov 2012)
New Revision: 5382
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/control
glibc-package/branches/eglibc-2.16/debian/control.in/opt
glibc-package/branches/eglibc-2.16/debian/debhelper.in/locales.postinst
glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-tls.diff
glibc-package/branches/eglibc-2.16/debian/patches/kfreebsd/local-getaddrinfo-freebsd-kernel.diff
glibc-package/branches/eglibc-2.16/debian/patches/localedata/locale-C.diff
Log:
Merge from unstable
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-18 23:44:00 UTC (rev 5382)
@@ -1,4 +1,4 @@
-eglibc (2.16-0experimental0) EXPERIMENTAL; urgency=low
+eglibc (2.16-0experimental0) experimental; urgency=low
[ Aurelien Jarno ]
* New upstream version. Closes: #672934.
@@ -374,8 +374,30 @@
* Fix building x32 multilib libraries, by correctly passing -mx32.
* Fix some ln calls in sysdeps/{amd64,i386} for binary-arch idempotence.
- -- Aurelien Jarno <aurel32@debian.org> Wed, 25 Jul 2012 23:45:58 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 18 Nov 2012 21:19:10 +0100
+
+eglibc (2.13-37) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * debhelper.in/locales.postinst: correctly lookup for the locales-all
+ package. Closes: #692777.
+ * patches/kfreebsd/local-getaddrinfo-freebsd-kernel.diff: update to
+ fix uninitialised bytes access in getaddrinfo(). Closes: #692433.
+ * patches/localedata/locale-C.diff: update to fix strftime('%X') return
+ a 24-hour time format. Closes: #693446.
+
+ [ Jonathan Nieder ]
+ * control.in/opt: remove outdated reference to 2.6 kernel from
+ description of i686 variant. Thanks to Regid Ichira. Closes:
+ #692154.
+
+ [ Samuel Thibault ]
+ * patches/hurd-i386/tg-tls-support.diff: Re-fix port leak in fork(). The
+ change was lost while synchronizing with the topgit repository.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 18 Nov 2012 22:53:04 +0100
+
eglibc (2.13-36) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.16/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/control 2012-11-18 23:44:00 UTC (rev 5382)
@@ -814,10 +814,10 @@
library and the standard math library, as well as many others.
.
This set of libraries is optimized for i686 machines, and will only be
- used if you are running a 2.6 kernel on an i686 class CPU (check the
- output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV,
- Celeron CPU's and similar class CPU's (including clones such as AMD
- Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezra).
+ used on an i686 class CPU (check the output of `uname -m'). This includes
+ Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's
+ (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA
+ C3 Ezla).
Package: libc6-xen
Architecture: i386
Modified: glibc-package/branches/eglibc-2.16/debian/control.in/opt
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control.in/opt 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/control.in/opt 2012-11-18 23:44:00 UTC (rev 5382)
@@ -11,10 +11,10 @@
library and the standard math library, as well as many others.
.
This set of libraries is optimized for i686 machines, and will only be
- used if you are running a 2.6 kernel on an i686 class CPU (check the
- output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV,
- Celeron CPU's and similar class CPU's (including clones such as AMD
- Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezra).
+ used on an i686 class CPU (check the output of `uname -m'). This includes
+ Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's
+ (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA
+ C3 Ezla).
Package: libc6-xen
Architecture: i386
Modified: glibc-package/branches/eglibc-2.16/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/locales.postinst 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/locales.postinst 2012-11-18 23:44:00 UTC (rev 5382)
@@ -58,7 +58,7 @@
fi
# Update requested locales if locales-all is not installed
- if dpkg-query -S locales-all >/dev/null 2>&1 ; then
+ if dpkg-query -s locales-all >/dev/null 2>&1 ; then
echo "locales-all installed, skipping locales generation"
else
locale-gen
Modified: glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-tls.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-tls.diff 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-tls.diff 2012-11-18 23:44:00 UTC (rev 5382)
@@ -215,7 +215,7 @@
/* Do special thread setup for TLS if needed. */
- if (err = _hurd_tls_fork (thread, &state))
-+ if (err = _hurd_tls_fork (thread, __mach_thread_self (), &state))
++ if (err = _hurd_tls_fork (thread, ss->thread, &state))
LOSE;
if (err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR,
Modified: glibc-package/branches/eglibc-2.16/debian/patches/kfreebsd/local-getaddrinfo-freebsd-kernel.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/kfreebsd/local-getaddrinfo-freebsd-kernel.diff 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/patches/kfreebsd/local-getaddrinfo-freebsd-kernel.diff 2012-11-18 23:44:00 UTC (rev 5382)
@@ -1,19 +1,24 @@
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2267,8 +2267,15 @@
+@@ -2267,8 +2267,20 @@
}
socklen_t sl = sizeof (results[i].source_addr);
-+ struct sockaddr sa = *q->ai_addr;
+#ifdef __FreeBSD_kernel__
++ struct sockaddr_in6 sa_in6;
++ const struct sockaddr *sa = &sa_in6;
++ memcpy(&sa_in6, q->ai_addr, q->ai_family == AF_INET6 ?
++ sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
+ /* The FreeBSD kernel doesn't allow connections on port 0. Use
+ port 1 instead, as on the FreeBSD libc. */
-+ if (((struct sockaddr_in *)&sa)->sin_port == htons(0))
-+ ((struct sockaddr_in *)&sa)->sin_port = htons(1);
++ if (sa_in6.sin6_port == htons(0))
++ sa_in6.sin6_port = htons(1);
++#else
++ const struct sockaddr *sa = q->ai_addr;
+#endif
if (fd != -1
- && __connect (fd, q->ai_addr, q->ai_addrlen) == 0
-+ && __connect (fd, &sa, q->ai_addrlen) == 0
++ && __connect (fd, sa, q->ai_addrlen) == 0
&& __getsockname (fd,
(struct sockaddr *) &results[i].source_addr,
&sl) == 0)
Modified: glibc-package/branches/eglibc-2.16/debian/patches/localedata/locale-C.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/localedata/locale-C.diff 2012-11-18 23:39:20 UTC (rev 5381)
+++ glibc-package/branches/eglibc-2.16/debian/patches/localedata/locale-C.diff 2012-11-18 23:44:00 UTC (rev 5382)
@@ -20,8 +20,8 @@
+fax ""
+language "C"
+territory ""
-+revision "1.4"
-+date "2012-04-26"
++revision "1.5"
++date "2012-11-18"
+%
+category "C:2012";LC_IDENTIFICATION
+category "C:2012";LC_CTYPE
@@ -395025,8 +395025,8 @@
+d_fmt "<U0025><U006D><U002F><U0025><U0064><U002F><U0025><U0059>"
+
+% Appropriate time representation (%X)
-+% "%r"
-+t_fmt "<U0025><U0072>"
++% "%T"
++t_fmt "<U0025><U0054>"
+
+% Appropriate AM/PM time representation (%r)
+% "%I:%M:%S %p"
Reply to: