Date: Monday, September 8, 2014 @ 14:02:08 Author: allan Revision: 221151
archrelease: copy trunk to staging-i686, staging-x86_64 Added: glibc/repos/staging-i686/ glibc/repos/staging-i686/PKGBUILD (from rev 221147, glibc/trunk/PKGBUILD) glibc/repos/staging-i686/glibc-2.19-fix-sign-in-bsloww1-input.patch (from rev 221148, glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch) glibc/repos/staging-i686/glibc-2.19-tzselect-default.patch (from rev 221149, glibc/trunk/glibc-2.19-tzselect-default.patch) glibc/repos/staging-i686/glibc-2.19-xattr_header.patch (from rev 221149, glibc/trunk/glibc-2.19-xattr_header.patch) glibc/repos/staging-i686/glibc.install (from rev 221149, glibc/trunk/glibc.install) glibc/repos/staging-i686/locale-gen (from rev 221149, glibc/trunk/locale-gen) glibc/repos/staging-i686/locale.gen.txt (from rev 221149, glibc/trunk/locale.gen.txt) glibc/repos/staging-x86_64/ glibc/repos/staging-x86_64/PKGBUILD (from rev 221150, glibc/trunk/PKGBUILD) glibc/repos/staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch (from rev 221150, glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch) glibc/repos/staging-x86_64/glibc-2.19-tzselect-default.patch (from rev 221150, glibc/trunk/glibc-2.19-tzselect-default.patch) glibc/repos/staging-x86_64/glibc-2.19-xattr_header.patch (from rev 221150, glibc/trunk/glibc-2.19-xattr_header.patch) glibc/repos/staging-x86_64/glibc.install (from rev 221150, glibc/trunk/glibc.install) glibc/repos/staging-x86_64/locale-gen (from rev 221150, glibc/trunk/locale-gen) glibc/repos/staging-x86_64/locale.gen.txt (from rev 221150, glibc/trunk/locale.gen.txt) -----------------------------------------------------------+ staging-i686/PKGBUILD | 142 ++++++++++++ staging-i686/glibc-2.19-fix-sign-in-bsloww1-input.patch | 71 ++++++ staging-i686/glibc-2.19-tzselect-default.patch | 13 + staging-i686/glibc-2.19-xattr_header.patch | 42 +++ staging-i686/glibc.install | 22 + staging-i686/locale-gen | 42 +++ staging-i686/locale.gen.txt | 23 + staging-x86_64/PKGBUILD | 142 ++++++++++++ staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch | 71 ++++++ staging-x86_64/glibc-2.19-tzselect-default.patch | 13 + staging-x86_64/glibc-2.19-xattr_header.patch | 42 +++ staging-x86_64/glibc.install | 22 + staging-x86_64/locale-gen | 42 +++ staging-x86_64/locale.gen.txt | 23 + 14 files changed, 710 insertions(+) Copied: glibc/repos/staging-i686/PKGBUILD (from rev 221147, glibc/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,142 @@ +# $Id$ +# Maintainer: Allan McRae <al...@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuilt with each major glibc version + +# NOTE: adjust version in install script when locale files are updated + +pkgname=glibc +pkgver=2.20 +pkgrel=1 +pkgdesc="GNU C Library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +groups=('base') +depends=('linux-api-headers>=3.16' 'tzdata' 'filesystem>=2013.01') +makedepends=('gcc>=4.9') +backup=(etc/gai.conf + etc/locale.gen + etc/nscd.conf) +options=('!strip' 'staticlibs') +install=glibc.install +source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + locale.gen.txt + locale-gen) +md5sums=('948a6e06419a01bd51e97206861595b0' + 'SKIP' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') +validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') + +prepare() { + mkdir ${srcdir}/glibc-build +} + +build() { + cd ${srcdir}/glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/usr/lib" >> configparms + echo "rtlddir=/usr/lib" >> configparms + echo "sbindir=/usr/bin" >> configparms + echo "rootsbindir=/usr/bin" >> configparms + + # remove hardening options for building libraries + CFLAGS=${CFLAGS/-fstack-protector-strong/} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --with-headers=/usr/include \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-add-ons \ + --enable-obsolete-rpc \ + --enable-kernel=2.6.32 \ + --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ + --enable-lock-elision \ + --enable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "/build-programs=/s#no#yes#" 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 + sed -i '5,7d' configparms +} + +check() { + # the linker commands need to be reordered - fixed in 2.19 + LDFLAGS=${LDFLAGS/--as-needed,/} + + cd ${srcdir}/glibc-build + + # tst-cleanupx4 failure on i686 is "expected" + make check || true +} + +package() { + cd ${srcdir}/glibc-build + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + + make install_root=${pkgdir} install + + rm -f ${pkgdir}/etc/ld.so.{cache,conf} + + install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d} + + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service ${pkgdir}/usr/lib/systemd/system + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf + + install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf + + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin + + # create /etc/locale.gen + install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen + sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ + ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + + # remove the static libraries that have a shared counterpart + # libc, libdl, libm and libpthread are required for toolchain testsuites + # in addition libcrypt appears widely required + rm $pkgdir/usr/lib/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...): + # ld-${pkgver}.so + # libc-${pkgver}.so + # libpthread-${pkgver}.so + # libthread_db-1.0.so + + cd $pkgdir + strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ + usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ + usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ + usr/lib/getconf/* + [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 + + strip $STRIP_STATIC usr/lib/*.a + + strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ + usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib/{audit,gconv}/*.so +} Copied: glibc/repos/staging-i686/glibc-2.19-fix-sign-in-bsloww1-input.patch (from rev 221148, glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch) =================================================================== --- staging-i686/glibc-2.19-fix-sign-in-bsloww1-input.patch (rev 0) +++ staging-i686/glibc-2.19-fix-sign-in-bsloww1-input.patch 2014-09-08 12:02:08 UTC (rev 221151) @@ -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 + Copied: glibc/repos/staging-i686/glibc-2.19-tzselect-default.patch (from rev 221149, glibc/trunk/glibc-2.19-tzselect-default.patch) =================================================================== --- staging-i686/glibc-2.19-tzselect-default.patch (rev 0) +++ staging-i686/glibc-2.19-tzselect-default.patch 2014-09-08 12:02:08 UTC (rev 221151) @@ -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)"|' \ Copied: glibc/repos/staging-i686/glibc-2.19-xattr_header.patch (from rev 221149, glibc/trunk/glibc-2.19-xattr_header.patch) =================================================================== --- staging-i686/glibc-2.19-xattr_header.patch (rev 0) +++ staging-i686/glibc-2.19-xattr_header.patch 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,42 @@ +From: Serge Hallyn <serge.hal...@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.hal...@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. */ Copied: glibc/repos/staging-i686/glibc.install (from rev 221149, glibc/trunk/glibc.install) =================================================================== --- staging-i686/glibc.install (rev 0) +++ staging-i686/glibc.install 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) + +post_upgrade() { + ldconfig -r . + + if [[ $(vercmp 2.19-2 $2) = 1 ]]; then + locale-gen + fi + + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} Copied: glibc/repos/staging-i686/locale-gen (from rev 221149, glibc/trunk/locale-gen) =================================================================== --- staging-i686/locale-gen (rev 0) +++ staging-i686/locale-gen 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +LOCALEGEN=/etc/locale.gen +LOCALES=/usr/share/i18n/locales +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi + + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; + +# Remove all old locale dir and locale-archive before generating new +# locale data. +rm -rf /usr/lib/locale/* || true + +umask 022 + +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi +} + +echo "Generating locales..." +while read locale charset; do \ + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ +done < $LOCALEGEN +echo "Generation complete." Copied: glibc/repos/staging-i686/locale.gen.txt (from rev 221149, glibc/trunk/locale.gen.txt) =================================================================== --- staging-i686/locale.gen.txt (rev 0) +++ staging-i686/locale.gen.txt 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,23 @@ +# Configuration file for locale-gen +# +# lists of locales that are to be generated by the locale-gen command. +# +# Each line is of the form: +# +# <locale> <charset> +# +# where <locale> is one of the locales given in /usr/share/i18n/locales +# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps +# +# Examples: +# en_US ISO-8859-1 +# en_US.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +# +# The locale-gen command will generate all the locales, +# placing them in /usr/lib/locale. +# +# A list of supported locales is included in this file. +# Uncomment the ones you need. +# Copied: glibc/repos/staging-x86_64/PKGBUILD (from rev 221150, glibc/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,142 @@ +# $Id$ +# Maintainer: Allan McRae <al...@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuilt with each major glibc version + +# NOTE: adjust version in install script when locale files are updated + +pkgname=glibc +pkgver=2.20 +pkgrel=1 +pkgdesc="GNU C Library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +groups=('base') +depends=('linux-api-headers>=3.16' 'tzdata' 'filesystem>=2013.01') +makedepends=('gcc>=4.9') +backup=(etc/gai.conf + etc/locale.gen + etc/nscd.conf) +options=('!strip' 'staticlibs') +install=glibc.install +source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + locale.gen.txt + locale-gen) +md5sums=('948a6e06419a01bd51e97206861595b0' + 'SKIP' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') +validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') + +prepare() { + mkdir ${srcdir}/glibc-build +} + +build() { + cd ${srcdir}/glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/usr/lib" >> configparms + echo "rtlddir=/usr/lib" >> configparms + echo "sbindir=/usr/bin" >> configparms + echo "rootsbindir=/usr/bin" >> configparms + + # remove hardening options for building libraries + CFLAGS=${CFLAGS/-fstack-protector-strong/} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --with-headers=/usr/include \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-add-ons \ + --enable-obsolete-rpc \ + --enable-kernel=2.6.32 \ + --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ + --enable-lock-elision \ + --enable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "/build-programs=/s#no#yes#" 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 + sed -i '5,7d' configparms +} + +check() { + # the linker commands need to be reordered - fixed in 2.19 + LDFLAGS=${LDFLAGS/--as-needed,/} + + cd ${srcdir}/glibc-build + + # tst-cleanupx4 failure on i686 is "expected" + make check || true +} + +package() { + cd ${srcdir}/glibc-build + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + + make install_root=${pkgdir} install + + rm -f ${pkgdir}/etc/ld.so.{cache,conf} + + install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d} + + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service ${pkgdir}/usr/lib/systemd/system + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf + + install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf + + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin + + # create /etc/locale.gen + install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen + sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ + ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + + # remove the static libraries that have a shared counterpart + # libc, libdl, libm and libpthread are required for toolchain testsuites + # in addition libcrypt appears widely required + rm $pkgdir/usr/lib/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...): + # ld-${pkgver}.so + # libc-${pkgver}.so + # libpthread-${pkgver}.so + # libthread_db-1.0.so + + cd $pkgdir + strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ + usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ + usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ + usr/lib/getconf/* + [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 + + strip $STRIP_STATIC usr/lib/*.a + + strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ + usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib/{audit,gconv}/*.so +} Copied: glibc/repos/staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch (from rev 221150, glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch) =================================================================== --- staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch (rev 0) +++ staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch 2014-09-08 12:02:08 UTC (rev 221151) @@ -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 + Copied: glibc/repos/staging-x86_64/glibc-2.19-tzselect-default.patch (from rev 221150, glibc/trunk/glibc-2.19-tzselect-default.patch) =================================================================== --- staging-x86_64/glibc-2.19-tzselect-default.patch (rev 0) +++ staging-x86_64/glibc-2.19-tzselect-default.patch 2014-09-08 12:02:08 UTC (rev 221151) @@ -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)"|' \ Copied: glibc/repos/staging-x86_64/glibc-2.19-xattr_header.patch (from rev 221150, glibc/trunk/glibc-2.19-xattr_header.patch) =================================================================== --- staging-x86_64/glibc-2.19-xattr_header.patch (rev 0) +++ staging-x86_64/glibc-2.19-xattr_header.patch 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,42 @@ +From: Serge Hallyn <serge.hal...@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.hal...@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. */ Copied: glibc/repos/staging-x86_64/glibc.install (from rev 221150, glibc/trunk/glibc.install) =================================================================== --- staging-x86_64/glibc.install (rev 0) +++ staging-x86_64/glibc.install 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) + +post_upgrade() { + ldconfig -r . + + if [[ $(vercmp 2.19-2 $2) = 1 ]]; then + locale-gen + fi + + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} Copied: glibc/repos/staging-x86_64/locale-gen (from rev 221150, glibc/trunk/locale-gen) =================================================================== --- staging-x86_64/locale-gen (rev 0) +++ staging-x86_64/locale-gen 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +LOCALEGEN=/etc/locale.gen +LOCALES=/usr/share/i18n/locales +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi + + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; + +# Remove all old locale dir and locale-archive before generating new +# locale data. +rm -rf /usr/lib/locale/* || true + +umask 022 + +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi +} + +echo "Generating locales..." +while read locale charset; do \ + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ +done < $LOCALEGEN +echo "Generation complete." Copied: glibc/repos/staging-x86_64/locale.gen.txt (from rev 221150, glibc/trunk/locale.gen.txt) =================================================================== --- staging-x86_64/locale.gen.txt (rev 0) +++ staging-x86_64/locale.gen.txt 2014-09-08 12:02:08 UTC (rev 221151) @@ -0,0 +1,23 @@ +# Configuration file for locale-gen +# +# lists of locales that are to be generated by the locale-gen command. +# +# Each line is of the form: +# +# <locale> <charset> +# +# where <locale> is one of the locales given in /usr/share/i18n/locales +# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps +# +# Examples: +# en_US ISO-8859-1 +# en_US.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +# +# The locale-gen command will generate all the locales, +# placing them in /usr/lib/locale. +# +# A list of supported locales is included in this file. +# Uncomment the ones you need. +#