Author: adconrad Date: 2014-02-16 03:15:11 +0000 (Sun, 16 Feb 2014) New Revision: 5935
Removed: glibc-package/branches/eglibc-2.19/debian/patches/any/local-getaddrinfo-interface.diff glibc-package/branches/eglibc-2.19/debian/patches/any/local-use-glibc-predef.diff glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-getaddrinfo-lo.diff glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-init.diff glibc-package/branches/eglibc-2.19/debian/patches/powerpc/submitted-gettimeofday-vdso.diff Log: Remove more unused/unreferenced patches Deleted: glibc-package/branches/eglibc-2.19/debian/patches/any/local-getaddrinfo-interface.diff =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/any/local-getaddrinfo-interface.diff 2014-02-16 03:14:12 UTC (rev 5934) +++ glibc-package/branches/eglibc-2.19/debian/patches/any/local-getaddrinfo-interface.diff 2014-02-16 03:15:11 UTC (rev 5935) @@ -1,27 +0,0 @@ -2009-04-26 Aurelien Jarno <aurel...@aurel32.net> - - * sysdeps/posix/getaddrinfo.c (rfc3484_sort): don't assign native - result if the result has no associated interface. - ---- - sysdeps/posix/getaddrinfo.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -1715,13 +1715,13 @@ - - /* Fill in the results in all the records. */ - for (int i = 0; i < src->nresults; ++i) -- if (src->results[i].index == a1_index) -+ if (a1_index != -1 && src->results[i].index == a1_index) - { - assert (src->results[i].native == -1 - || src->results[i].native == a1_native); - src->results[i].native = a1_native; - } -- else if (src->results[i].index == a2_index) -+ else if (a2_index != -1 && src->results[i].index == a2_index) - { - assert (src->results[i].native == -1 - || src->results[i].native == a2_native); Deleted: glibc-package/branches/eglibc-2.19/debian/patches/any/local-use-glibc-predef.diff =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/any/local-use-glibc-predef.diff 2014-02-16 03:14:12 UTC (rev 5934) +++ glibc-package/branches/eglibc-2.19/debian/patches/any/local-use-glibc-predef.diff 2014-02-16 03:15:11 UTC (rev 5935) @@ -1,56 +0,0 @@ -Description: Use stdc-predef.h from glibc instead of eglibc -Author: Adam Conrad <adcon...@ubuntu.com> -Bug-Debian: http://bugs.debian.org/717557 - ---- eglibc-2.18.orig/Makefile -+++ eglibc-2.18/Makefile -@@ -59,7 +59,7 @@ endif # $(AUTOCONF) = no - $(addprefix install-, no-libc.a bin lib data headers others) - - headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \ -- bits/xopen_lim.h gnu/libc-version.h stdc-predef.h bits/predefs.h -+ bits/xopen_lim.h gnu/libc-version.h stdc-predef.h - - echo-headers: subdir_echo-headers - ---- eglibc-2.18.orig/include/stdc-predef.h -+++ eglibc-2.18/include/stdc-predef.h -@@ -26,8 +26,36 @@ - explicitly includes a system header. GCC knows the name of this - header in order to preinclude it. */ - --/* Define __STDC_IEC_559__ and other similar macros. */ --#include <bits/predefs.h> -+/* glibc's intent is to support the IEC 559 math functionality, real -+ and complex. If the GCC (4.9 and later) predefined macros -+ specifying compiler intent are available, use them to determine -+ whether the overall intent is to support these features; otherwise, -+ presume an older compiler has intent to support these features and -+ define these macros by default. */ -+ -+#ifdef __GCC_IEC_559 -+# if __GCC_IEC_559 > 0 -+# define __STDC_IEC_559__ 1 -+# endif -+#elif defined (__arm__) -+# if defined (__VFP_FP__) && !defined (__SOFTFP__) -+# define __STDC_IEC_559__ 1 -+# endif -+#else -+# define __STDC_IEC_559__ 1 -+#endif -+ -+#ifdef __GCC_IEC_559_COMPLEX -+# if __GCC_IEC_559_COMPLEX > 0 -+# define __STDC_IEC_559_COMPLEX__ 1 -+# endif -+#elif defined (__arm__) -+# if defined (__VFP_FP__) && !defined (__SOFTFP__) -+# define __STDC_IEC_559_COMPLEX__ 1 -+# endif -+#else -+# define __STDC_IEC_559_COMPLEX__ 1 -+#endif - - /* wchar_t uses ISO/IEC 10646 (2nd ed., published 2011-03-15) / - Unicode 6.0. */ Deleted: glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-getaddrinfo-lo.diff =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-getaddrinfo-lo.diff 2014-02-16 03:14:12 UTC (rev 5934) +++ glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-getaddrinfo-lo.diff 2014-02-16 03:15:11 UTC (rev 5935) @@ -1,27 +0,0 @@ -2009-03-15 Aurelien Jarno <aurel...@aurel32.net> - - * sysdeps/posix/getaddrinfo.c (getaddrinfo): correctly detect - interface for all 127.X.Y.Z addresses. - ---- - sysdeps/posix/getaddrinfo.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -2531,7 +2531,14 @@ - tmp.addr[0] = 0; - tmp.addr[1] = 0; - tmp.addr[2] = htonl (0xffff); -- tmp.addr[3] = sinp->sin_addr.s_addr; -+ /* Special case for lo interface, the source address -+ being possibly different than the interface -+ address. */ -+ if ((ntohl(sinp->sin_addr.s_addr) & 0xff000000) -+ == 0x7f000000) -+ tmp.addr[3] = htonl(0x7f000001); -+ else -+ tmp.addr[3] = sinp->sin_addr.s_addr; - } - else - { Deleted: glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-init.diff =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-init.diff 2014-02-16 03:14:12 UTC (rev 5934) +++ glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-init.diff 2014-02-16 03:15:11 UTC (rev 5935) @@ -1,20 +0,0 @@ -2011-07-26 Aurelien Jarno <aurel...@aurel32.net> - - * res_send.c(__libc_res_nsend): Correctly copy the nameserver - address. - ---- - resolv/res_send.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -441,7 +441,7 @@ - malloc(sizeof (struct sockaddr_in6)); - if (EXT(statp).nsaddrs[n] != NULL) { - memset (mempcpy(EXT(statp).nsaddrs[n], -- &statp->nsaddr_list[n], -+ &statp->nsaddr_list[ns], - sizeof (struct sockaddr_in)), - '\0', - sizeof (struct sockaddr_in6) Deleted: glibc-package/branches/eglibc-2.19/debian/patches/powerpc/submitted-gettimeofday-vdso.diff =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/powerpc/submitted-gettimeofday-vdso.diff 2014-02-16 03:14:12 UTC (rev 5934) +++ glibc-package/branches/eglibc-2.19/debian/patches/powerpc/submitted-gettimeofday-vdso.diff 2014-02-16 03:15:11 UTC (rev 5935) @@ -1,35 +0,0 @@ -From de4acf65123639ced1d18bc1c40fb6968d2b9917 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella <azane...@linux.vnet.ibm.com> -Date: Fri, 10 Jan 2014 07:28:38 -0600 -Subject: [PATCH 1/2] PowerPC: Fix gettimeofday ifunc selection - -The IFUNC selector for gettimeofday runs before _libc_vdso_platform_setup where -__vdso_gettimeofday is set. The selector then sets __gettimeofday (the internal -version used within GLIBC) to use the system call version instead of the vDSO one. -This patch changes the check if vDSO is available to get its value directly -instead of rely on __vdso_gettimeofday value. ---- - sysdeps/unix/sysv/linux/powerpc/gettimeofday.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c -index 29a5e08..a90fd3e 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c -+++ b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c -@@ -35,8 +35,13 @@ __gettimeofday_syscall (struct timeval *tv, struct timezone *tz) - void * - gettimeofday_ifunc (void) - { -+ void *vdso_gettimeofday; -+ -+ PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565); -+ - /* If the vDSO is not available we fall back syscall. */ -- return (__vdso_gettimeofday ? VDSO_IFUNC_RET (__vdso_gettimeofday) -+ vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615); -+ return (vdso_gettimeofday ? VDSO_IFUNC_RET (vdso_gettimeofday) - : __gettimeofday_syscall); - } - asm (".type __gettimeofday, %gnu_indirect_function"); --- -1.8.4 -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1wescf-0008fq...@moszumanska.debian.org