Skip to content

Instantly share code, notes, and snippets.

@njsmith

njsmith/glibc 2.20 -> glibc-linaro 2.20-2014.11 .patch

Last active March 25, 2016 02:14
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save njsmith/2d84f5a588ff6a296295 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save njsmith/2d84f5a588ff6a296295 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
glibc 2.20 -> glibc-linaro 2.20-2014.11 .patch
diff -ur glibc-2.20/ChangeLog glibc-linaro-2.20-2014.11/ChangeLog
--- glibc-2.20/ChangeLog 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/ChangeLog 2014-10-22 08:03:50.000000000 -0700
@@ -1,3 +1,56 @@
+2014-10-08 Roland McGrath <roland@hack.frob.com>
+
+ [BZ #17460]
+ * nscd/nscd.c (more_help): Rewrite list of tables collection
+ using xstrdup and asprintf.
+
+ * nscd/nscd_conf.c: Remove local xstrdup declaration.
+
+2014-10-09 Allan McRae <allan@archlinux.org>
+
+ * po/fr.po: Update French translation from translation project.
+
+2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ [BZ #17370]
+ * libio/wfileops.c (do_ftell_wide): Free OUT on error path.
+
+2014-09-11 Tim Lammens <tim.lammens@gmail.com>
+
+ [BZ #17370]
+ * libio/wfileops (do_ftell_wide): Free OUT.
+
+2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+ Jakub Jelinek <jakub@redhat.com>
+
+ [BZ #17266]
+ * libio/stdio.h: Check definition of __fortify_function
+ instead of __extern_always_inline to include bits/stdio2.h.
+ * math/bits/math-finite.h [__USE_XOPEN || __USE_ISOC99]: Also
+ check if __extern_always_inline is defined.
+ [__USE_MISC || __USE_XOPEN]: Likewise.
+ [__USE_ISOC99] Likewise.
+ * misc/sys/cdefs.h (__fortify_function): Define only if
+ __extern_always_inline is defined.
+ [!__cplusplus || __GNUC_PREREQ (4,3)]: Revert to defining
+ __extern_always_inline and __extern_inline only for g++-4.3
+ and newer or a compatible gcc.
+
+2014-09-15 Andreas Schwab <schwab@linux-m68k.org>
+
+ [BZ #17371]
+ * sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs_internal): Fix
+ last change to handle zero prefix length.
+
+2014-09-12 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/gnu/netinet/udp.h (UDP_NO_CHECK6_TX): New macro.
+ (UDP_NO_CHECK6_RX): Likewise.
+
+2014-09-13 Allan McRae <allan@archlinux.org>
+
+ * po/ru.po: Update Russian translation from translation project.
+
2014-09-07 Allan McRae <allan@archlinux.org
* version.h (RELEASE): Set to "stable".
Only in glibc-linaro-2.20-2014.11: ChangeLog.linaro
diff -ur glibc-2.20/libio/stdio.h glibc-linaro-2.20-2014.11/libio/stdio.h
--- glibc-2.20/libio/stdio.h 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/libio/stdio.h 2014-10-22 08:03:50.000000000 -0700
@@ -932,7 +932,7 @@
#ifdef __USE_EXTERN_INLINES
# include <bits/stdio.h>
#endif
-#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline
+#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
# include <bits/stdio2.h>
#endif
#ifdef __LDBL_COMPAT
diff -ur glibc-2.20/libio/wfileops.c glibc-linaro-2.20-2014.11/libio/wfileops.c
--- glibc-2.20/libio/wfileops.c 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/libio/wfileops.c 2014-10-22 08:03:50.000000000 -0700
@@ -708,9 +708,13 @@
sequences must be complete since they are accepted as
wchar_t; if not, then that is an error. */
if (__glibc_unlikely (status != __codecvt_ok))
- return WEOF;
+ {
+ free (out);
+ return WEOF;
+ }
offset += outstop - out;
+ free (out);
}
/* We don't trust _IO_read_end to represent the current file offset
diff -ur glibc-2.20/math/bits/math-finite.h glibc-linaro-2.20-2014.11/math/bits/math-finite.h
--- glibc-2.20/math/bits/math-finite.h 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/math/bits/math-finite.h 2014-10-22 08:03:50.000000000 -0700
@@ -251,7 +251,8 @@
# endif
#endif
-#if defined __USE_XOPEN || defined __USE_ISOC99
+#if ((defined __USE_XOPEN || defined __USE_ISOC99) \
+ && defined __extern_always_inline)
/* lgamma. */
__extern_always_inline double __NTH (lgamma (double __d))
{
@@ -284,7 +285,8 @@
# endif
#endif
-#if defined __USE_MISC || defined __USE_XOPEN
+#if ((defined __USE_MISC || defined __USE_XOPEN) \
+ && defined __extern_always_inline)
/* gamma. */
__extern_always_inline double __NTH (gamma (double __d))
{
@@ -422,7 +424,7 @@
# endif
#endif
-#ifdef __USE_ISOC99
+#if defined __USE_ISOC99 && defined __extern_always_inline
/* tgamma. */
extern double __gamma_r_finite (double, int *);
__extern_always_inline double __NTH (tgamma (double __d))
diff -ur glibc-2.20/misc/sys/cdefs.h glibc-linaro-2.20-2014.11/misc/sys/cdefs.h
--- glibc-2.20/misc/sys/cdefs.h 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/misc/sys/cdefs.h 2014-10-22 08:03:50.000000000 -0700
@@ -131,7 +131,6 @@
/* Fortify support. */
#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
#define __bos0(ptr) __builtin_object_size (ptr, 0)
-#define __fortify_function __extern_always_inline __attribute_artificial__
#if __GNUC_PREREQ (4,3)
# define __warndecl(name, msg) \
@@ -318,12 +317,13 @@
# define __attribute_artificial__ /* Ignore */
#endif
-#ifdef __GNUC__
-/* One of these will be defined if the __gnu_inline__ attribute is
- available. In C++, __GNUC_GNU_INLINE__ will be defined even though
- __inline does not use the GNU inlining rules. If neither macro is
- defined, this version of GCC only supports GNU inline semantics. */
-# if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+ inline semantics, unless -fgnu89-inline is used. Using __GNUC_STDC_INLINE__
+ or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+ older than 4.3 may define these macros and still not guarantee GNU inlining
+ semantics. */
+#if !defined __cplusplus || __GNUC_PREREQ (4,3)
+# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
# define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
# define __extern_always_inline \
extern __always_inline __attribute__ ((__gnu_inline__))
@@ -331,9 +331,10 @@
# define __extern_inline extern __inline
# define __extern_always_inline extern __always_inline
# endif
-#else /* Not GCC. */
-# define __extern_inline /* Ignore */
-# define __extern_always_inline /* Ignore */
+#endif
+
+#ifdef __extern_always_inline
+# define __fortify_function __extern_always_inline __attribute_artificial__
#endif
/* GCC 4.3 and above allow passing all anonymous arguments of an
diff -ur glibc-2.20/NEWS glibc-linaro-2.20-2014.11/NEWS
--- glibc-2.20/NEWS 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/NEWS 2014-10-22 08:03:50.000000000 -0700
@@ -5,6 +5,12 @@
Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
+Version 2.20.1
+
+* The following bugs are resolved with this release:
+
+ 17266, 17370, 17371, 17460.
+
Version 2.20
* The following bugs are resolved with this release:
diff -ur glibc-2.20/nscd/nscd.c glibc-linaro-2.20-2014.11/nscd/nscd.c
--- glibc-2.20/nscd/nscd.c 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/nscd/nscd.c 2014-10-22 08:03:50.000000000 -0700
@@ -451,33 +451,36 @@
static char *
more_help (int key, const char *text, void *input)
{
- char *tables, *tp = NULL;
-
switch (key)
{
case ARGP_KEY_HELP_EXTRA:
{
- dbtype cnt;
+ /* We print some extra information. */
- tables = xmalloc (sizeof (dbnames) + 1);
- for (cnt = 0; cnt < lastdb; cnt++)
+ char *tables = xstrdup (dbnames[0]);
+ for (dbtype i = 1; i < lastdb; ++i)
{
- strcat (tables, dbnames[cnt]);
- strcat (tables, " ");
+ char *more_tables;
+ if (asprintf (&more_tables, "%s %s", tables, dbnames[i]) < 0)
+ more_tables = NULL;
+ free (tables);
+ if (more_tables == NULL)
+ return NULL;
+ tables = more_tables;
}
- }
- /* We print some extra information. */
- if (asprintf (&tp, gettext ("\
+ char *tp;
+ if (asprintf (&tp, gettext ("\
Supported tables:\n\
%s\n\
\n\
For bug reporting instructions, please see:\n\
%s.\n\
"), tables, REPORT_BUGS_TO) < 0)
- tp = NULL;
- free (tables);
- return tp;
+ tp = NULL;
+ free (tables);
+ return tp;
+ }
default:
break;
@@ -622,15 +625,15 @@
}
if (WIFEXITED (status))
- {
- child_ret = WEXITSTATUS (status);
- fprintf (stderr, _("child exited with status %d\n"), child_ret);
- }
+ {
+ child_ret = WEXITSTATUS (status);
+ fprintf (stderr, _("child exited with status %d\n"), child_ret);
+ }
if (WIFSIGNALED (status))
- {
- child_ret = WTERMSIG (status);
- fprintf (stderr, _("child terminated by signal %d\n"), child_ret);
- }
+ {
+ child_ret = WTERMSIG (status);
+ fprintf (stderr, _("child terminated by signal %d\n"), child_ret);
+ }
}
/* We have the child status, so exit with that code. */
diff -ur glibc-2.20/nscd/nscd_conf.c glibc-linaro-2.20-2014.11/nscd/nscd_conf.c
--- glibc-2.20/nscd/nscd_conf.c 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/nscd/nscd_conf.c 2014-10-22 08:03:50.000000000 -0700
@@ -32,9 +32,6 @@
#include "dbg_log.h"
#include "nscd.h"
-/* Wrapper functions with error checking for standard functions. */
-extern char *xstrdup (const char *s);
-
/* Names of the databases. */
const char *const dbnames[lastdb] =
diff -ur glibc-2.20/po/fr.po glibc-linaro-2.20-2014.11/po/fr.po
--- glibc-2.20/po/fr.po 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/po/fr.po 2014-10-22 08:03:50.000000000 -0700
@@ -6673,11 +6673,11 @@
#: sysdeps/gnu/errlist.c:1399
msgid "No medium found"
-msgstr "Aucun medium trouvé"
+msgstr "Aucun médium trouvé"
#: sysdeps/gnu/errlist.c:1407
msgid "Wrong medium type"
-msgstr "Mauvais type de medium"
+msgstr "Mauvais type de médium"
#: sysdeps/gnu/errlist.c:1415
msgid "Required key not available"
diff -ur glibc-2.20/po/ru.po glibc-linaro-2.20-2014.11/po/ru.po
--- glibc-2.20/po/ru.po 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/po/ru.po 2014-10-22 08:03:50.000000000 -0700
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: libc 2.19.90\n"
"POT-Creation-Date: 2014-08-09 17:06+1000\n"
-"PO-Revision-Date: 2014-08-21 14:55+0400\n"
+"PO-Revision-Date: 2014-09-10 16:38+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n"
@@ -76,7 +76,7 @@
#: iconv/iconv_prog.c:60 iconv/iconv_prog.c:61 nscd/nscd.c:105
#: nss/makedb.c:120
msgid "NAME"
-msgstr "ФАЙЛ"
+msgstr "ИМЯ"
#: argp/argp-parse.c:104
msgid "Set the program name"
@@ -123,7 +123,7 @@
#: catgets/gencat.c:110
msgid "Create C header file NAME containing symbol definitions"
-msgstr "Создает заголовочный ФАЙЛ на Си, содержащий определения символов."
+msgstr "Создает заголовочный файл с ИМЕНЕМ на Си, содержащий определения символов."
#: catgets/gencat.c:112
msgid "Do not use existing catalog, force new output file"
@@ -131,7 +131,7 @@
#: catgets/gencat.c:113 nss/makedb.c:120
msgid "Write output to file NAME"
-msgstr "Записать вывод в ФАЙЛ"
+msgstr "Записать вывод в файл с ИМЕНЕМ"
#: catgets/gencat.c:118
msgid ""
@@ -4098,7 +4098,7 @@
#: nscd/nscd.c:106
msgid "Read configuration data from NAME"
-msgstr "Читать конфигурационные данные из ФАЙЛА"
+msgstr "Читать конфигурационные данные из файла с ИМЕНЕМ"
#: nscd/nscd.c:108
msgid "Do not fork and display messages on the current tty"
diff -ur glibc-2.20/sysdeps/gnu/netinet/udp.h glibc-linaro-2.20-2014.11/sysdeps/gnu/netinet/udp.h
--- glibc-2.20/sysdeps/gnu/netinet/udp.h 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/sysdeps/gnu/netinet/udp.h 2014-10-22 08:03:50.000000000 -0700
@@ -78,6 +78,10 @@
#define UDP_CORK 1 /* Never send partially complete segments. */
#define UDP_ENCAP 100 /* Set the socket to accept
encapsulated packets. */
+#define UDP_NO_CHECK6_TX 101 /* Disable sending checksum for UDP
+ over IPv6. */
+#define UDP_NO_CHECK6_RX 102 /* Disable accepting checksum for UDP
+ over IPv6. */
/* UDP encapsulation types */
#define UDP_ENCAP_ESPINUDP_NON_IKE 1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
diff -ur glibc-2.20/sysdeps/unix/sysv/linux/ifaddrs.c glibc-linaro-2.20-2014.11/sysdeps/unix/sysv/linux/ifaddrs.c
--- glibc-2.20/sysdeps/unix/sysv/linux/ifaddrs.c 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/sysdeps/unix/sysv/linux/ifaddrs.c 2014-10-22 08:03:50.000000000 -0700
@@ -770,20 +770,17 @@
if (cp != NULL)
{
- char c;
unsigned int preflen;
- if ((max_prefixlen > 0) &&
- (ifam->ifa_prefixlen > max_prefixlen))
+ if (ifam->ifa_prefixlen > max_prefixlen)
preflen = max_prefixlen;
else
preflen = ifam->ifa_prefixlen;
- for (i = 0; i < ((preflen - 1) / 8); i++)
+ for (i = 0; i < preflen / 8; i++)
*cp++ = 0xff;
- c = 0xff;
- c <<= ((128 - preflen) % 8);
- *cp = c;
+ if (preflen % 8)
+ *cp = 0xff << (8 - preflen % 8);
}
}
}
diff -ur glibc-2.20/version.h glibc-linaro-2.20-2014.11/version.h
--- glibc-2.20/version.h 2014-09-07 01:09:09.000000000 -0700
+++ glibc-linaro-2.20-2014.11/version.h 2014-10-22 08:03:50.000000000 -0700
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
#define RELEASE "stable"
-#define VERSION "2.20"
+#define VERSION "2.20-2014.11"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment