.gitlab-ci.yml

 stages:
   - lint
+  - build
 
-# Make sure master points to the correct upstream commit
-before_script:
-  - >
-    git fetch $CI_MERGE_REQUEST_PROJECT_URL
-    +refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME:refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+variables:
+  GIT_STRATEGY: fetch
+  GIT_DEPTH: "0"
+
+default:
+    # Make sure master points to the correct upstream commit
+    before_script:
+      - >
+        git fetch $CI_MERGE_REQUEST_PROJECT_URL
+        +refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME:refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 lint:
   stage: lint
@@ -18,3 +24,76 @@ lint:
   tags:
     - docker-alpine
     - x86_64
+
+.build:
+  stage: build
+  image: alpinelinux/alpine-gitlab-ci:latest
+  script:
+    - build.sh
+    - cp -ar ~/packages packages/
+    - mkdir -p keys
+    - cp ~/.abuild/*.rsa.pub keys/
+  artifacts:
+    paths:
+      - packages/
+      - keys/
+    expire_in: 1 day
+  only:
+    - merge_requests
+
+build-x86_64:
+  extends: .build
+  artifacts:
+    name: MR${CI_MERGE_REQUEST_ID}_x86_64
+  tags:
+    - docker-alpine
+    - ci-build
+    - x86_64
+
+build-x86:
+  extends: .build
+  image:
+    name: alpinelinux/alpine-gitlab-ci:latest-x86
+    entrypoint: ["linux32", "sh", "-c"]
+  artifacts:
+    name: MR${CI_MERGE_REQUEST_ID}_x86
+  tags:
+    - docker-alpine
+    - ci-build
+    - x86
+
+build-s390x:
+  extends: .build
+  artifacts:
+    name: MR${CI_MERGE_REQUEST_ID}_s390x
+  tags:
+    - docker-alpine
+    - ci-build
+    - s390x
+
+build-ppc64le:
+  extends: .build
+  artifacts:
+    name: MR${CI_MERGE_REQUEST_ID}_ppc64le
+  tags:
+    - docker-alpine
+    - ci-build
+    - ppc64le
+
+build-aarch64:
+  extends: .build
+  artifacts:
+    name: MR${CI_MERGE_REQUEST_ID}_aarch64
+  tags:
+    - docker-alpine
+    - ci-build
+    - aarch64
+
+build-armv7:
+  extends: .build
+  artifacts:
+    name: MR${CI_MERGE_REQUEST_ID}_armv7
+  tags:
+    - docker-alpine
+    - ci-build
+    - armv7

community/6tunnel/APKBUILD

 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=6tunnel
-pkgver=0.12
-pkgrel=1
+pkgver=0.13
+pkgrel=0
 pkgdesc="TCP proxy for non-IPv6 applications"
 url="http://toxygen.net/6tunnel"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 makedepends="automake autoconf"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/wojtekka/$pkgname/archive/$pkgver.tar.gz
-	fix-help.patch
-	add-runit.patch
-	"
-builddir="$srcdir/"$pkgname-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://github.com/wojtekka/6tunnel/archive/$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	autoreconf --install
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/share/6tunnel
-	install -m644 contrib/* "$pkgdir"/usr/share/6tunnel || return 1
+	install -m644 contrib/* "$pkgdir"/usr/share/6tunnel
 }
 
-sha512sums="8d6148fec0d10b4eaad0c7b646a38b1e1f2dd2ca5f4c7b34e99fea67e5dde8a6b8d150a0bca777902dccb468f4ddf78d1fc6e3a73581314492de1ecccbb03e30  6tunnel-0.12.tar.gz
-20e6dbce54287fabdac12969ea63df598c4ed4e8a546b3dab71538ec0a942188ab7d0c91212e78f213f4fff953cf93f2462a1a858e01738ad0fce9d75ead088c  fix-help.patch
-a4544ce649ddc1a2855733116a9320f544d185f8dd04a4b7edd0a86ebc5bc0ef3e19f44841a92bbd3752afd257bb05e6b30f9669f75f8ed0f2ace15c0f44e3da  add-runit.patch"
+sha512sums="6b6f41e8dabd96a7997a467424865ab7d4e96442a7a91247a869959630a1606935d64cb0b2972264333d35b55f590d781a0cf987013bf8d1432b6fa81591df1b  6tunnel-0.13.tar.gz"

community/6tunnel/add-runit.patch

-From: Stuart Cardall <developer@it-offshore.co.uk>
-Date: Fri, 10 Feb 2017 15:26:30 +0000
-Subject: [PATCH] add contrib/runit.run
-
-Adds example run script for service supervision with runit.
-
-Alpine notes:
-* This patch is ported from upstream commit:
-  https://github.com/wojtekka/6tunnel/commit/f800eb1fe5b54ad1022c1bebd2a41a650b86752d
-
-new file mode 100755
-index 0000000..d87789e
---- /dev/null
-+++ b/contrib/runit.run
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+#
-+# example run script for service supervision with runit
-+# http://smarden.org/runit/
-+#
-+# redirect ipv4 port 80 to internal ipv6 port 80 & drop privileges
-+#
-+exec 2>&1
-+exec 6tunnel -u nobody -d -p /run/80.pid 80 a:dead:beef:1 80
-+
-+

community/6tunnel/fix-help.patch

-From: Stuart Cardall <developer@it-offshore.co.uk>
-Date: Fri, 10 Feb 2017 15:26:30 +0000
-Subject: [PATCH] fix help message
-
-Adds -u option to help message.
-
-Alpine notes:
-* This patch is ported from upstream commit:
-  https://github.com/wojtekka/6tunnel/commit/f800eb1fe5b54ad1022c1bebd2a41a650b86752d
-
-index c33865a..b8d551e 100644
---- a/6tunnel.c
-+++ b/6tunnel.c
-@@ -460,6 +460,7 @@
- "  -d  don't detach\n"
- "  -f  force tunneling (even if remotehost isn't resolvable)\n"
- "  -h  print hex dump of packets\n"
-+"  -u  change UID and GID after bind()\n"
- "  -i  act like irc proxy and ask for password\n"
- "  -I  send specified password to the irc server\n"
- "  -l  bind to specified address\n"

community/a2ps/APKBUILD

+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=a2ps
+pkgver=4.14
+pkgrel=8
+pkgdesc="a2ps is an Any to PostScript filter"
+url="https://www.gnu.org/software/a2ps/"
+arch="all"
+license="GPL-3.0"
+depends="ghostscript imagemagick perl"
+makedepends="gperf autoconf automake libtool"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+	$pkgname-4.13c-fnmatch-replacement.patch
+	$pkgname-4.13c-emacs.patch
+	$pkgname-4.13-manpage-chmod.patch
+	$pkgname-$pkgver-check-mempcpy.patch
+	$pkgname-$pkgver-fix-stpcpy-proto.patch
+	fix-redeclarations.patch
+	a2ps-automake-1.12.patch
+	automake.patch
+	CVE-2001-1593.patch
+	CVE-2014-0466.patch
+	"
+
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	sed -i -e 's/__mempcpy/mempcpy/g' lib/strftime.c src/regex.c \
+		|| return 1
+	rm -f aclocal.m4 */aclocal.m4
+	libtoolize --force --copy || return 1
+	aclocal -I m4 && automake --add-missing && autoreconf -I m4 || return 1
+}
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc/a2ps \
+		--includedir=/usr/include \
+		--disable-nls \
+		|| return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	sed -i "s:^countdictstack: \0:" "$pkgdir"/usr/bin/psset || return 1
+}
+
+md5sums="781ac3d9b213fa3e1ed0d79f986dc8c7  a2ps-4.14.tar.gz
+93011b58e9f20a7fafa31287a51884a4  a2ps-4.13c-fnmatch-replacement.patch
+2e493d0bc00d71eb3e8a9b6febc52b69  a2ps-4.13c-emacs.patch
+09cc5ed4d3d8ff1b2103e519191e8286  a2ps-4.13-manpage-chmod.patch
+42aa39b74f6da8cf6e94185c4fc3e601  a2ps-4.14-check-mempcpy.patch
+4b4fbc19a6b79fa64df7e26945fcdcf9  a2ps-4.14-fix-stpcpy-proto.patch
+2161408fcb532ac22dba95eb6e60ace6  fix-redeclarations.patch
+72e8f0a6cd234945df92549d8a5451f8  a2ps-automake-1.12.patch
+868217fde7f9a4c1350c99431b0c1671  automake.patch
+fa3c5f09f47619fbee347256e940fcce  CVE-2001-1593.patch
+f1c0a955f604ccf7d592b92d67c7d255  CVE-2014-0466.patch"
+sha256sums="f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4  a2ps-4.14.tar.gz
+5d1b8a8791fa2a36c23f43ef153a724cce1f8eec8fb92ab886f52fae7f8f3be3  a2ps-4.13c-fnmatch-replacement.patch
+943739a788db47f10942477754f42c8c9b22cdaad4463bea4103c31a330de76a  a2ps-4.13c-emacs.patch
+032c4698c1dabb1a72978b9aefef7a8895098fb5a7e46e81d861fedfef3b11ab  a2ps-4.13-manpage-chmod.patch
+7ec2164888d1621a8406d431ed3accd137ec8f92e0ca885175bc1c17010519a1  a2ps-4.14-check-mempcpy.patch
+547a50e7bd577222fac71ce1ab7fd25db2096a8874ae667bd09e118fb39bf5a9  a2ps-4.14-fix-stpcpy-proto.patch
+49532bc45d91f198791063f5c0438c163399f8dd8e497e660b2099f24c8914c1  fix-redeclarations.patch
+167a4639b008c123b54fe627a6fcbb1db12c37023f5c37a9994f2eeb212b1d55  a2ps-automake-1.12.patch
+ded40b73e44729ebf3cf4777eaea92915dde0429ab8a137ca53358333474f515  automake.patch
+fbfeb3d421e81540839e25f7a3efdab977e86e3c5748442eefe4560c85816a12  CVE-2001-1593.patch
+458601076b6e3cc241d121602cc455d2d3ae5fce47eeb57dd56c9acb9995db02  CVE-2014-0466.patch"
+sha512sums="fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f  a2ps-4.14.tar.gz
+5509ae1277ff1f1f487fb106ed6673eb67fa7d1531a35bfa087f78a0bdb4dc0bf38c69b7fab95161a19406fc1acaef09b22b8a05ef603c6d43a8d7a8c3077b56  a2ps-4.13c-fnmatch-replacement.patch
+0ef1a215ecb757e249c4d4bdf9a789419c6cd433f7e330783fef13a0158c57c5c5e6a22526d8abcca0919bdb1dc08337869fdd3f0fe192284ca087eafad322a3  a2ps-4.13c-emacs.patch
+f3dc2698ee989928b3179b65b01bf12d828f4428bd860f6f1a3811daaa9d6256b353c2acb5cd4bf392dd89b040f8e9c15420ab4373f3d54b8b60652aaf23f864  a2ps-4.13-manpage-chmod.patch
+6835f5e9205cb549da52c4a3c13aad601c9e9d294f0f35ebe4d8cc6f8bd8b5f6fe77b857f8c92f552a43c02eb6de812021c078ce597c319bde176f0e91cd167b  a2ps-4.14-check-mempcpy.patch
+605385c355b15f2f8142b4a05390ce131d3f2b7a8d56bf37b70457db64c0ce458778daf05ef015c9059482483907a629f12d210bcaa91cc007af4f708b66b765  a2ps-4.14-fix-stpcpy-proto.patch
+08382d49982190779f3070e06af773c0dd730e8f1a81310a537c149a438954e5c4b360c72a908fb50b1fb95fcf4b556c28ffd90932bae81140cab30b3419f364  fix-redeclarations.patch
+422dba4b43fb14d68263361dd917a866a9ff033d4a5f60faf668385b80093f7f3f6025de149810f9287790acc07ed5f5feb15c7b23ff083ab74eb21c22bf0f05  a2ps-automake-1.12.patch
+4336ad6b40ecfd16ac01304a4d27b7715e5c19ef3777b57f0ea152fa1a57db476605c330b5c0091dfbf95705e4345806c8393e6c3f3e89d528bd94cc91a9beb9  automake.patch
+22b9e23d74a914a3332615b911c655cf5e63ce445073e2cd7faa353c16b3e9c813cc4f3b20db68795f09da8b5a8952effe4727e6d1a429699ad66487bd2cab32  CVE-2001-1593.patch
+1816c8c98c8902801c5376ed86821b60d67c18fe9f5534936e3fa9ffaae01f1b1f5b4cf84fa176ba30ee7350737fffa3c2e4b60cf03cb9e64bc93487a6448bb1  CVE-2014-0466.patch"

community/abiword/APKBUILD

@@ -4,12 +4,12 @@ pkgver=3.0.2
 pkgrel=4
 pkgdesc="A fully-featured word processor"
 url="http://www.abisource.com"
-arch="all"
+arch="all !s390x"
 options="!check"  # Test suite requires valgrind, etc
 license="GPL-2.0-or-later"
 makedepends="gtk+3.0-dev readline-dev libgsf-dev enchant-dev fribidi-dev wv-dev
 	popt-dev libjpeg-turbo-dev librsvg-dev bzip2-dev goffice-dev pcre-dev
-	libxslt-dev"
+	libxslt-dev perl"
 
 # openxml plugin
 makedepends="$makedepends boost-dev"
@@ -29,13 +29,10 @@ for _i in $_plugins; do
 	subpackages="$subpackages $pkgname-plugin-$_i:_plugin"
 done
 
-source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz
+source="http://www.abisource.com/downloads/abiword/$pkgver/source/abiword-$pkgver.tar.gz
 	fix-black-drawing-regression.patch"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -47,12 +44,11 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 _plugin() {
-	local plugin="${subpkgname#${pkgname}-plugin-}"
+	local plugin="${subpkgname#$pkgname-plugin-}"
 	pkgdesc="Abiword $plugin plugin"
 	local dir="usr/lib/abiword-${pkgver%.*}/plugins"
 	mkdir -p "$subpkgdir"/$dir

community/acme.sh/APKBUILD

 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=acme.sh
-pkgver=2.8.2
+pkgver=2.8.3
 pkgrel=0
 pkgdesc="An ACME Shell script, an acme client alternative to certbot"
 options="!check" # No testsuite
@@ -23,4 +23,4 @@ package() {
 	ln -s /usr/share/acme.sh/acme.sh "$pkgdir"/usr/bin/acme.sh
 }
 
-sha512sums="d51824724dc207b34ba5a3a85a7ceb2674a20cb6bf0c1eeab215bf75d239eacbf8910e8efeb8d5fd0feb38eac928f226a9ad934b2a6084308e5c11f593803ff1  acme.sh-2.8.2.tar.gz"
+sha512sums="15e147d0f07af91eab7274df50e274ae41a411c30ee7f6ebc8bcbcb601b66094fc1d8126bfb816caa27dbeb5222da20a25d1c79227bc70ddb6b5d0ce0dcb389e  acme.sh-2.8.3.tar.gz"

community/adwaita-icon-theme/APKBUILD

+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=adwaita-icon-theme
+pkgver=3.34.0
+pkgrel=0
+pkgdesc="Adwaita icon theme"
+url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
+arch="all !s390x"
+options="!check"  # Icons only, no binaries.
+license="LGPL-3.0-or-later OR CC-BY-SA-3.0"
+depends="librsvg"
+makedepends="intltool gtk+2.0 gtk+3.0 icon-naming-utils"
+subpackages="$pkgname-dev"
+source="https://download.gnome.org/sources/adwaita-icon-theme/${pkgver%.*}/adwaita-icon-theme-$pkgver.tar.xz"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install pkgconfigdir=/usr/lib/pkgconfig
+}
+
+sha512sums="fc47e9448f498710fb9abf4c839918630f64cee189a0dec60672784bfdf6d350e6fc06d13732fb206380523507d1d3c3ca7609f68438d4b5b76d888b172d3072  adwaita-icon-theme-3.34.0.tar.xz"

community/afl/APKBUILD

 # Contributor: Marian <marian.buschsieweke@ovgu.de>
 # Maintainer: Marian <marian.buschsieweke@ovgu.de>
 pkgname=afl
-pkgver=2.52b
-pkgrel=2
+pkgver=2.56b
+pkgrel=0
 pkgdesc="Fuzzer relying on genetic algorithms instead of brute force"
 url="http://lcamtuf.coredump.cx/afl/"
 arch="all !x86"
@@ -10,13 +10,15 @@ license="Apache-2.0"
 options="!check" # no tests provided
 depends="clang llvm"
 makedepends="clang-dev llvm-dev"
-subpackages="$pkgname-doc"
-source="http://lcamtuf.coredump.cx/$pkgname/releases/$pkgname-$pkgver.tgz"
+subpackages="$pkgname-doc $pkgname-clang:_clang $pkgname-gcc:_gcc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/google/AFL/archive/v$pkgver.tar.gz"
+builddir="$srcdir/AFL-$pkgver"
+
+CC=clang
 
 build() {
-	local dir; for dir in "$builddir" "$builddir"/llvm_mode; do
-		make AFL_NO_X86=1 -C "$dir" PREFIX=/usr CC=clang
-	done
+	make AFL_NO_X86=1 PREFIX=/usr
+	make -C llvm_mode AFL_NO_X86=1 PREFIX=/usr
 }
 
 package() {
@@ -24,12 +26,6 @@ package() {
 	install -Dm644 llvm_mode/README.llvm \
 		"$pkgdir"/usr/share/doc/$pkgname/README.llvm_mode
 
-	# Only install the llvm_mode of afl. Even though this is still
-	# considered experimental it is faster than the gcc mode and
-	# portable to non-x86 platforms.
-	rm -f "$pkgdir/usr/bin/afl-clang" "$pkgdir/usr/bin/afl-clang++" \
-		"$pkgdir/usr/bin/afl-gcc" "$pkgdir/usr/bin/afl-g++"
-
 	# small_exec.elf is an Intel binary which causes an error during
 	# the strip() process on non Intel plattforms.
 	case "$CARCH" in
@@ -38,4 +34,24 @@ package() {
 	esac
 }
 
-sha512sums="30d4526440cff109ef2a014278f52a04b1b33560b6ab7d7f59e1516655858ffb36dac81963d2d8f214984776742ca9a7942c27c8fb61f7eb70b5b35cd029008f  afl-2.52b.tgz"
+_clang() {
+	description="$pkgdesc - CLang instrumention support"
+	depends="clang"
+
+	mkdir -p "$subpkgdir"/usr/bin