Author: sthibault
Date: 2013-11-10 09:47:31 +0000 (Sun, 10 Nov 2013)
New Revision: 5763
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/cvs-CVE-2012-44xx.diff
Log:
* patches/any/cvs-CVE-2012-44xx.diff: Include <sys/param.h> to get MIN/MAX
macros.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-11-10 04:46:47 UTC (rev
5762)
+++ glibc-package/trunk/debian/changelog 2013-11-10 09:47:31 UTC (rev
5763)
@@ -2,7 +2,9 @@
!!! PLEASE MOVE FEATURE DEVELOPMENT TO 2.18 OR UPSTREAM !!!
- *
+ [ Samuel Thibault ]
+ * patches/any/cvs-CVE-2012-44xx.diff: Include <sys/param.h> to get MIN/MAX
+ macros.
-- Adam Conrad <adcon...@0c3.net> Sat, 09 Nov 2013 21:45:05 -0700
Modified: glibc-package/trunk/debian/patches/any/cvs-CVE-2012-44xx.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-CVE-2012-44xx.diff
2013-11-10 04:46:47 UTC (rev 5762)
+++ glibc-package/trunk/debian/patches/any/cvs-CVE-2012-44xx.diff
2013-11-10 09:47:31 UTC (rev 5763)
@@ -8,8 +8,8 @@
Index: eglibc-2.17/string/Makefile
===================================================================
---- eglibc-2.17.orig/string/Makefile 2012-10-25 16:09:53.000000000 -0400
-+++ eglibc-2.17/string/Makefile 2013-09-27 08:52:43.931342684 -0400
+--- eglibc-2.17.orig/string/Makefile 2013-11-10 09:24:02.000000000 +0000
++++ eglibc-2.17/string/Makefile 2013-11-10 09:24:02.000000000 +0000
@@ -67,6 +67,8 @@
tests-ifunc := $(strop-tests:%=test-%-ifunc)
tests += $(tests-ifunc)
@@ -21,10 +21,18 @@
tester-ENV = LANGUAGE=C
Index: eglibc-2.17/string/strcoll_l.c
===================================================================
---- eglibc-2.17.orig/string/strcoll_l.c 2012-02-17 21:24:59.000000000
-0500
-+++ eglibc-2.17/string/strcoll_l.c 2013-09-27 08:52:43.931342684 -0400
-@@ -42,11 +42,434 @@
+--- eglibc-2.17.orig/string/strcoll_l.c 2013-11-10 09:24:02.000000000
+0000
++++ eglibc-2.17/string/strcoll_l.c 2013-11-10 09:25:17.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <gnu/option-groups.h>
++#include <sys/param.h>
+ #ifndef STRING_TYPE
+ # define STRING_TYPE char
+@@ -42,11 +43,434 @@
+
#include "../locale/localeinfo.h"
+/* Track status while looking for sequences in a string. */
@@ -462,7 +470,7 @@
{
struct __locale_data *current = l->__locales[LC_COLLATE];
#if __OPTION_EGLIBC_LOCALE_CODE
-@@ -61,34 +484,6 @@
+@@ -61,34 +485,6 @@
const USTRING_TYPE *weights;
const USTRING_TYPE *extra;
const int32_t *indirect;
@@ -497,7 +505,7 @@
if (nrules == 0)
return STRCMP (s1, s2);
-@@ -103,7 +498,6 @@
+@@ -103,7 +499,6 @@
current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_EXTRA,SUFFIX))].string;
indirect = (const int32_t *)
current->values[_NL_ITEM_INDEX
(CONCAT(_NL_COLLATE_INDIRECT,SUFFIX))].string;
@@ -505,7 +513,7 @@
assert (((uintptr_t) table) % __alignof__ (table[0]) == 0);
assert (((uintptr_t) weights) % __alignof__ (weights[0]) == 0);
-@@ -111,18 +505,13 @@
+@@ -111,18 +506,13 @@
assert (((uintptr_t) indirect) % __alignof__ (indirect[0]) == 0);
/* We need this a few times. */
@@ -527,7 +535,7 @@
/* Perform the first pass over the string and while doing this find
and store the weights for each character. Since we want this to
be as fast as possible we are using `alloca' to store the temporary
-@@ -132,411 +521,122 @@
+@@ -132,411 +522,122 @@
Please note that the localedef programs makes sure that `position'
is not used at the first level. */
@@ -1026,7 +1034,7 @@
Index: eglibc-2.17/string/tst-strcoll-overflow.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ eglibc-2.17/string/tst-strcoll-overflow.c 2013-09-27 08:52:43.931342684
-0400
++++ eglibc-2.17/string/tst-strcoll-overflow.c 2013-11-10 09:24:02.000000000
+0000
@@ -0,0 +1,61 @@
+/* Copyright (C) 2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
--
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/e1vfrcb-0001it...@vasks.debian.org
