Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id EC93A782C11 for ; Mon, 16 Aug 2021 11:27:56 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id q6so11581368wrv.6 for ; Mon, 16 Aug 2021 04:27:56 -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=sm/s/f0E7AkY2HlFRSGdqrnwEwtqmQYQuUdk+3c0hyY=; b=pUN2Ltbpsrg3Px/35pGudTJGW/VGSUBzspwisBn3GDPXgv7RXkU1KLaWukFTYoaVNa G7gZzaPLout6h1AVbaQCwQxB3fSvS+3J7SqtzBOEOB2fwN0EyHCu5aPkx7NEzqnkMGIC npAFKtdgowx9q+xHasQxwlF7Q91M4V3DdGDvp6VP7DkJ9M4CJS/vlPWvQ20xDy76CLGp 8NOdapEQppNuIksXuoEIdfD4oykuZHQNMvqDXpXaDxMnXnyl0OPaQLiPSMvf0dCc7Dt8 9XPQI6c+Ns5Oqx6FOcgc3NsExA5qWbl+Hfatu8c89DZBuHfA3HGvyvO1nWN9mvOFjDrg S7/A== 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=sm/s/f0E7AkY2HlFRSGdqrnwEwtqmQYQuUdk+3c0hyY=; b=ab5Jmomwehq5/Q1Bwvt//zcAKrFRzEqEhOHqY/4uTOosJ2G1qAJmFioO+umOZaBx6P HNVJteaAsw2wrJNJDNgQ5U8zBi9u++QaT1TDAVxyo0oxP7zUpDophki94Pbm91QQYHvD vGOVDpTLKeOHfRwgV/oDHEFSQ0yPrsYxwlo93Ye1rpr7/6YA8vf8lk39jz3uEsTMQKrD khwIe2lCiWnH6a0vkYqIiywsDf3vu0lm+nBhukVlnc9AV85FYbBdNtDTBd5AsOPU3GbS Z6e5o6swu/CVeb85+ODewwo2vXNoJ/hdwT/ksZWHeSlJOCkkRPsaxLIhy54IQ6Rix7mM AOxw== X-Gm-Message-State: AOAM532yJX7+2XqiWsacJLxx8Jw/JSbYVI5dGWOTQWt4ovUVzBrYP7js /2Opy4P/L6dmfrxt/4xVGZ2DnLab+70= X-Google-Smtp-Source: ABdhPJwpaCTnpaALQxZP48y6N0wOfOh34CXAe/fNY8PhaverQEgIa3wzesySwgWLMUA42S17gTgARg== X-Received: by 2002:a5d:6301:: with SMTP id i1mr17390383wru.423.1629113276581; Mon, 16 Aug 2021 04:27:56 -0700 (PDT) Received: from troy.wobcom.de ([94.31.100.46]) by smtp.gmail.com with ESMTPSA id e3sm11961482wrv.65.2021.08.16.04.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 04:27:56 -0700 (PDT) Sender: Marvin Preuss From: Marvin Preuss To: alpine-aports@lists.alpinelinux.org Cc: Marvin Preuss Subject: [PATCH] testing/ali: adds patch to fix building 32bit arches Date: Mon, 16 Aug 2021 13:27:49 +0200 Message-Id: <20210816112749.837018-1-marvin@xsteadfastx.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This should fix the builds on 32bit arches. i also added a [PR](https://github.com/nakabonne/ali/pull/109) on the project itself. --- .../ali/0001-moves-uint64-on-struct-top.patch | 26 +++++++++++++++++++ testing/ali/APKBUILD | 5 +++- 2 files changed, 30 insertions(+), 1 deletion(-) 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..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 " -- 2.32.0