[arch-commits] Commit in lib32-glibc/trunk (2 files)
Date: Friday, May 16, 2014 @ 22:53:14
Author: heftig
Revision: 111333
2.19-5
Added:
lib32-glibc/trunk/glibc-2.19-tzselect-default.patch
Modified:
lib32-glibc/trunk/PKGBUILD
---+
PKGBUILD | 27 ++-
glibc-2.19-tzselect-default.patch | 13 +
2 files changed, 31 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-16 17:15:47 UTC (rev 111332)
+++ PKGBUILD2014-05-16 20:53:14 UTC (rev 111333)
@@ -9,26 +9,32 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.19
-pkgrel=4
-pkgdesc=GNU C Library for multilib
+pkgrel=5
+pkgdesc=GNU C Library (32-bit)
arch=('x86_64')
url=http://www.gnu.org/software/libc;
license=('GPL' 'LGPL')
-makedepends=('gcc-multilib=4.7')
+groups=()
+depends=()
+makedepends=('gcc-multilib=4.8')
+backup=()
options=('!strip' '!emptydirs' 'staticlibs')
+install=
source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
glibc-2.19-xattr_header.patch
glibc-2.19-fix-sign-in-bsloww1-input.patch
+glibc-2.19-tzselect-default.patch
lib32-glibc.conf)
md5sums=('e26b8cc666b162f999404b03970f14e4'
'SKIP'
'39a4876837789e07746f1d84cd8cb46a'
'755a1a9d7844a5e338eddaa9a5d974cd'
+ 'c772dc99ddd8032ecbf43884ae0cf42e'
'6e052f1cb693d5d3203f50f9d4e8c33b')
prepare() {
cd ${srcdir}/${_pkgbasename}-${pkgver}
-
+
# fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae
patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch
@@ -35,6 +41,9 @@
# fix issues in sin/cos slow path calculation - commit ffe768a9
patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
+ # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb
+ patch -p1 -i $srcdir/glibc-2.19-tzselect-default.patch
+
mkdir ${srcdir}/glibc-build
}
@@ -55,7 +64,7 @@
export CXX=g++ -m32
# remove hardening options for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
+ CFLAGS=${CFLAGS/-fstack-protector-strong/}
CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
@@ -76,8 +85,8 @@
# re-enable hardening for programs
sed -i /build-programs=/s#no#yes# configparms
- echo CC += -fstack-protector -D_FORTIFY_SOURCE=2 configparms
- echo CXX += -fstack-protector -D_FORTIFY_SOURCE=2 configparms
+ echo CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2 configparms
+ echo CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2 configparms
make
# remove harding in preparation to run test-suite
@@ -90,8 +99,8 @@
cd ${srcdir}/glibc-build
- # only acceptable testsuite error is some small libm ulp failures on i686
with gcc-4.9
- # TODO: fix upstream and provide patch
+ # ULP failures on i686 are all small and can be ignored
+ # tst-cleanupx4.out failure on i686 needs investigating...
make -k check || true
}
Added: glibc-2.19-tzselect-default.patch
===
--- glibc-2.19-tzselect-default.patch (rev 0)
+++ glibc-2.19-tzselect-default.patch 2014-05-16 20:53:14 UTC (rev 111333)
@@ -0,0 +1,13 @@
+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)|' \
[arch-commits] Commit in lib32-glibc/trunk (2 files)
Date: Friday, February 28, 2014 @ 23:58:23
Author: heftig
Revision: 106353
2.19-3
Added:
lib32-glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch
Modified:
lib32-glibc/trunk/PKGBUILD
+
PKGBUILD |7 ++
glibc-2.19-fix-sign-in-bsloww1-input.patch | 71 +++
2 files changed, 77 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-28 22:32:40 UTC (rev 106352)
+++ PKGBUILD2014-02-28 22:58:23 UTC (rev 106353)
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.19
-pkgrel=1
+pkgrel=3
pkgdesc=GNU C Library for multilib
arch=('x86_64')
url=http://www.gnu.org/software/libc;
@@ -18,10 +18,12 @@
options=('!strip' '!emptydirs' 'staticlibs')
source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
glibc-2.18-xattr-compat-hack.patch
+glibc-2.19-fix-sign-in-bsloww1-input.patch
lib32-glibc.conf)
md5sums=('e26b8cc666b162f999404b03970f14e4'
'SKIP'
'7ca96c68a37f2a4ab91792bfa0160a24'
+ '755a1a9d7844a5e338eddaa9a5d974cd'
'6e052f1cb693d5d3203f50f9d4e8c33b')
prepare() {
@@ -30,6 +32,9 @@
# hack fix for {linux,sys}/xattr.h incompatibility
patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
+ # fix issues in sin/cos slow path calculation - commit ffe768a9
+ patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
+
mkdir ${srcdir}/glibc-build
}
Added: glibc-2.19-fix-sign-in-bsloww1-input.patch
===
--- glibc-2.19-fix-sign-in-bsloww1-input.patch (rev 0)
+++ glibc-2.19-fix-sign-in-bsloww1-input.patch 2014-02-28 22:58:23 UTC (rev
106353)
@@ -0,0 +1,71 @@
+From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar siddh...@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
+
[arch-commits] Commit in lib32-glibc/trunk (2 files)
Date: Tuesday, January 7, 2014 @ 14:27:35
Author: heftig
Revision: 103537
2.18-12
Added:
lib32-glibc/trunk/glibc-2.18-xattr-compat-hack.patch
Modified:
lib32-glibc/trunk/PKGBUILD
+
PKGBUILD | 12 +---
glibc-2.18-xattr-compat-hack.patch | 19 +++
2 files changed, 28 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-07 11:49:50 UTC (rev 103536)
+++ PKGBUILD2014-01-07 13:27:35 UTC (rev 103537)
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.18
-pkgrel=11
+pkgrel=12
pkgdesc=GNU C Library for multilib
arch=('x86_64')
url=http://www.gnu.org/software/libc;
@@ -26,6 +26,7 @@
glibc-2.18-getaddrinfo-assertion.patch
glibc-2.18-scanf-parse-0e-0.patch
glibc-2.18-strstr-hackfix.patch
+glibc-2.18-xattr-compat-hack.patch
lib32-glibc.conf)
md5sums=('88fbbceafee809e82efd52efa1e3c58f'
'SKIP'
@@ -38,6 +39,7 @@
'd4d86add33f22125777e0ecff06bc9bb'
'01d19fe9b2aea489cf5651530e0369f2'
'4441f6dfe7d75ced1fa75e54dd21d36e'
+ '7ca96c68a37f2a4ab91792bfa0160a24'
'6e052f1cb693d5d3203f50f9d4e8c33b')
prepare() {
@@ -69,6 +71,9 @@
# hack fix for strstr issues on x86
patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
+
+ # hack fix for {linux,sys}/xattr.h incompatibility
+ patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
mkdir ${srcdir}/glibc-build
}
@@ -148,8 +153,9 @@
ln -s ../lib/locale $pkgdir/usr/lib32/locale
# remove the static libraries that have a shared counterpart
- # note: keep libc, libdl, libm, libpthread for binutils testsuite
- rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a
+ # libc, libdl, libm and libpthread are required for toolchain testsuites
+ # in addition libcrypt appears widely required
+ rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
# Do not strip the following files for improved debugging support
# (improved as in not breaking gdb and valgrind...):
Added: glibc-2.18-xattr-compat-hack.patch
===
--- glibc-2.18-xattr-compat-hack.patch (rev 0)
+++ glibc-2.18-xattr-compat-hack.patch 2014-01-07 13:27:35 UTC (rev 103537)
@@ -0,0 +1,19 @@
+diff -Naur glibc-2.18-orig/misc/sys/xattr.h glibc-2.18/misc/sys/xattr.h
+--- glibc-2.18-orig/misc/sys/xattr.h 2013-08-11 08:52:55.0 +1000
glibc-2.18/misc/sys/xattr.h2014-01-07 15:45:50.533969040 +1000
+@@ -26,13 +26,8 @@
+
+ /* The following constants should be used for the fifth parameter of
+`*setxattr'. */
+-enum
+-{
+- XATTR_CREATE = 1, /* set value, fail if attr already exists. */
+-#define XATTR_CREATE XATTR_CREATE
+- XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */
+-#define XATTR_REPLACE XATTR_REPLACE
+-};
++#define XATTR_CREATE 1
++#define XATTR_REPLACE 2
+
+ /* 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. */
[arch-commits] Commit in lib32-glibc/trunk (2 files)
Date: Saturday, November 9, 2013 @ 16:24:23
Author: heftig
Revision: 100724
2.18-10
Added:
lib32-glibc/trunk/glibc-2.18-scanf-parse-0e-0.patch
Modified:
lib32-glibc/trunk/PKGBUILD
---+
PKGBUILD |7 +++
glibc-2.18-scanf-parse-0e-0.patch | 67
2 files changed, 73 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-09 15:11:30 UTC (rev 100723)
+++ PKGBUILD2013-11-09 15:24:23 UTC (rev 100724)
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.18
-pkgrel=9
+pkgrel=10
pkgdesc=GNU C Library for multilib
arch=('x86_64')
url=http://www.gnu.org/software/libc;
@@ -24,6 +24,7 @@
glibc-2.18-ptr-mangle-CVE-2013-4788.patch
glibc-2.18-getaddrinfo-CVE-2013-4458.patch
glibc-2.18-getaddrinfo-assertion.patch
+glibc-2.18-scanf-parse-0e-0.patch
glibc-2.18-strstr-hackfix.patch
lib32-glibc.conf)
md5sums=('88fbbceafee809e82efd52efa1e3c58f'
@@ -35,6 +36,7 @@
'9749ba386b08a8fe53e7ecede9bf2dfb'
'71329fccb8eb583fb0d67b55f1e8df68'
'd4d86add33f22125777e0ecff06bc9bb'
+ '01d19fe9b2aea489cf5651530e0369f2'
'4441f6dfe7d75ced1fa75e54dd21d36e'
'6e052f1cb693d5d3203f50f9d4e8c33b')
@@ -62,6 +64,9 @@
# upstream commit 894f3f10
patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-assertion.patch
+ # upstream commit a4966c61
+ patch -p1 -i $srcdir/glibc-2.18-scanf-parse-0e-0.patch
+
# hack fix for strstr issues on x86
patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
Added: glibc-2.18-scanf-parse-0e-0.patch
===
--- glibc-2.18-scanf-parse-0e-0.patch (rev 0)
+++ glibc-2.18-scanf-parse-0e-0.patch 2013-11-09 15:24:23 UTC (rev 100724)
@@ -0,0 +1,67 @@
+diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
+index 1edb227..3c34f58 100644
+--- a/stdio-common/tst-sscanf.c
b/stdio-common/tst-sscanf.c
+@@ -109,6 +109,19 @@ struct test double_tests[] =
+ { L(-inf), L(%g), 1 }
+ };
+
++struct test2
++{
++ const CHAR *str;
++ const CHAR *fmt;
++ int retval;
++ char residual;
++} double_tests2[] =
++{
++ { L(0e+0), L(%g%c), 1, 0 },
++ { L(0xe+0), L(%g%c), 2, '+' },
++ { L(0x.e+0), L(%g%c), 2, '+' },
++};
++
+ int
+ main (void)
+ {
+@@ -196,5 +209,26 @@ main (void)
+ }
+ }
+
++ for (i = 0; i sizeof (double_tests2) / sizeof (double_tests2[0]); ++i)
++{
++ double dummy;
++ int ret;
++ char c = 0;
++
++ if ((ret = SSCANF (double_tests2[i].str, double_tests2[i].fmt,
++ dummy, c)) != double_tests2[i].retval)
++ {
++printf (double_tests2[%d] returned %d != %d\n,
++i, ret, double_tests2[i].retval);
++result = 1;
++ }
++ else if (ret == 2 c != double_tests2[i].residual)
++ {
++printf (double_tests2[%d] stopped at '%c' != '%c'\n,
++i, c, double_tests2[i].residual);
++result = 1;
++ }
++}
++
+ return result;
+ }
+diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
+index 78dc2fc..e6fa8f3 100644
+--- a/stdio-common/vfscanf.c
b/stdio-common/vfscanf.c
+@@ -1966,6 +1966,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format,
_IO_va_list argptr,
+ if (width 0)
+ --width;
+ }
++else
++ got_digit = 1;
+ }
+
+ while (1)
+--
+1.8.4.2
+
[arch-commits] Commit in lib32-glibc/trunk (2 files)
Date: Tuesday, September 24, 2013 @ 08:48:52
Author: heftig
Revision: 97548
add CVE patch; 2.18-5
Added:
lib32-glibc/trunk/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
Modified:
lib32-glibc/trunk/PKGBUILD
---+
PKGBUILD |9
glibc-2.18-ptr-mangle-CVE-2013-4788.patch | 485
2 files changed, 492 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-24 04:06:27 UTC (rev 97547)
+++ PKGBUILD2013-09-24 06:48:52 UTC (rev 97548)
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.18
-pkgrel=4
+pkgrel=5
pkgdesc=GNU C Library for multilib
arch=('x86_64')
url=http://www.gnu.org/software/libc;
@@ -20,6 +20,7 @@
glibc-2.18-readdir_r-CVE-2013-4237.patch
glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+glibc-2.18-ptr-mangle-CVE-2013-4788.patch
glibc-2.18-strstr-hackfix.patch
lib32-glibc.conf)
md5sums=('88fbbceafee809e82efd52efa1e3c58f'
@@ -27,6 +28,7 @@
'154da6bf5a5248f42a7bf5bf08e01a47'
'b79561ab9dce900e9bbeaf0d49927c2b'
'c7264b99d0f7e51922a4d3126182c40a'
+ '9749ba386b08a8fe53e7ecede9bf2dfb'
'4441f6dfe7d75ced1fa75e54dd21d36e'
'6e052f1cb693d5d3203f50f9d4e8c33b')
@@ -39,11 +41,14 @@
# upstream commits 1159a193, 55e17aad and b73ed247
patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
- # upstream commit 1326ba1a and two not yet committed patches
+ # upstream commits 1326ba1a, 141f3a77 and 303e567a
# https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html
# https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html
patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+ # upstream commits c61b4d41 and 0b1f8e35
+ patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+
# hack fix for strstr issues on x86
patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
Added: glibc-2.18-ptr-mangle-CVE-2013-4788.patch
===
--- glibc-2.18-ptr-mangle-CVE-2013-4788.patch (rev 0)
+++ glibc-2.18-ptr-mangle-CVE-2013-4788.patch 2013-09-24 06:48:52 UTC (rev
97548)
@@ -0,0 +1,485 @@
+diff --git a/csu/libc-start.c b/csu/libc-start.c
+index e5da3ef..c898d06 100644
+--- a/csu/libc-start.c
b/csu/libc-start.c
+@@ -37,6 +37,12 @@ extern void __pthread_initialize_minimal (void);
+in thread local area. */
+ uintptr_t __stack_chk_guard attribute_relro;
+ # endif
++# ifndef THREAD_SET_POINTER_GUARD
++/* Only exported for architectures that don't store the pointer guard
++ value in thread local area. */
++uintptr_t __pointer_chk_guard_local
++ attribute_relro attribute_hidden __attribute__ ((nocommon));
++# endif
+ #endif
+
+ #ifdef HAVE_PTR_NTHREADS
+@@ -195,6 +201,16 @@ LIBC_START_MAIN (int (*main) (int, char **, char **
MAIN_AUXVEC_DECL),
+ # else
+ __stack_chk_guard = stack_chk_guard;
+ # endif
++
++ /* Set up the pointer guard value. */
++ uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
++ stack_chk_guard);
++# ifdef THREAD_SET_POINTER_GUARD
++ THREAD_SET_POINTER_GUARD (pointer_chk_guard);
++# else
++ __pointer_chk_guard_local = pointer_chk_guard;
++# endif
++
+ #endif
+
+ /* Register the destructor of the dynamic linker if there is any. */
+diff --git a/elf/Makefile b/elf/Makefile
+index aaa9534..cb8da93 100644
+--- a/elf/Makefile
b/elf/Makefile
+@@ -121,7 +121,8 @@ endif
+ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \
+ tst-array1 tst-array2 tst-array3 tst-array4 tst-array5
+ tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \
+- tst-leaks1-static tst-array1-static tst-array5-static
++ tst-leaks1-static tst-array1-static tst-array5-static \
++ tst-ptrguard1-static
+ ifeq (yes,$(build-shared))
+ tests-static += tst-tls9-static
+ tst-tls9-static-ENV = \
+@@ -145,7 +146,8 @@ tests += loadtest restest1 preloadtest loadfail multiload
origtest resolvfail \
+tst-audit1 tst-audit2 tst-audit8 \
+tst-stackguard1 tst-addr1 tst-thrlock \
+tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
+- tst-initorder tst-initorder2 tst-relsort1 tst-null-argv
++ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
++ tst-ptrguard1
+ # reldep9
+ test-srcs = tst-pathopt
+ selinux-enabled := $(shell cat /selinux/enforce 2 /dev/null)
+@@ -1016,6 +1018,9 @@ LDFLAGS-order2mod2.so = $(no-as-needed)
+ tst-stackguard1-ARGS = --command $(host-test-program-cmd) --child
+ tst-stackguard1-static-ARGS = --command $(objpfx)tst-stackguard1-static
--child
+
++tst-ptrguard1-ARGS = --command $(host-test-program-cmd) --child
