diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-02-09 11:25:53 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-02-09 12:34:25 +0100 |
| commit | 9409d6ec32cfd0f40069167c7ded9e22f6b07fad (patch) | |
| tree | 9aef608488e1d07f4d9ced851e163a52a3b70ee2 /main/abuild | |
| parent | 9ff54af144a29fb273153e1c72fcf92070eafcca (diff) | |
| download | aports-9409d6ec32cfd0f40069167c7ded9e22f6b07fad.tar.bz2 aports-9409d6ec32cfd0f40069167c7ded9e22f6b07fad.tar.xz | |
main/abuild: backport use-only-sha512 commit
this reduces clutter in the APKBUILD
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-use-only-sha512sum.patch | 34 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 16 |
2 files changed, 38 insertions, 12 deletions
diff --git a/main/abuild/0001-abuild-use-only-sha512sum.patch b/main/abuild/0001-abuild-use-only-sha512sum.patch new file mode 100644 index 0000000000..3c670e047e --- /dev/null +++ b/main/abuild/0001-abuild-use-only-sha512sum.patch @@ -0,0 +1,34 @@ +From 0ff2cf73f5070d5dd4f9df11d8d87b594cc0be7b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 26 Jan 2017 13:57:18 +0200 +Subject: [PATCH] abuild: use only sha512sum + +use only the strongest hash. this simplifies apkbuilds a bit. +--- + abuild.in | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/abuild.in b/abuild.in +index ecd6fcc..ce42c5a 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1907,16 +1907,6 @@ checksum() { + files="$files $(filename_from_uri $s)" + done + +- # for compatibility/backporting reasons we still add md5sum +- msg "Updating the md5sums in APKBUILD..." +- md5sums="$(cd "$srcdir" && md5sum $files)" || die "md5sum failed" +- echo "md5sums=\"$md5sums\"" >>"$APKBUILD" +- +- msg "Updating the sha256sums in APKBUILD..." +- sha256sums="$(cd "$srcdir" && sha256sum $files)" \ +- || die "sha256sum failed" +- echo "sha256sums=\"$sha256sums\"" >>"$APKBUILD" +- + msg "Updating the sha512sums in APKBUILD..." + sha512sums="$(cd "$srcdir" && sha512sum $files)" \ + || die "sha512sum failed" +-- +2.11.0 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 5ba376b822..93884cc814 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=4 +pkgrel=5 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -24,6 +24,7 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch 0001-abuild-properly-detect-package-size-on-filesystems.patch 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch + 0001-abuild-use-only-sha512sum.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -66,18 +67,9 @@ gems() { mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ } -md5sums="1a51f8786331ddf79bf46357fe938f6a abuild-2.29.0.tar.xz -5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch -fd7ac6bc2c104869b6c21d75570f4e01 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch -5f8853c8afa27f49bc2cf1216c4b95c3 0001-abuild-properly-detect-package-size-on-filesystems.patch -47bced6bf9bc8bd3f9fc7e3f899b8cca 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch" -sha256sums="06ba81d4b42e7d1ebb0761b0b0e1cbaf999acac54ab075906cecdf8f825950c1 abuild-2.29.0.tar.xz -e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch -24f0ceb383a8651f3df192773d62c7258d2ce9b3220fcedfe9a2c173d522111a 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch -3d4a2534548b25b9f0497c1a3536ae7585a0595547f4844e69a362751baa754e 0001-abuild-properly-detect-package-size-on-filesystems.patch -d897d365fdf9ab7bb911ff37af4d1287e7891ca7b49ad5a1196c076cd5bd5322 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch" sha512sums="349c0d5efaff05dc6f680a93e59a997857991520ae892426252d198aa4ef0b2854f1675ce3b1bc1bea810d5f97fae0985474ea13df3905d590b320373723990c abuild-2.29.0.tar.xz 1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch 655476f5d263701d59f85ff8c28c342d8d0710bb6c869ca7e0cb8df9f70ca2cd5af44c460b578f6ebcf320774575ce193be15830b942a956a04c0345bf27bd4e 0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch fb7d65b1c65368dfddf7e3b55774a699169eb1de63e1aa619d5a210773e912e66c6a573d7fb98d579e30f416968592592d7a912fb6efce8805ac0f149c500776 0001-abuild-properly-detect-package-size-on-filesystems.patch -6f4212c796829578f318b257adcfdf493a1520cd45c623c110a3181fd076bbcb94f84b04f9292bd081a923e5819448673e5adc1a3e8450e086784c00c3515459 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch" +6f4212c796829578f318b257adcfdf493a1520cd45c623c110a3181fd076bbcb94f84b04f9292bd081a923e5819448673e5adc1a3e8450e086784c00c3515459 0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch +99a260d2c1ebc625fece8fc0a6d31357c1695825da6357b67c138cf2d738507640a3b1873cf3a4ba1ed502a7d6f29fe7a9898ebc3005faf27353c989b3c340c1 0001-abuild-use-only-sha512sum.patch" |