[arch-commits] Commit in libunwind/trunk (2 files)

[Sébastien Luttringer]

    Date: Wednesday, September 30, 2015 @ 22:00:07
  Author: seblu
Revision: 247945

upgpkg: libunwind 1.1-3

- fix FS#46474 (apply the patch actually)

Modified:
  libunwind/trunk/001-invalid-dwarf-opcodes-can-cause-references-beyond.patch
  libunwind/trunk/PKGBUILD

-------------------------------------------------------------+
 001-invalid-dwarf-opcodes-can-cause-references-beyond.patch |   12 ----------
 PKGBUILD                                                    |    6 ++++-
 2 files changed, 6 insertions(+), 12 deletions(-)

Modified: 001-invalid-dwarf-opcodes-can-cause-references-beyond.patch
===================================================================
--- 001-invalid-dwarf-opcodes-can-cause-references-beyond.patch	2015-09-30 19:57:48 UTC (rev 247944)
+++ 001-invalid-dwarf-opcodes-can-cause-references-beyond.patch	2015-09-30 20:00:07 UTC (rev 247945)
@@ -1,21 +1,11 @@
-From 396b6c7ab737e2bff244d640601c436a26260ca1 Mon Sep 17 00:00:00 2001
-From: Arun Sharma <arun at sharma-home.net>
-Date: Sat, 20 Jun 2015 02:47:22 +0000
-Subject: Invalid dwarf opcodes can cause references beyond the end of the array.
-
----
-diff --git a/include/dwarf_i.h b/include/dwarf_i.h
-index 1e6231e..4a02a7d 100644
 --- a/include/dwarf_i.h
 +++ b/include/dwarf_i.h
 @@ -20,7 +20,7 @@
  extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
  /* REG is evaluated multiple times; it better be side-effects free!  */
- # define dwarf_to_unw_regnum(reg)                                         \
+ # define dwarf_to_unw_regnum(reg)					  \
 -  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
 +  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
  #endif
  
  #ifdef UNW_LOCAL_ONLY
---
-cgit v0.9.0.2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-30 19:57:48 UTC (rev 247944)
+++ PKGBUILD	2015-09-30 20:00:07 UTC (rev 247945)
@@ -15,8 +15,12 @@
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
         '001-invalid-dwarf-opcodes-can-cause-references-beyond.patch')
 md5sums=('fb4ea2f6fbbe45bf032cd36e586883ce'
-         'ea8aa624d6b6eaf1cbf56dfb48468e92')
+         '73db2376e195a716f271ebce6bb7e5c0')
 
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 001-invalid-dwarf-opcodes-can-cause-references-beyond.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure CFLAGS="$CFLAGS -U_FORTIFY_SOURCE" --prefix=/usr