From b5917b03f8b01e6f6d0725a0e6af1beb9cea70f3 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 24 May 2020 03:59:09 +0200 Subject: [PATCH] cross/binutils-*: upgrade to 2.34-r1 Generated with pmbootstrap!1942, so the builddir isn't removed. --- cross/binutils-aarch64/APKBUILD | 27 ++++++++++++--------------- cross/binutils-armhf/APKBUILD | 27 ++++++++++++--------------- cross/binutils-armv7/APKBUILD | 27 ++++++++++++--------------- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index 32eef1455..76d7e0b70 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -2,23 +2,22 @@ # Generator: pmbootstrap aportgen binutils-aarch64 # Based on: main/binutils -pkgname="binutils-aarch64" + +builddir="$srcdir/binutils-2.34" + +pkgname=binutils-aarch64 pkgver=2.34 -pkgrel=0 +pkgrel=1 pkgdesc="Tools necessary to build programs for aarch64 targets" url="https://www.gnu.org/software/binutils/" -makedepends_build="" -makedepends_host="" makedepends="gettext libtool autoconf automake bison texinfo" arch="armhf armv7 x86_64 x86" license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD" -subpackages="" -source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 +source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz binutils-ld-fix-static-linking.patch gold-mips.patch ld-bfd-mips.patch " -builddir="$srcdir/binutils-$pkgver" if [ "$CHOST" != "$CTARGET" ]; then pkgname="binutils-$CTARGET_ARCH" @@ -28,16 +27,15 @@ fi # secfixes: # 2.32-r0: -# - CVE-2018-19931 -# - CVE-2018-19932 -# - CVE-2018-20002 -# - CVE-2018-20712 +# - CVE-2018-19931 +# - CVE-2018-19932 +# - CVE-2018-20002 +# - CVE-2018-20712 # 2.28-r1: -# - CVE-2017-7614 +# - CVE-2017-7614 build() { _target="$(arch_to_hostspec aarch64)" - cd "$builddir" "$builddir"/configure \ --build="$CBUILD" \ --target=$_target \ @@ -55,7 +53,6 @@ build() { } package() { - cd "$builddir" make install DESTDIR="$pkgdir" # remove man, info folders @@ -64,7 +61,7 @@ package() { -sha512sums="f47e7304e102c7bbc97958a08093e27796b9051d1567ce4fbb723d39ef3e29efa325ee14a1bdcc462a925a7f9bbbc9aee28294c6dc23850f371030f3835a8067 binutils-2.34.tar.bz2 +sha512sums="2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd binutils-2.34.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch" diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index 5970b03f2..c787e12e9 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -2,23 +2,22 @@ # Generator: pmbootstrap aportgen binutils-armhf # Based on: main/binutils -pkgname="binutils-armhf" + +builddir="$srcdir/binutils-2.34" + +pkgname=binutils-armhf pkgver=2.34 -pkgrel=0 +pkgrel=1 pkgdesc="Tools necessary to build programs for armhf targets" url="https://www.gnu.org/software/binutils/" -makedepends_build="" -makedepends_host="" makedepends="gettext libtool autoconf automake bison texinfo" arch="armv7 aarch64 x86_64 x86" license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD" -subpackages="" -source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 +source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz binutils-ld-fix-static-linking.patch gold-mips.patch ld-bfd-mips.patch " -builddir="$srcdir/binutils-$pkgver" if [ "$CHOST" != "$CTARGET" ]; then pkgname="binutils-$CTARGET_ARCH" @@ -28,16 +27,15 @@ fi # secfixes: # 2.32-r0: -# - CVE-2018-19931 -# - CVE-2018-19932 -# - CVE-2018-20002 -# - CVE-2018-20712 +# - CVE-2018-19931 +# - CVE-2018-19932 +# - CVE-2018-20002 +# - CVE-2018-20712 # 2.28-r1: -# - CVE-2017-7614 +# - CVE-2017-7614 build() { _target="$(arch_to_hostspec armhf)" - cd "$builddir" "$builddir"/configure \ --build="$CBUILD" \ --target=$_target \ @@ -55,7 +53,6 @@ build() { } package() { - cd "$builddir" make install DESTDIR="$pkgdir" # remove man, info folders @@ -64,7 +61,7 @@ package() { -sha512sums="f47e7304e102c7bbc97958a08093e27796b9051d1567ce4fbb723d39ef3e29efa325ee14a1bdcc462a925a7f9bbbc9aee28294c6dc23850f371030f3835a8067 binutils-2.34.tar.bz2 +sha512sums="2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd binutils-2.34.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch" diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD index a827b21c3..6f4983cf3 100644 --- a/cross/binutils-armv7/APKBUILD +++ b/cross/binutils-armv7/APKBUILD @@ -2,23 +2,22 @@ # Generator: pmbootstrap aportgen binutils-armv7 # Based on: main/binutils -pkgname="binutils-armv7" + +builddir="$srcdir/binutils-2.34" + +pkgname=binutils-armv7 pkgver=2.34 -pkgrel=0 +pkgrel=1 pkgdesc="Tools necessary to build programs for armv7 targets" url="https://www.gnu.org/software/binutils/" -makedepends_build="" -makedepends_host="" makedepends="gettext libtool autoconf automake bison texinfo" arch="armhf aarch64 x86_64 x86" license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD" -subpackages="" -source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 +source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz binutils-ld-fix-static-linking.patch gold-mips.patch ld-bfd-mips.patch " -builddir="$srcdir/binutils-$pkgver" if [ "$CHOST" != "$CTARGET" ]; then pkgname="binutils-$CTARGET_ARCH" @@ -28,16 +27,15 @@ fi # secfixes: # 2.32-r0: -# - CVE-2018-19931 -# - CVE-2018-19932 -# - CVE-2018-20002 -# - CVE-2018-20712 +# - CVE-2018-19931 +# - CVE-2018-19932 +# - CVE-2018-20002 +# - CVE-2018-20712 # 2.28-r1: -# - CVE-2017-7614 +# - CVE-2017-7614 build() { _target="$(arch_to_hostspec armv7)" - cd "$builddir" "$builddir"/configure \ --build="$CBUILD" \ --target=$_target \ @@ -55,7 +53,6 @@ build() { } package() { - cd "$builddir" make install DESTDIR="$pkgdir" # remove man, info folders @@ -64,7 +61,7 @@ package() { -sha512sums="f47e7304e102c7bbc97958a08093e27796b9051d1567ce4fbb723d39ef3e29efa325ee14a1bdcc462a925a7f9bbbc9aee28294c6dc23850f371030f3835a8067 binutils-2.34.tar.bz2 +sha512sums="2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd binutils-2.34.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch"