[arch-commits] Commit in elfutils/trunk (CVE-2014-0172.patch PKGBUILD)

[Laurent Carlier]

    Date: Monday, April 28, 2014 @ 18:11:18
  Author: lcarlier
Revision: 211883

upgpkg: elfutils 0.158-2

fix CVE-2014-0172

Added:
  elfutils/trunk/CVE-2014-0172.patch
Modified:
  elfutils/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Added: CVE-2014-0172.patch
===================================================================
Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 15:42:49 UTC (rev 211882)
+++ PKGBUILD	2014-04-28 16:11:18 UTC (rev 211883)
@@ -4,7 +4,7 @@
 
 pkgname=elfutils
 pkgver=0.158
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/elfutils/"
@@ -14,15 +14,20 @@
 replaces=('libelf')
 conflicts=('libelf')
 source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
-        fix-run-backtrace-native-core-test.patch)
+        fix-run-backtrace-native-core-test.patch
+	CVE-2014-0172.patch)
 options=('staticlibs')
 sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
-          'SKIP')
+          'SKIP'
+          '8ecef640f3d1229cdf45ffda016a69848c18e61b'
+          'da39a3ee5e6b4b0d3255bfef95601890afd80709')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
   patch -Np1 -i ../fix-run-backtrace-native-core-test.patch
+  # merged upstream
+  patch -Np1 -i ../CVE-2014-0172.patch
 }
 
 build() {
@@ -47,6 +52,3 @@
   
   rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a
 }
-sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
-          'SKIP'
-          '8ecef640f3d1229cdf45ffda016a69848c18e61b')