diff options
25 files changed, 592 insertions, 28 deletions
diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 8303e6d75..fdf8be1e2 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -10,7 +10,7 @@ url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" -makedepends_build="groff perl" +makedepends_build="perl" makedepends_host="zlib-dev openssl-dev libssh2-dev" makedepends="$makedepends_build $makedepends_host" source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz" diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index bc7328ea3..9565e76d5 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.6.0.2 +pkgver=2.6.1.0 pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -61,5 +61,4 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } - -sha512sums="915823af0d557fc7a181e088ce319568e62ea4bf743704e498786422c97b991e6b09447c7cff7d7dda520d391773ef4b2fea68e44479c02766966256719bb4c0 execline-2.6.0.2.tar.gz" +sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e execline-2.6.1.0.tar.gz" diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 67df0d1b7..73f5d922b 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -12,7 +12,7 @@ depends="" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz" +source="https://mirrormaster.adelielinux.org/source/upstream/ncurses-$_ver.tgz" builddir="$srcdir"/ncurses-$_ver diff --git a/system/pax-utils/APKBUILD b/system/pax-utils/APKBUILD index 6c121b48a..481a7077e 100644 --- a/system/pax-utils/APKBUILD +++ b/system/pax-utils/APKBUILD @@ -12,7 +12,7 @@ depends="scanelf" makedepends_build="" makedepends_host="linux-headers libcap-dev" makedepends="$makedepends_build $makedepends_host" -source="http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz +source="https://mirrormaster.adelielinux.org/source/upstream/pax-utils-$pkgver.tar.xz fix-eitype.patch" subpackages="$pkgname-doc scanelf:_scanelf" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index c3985d7d3..2c67660c3 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.4.0 +pkgver=1.0.4.1 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 -depends="execline s6 s6-linux-init-common" +_skalibs_version=2.9.2.1 +_s6_version=2.9.2.0 +depends="execline s6>=$_s6_version s6-linux-init-common" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev" subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run" @@ -119,7 +120,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="791e376911c9217adace72c6048a295d4b486fc51c0a73578a40a0b020a735d9444f58e5f49d613e99a81aadd63d016ae60c8b056c49c1b50693a7b054890926 s6-linux-init-1.0.4.0.tar.gz +sha512sums="b5935d87a7fd37d7d1a07c14130325b7b8f7f0b592becbf451c8a310f8a4743b60722f4ca94b5f8d845ca285136cb2cc1406fc8cfddd808cec4a63f55f78565b s6-linux-init-1.0.4.1.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index cc7148513..b56132a15 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc pkgver=0.5.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.1.0 -_s6_version=2.9.0.1 +_skalibs_version=2.9.2.1 +_s6_version=2.9.2.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index e2a601690..4909c3daf 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.9.1.0 +pkgver=2.9.2.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -66,5 +66,4 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } - -sha512sums="190660ed3af678b304230c688d3364a20dfb8d6e944314506bc27c90fc2ccf1062c7b2931df93620dd3b6f5f794d6119d984f28cb2f4562c1abb8609270b90f5 s6-2.9.1.0.tar.gz" +sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz" diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index b60248950..c78339725 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps pkgver=0.0.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" diff --git a/user/gitlab-runner/APKBUILD b/user/gitlab-runner/APKBUILD new file mode 100644 index 000000000..62c9ef24c --- /dev/null +++ b/user/gitlab-runner/APKBUILD @@ -0,0 +1,88 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=gitlab-runner +pkgver=12.1.0 +pkgrel=0 +_testver=91956efe +_branch="${pkgver%.*}" +_branch="${pkgver%%.*}-${_branch#*.}-stable" +pkgdesc="GitLab runner for CI/CD jobs" +url="https://docs.gitlab.com/runner/" +# golang.org packages do not support ppc32 +arch="all !ppc" +pkgusers="gitlab-runner" +pkggroups="gitlab-runner" +options="!check" # Tests require network (git cloning) +license="MIT" +depends="" +makedepends="gcc-go" +subpackages="$pkgname-openrc" +install="$pkgname.pre-install" +source="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$pkgver/gitlab-runner-v$pkgver.tar.gz + https://dev.sick.bike/dist/gitlab-test-$_testver.tar.gz + $pkgname.confd + $pkgname.initd + clean-tmpdirs.patch + disable-crap.patch + gccgo.patch + posix-shell.patch + posix-shell-escape.patch + tests.patch + " +builddir="$srcdir/$pkgname-v$pkgver" + +unpack() { + default_unpack + mkdir "$builddir"/tmp + mv gitlab-test "$builddir"/tmp +} + +_make() { + make "$@" VERSION="$pkgver" REVISION="v$pkgver" BRANCH="$_branch" +} + +build() { + _make build_simple +} + +check() { + # Even with network access and a clean chroot, there are some + # tests that fail: + # + # gitlab.com/gitlab-org/gitlab-runner/commands/helpers : + # TestCacheArchiverAddingUntrackedFiles + # TestCacheArchiverAddingUntrackedUnicodeFiles + + # gitlab.com/gitlab-org/gitlab-runner/executors/shell : + # TestBuildWithGitStrategyFetchWithLFS + # TestBuildWithGitStrategyCloneWithLFS + # TestBuildWithSubmoduleLFSPullsLFSObject + # + # gitlab.com/gitlab-org/gitlab-runner/network (error: use of + # undefined type ‘RegisterRunnerParameters’) + _make test +} + +package() { + install -Dm755 out/binaries/gitlab-runner \ + "$pkgdir"/usr/bin/gitlab-runner + install -dm750 -g gitlab-runner \ + "$pkgdir"/etc/gitlab-runner + install -dm750 -o gitlab-runner -g gitlab-runner \ + "$pkgdir"/var/lib/gitlab-runner + + install -Dm644 "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname + install -Dm755 "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname +} + +sha512sums="1b3f06b7000252631bec04a58474dda826b0fb8d28c4144051a231fba5ef0c5c4b6e0f9ca6bdf9bf9b16b9117cbcf6385eb7bac85bda7b9f99de4300cbcc2066 gitlab-runner-v12.1.0.tar.gz +7bccab81aa1cb88c6a0f83a6d3dfc509e6f9ecb4d0168a5b30cc4e8fdd823294b95fe3633e09757905466f83bb3bf73b1d28fac475dff2dc3164604db4b5b995 gitlab-test-91956efe.tar.gz +f8a0c7e77cd563d7e5b4fb2319181ceab8de44c555cefa4803e985ad3ac6a9fea7bca469d80b28974edcfb65f2095d019bfdf0abd8a3221464276a8d89debc0d gitlab-runner.confd +7f785a65b46919f6a6695e25fdc414ee3204eb9aa1a3735e7884575434af94b20a48f2fe7a1fb787473de23a7bd2d56bc1e9c1fc6b522c6f0c05c47b3d37ab1c gitlab-runner.initd +f17a6b5053933d83d90272be7e98d4abf8d63e8a9c5ad30bbb61a29dbfa1e1b55421ba14be9f7db17cae30b2ff04efcb5da68543a2fa3d0e3e1882bc128cac06 clean-tmpdirs.patch +a32b7a6fa28c7f5bcb505308e615f17de179c15ce8c2ef73078143204195e36d99b18489114ce694c3d821378c1e9ccb26a999a50372b97df163e2512080f07e disable-crap.patch +4bc8f827cbcec212fcb1c5598aaf725138efa9a1de699d6261a65207cca7ef46f441edc02987efdd6d7c6e62943fda8f3f2a5a596d8d33b49fb78ba5df612e8b gccgo.patch +444adec507c5eebcfae268f2f475d29316119f30750f06877a91dff56942d0e4d34ed3011b774b0d7acd59acfe2ddbe75082b3cd5aebd72ddb4703fd083ad301 posix-shell.patch +05d12046448c79a12bf92974089ff97781304083f7bf35abb0b0c0f990c536bd6ff51652e16035a38e4ba5620dcad6e051ecdf4a80eb62039a15371073e525b5 posix-shell-escape.patch +dae9c3f86fdf21bd41202fc2c0bc7dd764078ea9215d7ddbac1f7bc47b0943f7a912250a3006122f74ed50052378ed2c946eefe5c1ce8400cd682b183221025a tests.patch" diff --git a/user/gitlab-runner/clean-tmpdirs.patch b/user/gitlab-runner/clean-tmpdirs.patch new file mode 100644 index 000000000..89efd7a22 --- /dev/null +++ b/user/gitlab-runner/clean-tmpdirs.patch @@ -0,0 +1,21 @@ +Backport of: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1978 + +--- gitlab-runner-v12.1.0/executors/custom/executor.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor.go 2020-04-27 00:19:46.613372635 +0000 +@@ -7,6 +7,7 @@ import ( + "fmt" + "io" + "io/ioutil" ++ "os" + "path/filepath" + + "github.com/sirupsen/logrus" +@@ -216,6 +217,8 @@ func (e *executor) Cleanup() { + return + } + ++ defer os.RemoveAll(e.tempDir) ++ + // nothing to do, as there's no cleanup_script + if e.config.CleanupExec == "" { + return diff --git a/user/gitlab-runner/disable-crap.patch b/user/gitlab-runner/disable-crap.patch new file mode 100644 index 000000000..b375934fc --- /dev/null +++ b/user/gitlab-runner/disable-crap.patch @@ -0,0 +1,21 @@ +--- gitlab-runner-v12.1.0/main.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/main.go 2020-03-04 22:28:31.741878923 +0000 +@@ -11,18 +11,11 @@ import ( + "gitlab.com/gitlab-org/gitlab-runner/helpers/cli" + "gitlab.com/gitlab-org/gitlab-runner/log" + +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/gcs" +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/s3" + _ "gitlab.com/gitlab-org/gitlab-runner/commands" + _ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/custom" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker/machine" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/kubernetes" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/shell" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox" + _ "gitlab.com/gitlab-org/gitlab-runner/shells" + ) + diff --git a/user/gitlab-runner/gccgo.patch b/user/gitlab-runner/gccgo.patch new file mode 100644 index 000000000..6c10893c7 --- /dev/null +++ b/user/gitlab-runner/gccgo.patch @@ -0,0 +1,68 @@ +* does not support -X ldflag: https://github.com/golang/go/issues/25183 +* does not support -cover testflag +* needs CGO to be enabled to build syscall module +* wants -gccgoflags, not -ldflags +* don't test stuff we've disabled + +--- gitlab-runner-v12.1.0/Makefile 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/Makefile 2020-04-26 23:58:20.823352305 +0000 +@@ -4,7 +4,6 @@ export VERSION := $(shell ./ci/version) + REVISION := $(shell git rev-parse --short=8 HEAD || echo unknown) + BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) + BUILT := $(shell date -u +%Y-%m-%dT%H:%M:%S%z) +-export TESTFLAGS ?= -cover + + LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) + export IS_LATEST := +@@ -45,14 +44,11 @@ export PATH := $(GOPATH_BIN):$(PATH) + + # Packages in vendor/ are included in ./... + # https://github.com/golang/go/issues/11659 +-export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/')) ++export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -ve '/vendor/' -e '/cache/gcs' -e '/cache/s3' -e '/docker' -e '/kubernetes' -e '/parallels' -e '/virtualbox')) + +-GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \ +- -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \ +- -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \ +- -s -w ++GO_LDFLAGS ?= -s -w + GO_FILES ?= $(shell find . -name '*.go' | grep -v './.gopath/') +-export CGO_ENABLED ?= 0 ++export CGO_ENABLED ?= 1 + + + # Development Tools +@@ -114,7 +110,7 @@ build: $(GOX) + build_simple: $(GOPATH_SETUP) + # Building $(NAME) in version $(VERSION) for current platform +- go build \ +- -ldflags "$(GO_LDFLAGS)" \ ++ go build -v \ ++ -gccgoflags "$(GO_LDFLAGS)" \ + -o "out/binaries/$(NAME)" \ + $(PKG) + +@@ -123,7 +119,7 @@ build_current: helper-docker build_simpl + check_race_conditions: + @./scripts/check_race_conditions $(OUR_PACKAGES) + +-test: $(PKG_BUILD_DIR) helper-docker ++test: $(PKG_BUILD_DIR) + go test $(OUR_PACKAGES) $(TESTFLAGS) + + parallel_test_prepare: $(GOPATH_SETUP) +--- gitlab-runner-v12.1.0/common/version.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/version.go 2020-04-27 00:57:04.923408027 +0000 +@@ -9,9 +9,9 @@ import ( + ) + + var NAME = "gitlab-runner" +-var VERSION = "development version" +-var REVISION = "HEAD" +-var BRANCH = "HEAD" ++var VERSION = "12.1.0" ++var REVISION = "v12.1.0" ++var BRANCH = "12-1-stable" + var BUILT = "unknown" + + var AppVersion AppVersionInfo diff --git a/user/gitlab-runner/gitlab-runner.confd b/user/gitlab-runner/gitlab-runner.confd new file mode 100644 index 000000000..05a3ac1bb --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.confd @@ -0,0 +1,17 @@ +#export CONFIG_FILE="/etc/gitlab-runner/config.toml" +#command_args="--working-directory /var/lib/gitlab-runner" +#logfile="/var/log/gitlab-runner.log" + +# Time to wait (in seconds) when gracefully stopping before forcefully +# stopping. +#timeout="300" + +# Time to wait (in seconds) when forcefully stopping the server before +# giving up. The runner can be a little slower than the OpenRC default +# of 5 seconds to stop when jobs are running. +#retry="60" + +# Run user service (default): +#command_user="gitlab-runner:gitlab-runner" +# Run system service: +#command_user="root:root" diff --git a/user/gitlab-runner/gitlab-runner.initd b/user/gitlab-runner/gitlab-runner.initd new file mode 100644 index 000000000..a5f65dacb --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.initd @@ -0,0 +1,46 @@ +#!/sbin/openrc-run + +: "${CONFIG_FILE:=/etc/gitlab-runner/config.toml}" +: "${command_args:=--working-directory /var/lib/gitlab-runner}" +: "${logfile:=/var/log/gitlab-runner.log}" +: "${timeout:=300}" +: "${retry:=60}" +: "${command_user:=gitlab-runner:gitlab-runner}" +export CONFIG_FILE + +command="/usr/bin/gitlab-runner" +command_args="run --service ${RC_SVCNAME} ${command_args}" +command_background="true" +start_stop_daemon_args="--stdout ${logfile} --stderr ${logfile}" +pidfile="/run/${RC_SVCNAME}.pid" + +extra_started_commands="reload gracefulstop" +description_reload="Reload configuration" +description_gracefulstop="Finish current jobs, then stop" + +start_pre() { + checkpath -f -m 640 -o "${command_user}" "${logfile}" +} + +reload() { + ebegin "Reloading ${RC_SVCNAME} configuration" + start-stop-daemon --quiet --signal HUP --pidfile "${pidfile}" + eend $? +} + +gracefulstop() { + ebegin "Gracefully stopping ${RC_SVCNAME}" + mark_service_stopping "${RC_SERVICE}" + start-stop-daemon --quiet --progress --stop --pidfile "${pidfile}" \ + --signal QUIT --retry "${timeout}" + if eend $?; then + mark_service_stopped "${RC_SVCNAME}" + else + eerror "${RC_SVCNAME} timed out, forcefully stopping" + if stop; then + mark_service_stopped "${RC_SVCNAME}" + else + return 1 + fi + fi +} diff --git a/user/gitlab-runner/gitlab-runner.pre-install b/user/gitlab-runner/gitlab-runner.pre-install new file mode 100644 index 000000000..9ef046f29 --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r gitlab-runner 2>/dev/null +useradd -c gitlab-runner -s /sbin/nologin -g gitlab-runner \ + -d /var/lib/gitlab-runner -r gitlab-runner 2>/dev/null + +exit 0 diff --git a/user/gitlab-runner/posix-shell-escape.patch b/user/gitlab-runner/posix-shell-escape.patch new file mode 100644 index 000000000..b454141ed --- /dev/null +++ b/user/gitlab-runner/posix-shell-escape.patch @@ -0,0 +1,139 @@ +--- gitlab-runner-v12.1.0/helpers/shell_escape.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape.go 2020-04-26 23:12:59.813309281 +0000 +@@ -4,7 +4,6 @@ package helpers + + import ( + "bytes" +- "encoding/hex" + "strings" + ) + +@@ -13,35 +12,10 @@ import ( + */ + + const ( +- ACK = 6 +- TAB = 9 +- LF = 10 +- CR = 13 +- US = 31 +- SPACE = 32 +- AMPERSTAND = 38 + SINGLE_QUOTE = 39 +- PLUS = 43 +- NINE = 57 +- QUESTION = 63 +- LOWERCASE_Z = 90 +- OPEN_BRACKET = 91 + BACKSLASH = 92 +- UNDERSCORE = 95 +- CLOSE_BRACKET = 93 +- BACKTICK = 96 +- TILDA = 126 +- DEL = 127 + ) + +-// ShellEscape is taken from https://github.com/solidsnack/shell-escape/blob/master/Text/ShellEscape/Bash.hs +-/* +-A Bash escaped string. The strings are wrapped in @$\'...\'@ if any +-bytes within them must be escaped; otherwise, they are left as is. +-Newlines and other control characters are represented as ANSI escape +-sequences. High bytes are represented as hex codes. Thus Bash escaped +-strings will always fit on one line and never contain non-ASCII bytes. +-*/ + func ShellEscape(str string) string { + if str == "" { + return "''" +@@ -50,85 +24,20 @@ func ShellEscape(str string) string { + out := bytes.NewBuffer(make([]byte, 0, len(str)*2)) + i := 0 + l := len(in) +- escape := false +- +- hex := func(char byte) { +- escape = true +- +- data := []byte{BACKSLASH, 'x', 0, 0} +- hex.Encode(data[2:], []byte{char}) +- out.Write(data) +- } +- +- backslash := func(char byte) { +- escape = true +- out.Write([]byte{BACKSLASH, char}) +- } +- +- escaped := func(str string) { +- escape = true +- out.WriteString(str) +- } +- +- quoted := func(char byte) { +- escape = true +- out.WriteByte(char) +- } +- +- literal := func(char byte) { +- out.WriteByte(char) +- } + ++ out.WriteByte(SINGLE_QUOTE) + for i < l { + char := in[i] +- switch { +- case char == TAB: +- escaped(`\t`) +- case char == LF: +- escaped(`\n`) +- case char == CR: +- escaped(`\r`) +- case char <= US: +- hex(char) +- case char <= AMPERSTAND: +- quoted(char) +- case char == SINGLE_QUOTE: +- backslash(char) +- case char <= PLUS: +- quoted(char) +- case char <= NINE: +- literal(char) +- case char <= QUESTION: +- quoted(char) +- case char <= LOWERCASE_Z: +- literal(char) +- case char == OPEN_BRACKET: +- quoted(char) +- case char == BACKSLASH: +- backslash(char) +- case char <= CLOSE_BRACKET: +- quoted(char) +- case char == UNDERSCORE: +- literal(char) +- case char <= BACKTICK: +- quoted(char) +- case char <= TILDA: +- quoted(char) +- case char == DEL: +- hex(char) +- default: +- hex(char) ++ if (char == SINGLE_QUOTE) { ++ out.Write([]byte{SINGLE_QUOTE, BACKSLASH, SINGLE_QUOTE, SINGLE_QUOTE}) ++ } else { ++ out.WriteByte(char) + } + i++ + } ++ out.WriteByte(SINGLE_QUOTE) + +- outStr := out.String() +- +- if escape { +- outStr = "$'" + outStr + "'" +- } +- +- return outStr ++ return out.String() + } + + func ToBackslash(path string) string { diff --git a/user/gitlab-runner/posix-shell.patch b/user/gitlab-runner/posix-shell.patch new file mode 100644 index 000000000..6169c3ecc --- /dev/null +++ b/user/gitlab-runner/posix-shell.patch @@ -0,0 +1,30 @@ +--- gitlab-runner-v12.1.0/shells/bash.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash.go 2020-04-26 23:07:57.303304498 +0000 +@@ -102,12 +102,12 @@ func (b *BashWriter) Variable(variable c + } + + func (b *BashWriter) IfDirectory(path string) { +- b.Line(fmt.Sprintf("if [[ -d %q ]]; then", path)) ++ b.Line(fmt.Sprintf("if [ -d %q ]; then", path)) + b.Indent() + } + + func (b *BashWriter) IfFile(path string) { +- b.Line(fmt.Sprintf("if [[ -e %q ]]; then", path)) ++ b.Line(fmt.Sprintf("if [ -e %q ]; then", path)) + b.Indent() + } + +@@ -200,9 +200,10 @@ func (b *BashWriter) Finish(trace bool) + io.WriteString(w, "set -o xtrace\n") + } + +- io.WriteString(w, "set -eo pipefail\n") ++ io.WriteString(w, "set -e\n") + io.WriteString(w, "set +o noclobber\n") +- io.WriteString(w, ": | eval "+helpers.ShellEscape(b.String())+"\n") ++ io.WriteString(w, "(\nexec </dev/null\n") ++ io.WriteString(w, b.String() + "\n)\n") + io.WriteString(w, "exit 0\n") + w.Flush() + return buffer.String() diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch new file mode 100644 index 000000000..1aff6c653 --- /dev/null +++ b/user/gitlab-runner/tests.patch @@ -0,0 +1,63 @@ +--- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000 +@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes + writer := &BashWriter{} + writer.Command("foo", "x&(y)") + +- assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String()) ++ assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String()) + } + + func TestBash_IfCmdShellEscapes(t *testing.T) { + writer := &BashWriter{} + writer.IfCmd("foo", "x&(y)") + +- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) ++ assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) + } +--- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000 +@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000 +@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000 +@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) { + in string + out string + }{ +- {"standard string", "$'standard string'"}, +- {"+\t\n\r&", "$'+\\t\\n\\r&'"}, ++ {"standard string", "'standard string'"}, ++ {"+\t\n\r&", "'+\t\n\r&'"}, + {"", "''"}, + } + +--- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000 +@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) { + }, + jobTimeout: 3600, + waitForTerminalTimeout: time.Hour, +- expectedErr: "terminal disconnected by system signal: interrupt", ++ expectedErr: "terminal disconnected by system signal: Interrupt", + }, + { + name: "Terminal Disconnect", diff --git a/system/groff/APKBUILD b/user/groff/APKBUILD index 1045af000..1045af000 100644 --- a/system/groff/APKBUILD +++ b/user/groff/APKBUILD diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index 0e09db7af..065576966 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -6,7 +6,7 @@ _pkgname=llvm pkgver=8.0.1 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" arch="all" options="!checkroot !dbg" @@ -25,6 +25,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l more-secure-plt.patch even-more-secure-plt.patch python3-test.patch + scc-insertion.patch " builddir="$srcdir/$_pkgname-$pkgver.src" @@ -233,4 +234,5 @@ caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60c e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch 7ba7f5b396e1afb49ea53fdc16729f0709fbba88de433cc8a8e2f751d13733011d4121318f68d7f8a16a6c57c3a1bee727cc3e0da0f5c6cae38eff70d3a539cf more-secure-plt.patch deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch -53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch" +53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch +4422a83ea953a6b30cb447a448d246956abd6b0cbd2451247e5f2c41318b2c0d18c7b6781155ea40a5558bbd66e9e1482cec0875d95776545fd0d87356b5e4bd scc-insertion.patch" diff --git a/user/llvm8/scc-insertion.patch b/user/llvm8/scc-insertion.patch new file mode 100644 index 000000000..b2d7d511a --- /dev/null +++ b/user/llvm8/scc-insertion.patch @@ -0,0 +1,33 @@ +From f7e9f4f4c50245d10ca9869a9f8f3d431dfb6948 Mon Sep 17 00:00:00 2001 +From: Warren Ristow <warren_ristow@playstation.sony.com> +Date: Tue, 14 Jan 2020 10:30:24 -0800 +Subject: [PATCH] SCC: Allow ReplaceNode to safely support insertion + +If scc_iterator::ReplaceNode is inserting a new entry in the map, +rather than replacing an existing entry, the possibility of growing +the map could cause a failure. This change safely implements the +insertion. + +Reviewed By: probinson + +Differential Revision: https://reviews.llvm.org/D72469 +--- + include/llvm/ADT/SCCIterator.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h +index eb1a5d0938cf..1e642b9f75d3 100644 +--- a/include/llvm/ADT/SCCIterator.h ++++ b/include/llvm/ADT/SCCIterator.h +@@ -134,7 +134,10 @@ class scc_iterator : public iterator_facade_base< + /// has been deleted, and \c New is to be used in its place. + void ReplaceNode(NodeRef Old, NodeRef New) { + assert(nodeVisitNumbers.count(Old) && "Old not in scc_iterator?"); +- nodeVisitNumbers[New] = nodeVisitNumbers[Old]; ++ // Do the assignment in two steps, in case 'New' is not yet in the map, and ++ // inserting it causes the map to grow. ++ auto tempVal = nodeVisitNumbers[Old]; ++ nodeVisitNumbers[New] = tempVal; + nodeVisitNumbers.erase(Old); + } + }; diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 45b92dbc8..9be7d7c68 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="Public-Domain" options="suid !check" # suid programs (qmail-queue); no test suite depends="execline s6 s6-networking" -makedepends="utmps-dev" +makedepends="groff utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" provider_priority=1 provides="sendmail" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index b738b4c16..01a984414 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.2 +pkgver=2.2.2.4 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ed7df36757780201ccfc0c35a4ab1f6eab16f9fd8a23a6c739a469b9b82862dbb60823748e82c4c902fac835a801f3f0ab0f3d90f20628d6ac8bf744a4fb44a2 s6-portable-utils-2.2.2.2.tar.gz" +sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index adac93a71..262a7f530 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 pkgver=4.8.7 -pkgrel=0 +pkgrel=1 pkgdesc="Mathematical theorem prover" url=" " arch="all" @@ -10,9 +10,15 @@ license="MIT" depends="" makedepends="gmp-dev python3-dev cmd:which" subpackages="$pkgname-dev py3-$pkgname:py3:noarch" -source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz + _trailing_zeros32.patch + " builddir="$srcdir/z3-z3-$pkgver" +case "$CARCH" in +pmmx) options="$options textrels";; +esac + build() { PYTHON=python3 ./configure \ --prefix=/usr \ @@ -37,4 +43,5 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz" +sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz +6cf6ee35b23f9ef9fe879369a1900c82d38836f245e927f0f80eb6361e3340c32c8b94f00b1cb69eb8cad1626675b8f7b9bdaecffa5072cd5e8b12ecf1e7e3c0 _trailing_zeros32.patch" diff --git a/user/z3/_trailing_zeros32.patch b/user/z3/_trailing_zeros32.patch new file mode 100644 index 000000000..05b977f51 --- /dev/null +++ b/user/z3/_trailing_zeros32.patch @@ -0,0 +1,23 @@ +From e212159f4e941c78fc03239e0884f2f0454f581f Mon Sep 17 00:00:00 2001 +From: Nikolaj Bjorner <nbjorner@microsoft.com> +Date: Wed, 20 Nov 2019 15:01:04 -0800 +Subject: [PATCH] fix #2727 + +Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> +--- + src/util/mpz.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp +index a8190df1b0..9c2d3d5ffb 100644 +--- a/src/util/mpz.cpp ++++ b/src/util/mpz.cpp +@@ -72,6 +72,8 @@ inline uint64_t _trailing_zeros64(uint64_t x) { + + #if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64) + // _trailing_zeros32 already defined using intrinsics ++#elif defined(__GNUC__) ++// _trailing_zeros32 already defined using intrinsics + #else + inline uint32_t _trailing_zeros32(uint32_t x) { + uint32_t r = 0; |