Date: Sunday, July 13, 2014 @ 12:58:44
Author: lcarlier
Revision: 115650
archrelease: copy trunk to multilib-x86_64
Added:
lib32-elfutils/repos/multilib-x86_64/CVE-2014-0172.patch
(from rev 115649, lib32-elfutils/trunk/CVE-2014-0172.patch)
lib32-elfutils/repos/multilib-x86_64/PKGBUILD
(from rev 115649, lib32-elfutils/trunk/PKGBUILD)
lib32-elfutils/repos/multilib-x86_64/fix-run-backtrace-native-core-test.patch
(from rev 115649,
lib32-elfutils/trunk/fix-run-backtrace-native-core-test.patch)
Deleted:
lib32-elfutils/repos/multilib-x86_64/CVE-2014-0172.patch
lib32-elfutils/repos/multilib-x86_64/PKGBUILD
lib32-elfutils/repos/multilib-x86_64/fix-run-backtrace-native-core-test.patch
------------------------------------------+
CVE-2014-0172.patch | 74 +++++++++++-----------
PKGBUILD | 95 ++++++++++++-----------------
fix-run-backtrace-native-core-test.patch | 86 +++++++++++++-------------
3 files changed, 122 insertions(+), 133 deletions(-)
Deleted: CVE-2014-0172.patch
===================================================================
--- CVE-2014-0172.patch 2014-07-13 10:58:36 UTC (rev 115649)
+++ CVE-2014-0172.patch 2014-07-13 10:58:44 UTC (rev 115650)
@@ -1,37 +0,0 @@
-From 7f1eec317db79627b473c5b149a22a1b20d1f68f Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <[email protected]>
-Date: Wed, 9 Apr 2014 11:33:23 +0200
-Subject: [PATCH] CVE-2014-0172 Check for overflow before calling malloc to
- uncompress data.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1085663
-
-Reported-by: Florian Weimer <[email protected]>
-Signed-off-by: Mark Wielaard <[email protected]>
-diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
-index 79daeac..34ea373 100644
---- a/libdw/dwarf_begin_elf.c
-+++ b/libdw/dwarf_begin_elf.c
-@@ -1,5 +1,5 @@
- /* Create descriptor from ELF descriptor for processing file.
-- Copyright (C) 2002-2011 Red Hat, Inc.
-+ Copyright (C) 2002-2011, 2014 Red Hat, Inc.
- This file is part of elfutils.
- Written by Ulrich Drepper <[email protected]>, 2002.
-
-@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn
*scn, bool inscngrp)
- memcpy (&size, data->d_buf + 4, sizeof size);
- size = be64toh (size);
-
-+ /* Check for unsigned overflow so malloc always allocated
-+ enough memory for both the Elf_Data header and the
-+ uncompressed section data. */
-+ if (unlikely (sizeof (Elf_Data) + size < size))
-+ break;
-+
- Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
- if (unlikely (zdata == NULL))
- break;
---
-1.9.2
-
Copied: lib32-elfutils/repos/multilib-x86_64/CVE-2014-0172.patch (from rev
115649, lib32-elfutils/trunk/CVE-2014-0172.patch)
===================================================================
--- CVE-2014-0172.patch (rev 0)
+++ CVE-2014-0172.patch 2014-07-13 10:58:44 UTC (rev 115650)
@@ -0,0 +1,37 @@
+From 7f1eec317db79627b473c5b149a22a1b20d1f68f Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <[email protected]>
+Date: Wed, 9 Apr 2014 11:33:23 +0200
+Subject: [PATCH] CVE-2014-0172 Check for overflow before calling malloc to
+ uncompress data.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1085663
+
+Reported-by: Florian Weimer <[email protected]>
+Signed-off-by: Mark Wielaard <[email protected]>
+diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
+index 79daeac..34ea373 100644
+--- a/libdw/dwarf_begin_elf.c
++++ b/libdw/dwarf_begin_elf.c
+@@ -1,5 +1,5 @@
+ /* Create descriptor from ELF descriptor for processing file.
+- Copyright (C) 2002-2011 Red Hat, Inc.
++ Copyright (C) 2002-2011, 2014 Red Hat, Inc.
+ This file is part of elfutils.
+ Written by Ulrich Drepper <[email protected]>, 2002.
+
+@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn
*scn, bool inscngrp)
+ memcpy (&size, data->d_buf + 4, sizeof size);
+ size = be64toh (size);
+
++ /* Check for unsigned overflow so malloc always allocated
++ enough memory for both the Elf_Data header and the
++ uncompressed section data. */
++ if (unlikely (sizeof (Elf_Data) + size < size))
++ break;
++
+ Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
+ if (unlikely (zdata == NULL))
+ break;
+--
+1.9.2
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-13 10:58:36 UTC (rev 115649)
+++ PKGBUILD 2014-07-13 10:58:44 UTC (rev 115650)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault <[email protected]>
-# Contributor: Andrej Gelenberg <[email protected]>
-
-_pkgbasename=elfutils
-pkgname=lib32-elfutils
-pkgver=0.158
-pkgrel=2
-pkgdesc="Collection of libraries for working with ELF object files and DWARF
debugging information (32-bit)"
-arch=('x86_64')
-url="https://fedorahosted.org/elfutils/";
-license=('LGPL3' 'GPL' 'GPL3')
-depends=('lib32-bzip2' 'lib32-zlib' 'elfutils')
-makedepends=('gcc-multilib')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2
- fix-run-backtrace-native-core-test.patch
- CVE-2014-0172.patch)
-sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
- '8ecef640f3d1229cdf45ffda016a69848c18e61b'
- '3e776c07d6ca2c7604a384d266f79c3ece1fb179')
-
-prepare() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- patch -Np1 -i ../fix-run-backtrace-native-core-test.patch
- # merged upstream
- patch -Np1 -i ../CVE-2014-0172.patch
-}
-
-build() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- CFLAGS+=" -g" # required for test-suite success
-
- ./configure --prefix=/usr --libdir=/usr/lib32
- make
-}
-
-#check() {
-# cd ${srcdir}/${_pkgbasename}-${pkgver}
-#
-# make check
-#}
-
-package() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- make DESTDIR=${pkgdir} install
- rm -rf ${pkgdir}/usr/{bin,include,share}
-}
Copied: lib32-elfutils/repos/multilib-x86_64/PKGBUILD (from rev 115649,
lib32-elfutils/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-07-13 10:58:44 UTC (rev 115650)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <[email protected]>
+# Contributor: Andrej Gelenberg <[email protected]>
+
+_pkgbasename=elfutils
+pkgname=lib32-elfutils
+pkgver=0.159
+pkgrel=1
+pkgdesc="Collection of libraries for working with ELF object files and DWARF
debugging information (32-bit)"
+arch=('x86_64')
+url="https://fedorahosted.org/elfutils/";
+license=('LGPL3' 'GPL' 'GPL3')
+depends=('lib32-bzip2' 'lib32-zlib' 'elfutils')
+makedepends=('gcc-multilib')
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig})
+sha1sums=('4ff214cdb95a10b03cf413f3d018393a838f98fc'
+ 'SKIP')
+
+build() {
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ CFLAGS+=" -g" # required for test-suite success
+
+ ./configure --prefix=/usr --libdir=/usr/lib32
+ make
+}
+
+#check() {
+# cd ${srcdir}/${_pkgbasename}-${pkgver}
+#
+# make check
+#}
+
+package() {
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+ rm -rf ${pkgdir}/usr/{bin,include,share}
+}
Deleted: fix-run-backtrace-native-core-test.patch
===================================================================
--- fix-run-backtrace-native-core-test.patch 2014-07-13 10:58:36 UTC (rev
115649)
+++ fix-run-backtrace-native-core-test.patch 2014-07-13 10:58:44 UTC (rev
115650)
@@ -1,43 +0,0 @@
-From e922ec4e3bcd7c164a9ce424accac4394e7d5afd Mon Sep 17 00:00:00 2001
-From: Matthias Klose <[email protected]>
-Date: Tue, 07 Jan 2014 09:25:29 +0000
-Subject: tests: backtrace-subr.sh (check_native_core) should check core file
name.
-
-Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename
-the core file, and if it does still fail, skip the test.
-
-Signed-off-by: Mark Wielaard <[email protected]>
----
-diff --git a/tests/ChangeLog b/tests/ChangeLog
-index 63b7bed..7e9dcf4 100644
---- a/tests/ChangeLog
-+++ b/tests/ChangeLog
-@@ -1,3 +1,9 @@
-+2014-01-07 Matthias Klose <[email protected]>
-+
-+ * backtrace-subr.sh (check_native_core): Check to see if core file
-+ was created without ".PID" extension, if so mv core to core.PID.
-+ Skip test if no core file was created or could be found.
-+
- 2014-01-04 Mark Wielaard <[email protected]>
-
- * backtrace-data.c (main): Don't assert if raise returns.
-diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh
-index e7ece91..62b873c 100644
---- a/tests/backtrace-subr.sh
-+++ b/tests/backtrace-subr.sh
-@@ -111,6 +111,11 @@ check_native_core()
-
- # Skip the test if we cannot adjust core ulimit.
- core="core.`ulimit -c unlimited || exit 77; set +ex; testrun
${abs_builddir}/$child --gencore; true`"
-+ # see if /proc/sys/kernel/core_uses_pid is set to 0
-+ if [ -f core ]; then
-+ mv core "$core"
-+ fi
-+ if [ ! -f "$core" ]; then exit 77; fi
-
- if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then
- VALGRIND_CMD="$SAVED_VALGRIND_CMD"
---
-cgit v0.9.2
-
Copied:
lib32-elfutils/repos/multilib-x86_64/fix-run-backtrace-native-core-test.patch
(from rev 115649, lib32-elfutils/trunk/fix-run-backtrace-native-core-test.patch)
===================================================================
--- fix-run-backtrace-native-core-test.patch (rev 0)
+++ fix-run-backtrace-native-core-test.patch 2014-07-13 10:58:44 UTC (rev
115650)
@@ -0,0 +1,43 @@
+From e922ec4e3bcd7c164a9ce424accac4394e7d5afd Mon Sep 17 00:00:00 2001
+From: Matthias Klose <[email protected]>
+Date: Tue, 07 Jan 2014 09:25:29 +0000
+Subject: tests: backtrace-subr.sh (check_native_core) should check core file
name.
+
+Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename
+the core file, and if it does still fail, skip the test.
+
+Signed-off-by: Mark Wielaard <[email protected]>
+---
+diff --git a/tests/ChangeLog b/tests/ChangeLog
+index 63b7bed..7e9dcf4 100644
+--- a/tests/ChangeLog
++++ b/tests/ChangeLog
+@@ -1,3 +1,9 @@
++2014-01-07 Matthias Klose <[email protected]>
++
++ * backtrace-subr.sh (check_native_core): Check to see if core file
++ was created without ".PID" extension, if so mv core to core.PID.
++ Skip test if no core file was created or could be found.
++
+ 2014-01-04 Mark Wielaard <[email protected]>
+
+ * backtrace-data.c (main): Don't assert if raise returns.
+diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh
+index e7ece91..62b873c 100644
+--- a/tests/backtrace-subr.sh
++++ b/tests/backtrace-subr.sh
+@@ -111,6 +111,11 @@ check_native_core()
+
+ # Skip the test if we cannot adjust core ulimit.
+ core="core.`ulimit -c unlimited || exit 77; set +ex; testrun
${abs_builddir}/$child --gencore; true`"
++ # see if /proc/sys/kernel/core_uses_pid is set to 0
++ if [ -f core ]; then
++ mv core "$core"
++ fi
++ if [ ! -f "$core" ]; then exit 77; fi
+
+ if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then
+ VALGRIND_CMD="$SAVED_VALGRIND_CMD"
+--
+cgit v0.9.2
+
