[arch-commits] Commit in avr-binutils/trunk (PKGBUILD)

[Jakob Gruber]

    Date: Wednesday, November 19, 2014 @ 09:31:28
  Author: schuay
Revision: 122729

avr-binutils-2.24-3

Modified:
  avr-binutils/trunk/PKGBUILD

----------+
 PKGBUILD |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-18 22:26:40 UTC (rev 122728)
+++ PKGBUILD	2014-11-19 08:31:28 UTC (rev 122729)
@@ -8,7 +8,7 @@
 
 pkgname=avr-binutils
 pkgver=2.24
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the AVR architecture"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
@@ -17,11 +17,20 @@
 options=('staticlibs' '!distcc' '!ccache')
 install=avr-binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+        binutils-2.24-CVE-2014-8484.patch
+        binutils-2.24-CVE-2014-8485.patch
+        binutils-2.24-CVE-2014-8501.patch
+        binutils-2.24-CVE-2014-8502.patch
+        binutils-2.24-CVE-2014-8503.patch
+        binutils-2.24-CVE-2014-8504.patch
+        binutils-2.24-CVE-2014-8737.patch
+        binutils-2.24-CVE-2014-8738.patch
+        binutils-2.24-strings-all-default.patch
         avr-size.patch)
 
 _builddir=binutils-build
 
-build() {
+prepare() {
     cd ${srcdir}/binutils-${pkgver}
 
     # See https://bugs.archlinux.org/task/32504
@@ -31,11 +40,43 @@
     # https://bugs.archlinux.org/task/34629
     sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
+    # CVE-2014-8484 - backport of commit bd25671c
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8484.patch
+
+    # CVE-2014-8485 - commit 493a3386
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8485.patch
+
+    # CVE-2014-8501 - commit 7e1e1988
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8501.patch
+
+    # CVE-2014-8502 - commits bf67003b and 5a4b0ccc
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8502.patch
+
+    # CVE-2014-8503 - commit 0102ea8c
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8503.patch
+
+    # CVE-2014-8504 - commit 708d7d0d
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8504.patch
+
+    # CVE-2014-8737 - commit dd9b91de
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8737.patch
+
+    # CVE-2014-8738 - commit bb0d8671
+    patch -p1 -i $srcdir/binutils-2.24-CVE-2014-8738.patch
+
+    # strings -a default - commit 7fac9594 (fedora backport)
+    patch -p0 -i $srcdir/binutils-2.24-strings-all-default.patch
+
+    rm -rf ${srcdir}/${_builddir}
+    mkdir ${srcdir}/${_builddir}
+}
+
+build() {
+    cd ${srcdir}/binutils-${pkgver}
+
     config_guess=$(./config.guess)
 
-    cd ${srcdir}
-    rm -rf ${_builddir}
-    mkdir ${_builddir} && cd ${_builddir}
+    cd ${srcdir}/${_builddir}
 
     ${srcdir}/binutils-${pkgver}/configure \
         --prefix=/usr \
@@ -77,4 +118,13 @@
 
 md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
          'SKIP'
+         '125d8ce675ced84814d5f068106dbaa3'
+         '6923e5279a84cb7134b07e2cf6686434'
+         '4c590dc70829d8f4fc190f0fe7e3add8'
+         '64efddd24d5628437cc457b468df8de3'
+         '70540e2c6418a54ad88ab9c6b988d075'
+         'acce1f1d28db6bdb84b430a05f331366'
+         '12fb3e860203a06b5d1f4b023c06dcec'
+         'd35b0ccb79d565757821b3e0206f3873'
+         '99445d528110543d88b59a1ec7677592'
          '7f62e260650ceb0ff2f7cb44c3ee899c')