1 files changed, 30 insertions, 15 deletions
diff --git a/abs/core/elfutils/PKGBUILD b/abs/core/elfutils/PKGBUILD
index 8cbee1e..6a7485d 100644
--- a/abs/core/elfutils/PKGBUILD
+++ b/abs/core/elfutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163718 2012-07-18 03:05:26Z eric $
-# Maintainer: 
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname=elfutils
-pkgver=0.154
-pkgrel=1
-pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information"
+pkgver=0.158
+pkgrel=2
+pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/elfutils/"
 license=('LGPL3' 'GPL' 'GPL3')
@@ -13,27 +13,42 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
 provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
-options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} \
-        elfutils-0.154-binutils-pr-ld-13621.patch)
-sha1sums=('3a92a6f636cc3d14d4b3b00ba5c1e88a2a8d510b'
-          '956461d44b03823e0b448e78b1f4aa25ef269e1e'
-          '09681b728edb86c77eed47286554bef048f3507f')
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
+        fix-run-backtrace-native-core-test.patch
+	CVE-2014-0172.patch)
+options=('staticlibs')
+sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
+          'SKIP'
+          '8ecef640f3d1229cdf45ffda016a69848c18e61b'
+          '3e776c07d6ca2c7604a384d266f79c3ece1fb179')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ../fix-run-backtrace-native-core-test.patch
+  # merged upstream
+  patch -Np1 -i ../CVE-2014-0172.patch
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+
   CFLAGS+=" -g"  # required for test-suite success
-  patch -p1 -i "${srcdir}/elfutils-0.154-binutils-pr-ld-13621.patch"
   ./configure --prefix=/usr --program-prefix="eu-"
+
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+
   make DESTDIR="${pkgdir}" install
+  
+  rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a
 }