aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Preuss <marvin@xsteadfastx.org>2021-08-16 13:27:49 +0200
committerdispatch <dispatch@listserv.local>2021-08-16 11:28:03 +0000
commitd48bd0841e60375a4478d32bf17f29ff6f8c6d3b (patch)
tree4ddfe64294e230975bd3657823c81b86db52ad85
parent4bc602251913e73f867d868ff1948278cad3dba3 (diff)
downloadaports-patches/3601.tar.gz
aports-patches/3601.tar.bz2
aports-patches/3601.tar.xz
testing/ali: adds patch to fix building 32bit archespatches/3601
This should fix the builds on 32bit arches. i also added a [PR](https://github.com/nakabonne/ali/pull/109) on the project itself.
-rw-r--r--testing/ali/0001-moves-uint64-on-struct-top.patch26
-rw-r--r--testing/ali/APKBUILD5
2 files changed, 30 insertions, 1 deletions
diff --git a/testing/ali/0001-moves-uint64-on-struct-top.patch b/testing/ali/0001-moves-uint64-on-struct-top.patch
new file mode 100644
index 0000000000..0cb5073ae5
--- /dev/null
+++ b/testing/ali/0001-moves-uint64-on-struct-top.patch
@@ -0,0 +1,26 @@
+From f7701809e24ea67411fceb25d5d1f0036c59872d Mon Sep 17 00:00:00 2001
+From: Marvin Preuss <marvin@xsteadfastx.org>
+Date: Mon, 16 Aug 2021 12:45:19 +0200
+Subject: [PATCH] moves uint64 on struct top
+
+---
+ attacker/resolver.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/attacker/resolver.go b/attacker/resolver.go
+index 8281492..4993ea8 100644
+--- a/attacker/resolver.go
++++ b/attacker/resolver.go
+@@ -8,8 +8,8 @@ import (
+ )
+
+ type resolver struct {
+- addrs []string
+ idx uint64
++ addrs []string
+ }
+
+ func NewResolver(addrs []string) *net.Resolver {
+--
+2.32.0
+
diff --git a/testing/ali/APKBUILD b/testing/ali/APKBUILD
index 674d4f3646..59df2681c9 100644
--- a/testing/ali/APKBUILD
+++ b/testing/ali/APKBUILD
@@ -8,7 +8,9 @@ url="https://github.com/nakabonne/ali"
arch="all !armhf !armv7 !x86" # unaligned 64-bit atomic operations
license="MIT"
makedepends="go"
-source="$pkgname-$pkgver.tar.gz::https://github.com/nakabonne/ali/archive/refs/tags/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/nakabonne/ali/archive/refs/tags/v$pkgver.tar.gz\
+ 0001-moves-uint64-on-struct-top.patch
+"
export GOPATH="$srcdir"
export GOFLAGS="$GOFLAGS -modcacherw"
@@ -31,4 +33,5 @@ package() {
}
sha512sums="
8f20135ce212f508352b39afe6db8499242116a28f9654d908ab25c5b690c5b455c31d0d8eeb91e3251cf979cdad8805349c525dffee37f2e600f9f844d9c456 ali-0.7.2.tar.gz
+97e71d74c459b1727f39451126302fb5ddab1e51e609232484c531b64e58f86dfeb601bfde1f3d6d91d8b199aa492b0e9a2440d67ff5dac1d48f757c79fa8101 0001-moves-uint64-on-struct-top.patch
"