Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 66F7E782C80 for ; Mon, 16 Aug 2021 11:35:22 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id k8so4158536wrn.3 for ; Mon, 16 Aug 2021 04:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uZBRnB6UdHwlF0Nn4KSy/MyIH36c+8CfGueKSWv9LXk=; b=ZwnPn21oQWtjSuFZzECUfgumKl/cFqYjOWkXjsikGblFmvFwSOSULTcmpcFQCAhB3o FjWZPEIGUJniKDzKhFk0l+lKSSfXknUz/UzI6di/AyUvcnDqr8KxOwq2eKycyzQpNYC0 jARQsm1Bh+r5RAXX4L8EmNFPC+2Hq0upWsz5usTG8YYqiPsqUVB/SBGQvKm9wJmj06VG NR1DvPkccCHCc0YSlHi6k7M9OsVmzcWnA+08OHssqS7VKMJzovMyfTgYnMeDTZZjkOqO nnKxJElLky4RZJ5aU0w2M+FipypkDUx5W6tzPthq1gE1G2299lRXUJdha4bmKdOZDdGi IZ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=uZBRnB6UdHwlF0Nn4KSy/MyIH36c+8CfGueKSWv9LXk=; b=qDzBA/QANSmI0ubgYIVkG4uOYtjHZC9ZwHCeGXMyIQnyAxx1qSLZIGBbtM5wZlnMPL Zy1FgmJVYhayZGPPUgtAtx9t/e1QlPSbfxgx60J+1K6kcWnGbaLzUU8nX9KbR0YB+NB8 6z6xulJOjNJ6rJGEqLqL/gtb3bJbTtEQlqT9KZs6JDQepnIwS/2t0ueKG6NgNUD4xc3m mlbOO0YRCjhGG29AVyvTuaCpXkB4bzd4DjNzKHiOH7sO9F0j1Azh1FUcOSGH6LEzf+8V nzCKkFnpGaMDSBZg2ibsyA2dvPbSyqxjyVIlYChvJjI/7IGcAzp6S6MYKA1BfAV1fcYw jv2g== X-Gm-Message-State: AOAM5303abvvhwQi1pHNaCEqJ1maFYrtqwtaciTFIkcFM+nlzkcAztPS tfbUTAevdM2UT7Kex0aWn2H0MJ3LrAQ= X-Google-Smtp-Source: ABdhPJxTk82Hfvd0VxvoPlEuSP6ry4CscpzYa53DbtddJyOyLmVS5AP8IPs4VsTIHWN2P72vw0/43g== X-Received: by 2002:adf:f290:: with SMTP id k16mr9002178wro.88.1629113722168; Mon, 16 Aug 2021 04:35:22 -0700 (PDT) Received: from troy.wobcom.de ([94.31.100.46]) by smtp.gmail.com with ESMTPSA id n3sm10933903wmi.0.2021.08.16.04.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 04:35:21 -0700 (PDT) Sender: Marvin Preuss From: Marvin Preuss To: alpine-aports@lists.alpinelinux.org Cc: Marvin Preuss Subject: [PATCH v2] testing/ali: adds patch to fix building 32bit arches Date: Mon, 16 Aug 2021 13:35:18 +0200 Message-Id: <20210816113518.848385-1-marvin@xsteadfastx.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit sorry, forgot to enable the arches. --- .../ali/0001-moves-uint64-on-struct-top.patch | 26 +++++++++++++++++++ testing/ali/APKBUILD | 7 +++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 testing/ali/0001-moves-uint64-on-struct-top.patch 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 +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..b99f0b3aa6 100644 --- a/testing/ali/APKBUILD +++ b/testing/ali/APKBUILD @@ -5,10 +5,12 @@ pkgver=0.7.2 pkgrel=1 pkgdesc="Generate HTTP load and plot the results in real-time" url="https://github.com/nakabonne/ali" -arch="all !armhf !armv7 !x86" # unaligned 64-bit atomic operations +arch="all" 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 " -- 2.32.0