From 0132af72b5ed2ac4f292ed2569baf4c9b37e3e42 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 24 Aug 2022 08:37:42 +0200 Subject: [PATCH] test/testdata/aportgen: upgrade binutils to 2.39 (MR 2199) --- .../aportgen/aports/main/binutils/APKBUILD | 22 +++++++++++++------ .../pmaports/cross/binutils-armhf/APKBUILD | 19 +++++++++++----- .../aportgen/pmaports/temp/binutils/APKBUILD | 19 +++++++++++----- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/test/testdata/aportgen/aports/main/binutils/APKBUILD b/test/testdata/aportgen/aports/main/binutils/APKBUILD index 7c02f23d..01a4003c 100644 --- a/test/testdata/aportgen/aports/main/binutils/APKBUILD +++ b/test/testdata/aportgen/aports/main/binutils/APKBUILD @@ -1,6 +1,7 @@ -# Maintainer: Natanael Copa +# Contributor: Natanael Copa +# Maintainer: Ariadne Conill pkgname=binutils -pkgver=2.35.2 +pkgver=2.39 pkgrel=1 pkgdesc="Tools necessary to build programs" url="https://www.gnu.org/software/binutils/" @@ -15,7 +16,7 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz gold-mips.patch ld-bfd-mips.patch 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch - CVE-2021-3487.patch + binutils-mips-disable-assert.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -45,10 +46,12 @@ build() { local _cross_configure="--enable-install-libiberty --enable-shared" local _arch_configure="" local _gold_configure="--disable-gold" + local _plugin_configure="--enable-plugins" if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" + _plugin_configure="--disable-plugins" fi if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then @@ -78,12 +81,14 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-multilib \ + --disable-gprofng \ --enable-ld=default \ $_gold_configure \ --enable-64-bit-bfd \ - --enable-plugins \ + $_plugin_configure \ --enable-relro \ --enable-deterministic-archives \ + --enable-default-execstack=no \ $_cross_configure \ $_arch_configure \ $_hash_style_configure \ @@ -106,6 +111,7 @@ package() { # with the native tools, or other cross tools rm -r "${pkgdir:?}"/usr/share rm -f "$pkgdir"/usr/lib/libiberty.a + rm -r "${pkgdir:?}"/usr/lib/bfd-plugins fi } @@ -127,9 +133,11 @@ gold() { mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold } -sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz +sha512sums=" +68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch -642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch -b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355 CVE-2021-3487.patch" +70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch +609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.patch +" diff --git a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD index 29e7cfe6..65e34b4b 100644 --- a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD @@ -7,7 +7,7 @@ CTARGET_ARCH=armhf CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-armhf -pkgver=2.35.2 +pkgver=2.39 pkgrel=1 pkgdesc="Tools necessary to build programs for armhf targets" url="https://www.gnu.org/software/binutils/" @@ -22,7 +22,7 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz gold-mips.patch ld-bfd-mips.patch 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch - CVE-2021-3487.patch + binutils-mips-disable-assert.patch " builddir="$srcdir/binutils-$pkgver" @@ -52,10 +52,12 @@ build() { local _cross_configure="--enable-install-libiberty --enable-shared" local _arch_configure="" local _gold_configure="--disable-gold" + local _plugin_configure="--enable-plugins" if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" + _plugin_configure="--disable-plugins" fi if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then @@ -85,12 +87,14 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-multilib \ + --disable-gprofng \ --enable-ld=default \ $_gold_configure \ --enable-64-bit-bfd \ - --enable-plugins \ + $_plugin_configure \ --enable-relro \ --enable-deterministic-archives \ + --enable-default-execstack=no \ $_cross_configure \ $_arch_configure \ $_hash_style_configure \ @@ -113,6 +117,7 @@ package() { # with the native tools, or other cross tools rm -r "${pkgdir:?}"/usr/share rm -f "$pkgdir"/usr/lib/libiberty.a + rm -r "${pkgdir:?}"/usr/lib/bfd-plugins fi } @@ -134,9 +139,11 @@ gold() { mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold } -sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz +sha512sums=" +68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch -642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch -b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355 CVE-2021-3487.patch" +70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch +609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.patch +" diff --git a/test/testdata/aportgen/pmaports/temp/binutils/APKBUILD b/test/testdata/aportgen/pmaports/temp/binutils/APKBUILD index 6161f9ab..8e58814a 100644 --- a/test/testdata/aportgen/pmaports/temp/binutils/APKBUILD +++ b/test/testdata/aportgen/pmaports/temp/binutils/APKBUILD @@ -1,7 +1,7 @@ # Forked from Alpine INSERT-REASON-HERE (CHANGEME!) pkgname=binutils -pkgver=2.35.2 +pkgver=2.39 pkgrel=1 pkgdesc="Tools necessary to build programs" url="https://www.gnu.org/software/binutils/" @@ -16,7 +16,7 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz gold-mips.patch ld-bfd-mips.patch 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch - CVE-2021-3487.patch + binutils-mips-disable-assert.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -46,10 +46,12 @@ build() { local _cross_configure="--enable-install-libiberty --enable-shared" local _arch_configure="" local _gold_configure="--disable-gold" + local _plugin_configure="--enable-plugins" if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" + _plugin_configure="--disable-plugins" fi if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then @@ -79,12 +81,14 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-multilib \ + --disable-gprofng \ --enable-ld=default \ $_gold_configure \ --enable-64-bit-bfd \ - --enable-plugins \ + $_plugin_configure \ --enable-relro \ --enable-deterministic-archives \ + --enable-default-execstack=no \ $_cross_configure \ $_arch_configure \ $_hash_style_configure \ @@ -107,6 +111,7 @@ package() { # with the native tools, or other cross tools rm -r "${pkgdir:?}"/usr/share rm -f "$pkgdir"/usr/lib/libiberty.a + rm -r "${pkgdir:?}"/usr/lib/bfd-plugins fi } @@ -128,9 +133,11 @@ gold() { mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold } -sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz +sha512sums=" +68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d ld-bfd-mips.patch -642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch -b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355 CVE-2021-3487.patch" +70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch +609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f binutils-mips-disable-assert.patch +"