This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.20/master updated. glibc-2.20-3-gea55092
- From: allan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Sep 2014 23:05:41 -0000
- Subject: GNU C Library master sources branch release/2.20/master updated. glibc-2.20-3-gea55092
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.20/master has been updated
via ea5509237291f1a109d46052353ece197f4213bc (commit)
via 3b016908924afb5ef71ac874bedf8c6f0157941c (commit)
via b735a759ef35d73f1cfc783187fe8281b75069ac (commit)
from b8079dd0d360648e4e8de48656c5c38972621072 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ea5509237291f1a109d46052353ece197f4213bc
commit ea5509237291f1a109d46052353ece197f4213bc
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Sep 13 10:10:29 2014 +0200
Handle zero prefix length in getifaddrs (BZ #17371)
(cherry picked from commit a7b872687073decdcc7effc2289877d69058aca9)
Conflicts:
NEWS
diff --git a/ChangeLog b/ChangeLog
index cc99818..ed6b9ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/NEWS b/NEWS
index 721b457..3373c96 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ See the end for copying conditions.
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:
+
+ 17371.
+
Version 2.20
* The following bugs are resolved with this release:
diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
index 2c04e17..a47b2ed 100644
--- a/sysdeps/unix/sysv/linux/ifaddrs.c
+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
@@ -770,20 +770,17 @@ getifaddrs_internal (struct ifaddrs **ifap)
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);
}
}
}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3b016908924afb5ef71ac874bedf8c6f0157941c
commit 3b016908924afb5ef71ac874bedf8c6f0157941c
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Sep 12 12:13:08 2014 +0000
Add new Linux 3.16 constants to netinet/udp.h.
This patch adds the new constants UDP_NO_CHECK6_TX and
UDP_NO_CHECK6_RX from Linux 3.16 to sysdeps/gnu/netinet/udp.h. (I
believe the existing constants there are already Linux-specific,
possibly with the intention that other OSes should adopt the same
values if possible if adopting the features in question.)
Tested on x86_64.
* sysdeps/gnu/netinet/udp.h (UDP_NO_CHECK6_TX): New macro.
(UDP_NO_CHECK6_RX): Likewise.
(cherry picked from commit 0bd72468030947254e7de183cac1014dac884475)
diff --git a/ChangeLog b/ChangeLog
index 848e5c8..cc99818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h
index 32159cd..8cc1c60 100644
--- a/sysdeps/gnu/netinet/udp.h
+++ b/sysdeps/gnu/netinet/udp.h
@@ -78,6 +78,10 @@ struct udphdr
#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 */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b735a759ef35d73f1cfc783187fe8281b75069ac
commit b735a759ef35d73f1cfc783187fe8281b75069ac
Author: Allan McRae <allan@archlinux.org>
Date: Sat Sep 13 15:41:54 2014 +1000
Update Russian translation
(cherry picked from commit d8f879ee3e4131542c2ac3d1d9db4cf12cb86729)
diff --git a/ChangeLog b/ChangeLog
index f343428..848e5c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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".
diff --git a/po/ru.po b/po/ru.po
index 8596b47..d3d0973 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
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 @@ msgstr "Ð?Ñ?даеÑ? кÑ?аÑ?кÑ?Ñ? инÑ?оÑ?маÑ?иÑ? об иÑ?полÑ?зов
#: 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 @@ msgstr ""
#: 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 @@ msgstr "Ð?е иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий каÑ?алог,
#: 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 @@ msgstr "Ð?еÑ?езагÑ?Ñ?зка «%s (%s,%s,%s)» в кÑ?Ñ?е netgroup!"
#: 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"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 15 +++++++++++++++
NEWS | 6 ++++++
po/ru.po | 10 +++++-----
sysdeps/gnu/netinet/udp.h | 4 ++++
sysdeps/unix/sysv/linux/ifaddrs.c | 11 ++++-------
5 files changed, 34 insertions(+), 12 deletions(-)
hooks/post-receive
--
GNU C Library master sources