[arch-commits] Commit in glibc/trunk (3 files)

Allan McRae allan at archlinux.org
Thu Nov 20 03:23:15 UTC 2014


    Date: Thursday, November 20, 2014 @ 04:23:15
  Author: allan
Revision: 226746

upgpkg: glibc 2.20-3

use full 2.20 patchset, fixes CVE-2014-7817

Deleted:
  glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch
  glibc/trunk/glibc-2.19-tzselect-default.patch
  glibc/trunk/glibc-2.19-xattr_header.patch

--------------------------------------------+
 glibc-2.19-fix-sign-in-bsloww1-input.patch |   71 ---------------------------
 glibc-2.19-tzselect-default.patch          |   13 ----
 glibc-2.19-xattr_header.patch              |   42 ---------------
 3 files changed, 126 deletions(-)

Deleted: glibc-2.19-fix-sign-in-bsloww1-input.patch
===================================================================
--- glibc-2.19-fix-sign-in-bsloww1-input.patch	2014-11-20 03:15:35 UTC (rev 226745)
+++ glibc-2.19-fix-sign-in-bsloww1-input.patch	2014-11-20 03:23:15 UTC (rev 226746)
@@ -1,71 +0,0 @@
-From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh at redhat.com>
-Date: Thu, 27 Feb 2014 21:29:16 +0530
-Subject: [PATCH] Fix sign of input to bsloww1 (BZ #16623)
-
-In 84ba214c, I removed some redundant sign computations and in the
-process, I incorrectly got rid of a temporary variable, thus passing
-the absolute value of the input to bsloww1.  This caused #16623.
-
-This fix undoes the incorrect change.
----
- sysdeps/ieee754/dbl-64/s_sin.c | 16 ++++++++++------
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c
-index 6105e9f..50109b8 100644
---- a/sysdeps/ieee754/dbl-64/s_sin.c
-+++ b/sysdeps/ieee754/dbl-64/s_sin.c
-@@ -447,19 +447,21 @@ __sin (double x)
- 	    }
- 	  else
- 	    {
-+	      double t;
- 	      if (a > 0)
- 		{
- 		  m = 1;
-+		  t = a;
- 		  db = da;
- 		}
- 	      else
- 		{
- 		  m = 0;
--		  a = -a;
-+		  t = -a;
- 		  db = -da;
- 		}
--	      u.x = big + a;
--	      y = a - (u.x - big);
-+	      u.x = big + t;
-+	      y = t - (u.x - big);
- 	      res = do_sin (u, y, db, &cor);
- 	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
- 	      retval = ((res == res + cor) ? ((m) ? res : -res)
-@@ -671,19 +673,21 @@ __cos (double x)
- 	    }
- 	  else
- 	    {
-+	      double t;
- 	      if (a > 0)
- 		{
- 		  m = 1;
-+		  t = a;
- 		  db = da;
- 		}
- 	      else
- 		{
- 		  m = 0;
--		  a = -a;
-+		  t = -a;
- 		  db = -da;
- 		}
--	      u.x = big + a;
--	      y = a - (u.x - big);
-+	      u.x = big + t;
-+	      y = t - (u.x - big);
- 	      res = do_sin (u, y, db, &cor);
- 	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
- 	      retval = ((res == res + cor) ? ((m) ? res : -res)
--- 
-1.9.0
-

Deleted: glibc-2.19-tzselect-default.patch
===================================================================
--- glibc-2.19-tzselect-default.patch	2014-11-20 03:15:35 UTC (rev 226745)
+++ glibc-2.19-tzselect-default.patch	2014-11-20 03:23:15 UTC (rev 226746)
@@ -1,13 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 998cd14..d5f647c 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
- 
- $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	sed -e 's|/bin/bash|$(KSH)|g' \
--	    -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-+	    -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
- 	    -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
- 	    -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
- 	    -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \

Deleted: glibc-2.19-xattr_header.patch
===================================================================
--- glibc-2.19-xattr_header.patch	2014-11-20 03:15:35 UTC (rev 226745)
+++ glibc-2.19-xattr_header.patch	2014-11-20 03:23:15 UTC (rev 226746)
@@ -1,42 +0,0 @@
-From: Serge Hallyn <serge.hallyn at ubuntu.com>
-Date: Tue, 11 Mar 2014 04:17:07 +0000 (-0500)
-Subject: misc/sys/xattr.h: guard against linux uapi header inclusion
-X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fdbe8eae;hp=fede7a5ffa188c22c3789135bd5cf82e487dd3d0
-
-misc/sys/xattr.h: guard against linux uapi header inclusion
-
-If the glibc xattr.h header is included after the uapi header,
-compilation fails due to an enum re-using a #define from the
-uapi header.  Protect against this by guarding the define and
-enum inclusions against each other.
-
-(A corresponding kernel patch has been sent here:
-http://lkml.org/lkml/2014/3/7/331 )
-
-(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
-and https://sourceware.org/glibc/wiki/Synchronizing_Headers
-for more information.)
-
-Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
----
-
-diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
-index 929cd87..796df90 100644
---- a/misc/sys/xattr.h
-+++ b/misc/sys/xattr.h
-@@ -26,6 +26,7 @@ __BEGIN_DECLS
- 
- /* The following constants should be used for the fifth parameter of
-    `*setxattr'.  */
-+#ifndef __USE_KERNEL_XATTR_DEFS
- enum
- {
-   XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
-@@ -33,6 +34,7 @@ enum
-   XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
- #define XATTR_REPLACE	XATTR_REPLACE
- };
-+#endif
- 
- /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
-    is SIZE bytes long).  Return 0 on success, -1 for errors.  */


More information about the arch-commits mailing list