diff options
42 files changed, 702 insertions, 149 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 1ec934da1..f3c5bef69 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -3,7 +3,7 @@ pkgname=abuild pkgver=3.4.2 pkgrel=0 pkgdesc="Script to build APK packages" -url="https://code.foxkit.us/adelie/abuild" +url="https://git.adelielinux.org/adelie/abuild" arch="all" options="suid !check" license="GPL-2.0-only" diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index cbbf3ceaf..d664340e0 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -1,28 +1,32 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=apk-tools -pkgver=2.10.5 +pkgver=2.12.0 pkgrel=0 pkgdesc="Alpine Package Keeper - package manager" -url="https://git.alpinelinux.org/cgit/apk-tools/" +url="https://git.adelielinux.org/adelie/apk-tools" arch="all" license="GPL-2.0-only" depends="ca-certificates" makedepends_build="" makedepends_host="zlib-dev openssl openssl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" -subpackages="$pkgname-static" -source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz - dash.patch - pmmx.patch +subpackages="$pkgname-dev $pkgname-static $pkgname-doc" +source="https://dev.sick.bike/dist/$pkgname-v$pkgver+adelie.tar.gz + https://dev.sick.bike/dist/$pkgname-help-v$pkgver.tar.gz + apk.zsh-completion + s6-linux-init.patch " +builddir="$srcdir/$pkgname-v$pkgver" prepare() { default_prepare sed -i -e 's:-Werror::' Make.rules - echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk - echo "LUAAPK=" >> config.mk - echo "export LUAAPK" >> config.mk + cat >config.mk <<-EOF + FULL_VERSION=$pkgver-r$pkgrel + LUA=no + export LUA + EOF } build() { @@ -40,13 +44,16 @@ package() { "$pkgdir"/var/cache/misc \ "$pkgdir"/etc/apk/keys \ "$pkgdir"/etc/apk/protected_paths.d - # the shipped README is empty - rm -r "$pkgdir"/usr/share/ + # the shipped README is not useful + rm -r "$pkgdir"/usr/share/doc + + install -Dm644 "$srcdir"/apk.zsh-completion \ + "$pkgdir"/usr/share/zsh/site-functions/_apk } static() { pkgdesc="Alpine Package Keeper - static binary" - install -Dm755 "$srcdir"/$pkgname-$pkgver/src/apk.static \ + install -Dm755 "$builddir"/src/apk.static \ "$subpkgdir"/sbin/apk.static # Sign the static binary so it can be vefified from distros @@ -64,6 +71,7 @@ static() { "$subpkgdir"/sbin/apk.static } -sha512sums="0f85ec7c734f2ffc671007fa029f3c96eacfb196c45e465e33aa65c32a6fbcd7523153b6441fdf826a5b4d2e66de02d338620474d333c28cb1ce0233f1120495 apk-tools-2.10.5.tar.xz -5892ad7038c942e82b011a64484253a157711ad65cb754b884c2b9b6047dd4693b530b6639f6d8c35aa21f9c293ee01a3f36ead1d148f77a2012053766f75ee2 dash.patch -edff13f21debc227c7448f0ac42744b2655f8f23ea23aefa04db7d2c44e8a91f77227e84ef090e65364f6999b6ee1138c98490530cb6b9b0594b7cfeeef25b61 pmmx.patch" +sha512sums="739cbf487a9184aba56c87448d18acebf357b6eddb4852033cc0cd331fc910d425a5d01f7b0bf109f5cd62f78f10cca96ebcbdb4fa00d197edb90726998e1523 apk-tools-v2.12.0+adelie.tar.gz +b8e6e6e9efe2fc3a900e5fea54ed2f047bbf8917c8c3e470e001865c2169167ce6a273869ba577aceb1a1580b7dd684de115a4d92250786958fa13b9e8abf28b apk-tools-help-v2.12.0.tar.gz +cedda9bf11e0a516c9bf0fd1a239ffa345cdd236419cbd8b10273410610ae7d0f0f61fd36e1e9ccc3bbf32f895508cdca4fb57a0e04f78dd88469b33bf64a32a apk.zsh-completion +f92e2e0c062b71e1e5cf95f0d4997166ccc7f7a5e45af8d1650f5951a1d552d89217c8c60d24f31fa626e8e0675c5e882e6b36ef1af8f7624e54627b22801381 s6-linux-init.patch" diff --git a/system/apk-tools/apk.zsh-completion b/system/apk-tools/apk.zsh-completion new file mode 100644 index 000000000..955d504be --- /dev/null +++ b/system/apk-tools/apk.zsh-completion @@ -0,0 +1,240 @@ +#compdef apk + +function _apk { + + local -a global_opts=( + "(-h --help)"{-h,--help}"[Print help information]" + "(-i --interactive)"{-i,--interactive}"[Ask confirmation before performing certain operations]" + "(-p --root)"{-p,--root}"[Manage file system at ROOT]" + "(-q --quiet)"{-q,--quiet}"[Print less information]" + "(-U --update-cache)"{-U,--update-cache}"[Alias for '--cache-max-age 1']" + "(-v --verbose)"{-v,--verbose}"[Print more information]" + "(-V --version)"{-V,--version}"[Print program version and exit]" + "(-X --repository)"{-X,--repository}"[Specify additional package repository]:repository:_host" + "--allow-untrusted[Install packages with untrusted signature or no signature]" + "--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7)" + "--cache-dir[Temporarily override the cache directory]:directory:_dir_list" + "--cache-max-age[Maximum age for index in cache before it's refreshed]:minutes" + "--force-binary-stdout[Continue even if binary data will be printed to the terminal]" + "--force-broken-world[Continue even if world cannot be satisfied]" + "--force-non-repository[Continue even if packages may be lost on reboot]" + "--force-old-apk[Continue even if packages use unsupported features]" + "--force-overwrite[Overwrite files in other packages]" + "--force-refresh[Do not use cached files]" + "--keys-dir[Override directory of trusted keys]:directory:_dir_list" + "--no-cache[Do not use any local cache path]" + "--no-network[Do not use the network]" + "--no-progress[Disable progress bar even for TTYs]" + "--print-arch[Print default arch and exit]" + "--progress[Show progress]" + "--progress-fd[Write progress to the specified file descriptor]:file descriptor" + "--purge[Delete modified configuration files or uninstalled packages from cache]" + "--repositories-file[Override system repositories]:repository file:_files" + "--wait[Wait to get an exclusive repository lock before failing]:seconds" + ) + + local -a commit_opts=( + "(-s --simulate)"{-s,--simulate}"[Simulate the requested operation without making any changes]" + "--clean-protected[Do not create .apk-new files in configuration directories]" + "--overlay-from-stdin[Read list of overlay files from stdin]" + "--no-scripts[Do not execute any scripts]" + "--no-commit-hooks[Skip pre/post hook scripts]" + "--initramfs-diskless-boot[Enables selected force options, disables commit hooks and more]" + ) + + local -a latest_opt=("(-l --latest)"{-l,--latest}"[Always choose the latest package by version]") + local -a upgrade_opt=("(-u --upgrade)"{-u,--upgrade}"[Upgrade packages and it's dependencies]") + + local context state state_descr line + typeset -A opt_args + local curcontext="$curcontext" + local ret=1 + + function _ccache_apk_world { [[ "$1" -ot /etc/apk/world ]] } + function _ccache_apk_avail { + for i in /etc/apk/cache/APKINDEX.*; do + [[ "$1" -ot "$i" ]] && return + done + } + + function _apk_available_pkgs { + local -a _apk_available_packs + zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail + local IFS=$'\n' + if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then + _apk_available_packs=(${$(/sbin/apk list -a 2>/dev/null)%-[[:digit:][:lower:]._]##-r[[:digit:]]## * \{*\} (*)}) + _store_cache apk_index_packages_available _apk_available_packs + fi + _describe 'available packages' _apk_available_packs + } + + function _apk_installed_pkgs { + local -a _apk_installed_packs + zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world + local IFS=$'\n' + if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then + _apk_installed_packs=(${$(/sbin/apk list -I 2>/dev/null)%-[[:digit:][:lower:]._]##-r[[:digit:]]## * \{*\} (*)}) + _store_cache apk_index_packages_installed _apk_installed_packs + fi + _describe 'installed packages' _apk_installed_packs + } + + function _apk_packages { + _alternative 'repo:available packages:_apk_available_pkgs' 'localpkgs:local packages:_files -g "*.apk"' + } + + function _apk_cache { + local -a cache_subcmds=( + "clean:Remove package files which are no longer necessary" + "download:Fetch package files from the repositories and store them in the cache" + "sync:Clean and Download" + ) + _describe 'subcommand' cache_subcmds + } + + function _apk_subcmds { + local -a cmds=( + "add:Add packages to world and commit changes" + "del:Remove packages from world and commit changes" + "fix:Fix, reinstall or upgrade packages without modifying world" + "update:Update repository indexes" + "upgrade:Install upgrades available from repositories" + "cache:Manage the local package cache" + "info:Give detailed information about packages or repositories" + "list:List packages matching a pattern or other criteria" + "dot:Render dependencies as graphviz graphs" + "policy:Show repository policy for packages" + "index:Create repository index file from packages" + "fetch:Download packages from global repositories to a local directory" + "manifest:Show checksums of package contents" + "verify:Verify package integrity and signature" + "audit:Audit system for changes" + "stats:Show statistics about repositories and installations" + "version:Compare package versions or perform tests on version strings" + ) + _describe 'subcommand' cmds + } + + local -a completion_spec=($global_opts ':subcommand:_apk_subcmds') + + case ${${words:#-*}[2]} in + (add) + completion_spec+=( + $commit_opts \ + $latest_opt \ + $upgrade_opt \ + "--initdb[Initialize a new package database]" \ + "(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \ + "*:package:_apk_packages" + ) + ;; + (del) + completion_spec+=( + $commit_opts \ + "--rdepeds[Recursively delete all top-level reverse dependencies]" \ + "*:installed package:_apk_installed_pkgs" + ) + ;; + (fix) + completion_spec+=( + $commit_opts \ + "(-d --depends)"{-d,--depends}"[Fix dependencies of specified packages]" \ + "(-r --reinstall)"{-r,--reinstall}"[Reinstall packages]" \ + "(-u --upgrade)"{-u,--upgrade}"[Upgrade if an upgrade is available and does not break dependencies]" \ + "(-x --xattr)"{-x,--xattr}"[Fix packages with broken xattrs]" \ + "--directory-permissions[Reset all directory permissions]" \ + "*:package:_apk_packages" + ) + ;; + (update) completion_spec+=($commit_opts);; + (upgrade) + completion_spec+=( + $commit_opts \ + $latest_opt \ + "(-a --available)"{-a,--available}"[Reset all packages to versions available from current repositories]" \ + "--ignore[Upgrade all other packages than the ones listed]" \ + "--no-self-upgrade[Do not do an early upgrade of the 'apk-tools' package]" \ + "--prune[Remove packages which are no longer available from any configured repository]" \ + "--self-upgrade-only[Only perform a self-upgrade of the 'apk-tools' package]" \ + "*:package:_apk_packages" + ) + ;; + (cache) + completion_spec+=( + $latest_opt \ + $upgrade_opt \ + '2:subcommand:_apk_cache' + ) + ;; + (info) + completion_spec+=( + "(-a --all)"{-a,--all}"[List all information known about the package]" \ + "(-d --description)"{-d,--descripton}"[Print the package description]" \ + "(-e --installed)"{-e,--installed}"[Check package installed status]" \ + "(-L --contents)"{-L,--contents}"[List files included in the package]" \ + "(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \ + "(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \ + "(-r --rdepends)"{-r,--rdepends}"[List reverse dependencies of the package]" \ + "(-R --depends)"{-R,--depends}"[List the dependencies of the package]" \ + "(-s --size)"{-s,--size}"[Print the package's installed size]" \ + "(-w --webpage)"{-w,--webpage}"[Print the URL for the package's upstream webpage]" \ + "(-W --who-owns)"{-W,--who-owns}"[Print the package which owns the specified file]:file:_files" \ + "--license[Print the package SPDX license identifier]" \ + "--replaces[List the other packages for which this package is marked as a replacement]" \ + "--triggers[Print active triggers for the package]" \ + "*:package:_apk_packages" + ) + ;; + (list) + completion_spec+=( + "(-I --installed)"{-I,--installed}"[Consider only installed packages]" \ + "(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \ + "(-a --available)"{-a,--available}"[Consider only available packages]" \ + "(-u --upgradeable)"{-u,--upgradeable}"[Consider only upgradable packages]" \ + "(-o --origin)"{-o,--origin}"[List packages by origin]" \ + "(-d --depends)"{-d,--depends}"[List packages by dependency]" \ + "(-P --providers)"{-P,--providers}"[List packages by provider]" \ + "*:pattern" + ) + ;; + (dot) + completion_spec+=( + "--errors[Consider only packages with errors]" \ + "--installed[Consider only installed packages]" + ) + ;; + (index) + completion_spec+=( + "(-d --description)"{-d,--description}"[Add a description to the index]:description" \ + "(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \ + "(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \ + "--no-warnings[Disable warnings about missing dependencies]" \ + "*:package:_apk_packages" + ) + ;; + (fetch) + completion_spec+=( + "(-l --link)"{-l,--link}"[Create hard links if possible]" \ + "(-o --output)"{-o,--output}"[Where to write the downloaded files]:directory:_dir_list" \ + "(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \ + "(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \ + "--simulate[Simulate the requested operation without making any changes]" \ + "*:package:_apk_packages" + ) + ;; + (manifest) completion_spec+=("*:package:_apk_packages");; + (verify) completion_spec+=("*:package:_apk_packages");; + (audit) completion_spec+=("*:files:_files");; + (version) + completion_spec+=( + "-a[Consider packages from all repository tags]" \ + "-l[Limit to packages with output matching given operand]:operand" \ + "*:package:_apk_packages" + ) + ;; + (policy) completion_spec+=("*:package:_apk_packages");; + esac + + _arguments -C -s $completion_spec && ret=0 + return ret +} diff --git a/system/apk-tools/dash.patch b/system/apk-tools/dash.patch deleted file mode 100644 index 5847d87df..000000000 --- a/system/apk-tools/dash.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- apk-tools-2.10.4/test/solver.sh -+++ apk-tools-2.10.4/test/solver.sh -@@ -10,9 +10,9 @@ TEST_TO_RUN="$@" - fail=0 - pass=0 - for test in ${TEST_TO_RUN:-*.test}; do -- get_block ARGS < $test | xargs $APK_TEST &> .$test.got -+ get_block ARGS < $test | xargs $APK_TEST > .$test.got 2>&1 - -- if ! get_block EXPECT < $test | cmp .$test.got &> /dev/null; then -+ if ! get_block EXPECT < $test | cmp .$test.got > /dev/null 2>&1; then - fail=$((fail+1)) - echo "FAIL: $test" - get_block EXPECT < $test | diff -ru - .$test.got diff --git a/system/apk-tools/pmmx.patch b/system/apk-tools/pmmx.patch deleted file mode 100644 index 4891e5ddd..000000000 --- a/system/apk-tools/pmmx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apk-tools-2.10.1/src/apk_defines.h.old 2018-09-10 08:04:03.000000000 +0000 -+++ apk-tools-2.10.1/src/apk_defines.h 2019-01-04 03:31:41.900000000 +0000 -@@ -93,7 +93,7 @@ - #if defined(__x86_64__) - #define APK_DEFAULT_ARCH "x86_64" - #elif defined(__i386__) --#define APK_DEFAULT_ARCH "x86" -+#define APK_DEFAULT_ARCH "pmmx" - #elif defined(__powerpc__) && !defined(__powerpc64__) - #define APK_DEFAULT_ARCH "ppc" - #elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ diff --git a/system/apk-tools/s6-linux-init.patch b/system/apk-tools/s6-linux-init.patch new file mode 100644 index 000000000..2dc3db924 --- /dev/null +++ b/system/apk-tools/s6-linux-init.patch @@ -0,0 +1,11 @@ +The s6-linux-init-common package has a FIFO which breaks with this. +--- apk-tools-v2.12.0/src/database.c.old 2020-12-30 02:39:04.000000000 +0000 ++++ apk-tools-v2.12.0/src/database.c 2021-01-27 01:47:04.680712750 +0000 +@@ -2592,7 +2592,6 @@ + apk_warning(PKG_VER_FMT": support for packages without embedded " + "checksums will be dropped in apk-tools 3.", + PKG_VER_PRINTF(pkg)); +- ipkg->broken_files = 1; + ctx->missing_checksum = 1; + } + break; diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 9565e76d5..6306ef14f 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.1.0 +pkgver=2.7.0.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.2.1 +_skalibs_version=2.10.0.0 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,4 +61,5 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e execline-2.6.1.0.tar.gz" + +sha512sums="e13e4f37ef95284be5c0f9704baf11fe43a402320e3f5a4f3fce4310e6b93c9f1c0424ed12ff9bebd6e3f82abec138c36491f7477912c9bcb30b3499c4d12441 execline-2.7.0.0.tar.gz" diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index c0c9ac011..36128c5cb 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd -pkgver=0.1.1.2 +pkgver=0.1.3.0 pkgrel=0 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.10.0.0 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc $pkgname-openrc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd" @@ -47,7 +47,7 @@ openrc() { ln -s ../../init.d/mdevd "$rldir/mdevd" } -sha512sums="7d7a25facde1291854f564e805cc2bf7e7e0b06aaa4b631a640cf999007a3ef063ec68e8973559ec69023f40bb6ed24937d4d8510fd697f34a97345a22ede5b5 mdevd-0.1.1.2.tar.gz +sha512sums="8f7b922f6ce8b4dad2dd0e395034f068d950501fe166609da31b5fd7110e938e91e537f6c5e5271043cb24864955aff21f708b80aeea83c9502cce280376c17c mdevd-0.1.3.0.tar.gz b237443837c3d76f8964e2b1a48c2278af7b4a4e7f735da6fc861b7598cbf50017e961e5a4fd1f20dd9cb7dd46f4cdf68144539d909b1f245e110b75c2d849db mdev.conf 31231b28d0b980dda634e8b043a2ee31960493d60c2c9aac8a4f3f68ca1d130342569af2acd0bc04d9d8008b8e234ba949b64d9ec3ff1bded64b4e4f0ce3786b mdevd.run f6f9eebf49c2de6abde9cfb7a9d7b3a6b3afdd3e01ba4155f1b95dfa27e522363059b69cec19305881773d776ffeccf6c1106d537d01780468bd3b9846edb2cc mdevd.initd" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 742ed3ff6..102b23a4f 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.5.1 +pkgver=1.0.6.0 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.3.0 -_s6_version=2.9.2.0 +_skalibs_version=2.10.0.0 +_s6_version=2.10.0.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" @@ -119,7 +119,8 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="c23fff1f5f2433119cbcfceb8e69c2f5542c8377079010891f4147a056d66c23fc08e08ca20ce0236d40386aac187cefd7b38bccb1bd5395d01ef4716c7a7432 s6-linux-init-1.0.5.1.tar.gz + +sha512sums="9312a7719bd1d10c2846aab996a88b7e55b3a805cbae8f270983ded2707f05bfb76cff211e0a4aee76ec62ed0a23d956fcf56daebf8b2decc499c375c768446d s6-linux-init-1.0.6.0.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index ae61b9a1a..bb11c9844 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc -pkgver=0.5.1.4 +pkgver=0.5.2.1 pkgrel=0 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.2.1 -_s6_version=2.9.2.0 +_skalibs_version=2.10.0.0 +_s6_version=2.10.0.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" @@ -66,4 +66,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="3b5f6d8676e77e81f50faed314239cd98ff1094568fe415786a3c2176d8d1c9344a05cdca659482e5d5b573acc04c4ecc0d0793a2fd62ae9b2204cbf6e4c3658 s6-rc-0.5.1.4.tar.gz" +sha512sums="0cbd48e79b7f0e24528b6dda1df6980ca3dcebca7aecf408ad69490aacced4a425b5bcdb1a68b5bfa46199b7a05364a80158db5722cd6506d8d833da125c1fec s6-rc-0.5.2.1.tar.gz" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 4909c3daf..4529f6126 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.2.0 +pkgver=2.10.0.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.2.1 +_skalibs_version=2.10.0.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -66,4 +66,5 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz" + +sha512sums="a3b6603ff7144a41d15e85bbfabc78656a52c0fad18e4195619a9a2c1a84adb84d736bcaa3f082d98dd11d3ac4d4d40988d1206ebaa33a0f9125b29fe380b6f7 s6-2.10.0.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 26d289c27..3188f031d 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -5,13 +5,14 @@ oldv="$2" rm -f /etc/runlevels/default/s6 -if test `apk version -t "$oldv" 2.8` = "<" ; then +if test `apk version -t "$oldv" 2.9` = "<" ; then cat <<EOF * * The s6 package has been upgraded. To complete the upgrade, you need to -* restart the supervision tree - with the following command, run as root: +* restart the supervision tree. If you are using sysvinit, please use the +* following command, run as root: * * s6-svscanctl -t /run/service * @@ -19,6 +20,9 @@ if test `apk version -t "$oldv" 2.8` = "<" ; then * terminals that are listed in the GETTYS variable in /etc/conf.d/gettys * - so please save your work first. * +* If you are using s6-linux-init, which is the default, please just +* reboot your machine as soon as is convenient for you. +* EOF fi diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD index ab9b55f64..d0d8470d3 100644 --- a/system/shimmy/APKBUILD +++ b/system/shimmy/APKBUILD @@ -4,7 +4,7 @@ pkgname=shimmy pkgver=0.6 pkgrel=0 pkgdesc="Utilities for stricter POSIX conformance" -url="https://code.foxkit.us/adelie/shimmy" +url="https://git.adelielinux.org/adelie/shimmy" arch="all" options="!check" # No test suite. license="NCSA" diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index ed0414589..6a09485b8 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.9.3.0 +pkgver=2.10.0.0 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -57,4 +57,5 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11 skalibs-2.9.3.0.tar.gz" + +sha512sums="e8b36388b24ee8066e48d39650a27030374f263f0ee014eaa79f9d71f2b5647dd1a052cc8ffe0d8457fed8fd1b1fc74980c03dd1182a9d0f1efbe044bff99269 skalibs-2.10.0.0.tar.gz" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 5ad968957..1305a61f3 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -9,7 +9,7 @@ if [ "${pkgver%_*}" != "$pkgver" ]; then else _realver=$pkgver fi -pkgrel=1 +pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" url="https://www.sudo.ws/sudo/" arch="all" @@ -24,6 +24,7 @@ source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz fix-cross-compile.patch musl-fix-headers.patch SIGUNUSED.patch + CVE-2021-3156.patch " builddir="$srcdir"/$pkgname-$_realver somask="audit_json.so @@ -42,6 +43,8 @@ somask="audit_json.so # - CVE-2019-14287 # 1.9.0-r0: # - CVE-2019-19232 +# 1.9.2-r2: +# - CVE-2021-3156 build() { ./configure \ @@ -84,4 +87,5 @@ package() { sha512sums="20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21 sudo-1.9.2.tar.gz f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch -2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch" +2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch +7ef329edccbbd26ac55ff58d4c6c470bf2d829ff8ad1388d67b6ea8c2c8284fd362209cf11458787efaa4e301106bd3b49b8b7310c9d222ac3a3483a17b3ec0e CVE-2021-3156.patch" diff --git a/system/sudo/CVE-2021-3156.patch b/system/sudo/CVE-2021-3156.patch new file mode 100644 index 000000000..7cb492d61 --- /dev/null +++ b/system/sudo/CVE-2021-3156.patch @@ -0,0 +1,165 @@ + +# HG changeset patch +# User Todd C. Miller <Todd.Miller@sudo.ws> +# Date 1611416639 25200 +# Node ID 049ad90590be1e5dfb7df2675d2eb3e37c96ab86 +# Parent a97dc92eae6b60ae285055441341d493c17262ff +Fix potential buffer overflow when unescaping backslashes in user_args. +Also, do not try to unescaping backslashes unless in run mode *and* +we are running the command via a shell. +Found by Qualys, this fixes CVE-2021-3156. + +diff -r a97dc92eae6b -r 049ad90590be plugins/sudoers/sudoers.c +--- a/plugins/sudoers/sudoers.c Sat Jan 23 08:43:59 2021 -0700 ++++ b/plugins/sudoers/sudoers.c Sat Jan 23 08:43:59 2021 -0700 +@@ -547,7 +547,7 @@ + + /* If run as root with SUDO_USER set, set sudo_user.pw to that user. */ + /* XXX - causes confusion when root is not listed in sudoers */ +- if (sudo_mode & (MODE_RUN | MODE_EDIT) && prev_user != NULL) { ++ if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT) && prev_user != NULL) { + if (user_uid == 0 && strcmp(prev_user, "root") != 0) { + struct passwd *pw; + +@@ -932,8 +932,8 @@ + if (user_cmnd == NULL) + user_cmnd = NewArgv[0]; + +- if (sudo_mode & (MODE_RUN | MODE_EDIT | MODE_CHECK)) { +- if (ISSET(sudo_mode, MODE_RUN | MODE_CHECK)) { ++ if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT|MODE_CHECK)) { ++ if (!ISSET(sudo_mode, MODE_EDIT)) { + if (def_secure_path && !user_is_exempt()) + path = def_secure_path; + if (!set_perms(PERM_RUNAS)) +@@ -961,7 +961,8 @@ + sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); + debug_return_int(NOT_FOUND_ERROR); + } +- if (ISSET(sudo_mode, MODE_SHELL|MODE_LOGIN_SHELL)) { ++ if (ISSET(sudo_mode, MODE_SHELL|MODE_LOGIN_SHELL) && ++ ISSET(sudo_mode, MODE_RUN)) { + /* + * When running a command via a shell, the sudo front-end + * escapes potential meta chars. We unescape non-spaces +@@ -969,10 +970,22 @@ + */ + for (to = user_args, av = NewArgv + 1; (from = *av); av++) { + while (*from) { +- if (from[0] == '\\' && !isspace((unsigned char)from[1])) ++ if (from[0] == '\\' && from[1] != '\0' && ++ !isspace((unsigned char)from[1])) { + from++; ++ } ++ if (size - (to - user_args) < 1) { ++ sudo_warnx(U_("internal error, %s overflow"), ++ __func__); ++ debug_return_int(NOT_FOUND_ERROR); ++ } + *to++ = *from++; + } ++ if (size - (to - user_args) < 1) { ++ sudo_warnx(U_("internal error, %s overflow"), ++ __func__); ++ debug_return_int(NOT_FOUND_ERROR); ++ } + *to++ = ' '; + } + *--to = '\0'; + + +# HG changeset patch +# User Todd C. Miller <Todd.Miller@sudo.ws> +# Date 1611416639 25200 +# Node ID 9b97f1787804aedccaec63c379053b1a91a0e409 +# Parent 90aba6ba6e03f3bc33b4eabf16358396ed83642d +Reset valid_flags to MODE_NONINTERACTIVE for sudoedit. +This is consistent with how the -e option is handled. +Also reject -H and -P flags for sudoedit as was done in sudo 1.7. +Found by Qualys, this is part of the fix for CVE-2021-3156. + +diff -r 90aba6ba6e03 -r 9b97f1787804 src/parse_args.c +--- a/src/parse_args.c Mon Jan 18 12:30:52 2021 +0100 ++++ b/src/parse_args.c Sat Jan 23 08:43:59 2021 -0700 +@@ -117,7 +117,10 @@ + /* + * Default flags allowed when running a command. + */ +-#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_SHELL) ++#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_PRESERVE_GROUPS|MODE_SHELL) ++#define EDIT_VALID_FLAGS MODE_NONINTERACTIVE ++#define LIST_VALID_FLAGS (MODE_NONINTERACTIVE|MODE_LONG_LIST) ++#define VALIDATE_VALID_FLAGS MODE_NONINTERACTIVE + + /* Option number for the --host long option due to ambiguity of the -h flag. */ + #define OPT_HOSTNAME 256 +@@ -262,6 +265,7 @@ + progname = "sudoedit"; + mode = MODE_EDIT; + sudo_settings[ARG_SUDOEDIT].value = "true"; ++ valid_flags = EDIT_VALID_FLAGS; + } + + /* Load local IP addresses and masks. */ +@@ -365,7 +369,7 @@ + usage_excl(); + mode = MODE_EDIT; + sudo_settings[ARG_SUDOEDIT].value = "true"; +- valid_flags = MODE_NONINTERACTIVE; ++ valid_flags = EDIT_VALID_FLAGS; + break; + case 'g': + assert(optarg != NULL); +@@ -377,6 +381,7 @@ + break; + case 'H': + sudo_settings[ARG_SET_HOME].value = "true"; ++ SET(flags, MODE_RESET_HOME); + break; + case 'h': + if (optarg == NULL) { +@@ -431,7 +436,7 @@ + usage_excl(); + } + mode = MODE_LIST; +- valid_flags = MODE_NONINTERACTIVE|MODE_LONG_LIST; ++ valid_flags = LIST_VALID_FLAGS; + break; + case 'n': + SET(flags, MODE_NONINTERACTIVE); +@@ -439,6 +444,7 @@ + break; + case 'P': + sudo_settings[ARG_PRESERVE_GROUPS].value = "true"; ++ SET(flags, MODE_PRESERVE_GROUPS); + break; + case 'p': + /* An empty prompt is allowed. */ +@@ -505,7 +511,7 @@ + if (mode && mode != MODE_VALIDATE) + usage_excl(); + mode = MODE_VALIDATE; +- valid_flags = MODE_NONINTERACTIVE; ++ valid_flags = VALIDATE_VALID_FLAGS; + break; + case 'V': + if (mode && mode != MODE_VERSION) +@@ -533,7 +539,7 @@ + if (!mode) { + /* Defer -k mode setting until we know whether it is a flag or not */ + if (sudo_settings[ARG_IGNORE_TICKET].value != NULL) { +- if (argc == 0 && !(flags & (MODE_SHELL|MODE_LOGIN_SHELL))) { ++ if (argc == 0 && !ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL)) { + mode = MODE_INVALIDATE; /* -k by itself */ + sudo_settings[ARG_IGNORE_TICKET].value = NULL; + valid_flags = 0; +@@ -601,7 +607,7 @@ + /* + * For shell mode we need to rewrite argv + */ +- if (ISSET(mode, MODE_RUN) && ISSET(flags, MODE_SHELL)) { ++ if (ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL) && ISSET(mode, MODE_RUN)) { + char **av, *cmnd = NULL; + int ac = 1; + + diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD index 67ce05459..b3e912601 100644 --- a/system/sysvinit/APKBUILD +++ b/system/sysvinit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=7 +pkgrel=8 pkgdesc="System V-style init programs" url="https://savannah.nongnu.org/projects/sysvinit" arch="all" @@ -53,7 +53,7 @@ _install_s6_stuff() { mkdir -p -m 0755 "$pkgdir/sbin" "$svcimg/.s6-svscan" "$svcimg/s6-svscan-log" { echo '#!/bin/execlineb -P' ; echo 'false' ; } > "$svcimg/.s6-svscan/crash" chmod 0755 "$svcimg/.s6-svscan/crash" - { echo '#!/bin/execlineb -P' ; echo 's6-svc -X -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish" + { echo '#!/bin/execlineb -P' ; echo 's6-svc -x -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish" chmod 0755 "$svcimg/.s6-svscan/finish" { echo '#!/bin/execlineb -P' ; echo 'redirfd -rnb 0 fifo' ; echo 's6-setuidgid catchlog' ; echo 's6-log -bd3 -- t /run/uncaught-logs' ; } > "$svcimg/s6-svscan-log/run" chmod 0755 "$svcimg/s6-svscan-log/run" @@ -67,9 +67,8 @@ package() { _install_s6_stuff } - sha512sums="0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf sysvinit-2.88dsf.tar.bz2 87668b49690091a227c0384fd2400f1006d24c27cc27a25efa7eba56839ccb1eead00b58ce4b654eab9c0208d68aa2cbb888fd5f2990905845aa9688442a69a0 inittab-2.88 27dfe089660a291cbcba06d8564bad11f7fd7c96629e72c2b005562689dc7d8bb479c760e980590906e98423b991ae0acd048713d3bc372174d55ed894abeb3f sysvinit-2.88-posix-header.patch 3605f88ac3faf7d12bf2269ca5d8625850d53e8583b573ab280fa17066c8e4e5217a0d17b94e47ea67a153ad3b88b433471a77544bd085f01f7d9d353ac16aae utmpx.patch -30fc01b99350d9cb9e2d430f32c357fce571864e618f25fc2c82199f0ae36f3d81316b175af37ff779c0ef26780452877ff0355b3ea47e2ef4eadc823d085e98 s6-svscanboot" +e52fd49daa5abfc583f1973f3428b1e00a71e7136a8bc6418e94b345d53ef250b3b3c3bee389fe37872b26a78d0957ae852e221428f33b2c728dfd3d50b59634 s6-svscanboot" diff --git a/system/sysvinit/s6-svscanboot b/system/sysvinit/s6-svscanboot index 8c134b485..adfdc8044 100644 --- a/system/sysvinit/s6-svscanboot +++ b/system/sysvinit/s6-svscanboot @@ -12,4 +12,4 @@ if redirfd -w 3 /run/s6_ready redirfd -wnb 1 /run/service/s6-svscan-log/fifo fdmove -c 2 1 -s6-svscan -St0 -d3 /run/service +s6-svscan -d3 /run/service diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index c78339725..cd7040973 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.0.3.2 -pkgrel=1 +pkgver=0.1.0.0 +pkgrel=0 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.2.1 +_skalibs_version=2.10.0.0 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" @@ -25,7 +25,8 @@ build() { --enable-static-libc \ --libdir=/usr/lib \ --libexecdir="/lib/$pkgname" \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --enable-libc-includes make } @@ -75,6 +76,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="096615bf4ef4bf73af6128fcdebc0473c736a154fb3f1db89f6f2f2301fdaf2ea183b709991d4591e75e6e8c51426ac03ce602e2d8ce9cd4a5c360bc5b44003e utmps-0.0.3.2.tar.gz +sha512sums="f8d246897690829fccc6e4a4e1bfbbbacd10d337863dacb6966f62cffc166d61c49db1ac83d51aa023e571a5d62f81cf030fa439eb8e3fe742e427764f18adcf utmps-0.1.0.0.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" diff --git a/user/apkvitrine/APKBUILD b/user/apkvitrine/APKBUILD new file mode 100644 index 000000000..5ea799e72 --- /dev/null +++ b/user/apkvitrine/APKBUILD @@ -0,0 +1,22 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=apkvitrine +pkgver=0.2 +pkgrel=0 +pkgdesc="Package tracker and analyzer for APK repositories" +url="https://code.foxkit.us/sroracle/apkvitrine" +arch="noarch" +options="!check" # No test suite. +license="NCSA" +depends="apk-tools~2.12.0 py3-apkkit py3-flup py3-jinja2" +makedepends="" +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz" + +build() { + make +} + +package() { + make install DESTDIR="$pkgdir" +} + +sha512sums="11ec7adfdaaa9c72735a53514457e690f285e415dddeaaefe35024a09f8e01e654628654f2e55c9b67712a42c898e3a864f38d7f60ae8fa435bd64ad04bfc883 apkvitrine-0.2.tar.gz" diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD index c1f6e0b04..0c7fa9cb1 100644 --- a/user/bcnm/APKBUILD +++ b/user/bcnm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bcnm -pkgver=0.0.1.0 +pkgver=0.0.1.2 pkgrel=0 pkgdesc="Client network manager" url="https://www.skarnet.org/software/bcnm/" @@ -9,7 +9,7 @@ arch="all" options="!check" # No test suite. license="ISC" depends="" -makedepends="skalibs-dev" +makedepends="skalibs-dev>=2.10" subpackages="$pkgname-dev" source="https://www.skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abe37c2629baa3c583734c7f783565c52f376ff553c503b5666e081cce042efa2e4d2a219b4911b23ea1c437f1ab0d9d1a928cc5126d8efb65e2981b86b220e1 bcnm-0.0.1.0.tar.gz" +sha512sums="41c69b4800dc347f12b06010fe6a64391ad18fc35f0171fdcedb7843725dc6308c1d1f0486b10618938f6f98c8ca63eb15567af64e271efffcf255a8b96c3add bcnm-0.0.1.2.tar.gz" diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index 64ac365e5..b7aaceef8 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -5,10 +5,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=dovecot -pkgver=2.3.11.3 +pkgver=2.3.13 _pkgvermajor=2.3 pkgrel=0 -_pigeonholever=0.5.11 +_pigeonholever=0.5.13 _pigeonholevermajor=${_pigeonholever%.*} pkgdesc="IMAP and POP3 server" url="https://www.dovecot.org/" @@ -35,14 +35,17 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz split-protocols.patch default-config.patch ssl-paths.patch + test-file-cache-enomem.patch time64.patch - apop.patch dovecot.logrotate dovecot.initd " _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever" # secfixes: +# 2.3.13-r0: +# - CVE-2020-24386 +# - CVE-2020-25275 # 2.3.11.3-r0: # - CVE-2020-12100 # - CVE-2020-12673 @@ -255,13 +258,13 @@ _submv() { done } -sha512sums="d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb dovecot-2.3.11.3.tar.gz -793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d dovecot-2.3-pigeonhole-0.5.11.tar.gz +sha512sums="758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 dovecot-2.3.13.tar.gz +fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 dovecot-2.3-pigeonhole-0.5.13.tar.gz fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch 0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch 5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f ssl-paths.patch +277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9 test-file-cache-enomem.patch ee2e1916c712db77409567b4ded9c7fb7dfed295e044c19694bc369af3d4a7086caf14e97809531f76b630bc578271af6e5137985b7d4e8d2afb2a71f800912f time64.patch -7831276d17386b204ca3aed7fdd9439f00230aa345b367567133d568c07a92bec80ca7512c20b80f692f7f6809cf4a27398c9915aae763e0c9f641650540a73b apop.patch 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd" diff --git a/user/dovecot/apop.patch b/user/dovecot/apop.patch deleted file mode 100644 index a75c770e5..000000000 --- a/user/dovecot/apop.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d1c5d356f36aaf9c32708cc6960fcaebe1cf6e63 Mon Sep 17 00:00:00 2001 -From: Paul Howarth <paul@city-fan.org> -Date: Sun, 16 Aug 2020 20:32:03 +0100 -Subject: [PATCH] Fix APOP test failure on 32-bit systems - -The challenge timestamp is read as a hex number in mech_apop_auth_initial() -so it should be written as hex, not decimal. - -Also fix compiler warnings for 32-bit architectures. ---- - src/auth/test-mech.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c -index cf05370035..db9f85ccfc 100644 ---- a/src/auth/test-mech.c -+++ b/src/auth/test-mech.c -@@ -192,11 +192,11 @@ static void test_mech_handle_challenge(struct auth_request *request, - } - - static inline const unsigned char * --test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r) -+test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r) - { - string_t *apop_challenge = t_str_new(128); - -- str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(), -+ str_printfa(apop_challenge,"<%lx.%u.%"PRIxTIME_T"", (unsigned long) getpid(), - connect_uid, process_start_time+10); - str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26); - *len_r = apop_challenge->used; -@@ -323,7 +323,7 @@ static void test_mechs(void) - struct test_case *test_case = &tests[running_test]; - const struct mech_module *mech = test_case->mech; - struct auth_request *request; -- const char *testname = t_strdup_printf("auth mech %s %d/%lu", -+ const char *testname = t_strdup_printf("auth mech %s %d/%zu", - mech->mech_name, - running_test+1, - N_ELEMENTS(tests)); diff --git a/user/dovecot/test-file-cache-enomem.patch b/user/dovecot/test-file-cache-enomem.patch new file mode 100644 index 000000000..536b857de --- /dev/null +++ b/user/dovecot/test-file-cache-enomem.patch @@ -0,0 +1,20 @@ +--- a/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000 ++++ b/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000 +@@ -263,7 +263,7 @@ + }; + const char *errstr = + t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: " +- "Cannot allocate memory", page_size); ++ "Out of memory", page_size); + test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0); + test_expect_error_string(errstr); + test_assert(file_cache_set_size(cache, 1024) == -1); +@@ -271,7 +271,7 @@ + + /* same for mremap */ + errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: " +- "Cannot allocate memory", page_size*2); ++ "Out of memory", page_size*2); + test_assert(file_cache_set_size(cache, 1) == 0); + test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0); + test_expect_error_string(errstr); diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index b515cb6ef..ea2f13e15 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -3,7 +3,7 @@ pkgname=gcompat pkgver=1.0.0 pkgrel=0 pkgdesc="The GNU C Library compatibility layer for musl" -url="https://code.foxkit.us/adelie/gcompat" +url="https://git.adelielinux.org/adelie/gcompat" arch="all" options="!check" # No test suite. license="UoI-NCSA" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index bbe467b5d..34e5efe4f 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.23 +pkgver=3.24.24 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -13,7 +13,7 @@ makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev gobject-introspection-dev libepoxy-dev libice-dev libx11-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev pango-dev - tiff-dev zlib-dev" + tiff-dev wayland-dev wayland-protocols libxkbcommon-dev zlib-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" @@ -26,6 +26,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --enable-wayland-backend \ --enable-xkb \ --enable-xinerama \ --enable-xrandr \ @@ -48,4 +49,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="fe3d677f4922b4568ef406c318ac71e26aac22b808d8d42b516d0e142d38dc12bc97d8a903dfe3e819adf491b9437a49f34213bc67219bee92692e40c6ef564e gtk+-3.24.23.tar.xz" +sha512sums="f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520 gtk+-3.24.24.tar.xz" diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD index 2d42c60ff..e36cee7ff 100644 --- a/user/nfs-utils/APKBUILD +++ b/user/nfs-utils/APKBUILD @@ -70,5 +70,5 @@ f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc69 d9d7eeebbe153d3c4784112ed6d50734b5619b3315bb1454f8163de2b78ed8f958029a0e1088de58e9b1b8069184aeab2c8f19af4b957b6be25e4f138960aeac rpc.gssd.initd f3e88038cb040ffcbca76166f4322d37e39da00d144bc0a17aed4467ab10c6e626fcde6c407d0911d135bfab55622ad2e38ed93788b11459c5882ce60577fb45 rpc.idmapd.initd 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b rpc.pipefs.initd -7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac rpc.statd.initd +a0fe91b4d7d288cb4793335c79e715b3726f573674ef29525bdab20c2053d1ae19e53a76852ef038aee0ad24fb18827a4ff333a0a179263b1ba47c9a6e2d337c rpc.statd.initd 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f rpc.svcgssd.initd" diff --git a/user/nfs-utils/rpc.statd.initd b/user/nfs-utils/rpc.statd.initd index ea78b9aef..bd0e9cb8f 100644 --- a/user/nfs-utils/rpc.statd.initd +++ b/user/nfs-utils/rpc.statd.initd @@ -4,7 +4,7 @@ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs -rpc_bin=/sbin/rpc.statd +rpc_bin=/usr/sbin/rpc.statd rpc_pid=/var/run/rpc.statd.pid depend() { diff --git a/user/py3-apkkit/APKBUILD b/user/py3-apkkit/APKBUILD new file mode 100644 index 000000000..a407ba767 --- /dev/null +++ b/user/py3-apkkit/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=py3-apkkit +_pkgname=${pkgname#py3-} +pkgver=0.6.0.1 +pkgrel=0 +pkgdesc="Python library for manipulating and verifying APK packages" +url="https://git.adelielinux.org/adelie/apkkit" +arch="noarch" +options="!check" # No test suite. +license="NCSA" +depends="python3" +makedepends="" +source="https://files.pythonhosted.org/packages/source/a/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" + rm "$pkgdir"/usr/README.rst +} + +sha512sums="ef33047ce765d86872e0b4eb9204ec8741e1bbf3c93257797b2c7a0720bb090a90b83380e5f3194b3788557b9693dd32392e6be8235f82ab2eaf118cba8166e2 apkkit-0.6.0.1.tar.gz" diff --git a/user/py3-flup/APKBUILD b/user/py3-flup/APKBUILD new file mode 100644 index 000000000..c9b0013f7 --- /dev/null +++ b/user/py3-flup/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=py3-flup +_pkgname=${pkgname#py3-} +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Python WSGI module collection" +url="https://www.saddi.com/software/flup/" +arch="noarch" +options="!check" # No test suite. +license="BSD-2-Clause" +depends="python3" +makedepends="" +source="https://files.pythonhosted.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="f165685b39a8539d29d48d0ad3c9c0495f428892b8935545a128730687c658a1e8b74a09c8084dd4a2490b1d26f1382b48c95ba43401171fd46876b068ba2f8e flup-1.0.3.tar.gz" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD index 92e9e59db..482cc18df 100644 --- a/user/qt5-qtwayland/APKBUILD +++ b/user/qt5-qtwayland/APKBUILD @@ -12,6 +12,7 @@ license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-ex depends="" makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools" +install_if="qt5-qtbase~$pkgver wayland" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD index a535b8c7a..383e98045 100644 --- a/user/rpcbind/APKBUILD +++ b/user/rpcbind/APKBUILD @@ -22,7 +22,7 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --bindir=/sbin \ + --sbindir=/sbin \ --enable-warmstarts \ --with-statedir=/var/lib/rpcbind \ --with-rpcuser=rpc \ diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index ef366ef0f..2b593fc90 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.3.2.0 +pkgver=2.3.4.0 pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -59,4 +59,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="c4b833a944e6c99f52283d7c27c4a4937995b99afb1e9a9d601bb20efec7b23e05fb8500b1653c3a1c045811087acd0bc800cebfdd2fb60c6eba2fd85cfd580d s6-dns-2.3.2.0.tar.gz" +sha512sums="dde618c292696fd686b9346273504be82fb82d4f6ee46b4255874bd2411aa6b8199cf13d4a436d7d121b126da0d0021acf3d142f81f23a0ac4cd301906d3df32 s6-dns-2.3.4.0.tar.gz" diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index 62103295d..2a4e8e8d6 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.5.1.2 +pkgver=2.5.1.4 pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -34,4 +34,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="4557148c3e739471a8846d3e0425da826d77ab3b7fc8d6c777d110152343596d17fde37fddcb099b107663138a5447866c3ff00a05f59d034379d26b1e147331 s6-linux-utils-2.5.1.2.tar.gz" +sha512sums="e88ba46b63fc2823e4721c2d87bca128df5a7d44769c09fee19b5cc25bb9be334241262aba13c421c3211dc4dc47ec919f504af81a6f3ccfb80efa357b8b7549 s6-linux-utils-2.5.1.4.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 89ef875b6..bb81a620e 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.3.1.2 +pkgver=2.4.0.0 pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities." url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10 depends="execline" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -62,4 +62,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="292bba150fcf4567073690411caebb66b407dbac20dfcc07f8a79d55962ef07f1fcfcf25bac21734605bc171e22805812788b0c12ec01e79f320eef782479d1c s6-networking-2.3.1.2.tar.gz" +sha512sums="e8646bbfe965db0a736b1624e3533151182fd0d0337c08ab6af52f6872af1e8c82e3afa85fd146fec3f0640360173aa57182065982e1f3d60ec16862f449115b s6-networking-2.4.0.0.tar.gz" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 01a984414..6ee77bb99 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.4 +pkgver=2.2.3.1 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz" +sha512sums="76c464b90b5c67f87bec053cadb5dac1b5928df7f373b7a0b6700e8ab684fb8c5354788720e216f1fb9e332a0a5dec92618aee3e0f6ff578c8aa42f2aa787549 s6-portable-utils-2.2.3.1.tar.gz" diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index a683848a4..677dd6007 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -19,6 +19,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxml2-dev libxslt-dev subpackages="$pkgname-doc $pkgname-lang" source="http://tellico-project.org/files/tellico-$pkgver.tar.xz btparse-strcasecmp.patch + modern-taglib.patch " build() { @@ -41,7 +42,7 @@ check() { # htmlexporter: needs plasma desktop # filelisting: needs dbus # tellicoread: needs network - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread)test' + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread|comparison)test' } package() { @@ -49,4 +50,5 @@ package() { } sha512sums="12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74 tellico-3.3.1.tar.xz -4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" +4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch +1d2b7825249167868b4127e424b3763551d9c361c500bb251b2e22e6e0b938e3015454092ec9e4724b2fd7a3bc1b059f9ead52cf75b7c85ca3a66d0fc3fe57e5 modern-taglib.patch" diff --git a/user/tellico/modern-taglib.patch b/user/tellico/modern-taglib.patch new file mode 100644 index 000000000..194914da8 --- /dev/null +++ b/user/tellico/modern-taglib.patch @@ -0,0 +1,13 @@ +Fix build with Taglib's built-in CMake module. +--- tellico-3.3.1/CMakeLists.txt.old 2020-06-01 00:57:12.000000000 +0000 ++++ tellico-3.3.1/CMakeLists.txt 2021-01-28 04:48:08.457839033 +0000 +@@ -128,7 +128,8 @@ + TYPE OPTIONAL) + if(TAGLIB_FOUND) + add_definitions(${TAGLIB_CFLAGS}) +- include_directories(${TAGLIB_INCLUDES}) ++ include_directories(${Taglib_INCLUDE_DIRS}) ++ set(TAGLIB_LIBRARIES ${Taglib_LIBRARIES}) + endif(TAGLIB_FOUND) + + find_package(Yaz 2.0) diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD index 4addb5f3f..4b1d41ea4 100644 --- a/user/wayland-protocols/APKBUILD +++ b/user/wayland-protocols/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=wayland-protocols -pkgver=1.18 +pkgver=1.20 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483 wayland-protocols-1.18.tar.xz" +sha512sums="d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977 wayland-protocols-1.20.tar.xz" diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD index 6dd1f52ff..4036d6b96 100644 --- a/user/wayland/APKBUILD +++ b/user/wayland/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: pkgname=wayland -pkgver=1.17.0 +pkgver=1.18.0 pkgrel=0 pkgdesc="A computer display server protocol" url="https://wayland.freedesktop.org" @@ -44,4 +44,4 @@ dev() { default_dev } -sha512sums="c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz" +sha512sums="e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz" diff --git a/user/wlroots/APKBUILD b/user/wlroots/APKBUILD new file mode 100644 index 000000000..8af0de066 --- /dev/null +++ b/user/wlroots/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=wlroots +pkgver=0.12.0 +pkgrel=0 +pkgdesc="Library for building Wayland compositors" +url="https://swaywm.org/" +arch="all" +license="MIT" +depends="wayland>=1.18.0" +makedepends="cmake elogind-dev eudev-dev ffmpeg-dev libinput-dev + libxkbcommon-dev mesa-dev meson ninja pixman-dev wayland-dev>=1.18.0 + wayland-protocols>=1.17.0 xcb-util-errors-dev xcb-util-wm-dev" +subpackages="$pkgname-dev" +source="https://github.com/swaywm/wlroots/releases/download/$pkgver/wlroots-$pkgver.tar.gz" + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + -Dlogind-provider=elogind \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415 wlroots-0.12.0.tar.gz" diff --git a/user/xcb-util-errors/APKBUILD b/user/xcb-util-errors/APKBUILD new file mode 100644 index 000000000..f9643b5b4 --- /dev/null +++ b/user/xcb-util-errors/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=xcb-util-errors +pkgver=1.0 +pkgrel=0 +pkgdesc="XCB utility library for readable X errors" +url="https://xcb.freedesktop.org/" +arch="all" +license="MIT" +depends="" +makedepends="automake autoconf xcb-util-dev" +subpackages="$pkgname-dev" +source="https://xcb.freedesktop.org/dist/xcb-util-errors-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="479b731b7056313955db9471d37416c4c9ab8c4574214fe20b3c0bcc1f57812fc343af6b0196814caaa6cc848dd120c70fab2f142902125cba63a8386d32179d xcb-util-errors-1.0.tar.bz2" |