diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-11 03:21:28 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-11 03:21:28 +0000 |
commit | 121ee20158ca9869daadf9a2993b431af9661cb6 (patch) | |
tree | 3b8f82250a4d0f25ef33e3ea3300c24a74c262dd /core | |
parent | ffe0bbfd85b1341f3b15f809ea92f330d2f7cea3 (diff) |
Tue Feb 11 03:19:20 UTC 2014
Diffstat (limited to 'core')
-rw-r--r-- | core/binutils/PKGBUILD | 10 | ||||
-rw-r--r-- | core/gcc/PKGBUILD | 19 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 65 | ||||
-rw-r--r-- | core/glibc/glibc.install | 2 |
4 files changed, 24 insertions, 72 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 6dc36f564..d58baa3f7 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 201559 2013-12-15 06:41:35Z allan $ +# $Id: PKGBUILD 205615 2014-02-10 03:07:50Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base-devel') -depends=('glibc>=2.18' 'zlib') +depends=('glibc>=2.19' 'zlib') checkdepends=('dejagnu' 'bc') +conflicts=('binutils-multilib') +replaces=('binutils-multilib') options=('staticlibs' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}) @@ -36,7 +38,7 @@ build() { --with-bugurl=https://bugs.archlinux.org/ \ --enable-threads --enable-shared \ --enable-ld=default --enable-gold --enable-plugins \ - --disable-werror --disable-multilib + --disable-werror # check the host environment and makes sure all the necessary tools are available make configure-host diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 412cd95bd..ffb33ea06 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202694 2013-12-25 03:04:31Z allan $ +# $Id: PKGBUILD 205614 2014-02-10 03:07:49Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -7,24 +7,23 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.8.2 _pkgver=4.8 -pkgrel=7 -_snapshot=4.8-20131219 +pkgrel=8 +_snapshot=4.8-20140206 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') +makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!emptydirs') source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 gcc-4.8-filename-output.patch gcc-4.8-lambda-ICE.patch) -md5sums=('666ef08f87649f941bc5512e13a88fdc' +md5sums=('9d35549404a2326540fb88301ebd1977' '40cb437805e2f7a006aa0d0c3098ab0f' '6eb6e080dbf7bc6825f53a0aaa6c4ef9') - if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} else @@ -105,7 +104,7 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" groups=('base') - depends=('glibc>=2.17') + depends=('glibc>=2.19') options=('!emptydirs') install=gcc-libs.install @@ -146,7 +145,7 @@ package_gcc-libs() package_gcc() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.24' 'libmpc' 'cloog') groups=('base-devel') options=('staticlibs') install=gcc.install @@ -280,11 +279,11 @@ package_gcc-ada() ln -s gcc ${pkgdir}/usr/bin/gnatgcc - # insist on dynamic linking + # insist on dynamic linking, but keep static libraries because gnatmake complains mv ${pkgdir}/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so ${pkgdir}/usr/lib ln -s libgnarl-${_pkgver}.so ${pkgdir}/usr/lib/libgnarl.so ln -s libgnat-${_pkgver}.so ${pkgdir}/usr/lib/libgnat.so - rm ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.* + rm ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.so # Install Runtime Library Exception install -d ${pkgdir}/usr/share/licenses/gcc-ada/ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 0f823bd59..0e220e455 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203338 2014-01-08 11:40:24Z allan $ +# $Id: PKGBUILD 205613 2014-02-10 03:07:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -7,81 +7,32 @@ # NOTE: adjust version in install script when locale files are updated pkgname=glibc -pkgver=2.18 -pkgrel=12 +pkgver=2.19 +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.7' 'tzdata' 'filesystem>=2013.01') -makedepends=('gcc>=4.7') +depends=('linux-api-headers>=3.13' 'tzdata' 'filesystem>=2013.01') +makedepends=('gcc>=4.8') 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} - glibc-2.18-make-4.patch - 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-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 glibc-2.18-xattr-compat-hack.patch - nscd.service - nscd.tmpfiles locale.gen.txt locale-gen) -md5sums=('88fbbceafee809e82efd52efa1e3c58f' +md5sums=('e26b8cc666b162f999404b03970f14e4' 'SKIP' - 'e1883c2d1b01ff73650db5f5bb5a5a52' - '154da6bf5a5248f42a7bf5bf08e01a47' - 'b79561ab9dce900e9bbeaf0d49927c2b' - 'c7264b99d0f7e51922a4d3126182c40a' - '9749ba386b08a8fe53e7ecede9bf2dfb' - '71329fccb8eb583fb0d67b55f1e8df68' - 'd4d86add33f22125777e0ecff06bc9bb' - '01d19fe9b2aea489cf5651530e0369f2' - '4441f6dfe7d75ced1fa75e54dd21d36e' '7ca96c68a37f2a4ab91792bfa0160a24' - 'd5fab2cd3abea65aa5ae696ea4a47d6b' - 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' 'b5fd017036fb91199ee76f670da8c15b') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - - # compatibility with make-4.0 (submitted upstream) - patch -p1 -i $srcdir/glibc-2.18-make-4.patch - - # upstream commit 91ce4085 - patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch - - # upstream commits 1159a193, 55e17aad and b73ed247 - patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch - - # upstream commits 1326ba1a, 141f3a77 and 303e567a - 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 - - # upstream commit 7cbcdb36 - patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-CVE-2013-4458.patch - - # 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 # hack fix for {linux,sys}/xattr.h incompatibility patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch @@ -153,8 +104,8 @@ package() { 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}/nscd.service ${pkgdir}/usr/lib/systemd/system - install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/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 diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install index 6b405486e..749838c16 100644 --- a/core/glibc/glibc.install +++ b/core/glibc/glibc.install @@ -4,7 +4,7 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) post_upgrade() { ldconfig -r . - if [[ $(vercmp 2.18 $2) = 1 ]]; then + if [[ $(vercmp 2.19 $2) = 1 ]]; then locale-gen fi |