Subject: [PATCH 4/6] testing/sniffglue: enable on arches supported by rust >= 1.37.0-r0

From: Marian Buschsieweke <[email-masked]>
Date: Mon, 2 Sep 2019 11:59:22 +0200

From: Rasmus Thomsen <[email-masked]>

* Remove unneccesary `cd "$builddir"`
---
 testing/sniffglue/APKBUILD | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/testing/sniffglue/APKBUILD b/testing/sniffglue/APKBUILD
index 0bf7283d80..f29a6208df 100644
--- a/testing/sniffglue/APKBUILD
+++ b/testing/sniffglue/APKBUILD
@@ -5,7 +5,8 @@ pkgver=0.9.0
 pkgrel=0
 pkgdesc="Secure multithreaded packet sniffer"
 url="https://github.com/kpcyrd/sniffglue"
-arch="x86_64" # limited by cargo pkg
+# !aarch64: https://cloud.drone.io/alpinelinux/aports/10687/3/1
+arch="x86_64 x86 armhf armv7 ppc64le" # limited by cargo
 license="GPL-3.0-or-later"
 makedepends="
 	cargo
@@ -20,12 +21,17 @@ source="
 	"
 
 build() {
-	cd "$builddir"
+	# libring fails to compile otherwise
+	case "$CARCH" in
+		x86)
+			export CFLAGS="$CFLAGS -fno-stack-protector"
+			;;
+	esac
+
 	cargo build --release --locked
 }
 
 check() {
-	cd "$builddir"
 	cargo test --release --locked
 }
 
-- 
2.23.0

---

From: Marian Buschsieweke <[email-masked]>
Date: Mon, 2 Sep 2019 11:59:23 +0200

From: prspkt <[email-masked]>

Signed-off-by: prspkt <[email-masked]>
---
 testing/amule/APKBUILD | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/testing/amule/APKBUILD b/testing/amule/APKBUILD
index 37fb536a3c..1c22cc3223 100644
--- a/testing/amule/APKBUILD
+++ b/testing/amule/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: August Klein <[email-masked]>
 # Maintainer: August Klein <[email-masked]>
 pkgname=amule
-_commit=21c3aa111bc8ff04c876494054580a7ccaa6a3a4
-pkgver=11015
-pkgrel=1
+_commit=314e62e87ff0481d3171f74751aaf0179e518765
+pkgver=11025
+pkgrel=0
 pkgdesc="An eMule-like client for the eD2k and Kademlia networks"
 url="http://www.amule.org"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="bison boost-dev crypto++-dev gd-dev geoip-dev libsm-dev libupnp-dev wxgtk-dev"
+makedepends="bison boost-dev crypto++-dev gd-dev geoip-dev libsm-dev libupnp-dev
+	wxgtk3-dev"
 subpackages="$pkgname-lang $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://repo.or.cz/amule.git/snapshot/$_commit.tar.gz"
 
@@ -33,13 +34,13 @@ build() {
 		--enable-upnp \
 		--enable-ccache \
 		--disable-debug \
-		--with-boost
+		--with-boost \
+		--with-wx-config=wx-config-gtk3
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/charset.alias
 }
 
-sha512sums="7c39aaff50c419197996123a77a9795dfeff302e22d7d3c11bee50d319c7839fb6e22393a13e789ca084ee9fd1748f842348bc7c71085dc318a8e8593f673a3b  amule-11015.tar.gz"
+sha512sums="26be2ce0c504091a6f668832b8dcd2b5b806a8a968e2d6db756be87c1eac7efe9bad587de7708542f21b70008da0fad36278428f62d8c86c6a9ba7db00044675  amule-11025.tar.gz"
-- 
2.23.0