diff options
495 files changed, 2903 insertions, 1329 deletions
@@ -1,3 +1,7 @@ A. Wilcox <AWilcox@Wilcox-Tech.com> Horst G. Burkhardt <mc@680x0.com> Mira Ressel <aranea@aixah.de> +Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <adelie@aerdan.vulpine.house> +Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman+apkfission@gmail.com> +Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman@gmail.com> diff --git a/experimental/zfs-utils/APKBUILD b/experimental/zfs-utils/APKBUILD index dc985302e..71213e3d6 100644 --- a/experimental/zfs-utils/APKBUILD +++ b/experimental/zfs-utils/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> # keep these in sync with kernel version _kflavour="" _kver="5.4.5-mc0" diff --git a/experimental/zfs/APKBUILD b/experimental/zfs/APKBUILD index 31991c44d..db467f0c5 100644 --- a/experimental/zfs/APKBUILD +++ b/experimental/zfs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> # keep these in sync with kernel version _kflavour="" _kver="5.4.5-mc0" diff --git a/legacy/which/APKBUILD b/legacy/which/APKBUILD index f8360b7b7..c150c3f1c 100644 --- a/legacy/which/APKBUILD +++ b/legacy/which/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=which pkgver=2.21 pkgrel=2 diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 53d53a818..f3c5bef69 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild -pkgver=3.4.1 -pkgrel=2 +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" @@ -19,8 +19,6 @@ makedepends="$makedepends_host $makedepends_build" subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz - apkpath.patch - fix-apk-invocation.patch keyhole.patch " @@ -55,7 +53,5 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="6446171cc68d8341b5267816e7a05e0dc7b8a4e89c8c8410ae61e9501b163cc32db888476b14f032c16ef15bdd4dd4844e087394c2d061db8281f7bdfb34d450 abuild-3.4.1.tar.xz -bc373c93344d498a48675256bb26cf9bebac74f54d8e53a09c0975e3047c481ee35c6b88e5de392efd2d0ce2a8de23ebbf0822e1a093ee01ea99349f238c62f7 apkpath.patch -4ae8a0d7efb94e8390250c2c43294ba40afcf27409257cccffb9315f00e887972e29573ddbfb830a82eab473c6d292fe7a1bf30fb9761b6fa24b8fe8c0940c79 fix-apk-invocation.patch +sha512sums="9bdeb31f54879878697b4a5436ec2bc7764e1b9840798e913ba3dd47c344437e362a3067b89440ca8a7940af1efcaa83a24e7c1077187f924bf73fb058f97fbf abuild-3.4.2.tar.xz 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch" diff --git a/system/abuild/apkpath.patch b/system/abuild/apkpath.patch deleted file mode 100644 index 4390fe0b0..000000000 --- a/system/abuild/apkpath.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d9811dee71cfafde1fe6d596a2b9922b60dd0c4f Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 21 Feb 2020 19:28:36 -0600 -Subject: [PATCH] abuild: Solve, once and for all, 'apk: not found' - ---- - abuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index 1b8898b..2212789 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -23,7 +23,7 @@ fi - # defaults - : ${FAKEROOT:="fakeroot"} - : ${SUDO_APK:="abuild-apk"} --: ${APK:="apk"} -+: ${APK:="/sbin/apk"} - : ${ADDUSER:="abuild-adduser"} - : ${ADDGROUP:="abuild-addgroup"} - --- -2.25.0 - diff --git a/system/abuild/fix-apk-invocation.patch b/system/abuild/fix-apk-invocation.patch deleted file mode 100644 index 71bc3d1c9..000000000 --- a/system/abuild/fix-apk-invocation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 27 Feb 2020 04:41:04 -0600 -Subject: [PATCH] abuild: Use $APK instead of apk - -This is the only appearance of `apk` in the source. Appears accidental. - -Fixes: 41343329 ("abuild: fix dependency tracing for cross builds") -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> ---- - abuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index 2212789..7daa366 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1255,7 +1255,7 @@ trace_apk_deps() { - autodeps="$autodeps pc:$pcprefix$i" - elif subpkg_provides_pc "$i" \ - || $APK $apkroot info --quiet --installed "pc:$i"; then -- local provider="$(apk $apkroot search --quiet "pc:$i")" -+ local provider="$($APK $apkroot search --quiet "pc:$i")" - if list_has "$provider" $depends_dev; then - warning "$provider should be removed from depends_dev" - fi --- -2.25.1 - 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/argon2/APKBUILD b/system/argon2/APKBUILD index 42d459e1f..c7a1bd6c2 100644 --- a/system/argon2/APKBUILD +++ b/system/argon2/APKBUILD @@ -4,7 +4,7 @@ pkgname=argon2 _pkgname=phc-winner-argon2 pkgver=20190702 -pkgrel=0 +pkgrel=1 pkgdesc="Password hashing library" url="https://github.com/P-H-C/phc-winner-argon2" arch="all" @@ -30,7 +30,8 @@ package() { sed -i 's#libdir=${prefix}/lib#libdir=/lib#' "$builddir"/libargon2.pc make OPTTARGET=none DESTDIR="$pkgdir" LIBRARY_REL=lib install # ...but cryptsetup needs this in /lib for early-boot - mv "$pkgdir"/usr/lib "$pkgdir"/ + mkdir "$pkgdir"/lib + mv "$pkgdir"/usr/lib/lib* "$pkgdir"/lib } sha512sums="0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f argon2-20190702.tar.gz" diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index c234818af..cfeabb5a2 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bc -pkgver=3.1.5 +pkgver=3.1.6 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -25,4 +25,4 @@ package() { make install } -sha512sums="34be1c186df5906ab7a966739220a20afd7e3b227a5c7ba32a77256a36e097bbcc39b99ce6d6855de3e6e2296612f8fbe63dc0983ad91d4eb4c1e630dbb587a0 bc-3.1.5.tar.xz" +sha512sums="1219a074845b8c66a431ddb78bab643793f5275c26404e92e360e655418d70d1aafa02be2fc4dec25d99a85ae2da1aab7d615de893f85913ca8834448dcade53 bc-3.1.6.tar.xz" diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index 0130a2038..77ed1c517 100644 --- a/system/bison/APKBUILD +++ b/system/bison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bison -pkgver=3.7.2 +pkgver=3.7.3 pkgrel=0 pkgdesc="The GNU general-purpose parser generator" arch="all" @@ -49,4 +49,4 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="42eb501c246e9b4b24cb212c8da538b11b1944b997314105e67f88f22d73b7d00cf19b21e086aa7523630a2a24e1fd70a89d85a7e3003783990e08d31f711a27 bison-3.7.2.tar.xz" +sha512sums="34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed bison-3.7.3.tar.xz" diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index f9d5dab28..1786fbb0d 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=cryptsetup pkgver=2.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="Utility for setting up encrypted filesystems" url="https://gitlab.com/cryptsetup/cryptsetup" arch="all" diff --git a/system/cxref/APKBUILD b/system/cxref/APKBUILD index f1bc75fb4..c9d05c608 100644 --- a/system/cxref/APKBUILD +++ b/system/cxref/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cxref pkgver=1.6e pkgrel=0 diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD index acf091602..f2f096ffd 100644 --- a/system/dash/APKBUILD +++ b/system/dash/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=dash pkgver=0.5.11.2 pkgrel=0 diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 9565e76d5..a0fcc2a88 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.8.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="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz" diff --git a/system/file/APKBUILD b/system/file/APKBUILD index b2968c3ca..8955ca71c 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=file pkgver=5.39 pkgrel=0 diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 646c48434..7a2b458b1 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.29.1 +pkgver=2.29.2 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -165,7 +165,7 @@ subtree() { make install prefix=/usr DESTDIR="$subpkgdir" } -sha512sums="4c72afd33a83b93769bdd16350925f4776a2c92bdbffd951bf8b0bb0fc6a474b3f54b08fc4252cc5b1a029d9d21e1f8993d49e991af89ee9b676c6d18d696822 git-2.29.1.tar.xz +sha512sums="34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62 git-2.29.2.tar.xz 0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/json-c/APKBUILD b/system/json-c/APKBUILD index 32ee431dd..c05a7d9b7 100644 --- a/system/json-c/APKBUILD +++ b/system/json-c/APKBUILD @@ -1,52 +1,36 @@ # Maintainer: pkgname=json-c -pkgver=0.13.1 -pkgrel=1 +pkgver=0.15 +pkgrel=0 pkgdesc="A JSON implementation in C" url="https://github.com/json-c/json-c/wiki" arch="all" license="MIT" depends="" -makedepends="autoconf automake libtool" -subpackages="$pkgname-static $pkgname-dev" +makedepends="cmake doxygen" +subpackages="$pkgname-dev" source="https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz - fix-libdir.patch " -prepare() { - default_prepare - autoreconf -f -v -i -} +# secfixes: +# 0.15-r0: +# - CVE-2020-12762 build() { - export CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable" - ./configure --prefix=/usr \ - --build=$CBUILD \ - --host=$CHOST \ - --libdir=/lib \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-shared \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes - make -j1 + cmake -B "$builddir" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON + make + make doc } check() { - make check + make test } package() { make -j1 DESTDIR="$pkgdir" install } -static() { - pkgdesc="Static JSON C library" - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ -} - -sha512sums="e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 json-c-0.13.1.tar.gz -939f2b02fe5beb5d85ebc3fd8463bee0cff6b7da98b48edb599e88dda7955b6ba65afc17f9e828025086a1b384aa99703be06b6613e405d9c48541cf52c380f0 fix-libdir.patch" +sha512sums="dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 json-c-0.15.tar.gz" diff --git a/system/json-c/fix-libdir.patch b/system/json-c/fix-libdir.patch deleted file mode 100644 index bf69168e7..000000000 --- a/system/json-c/fix-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- json-c-0.13.1/Makefile.am.old 2018-03-06 04:13:22.000000000 +0000 -+++ json-c-0.13.1/Makefile.am 2018-07-19 02:12:00.270000000 +0000 -@@ -14,7 +14,7 @@ - - lib_LTLIBRARIES = libjson-c.la - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = /usr/lib/pkgconfig - pkgconfig_DATA = json-c.pc - - libjson_cincludedir = $(includedir)/json-c diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD index 507b87368..44479ae49 100644 --- a/system/libcap-ng/APKBUILD +++ b/system/libcap-ng/APKBUILD @@ -1,6 +1,6 @@ -# Maintainer: +# Maintainer: Nathan <ndowens@artixlinux.org> pkgname=libcap-ng -pkgver=0.7.10 +pkgver=0.8 pkgrel=0 pkgdesc="POSIX capabilities library" url="https://people.redhat.com/sgrubb/libcap-ng/index.html" @@ -12,7 +12,6 @@ makedepends="python3 $depends_dev" makedepends_host="$depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz - fix-includes.patch " build() { @@ -42,5 +41,4 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def libcap-ng-0.7.10.tar.gz -8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324 fix-includes.patch" +sha512sums="d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2 libcap-ng-0.8.tar.gz" diff --git a/system/libcap-ng/fix-includes.patch b/system/libcap-ng/fix-includes.patch deleted file mode 100644 index 8fbd984b8..000000000 --- a/system/libcap-ng/fix-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru libcap-ng-0.7.4.orig/src/cap-ng.c libcap-ng-0.7.4/src/cap-ng.c ---- libcap-ng-0.7.4.orig/src/cap-ng.c 2014-04-24 15:41:43.000000000 -0300 -+++ libcap-ng-0.7.4/src/cap-ng.c 2015-04-15 08:45:10.783335463 -0300 -@@ -34,6 +34,7 @@ - #include <stdarg.h> - #include <errno.h> - #include <fcntl.h> -+#include <endian.h> - #include <byteswap.h> - #ifdef HAVE_SYSCALL_H - #include <sys/syscall.h> 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/musl/APKBUILD b/system/musl/APKBUILD index 8517b148b..735541e51 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="System library (libc) implementation" url="https://www.musl-libc.org/" arch="all" @@ -27,6 +27,7 @@ source="https://musl.libc.org/releases/$pkgname-$pkgver.tar.gz handle-aux-at_base.patch fgetspent_r.patch threads_minus_1.patch + CVE-2020-28928.patch ldconfig getent.c @@ -38,6 +39,8 @@ source="https://musl.libc.org/releases/$pkgname-$pkgver.tar.gz # - CVE-2016-8859 # 1.1.23-r2: # - CVE-2019-14697 +# 1.2.0-r2: +# - CVE-2020-28928 build() { [ "$BOOTSTRAP" = "nocc" ] && return 0 @@ -123,6 +126,7 @@ f01ab92b9d385c15369c0bb7d95e1bc06a009c8851e363517d0ba1bae3fc2647af69fc2f363b5d96 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch 68830961e297d9a499f3b609be84848ad5d3326a1af56e9e54a40ecd972c48da11532c51da572d45e0df3574d63191e7ae0d3a1b84a029365f8d00691de96952 threads_minus_1.patch +343ac5e5365cf98a5d5b7bc192c671733fdba27f06b83484f1ac7647154228745415f62dd676029de538460f8b35e0a70ca453a0f8b73226ed1c420099b1cf90 CVE-2020-28928.patch cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/CVE-2020-28928.patch b/system/musl/CVE-2020-28928.patch new file mode 100644 index 000000000..cc668e149 --- /dev/null +++ b/system/musl/CVE-2020-28928.patch @@ -0,0 +1,112 @@ +From 3ab2a4e02682df1382955071919d8aa3c3ec40d4 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Thu, 19 Nov 2020 17:12:43 -0500 +Subject: [PATCH] rewrite wcsnrtombs to fix buffer overflow and other bugs + +the original wcsnrtombs implementation, which has been largely +untouched since 0.5.0, attempted to build input-length-limiting +conversion on top of wcsrtombs, which only limits output length. as +best I recall, this choice was made out of a mix of disdain over +having yet another variant function to implement (added in POSIX 2008; +not standard C) and preference not to switch things around and +implement the wcsrtombs in terms of the more general new function, +probably over namespace issues. the strategy employed was to impose +output limits that would ensure the input limit wasn't exceeded, then +finish up the tail character-at-a-time. unfortunately, none of that +worked correctly. + +first, the logic in the wcsrtombs loop was wrong in that it could +easily get stuck making no forward progress, by imposing an output +limit too small to convert even one character. + +the character-at-a-time loop that followed was even worse. it made no +effort to ensure that the converted multibyte character would fit in +the remaining output space, only that there was a nonzero amount of +output space remaining. it also employed an incorrect interpretation +of wcrtomb's interface contract for converting the null character, +thereby failing to act on end of input, and remaining space accounting +was subject to unsigned wrap-around. together these errors allow +unbounded overflow of the destination buffer, controlled by input +length limit and input wchar_t string contents. + +given the extent to which this function was broken, it's plausible +that most applications that would have been rendered exploitable were +sufficiently broken not to be usable in the first place. however, it's +also plausible that common (especially ASCII-only) inputs succeeded in +the wcsrtombs loop, which mostly worked, while leaving the wildly +erroneous code in the second loop exposed to particular non-ASCII +inputs. + +CVE-2020-28928 has been assigned for this issue. +--- + src/multibyte/wcsnrtombs.c | 46 ++++++++++++++++---------------------- + 1 file changed, 19 insertions(+), 27 deletions(-) + +diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c +index 676932b5..95e25e70 100644 +--- a/src/multibyte/wcsnrtombs.c ++++ b/src/multibyte/wcsnrtombs.c +@@ -1,41 +1,33 @@ + #include <wchar.h> ++#include <limits.h> ++#include <string.h> + + size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st) + { +- size_t l, cnt=0, n2; +- char *s, buf[256]; + const wchar_t *ws = *wcs; +- const wchar_t *tmp_ws; +- +- if (!dst) s = buf, n = sizeof buf; +- else s = dst; +- +- while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) { +- if (n2>=n) n2=n; +- tmp_ws = ws; +- l = wcsrtombs(s, &ws, n2, 0); +- if (!(l+1)) { +- cnt = l; +- n = 0; ++ size_t cnt = 0; ++ if (!dst) n=0; ++ while (ws && wn) { ++ char tmp[MB_LEN_MAX]; ++ size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0); ++ if (l==-1) { ++ cnt = -1; + break; + } +- if (s != buf) { +- s += l; ++ if (dst) { ++ if (n<MB_LEN_MAX) { ++ if (l>n) break; ++ memcpy(dst, tmp, l); ++ } ++ dst += l; + n -= l; + } +- wn = ws ? wn - (ws - tmp_ws) : 0; +- cnt += l; +- } +- if (ws) while (n && wn) { +- l = wcrtomb(s, *ws, 0); +- if ((l+1)<=1) { +- if (!l) ws = 0; +- else cnt = l; ++ if (!*ws) { ++ ws = 0; + break; + } +- ws++; wn--; +- /* safe - this loop runs fewer than sizeof(buf) times */ +- s+=l; n-=l; ++ ws++; ++ wn--; + cnt += l; + } + if (dst) *wcs = ws; +-- +2.25.4 + diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 73f5d922b..e3c114a6d 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ncurses pkgver=6.2 _ver=${pkgver}-20200212 -pkgrel=0 +pkgrel=1 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/ncurses.html" arch="all" @@ -12,9 +12,9 @@ depends="" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://mirrormaster.adelielinux.org/source/upstream/ncurses-$_ver.tgz" - -builddir="$srcdir"/ncurses-$_ver +source="https://distfiles.adelielinux.org/source/upstream/$pkgname-$_ver.tgz + " +builddir="$srcdir/$pkgname-$_ver" # secfixes: # 6.0_p20171125-r0: @@ -48,16 +48,23 @@ package() { # Install basic terms in /etc/terminfo for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \ - vt200 vt220 xterm xterm-color xterm-xfree86; do - local termfile="$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null)" + vt200 vt220 xterm xterm-color xterm-xfree86 xterm-256color \ + alacritty tmux tmux-256color terminator 'terminology*' \ + vte vte-256color gnome gnome-256color kitty konsole konsole-256color \ + konsole-linux putty putty-256color rxvt-256color 'st-*' \ + screen-256color; do + local termfiles="$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null)" local basedir="$(basename $(dirname "$termfile"))" - [ -z "$termfile" ] && continue - + [ -z "$termfiles" ] && continue + + for termfile in $termfiles; do + local basedir=$(basename "$(dirname "$termfile")") install -d "$pkgdir"/etc/terminfo/$basedir - mv ${termfile} "$pkgdir"/etc/terminfo/$basedir/ - ln -s ../../../../etc/terminfo/$basedir/$i \ - "$pkgdir"/usr/share/terminfo/$basedir/$i + mv "$termfile" "$pkgdir"/etc/terminfo/$basedir/ + ln -s ../../../../etc/terminfo/$basedir/${termfile##*/} \ + "$pkgdir"/usr/share/terminfo/$basedir/${termfile##*/} + done done } diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD index b299382c9..677dec208 100644 --- a/system/patch/APKBUILD +++ b/system/patch/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=patch pkgver=2.7.6 pkgrel=4 diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD index 02ed7b7e3..2e1a0a5cf 100644 --- a/system/perl-encode-eucjpascii/APKBUILD +++ b/system/perl-encode-eucjpascii/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-eucjpascii _pkgreal=Encode-EUCJPASCII diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD index 6d52e5647..5529f338b 100644 --- a/system/perl-encode-hanextra/APKBUILD +++ b/system/perl-encode-hanextra/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-hanextra _pkgreal=Encode-HanExtra diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD index b59b3a5cb..9e41c6a16 100644 --- a/system/perl-encode-iso2022/APKBUILD +++ b/system/perl-encode-iso2022/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-iso2022 _pkgreal=Encode-ISO2022 diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD index 5a956d1aa..809a06b25 100644 --- a/system/perl-encode-jisx0213/APKBUILD +++ b/system/perl-encode-jisx0213/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-jisx0213 _pkgreal=Encode-JISX0213 diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD index 839df093e..af9d236cf 100644 --- a/system/perl-http-message/APKBUILD +++ b/system/perl-http-message/APKBUILD @@ -1,5 +1,5 @@ # Automatically generated by apkbuild-cpan, template 1 -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-message _pkgreal=HTTP-Message diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD index e3ce567bb..7b85dc2ca 100644 --- a/system/perl-json/APKBUILD +++ b/system/perl-json/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json _pkgreal=JSON diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD index 4a04e17e9..139766e3a 100644 --- a/system/perl-mime-charset/APKBUILD +++ b/system/perl-mime-charset/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-mime-charset _pkgreal=MIME-Charset diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD index 05703bcf6..dc9fd74f0 100644 --- a/system/perl-pod2-base/APKBUILD +++ b/system/perl-pod2-base/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod2-base _pkgreal=POD2-Base diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD index e6ceae295..e64291280 100644 --- a/system/perl-sgmls/APKBUILD +++ b/system/perl-sgmls/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sgmls _pkgreal=SGMLSpm diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD index e97893fda..a0b3b1e96 100644 --- a/system/perl-test-fatal/APKBUILD +++ b/system/perl-test-fatal/APKBUILD @@ -1,5 +1,5 @@ # Automatically generated by apkbuild-cpan, template 1 -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-fatal _pkgreal=Test-Fatal diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD index 0d098b55c..f8d644f76 100644 --- a/system/perl-test-needs/APKBUILD +++ b/system/perl-test-needs/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-needs _pkgreal=Test-Needs diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD index 4078a2f5e..14efc46ce 100644 --- a/system/perl-try-tiny/APKBUILD +++ b/system/perl-try-tiny/APKBUILD @@ -1,5 +1,5 @@ # Automatically generated by apkbuild-cpan, template 1 -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-try-tiny _pkgreal=Try-Tiny diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD index 907b970b3..b14736fc0 100644 --- a/system/perl-unicode-linebreak/APKBUILD +++ b/system/perl-unicode-linebreak/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-unicode-linebreak _pkgreal=Unicode-LineBreak diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD index 1f3cbec5c..0c8774c7e 100644 --- a/system/perl-uri/APKBUILD +++ b/system/perl-uri/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-uri _pkgreal=URI diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD index 7e23f0a82..40277eb72 100644 --- a/system/perl/APKBUILD +++ b/system/perl/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> # Proxy-For: solar pkgname=perl pkgver=5.26.3 -pkgrel=1 +pkgrel=2 pkgdesc="Larry Wall's Practical Extraction and Report Language" url="https://www.perl.org/" arch="all" @@ -41,7 +41,7 @@ prepare() { default_prepare sed -e 's/less -R/less/g' \ -e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \ - -i ./Configure || + -i ./Configure # Ensure that we never accidentally bundle zlib or bzip2 rm -rf cpan/Compress-Raw-Zlib/zlib-src diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD index 4414d28b9..0f53e5ffa 100644 --- a/system/psmisc/APKBUILD +++ b/system/psmisc/APKBUILD @@ -15,15 +15,13 @@ makedepends_build="autoconf>=2.69 automake" makedepends_host="ncurses-dev" subpackages="$pkgname-doc" [ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang" -source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver +source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/psmisc/psmisc/-/archive/v$pkgver/psmisc-v$pkgver.tar.bz2 fix-peekfd-on-ppc.patch " +builddir="$srcdir/$pkgname-v$pkgver" prepare() { - ln -fs $pkgname-v$pkgver-* "$builddir" - default_prepare - sh autogen.sh } @@ -51,5 +49,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0571aadcd89ecbc89f991a80b02372b3cb881abed97313640bb23905e133473e1c7a51bf8d6c6dbd3d12a013b3aad88d7f94adfcdc3f6f22a53c57e1e0b33016 psmisc-23.3.tar.bz2 +sha512sums="78e8298b4cc2d888159f2689c7957ab5f17c782d6a64642b055a455579d79759a0f62d46e473d9c0dd4e026f4917226b8907afa6178a24a5615194d38b8aed1a psmisc-23.3.tar.bz2 a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch" diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD index e875d3941..a6d47495b 100644 --- a/system/python3/APKBUILD +++ b/system/python3/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=python3 pkgver=3.6.10 diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD index 728a32fbc..f48b55099 100644 --- a/system/rsync/APKBUILD +++ b/system/rsync/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=rsync pkgver=3.1.3 pkgrel=2 diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 49a69ddad..e7c6c86ce 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.4.2 +pkgver=1.0.6.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.2.1 -_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" @@ -120,7 +120,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53 s6-linux-init-1.0.4.2.tar.gz +sha512sums="0d18b96a70ef39e06e164bb391e22d7b1cce54f941c5526e6a107c7af5b6801b1dd257ba255bc07eff240d48f8ef7f096e180bade25490a86b6326290448d45c s6-linux-init-1.0.6.1.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..489a8ef22 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.2 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="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.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/sed/APKBUILD b/system/sed/APKBUILD index 17f50b841..cb4369afe 100644 --- a/system/sed/APKBUILD +++ b/system/sed/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=sed pkgver=4.8 pkgrel=0 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 129fa7e79..ee8b7c95d 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.2.1 +pkgver=2.10.0.2 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -57,4 +57,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="bd507faf30f0564fb8d3e5f86de04ab4b39961dab2497ba9f4a81980a57f7ff68cad366b9847b25d555b5b9263460d13f096e1774d080d1d286979f2e7324c54 skalibs-2.9.2.1.tar.gz" +sha512sums="b36b7fefb9df63093f1bd775fe9d2bf7ed588404a99a55b1ecabfc0e3b6eac49989dfb736f7f69a9508e4dfeeb669d48e639964aef5c65c330043c543cd38801 skalibs-2.10.0.2.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/system/uucp/APKBUILD b/system/uucp/APKBUILD index 422f28ae5..71151e6f0 100644 --- a/system/uucp/APKBUILD +++ b/system/uucp/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=uucp pkgver=1.07 pkgrel=0 diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index e9148fed1..cd4a39004 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vim pkgver=8.2.1900 _pkgver=${pkgver%.*.*}${pkgver#*.} @@ -49,7 +49,7 @@ build() { --with-compiledby="Adélie Linux" \ vim_cv_toupper_broken=no \ vim_cv_terminfo=yes \ - vim_cv_tgent=zero \ + vim_cv_tgetent=zero \ vim_cv_tty_group=world \ vim_cv_getcwd_broken=no \ vim_cv_stat_ignores_slash=no \ diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index 685cfa1cb..0b3f062eb 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alkimia -pkgver=8.0.3 +pkgver=8.0.4 pkgrel=0 pkgdesc="Library for common financial functionality" url="https://community.kde.org/Alkimia/libalkimia" @@ -11,8 +11,8 @@ license="LGPL-2.1+" depends="" depends_dev="gmp-dev qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtwebkit-dev - kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev - kpackage-dev plasma-framework-dev" + kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev + kpackage-dev plasma-framework-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e alkimia-8.0.3.tar.xz" +sha512sums="49b771ac28ec76143cf1237a21a834fa38689c91c773a472cc090e94f49287a79ad7790ef068cd6bebc4e64aa97e5026a9ea5be841bbdb3ca89b00b6ca7acc27 alkimia-8.0.4.tar.xz" diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD index 2ac0989d2..476a56276 100644 --- a/user/alpine/APKBUILD +++ b/user/alpine/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=alpine pkgver=2.23 pkgrel=0 diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index a14c25cc8..67b2bb577 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=apache-httpd _pkgreal=httpd pkgver=2.4.46 diff --git a/user/apkfoundry/APKBUILD b/user/apkfoundry/APKBUILD index 007c3d913..c06c33e20 100644 --- a/user/apkfoundry/APKBUILD +++ b/user/apkfoundry/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=apkfoundry -pkgver=0.5 +pkgver=0.6 pkgrel=0 pkgdesc="APK build orchestrator and distribution builder" url="https://dev.sick.bike/apkfoundry/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="169caf3b594929814c87fa7a3b7d8e56476a7862d64eaf7bfdf13468c4258e8879f5de738758de39631085a5cbae4b47f7656b4335bb4d7fafd2abce834ee233 apkfoundry-0.5.tar.gz" +sha512sums="71c1a0baabb2d1092e8873d438a14fba40eb953f7a11a93754e2dd6753da34a4427b2b7d50de6b7e7d34eb99b9bb91f829453d431649d3596a9789e1f1b34a0b apkfoundry-0.6.tar.gz" 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/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD index 4aa8979d1..33771f7b8 100644 --- a/user/aspell-dict-af/APKBUILD +++ b/user/aspell-dict-af/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-af pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD index 79e44d947..655453f04 100644 --- a/user/aspell-dict-am/APKBUILD +++ b/user/aspell-dict-am/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-am pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD index 6880ae201..ab2fa8016 100644 --- a/user/aspell-dict-ar/APKBUILD +++ b/user/aspell-dict-ar/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ar pkgver=1.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD index 9e7c0320c..c3302a23f 100644 --- a/user/aspell-dict-ast/APKBUILD +++ b/user/aspell-dict-ast/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ast pkgver=0.01 pkgrel=0 diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD index 9854bcc48..a97386923 100644 --- a/user/aspell-dict-az/APKBUILD +++ b/user/aspell-dict-az/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-az pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD index 8c0c67349..9846afced 100644 --- a/user/aspell-dict-be/APKBUILD +++ b/user/aspell-dict-be/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-be pkgver=0.01 pkgrel=0 diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD index 809c98aab..7fdfb97e9 100644 --- a/user/aspell-dict-bg/APKBUILD +++ b/user/aspell-dict-bg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-bg pkgver=4.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD index 92b006733..62e396f3f 100644 --- a/user/aspell-dict-bn/APKBUILD +++ b/user/aspell-dict-bn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-bn pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD index 0cc1b2057..8708d2806 100644 --- a/user/aspell-dict-br/APKBUILD +++ b/user/aspell-dict-br/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-br pkgver=0.50.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD index 74a2c7a6d..d1dcf07d3 100644 --- a/user/aspell-dict-ca/APKBUILD +++ b/user/aspell-dict-ca/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ca pkgver=2.5.0 pkgrel=0 diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD index 31a59210c..0cddbb21d 100644 --- a/user/aspell-dict-cs/APKBUILD +++ b/user/aspell-dict-cs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-cs pkgver=20040614.1 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD index 8e4be27dc..09f890e06 100644 --- a/user/aspell-dict-csb/APKBUILD +++ b/user/aspell-dict-csb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-csb pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD index e1f64d6c7..d357d42dd 100644 --- a/user/aspell-dict-cy/APKBUILD +++ b/user/aspell-dict-cy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-cy pkgver=0.50.3 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD index db515b3b9..e89c676ee 100644 --- a/user/aspell-dict-da/APKBUILD +++ b/user/aspell-dict-da/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-da pkgver=1.4.42.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD index 8140d5f0a..61fb0f6fd 100644 --- a/user/aspell-dict-de-alt/APKBUILD +++ b/user/aspell-dict-de-alt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-de-alt pkgver=2.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD index 7c0f5f834..0ae31545c 100644 --- a/user/aspell-dict-de/APKBUILD +++ b/user/aspell-dict-de/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-de pkgver=20161207 pkgrel=0 diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD index e0a194d90..ad8db028a 100644 --- a/user/aspell-dict-el/APKBUILD +++ b/user/aspell-dict-el/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-el pkgver=0.08.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD index bd3e44e93..3f5f2b8f7 100644 --- a/user/aspell-dict-en/APKBUILD +++ b/user/aspell-dict-en/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-en pkgver=2019.10.06.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD index cefd65d6d..5bf6ffd88 100644 --- a/user/aspell-dict-eo/APKBUILD +++ b/user/aspell-dict-eo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-eo pkgver=2.1.20000225.a2 _pkgver=${pkgver%.*}${pkgver#*.*.*.} diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD index 80a8b2848..f9bafde42 100644 --- a/user/aspell-dict-es/APKBUILD +++ b/user/aspell-dict-es/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-es pkgver=1.11.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD index 4e84a1f9c..bb7c77612 100644 --- a/user/aspell-dict-et/APKBUILD +++ b/user/aspell-dict-et/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-et pkgver=0.1.21.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD index 93def9869..e84e0c811 100644 --- a/user/aspell-dict-fa/APKBUILD +++ b/user/aspell-dict-fa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fa pkgver=0.11.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD index 78a4fa207..67bc18365 100644 --- a/user/aspell-dict-fi/APKBUILD +++ b/user/aspell-dict-fi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fi pkgver=0.7.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD index d9631bffd..c186949bd 100644 --- a/user/aspell-dict-fo/APKBUILD +++ b/user/aspell-dict-fo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fo pkgver=0.2.16.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD index bb0a14d2b..335931c8a 100644 --- a/user/aspell-dict-fr/APKBUILD +++ b/user/aspell-dict-fr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fr pkgver=0.50.3 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD index 7331a46f9..d42f5fced 100644 --- a/user/aspell-dict-fy/APKBUILD +++ b/user/aspell-dict-fy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fy pkgver=0.12.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD index 3ccdb1272..97433440a 100644 --- a/user/aspell-dict-ga/APKBUILD +++ b/user/aspell-dict-ga/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ga pkgver=5.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD index aff399a6b..29238c28c 100644 --- a/user/aspell-dict-gd/APKBUILD +++ b/user/aspell-dict-gd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gd pkgver=0.1.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD index 4001fd9cb..2e4f630d5 100644 --- a/user/aspell-dict-gl/APKBUILD +++ b/user/aspell-dict-gl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gl pkgver=0.5.a2 _pkgver=${pkgver%.*}${pkgver#*.*.} diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD index c5016e224..7ad9ac316 100644 --- a/user/aspell-dict-grc/APKBUILD +++ b/user/aspell-dict-grc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-grc pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD index feeadf574..95d3df597 100644 --- a/user/aspell-dict-gu/APKBUILD +++ b/user/aspell-dict-gu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gu pkgver=0.03.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD index 513a9491d..022042c0a 100644 --- a/user/aspell-dict-gv/APKBUILD +++ b/user/aspell-dict-gv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gv pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD index cac888171..5052052c5 100644 --- a/user/aspell-dict-he/APKBUILD +++ b/user/aspell-dict-he/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-he pkgver=1.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD index 789b77dc2..7be1a71e8 100644 --- a/user/aspell-dict-hi/APKBUILD +++ b/user/aspell-dict-hi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hi pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD index f634034b9..13be13861 100644 --- a/user/aspell-dict-hil/APKBUILD +++ b/user/aspell-dict-hil/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hil pkgver=0.11.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD index c4bc01e03..1b73b5274 100644 --- a/user/aspell-dict-hr/APKBUILD +++ b/user/aspell-dict-hr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hr pkgver=0.51.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD index 8c8c85b1b..9c47957de 100644 --- a/user/aspell-dict-hsb/APKBUILD +++ b/user/aspell-dict-hsb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hsb pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD index a118ce6a9..9973ca8ed 100644 --- a/user/aspell-dict-hu/APKBUILD +++ b/user/aspell-dict-hu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hu pkgver=0.99.4.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.*.} diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD index 33e998e30..a33f44136 100644 --- a/user/aspell-dict-hus/APKBUILD +++ b/user/aspell-dict-hus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hus pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD index a88dbb382..da7a6ca99 100644 --- a/user/aspell-dict-hy/APKBUILD +++ b/user/aspell-dict-hy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hy pkgver=0.10.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD index fb8d26f62..908b26610 100644 --- a/user/aspell-dict-ia/APKBUILD +++ b/user/aspell-dict-ia/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ia pkgver=0.50.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD index 75b2839b9..28fce71e1 100644 --- a/user/aspell-dict-id/APKBUILD +++ b/user/aspell-dict-id/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-id pkgver=1.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD index 83d58f2bc..6e096c434 100644 --- a/user/aspell-dict-is/APKBUILD +++ b/user/aspell-dict-is/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-is pkgver=0.51.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD index 23b5cc043..6b9acdfb8 100644 --- a/user/aspell-dict-it/APKBUILD +++ b/user/aspell-dict-it/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-it pkgver=2.4.20070901.0 _pkgver=${pkgver%.*.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD index 6eefab144..a4885a08a 100644 --- a/user/aspell-dict-kn/APKBUILD +++ b/user/aspell-dict-kn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-kn pkgver=0.01.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD index 042c91bca..6fd0e03e0 100644 --- a/user/aspell-dict-ku/APKBUILD +++ b/user/aspell-dict-ku/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ku pkgver=0.20.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD index 0ec8c8552..68176d858 100644 --- a/user/aspell-dict-ky/APKBUILD +++ b/user/aspell-dict-ky/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ky pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD index 257624e08..24aa053c7 100644 --- a/user/aspell-dict-la/APKBUILD +++ b/user/aspell-dict-la/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-la pkgver=20020503.0 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD index 1f0f0c657..1eefd3d59 100644 --- a/user/aspell-dict-lt/APKBUILD +++ b/user/aspell-dict-lt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-lt pkgver=1.3 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD index 1640813f6..4ad0da3a2 100644 --- a/user/aspell-dict-lv/APKBUILD +++ b/user/aspell-dict-lv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-lv pkgver=0.5.5.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD index a93c2b691..fb04eb1e4 100644 --- a/user/aspell-dict-mg/APKBUILD +++ b/user/aspell-dict-mg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mg pkgver=0.03.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD index aa6db01e1..8cea7a75d 100644 --- a/user/aspell-dict-mi/APKBUILD +++ b/user/aspell-dict-mi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mi pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD index 324ab0c10..1d8960fb9 100644 --- a/user/aspell-dict-mk/APKBUILD +++ b/user/aspell-dict-mk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mk pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD index 03562f30c..c296d6f41 100644 --- a/user/aspell-dict-ml/APKBUILD +++ b/user/aspell-dict-ml/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ml pkgver=0.04.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD index f71c509d1..a76245c20 100644 --- a/user/aspell-dict-mn/APKBUILD +++ b/user/aspell-dict-mn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mn pkgver=0.06.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD index 583a1fb49..31f17d31d 100644 --- a/user/aspell-dict-mr/APKBUILD +++ b/user/aspell-dict-mr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mr pkgver=0.10.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD index 25a29a229..9e66bdcc8 100644 --- a/user/aspell-dict-ms/APKBUILD +++ b/user/aspell-dict-ms/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ms pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD index 5d22c27c3..88b601f80 100644 --- a/user/aspell-dict-mt/APKBUILD +++ b/user/aspell-dict-mt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mt pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD index 6db6e6fb5..cfc57385a 100644 --- a/user/aspell-dict-nb/APKBUILD +++ b/user/aspell-dict-nb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nb pkgver=0.50.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD index 9e4e26201..40ff55d26 100644 --- a/user/aspell-dict-nds/APKBUILD +++ b/user/aspell-dict-nds/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nds pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD index 87ffadacf..3d2a99759 100644 --- a/user/aspell-dict-nl/APKBUILD +++ b/user/aspell-dict-nl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nl pkgver=0.50.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD index cf8a0aa21..2f5f6a8b1 100644 --- a/user/aspell-dict-nn/APKBUILD +++ b/user/aspell-dict-nn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nn pkgver=0.50.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD index f8f15a08d..cb998d970 100644 --- a/user/aspell-dict-ny/APKBUILD +++ b/user/aspell-dict-ny/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ny pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD index 4717c0f76..6f7a0790f 100644 --- a/user/aspell-dict-or/APKBUILD +++ b/user/aspell-dict-or/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-or pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD index 67fc9ca9f..089033fcd 100644 --- a/user/aspell-dict-pa/APKBUILD +++ b/user/aspell-dict-pa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pa pkgver=0.01.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD index ff226f2fe..209a45d47 100644 --- a/user/aspell-dict-pl/APKBUILD +++ b/user/aspell-dict-pl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pl pkgver=20200619 pkgrel=0 diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD index e83fb61b4..7200d86de 100644 --- a/user/aspell-dict-pt_BR/APKBUILD +++ b/user/aspell-dict-pt_BR/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pt_BR pkgver=20090702.0 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD index 412dd51c8..3b25dc636 100644 --- a/user/aspell-dict-pt_PT/APKBUILD +++ b/user/aspell-dict-pt_PT/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pt_PT pkgver=20190329.1.0 _pkgver=${pkgver%.*.*}-${pkgver#*.} diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD index 10010ba13..f699cd6e4 100644 --- a/user/aspell-dict-qu/APKBUILD +++ b/user/aspell-dict-qu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-qu pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD index 449bf9276..76888dca9 100644 --- a/user/aspell-dict-ro/APKBUILD +++ b/user/aspell-dict-ro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ro pkgver=3.3.10 pkgrel=0 diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD index 29dbbf43e..1605b63a6 100644 --- a/user/aspell-dict-ru/APKBUILD +++ b/user/aspell-dict-ru/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ru pkgver=0.99f7.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD index e9a28d063..9708ede9e 100644 --- a/user/aspell-dict-rw/APKBUILD +++ b/user/aspell-dict-rw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-rw pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD index 8649e338f..b0ea6622b 100644 --- a/user/aspell-dict-sc/APKBUILD +++ b/user/aspell-dict-sc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sc pkgver=1.0 pkgrel=0 diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD index 466ee7cb7..ae5a93b65 100644 --- a/user/aspell-dict-sk/APKBUILD +++ b/user/aspell-dict-sk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sk pkgver=2.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD index 2665c4a17..54fb43e88 100644 --- a/user/aspell-dict-sl/APKBUILD +++ b/user/aspell-dict-sl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sl pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD index 3535a244c..fbebf7bcb 100644 --- a/user/aspell-dict-sr/APKBUILD +++ b/user/aspell-dict-sr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sr pkgver=0.02 pkgrel=0 diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD index 05c6da187..44a508d69 100644 --- a/user/aspell-dict-sv/APKBUILD +++ b/user/aspell-dict-sv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sv pkgver=0.51.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD index b6da8032d..72e531448 100644 --- a/user/aspell-dict-sw/APKBUILD +++ b/user/aspell-dict-sw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sw pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD index d9afb81d6..a5044a9a2 100644 --- a/user/aspell-dict-ta/APKBUILD +++ b/user/aspell-dict-ta/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ta pkgver=20040424.1 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD index 9544673a1..f03f054e2 100644 --- a/user/aspell-dict-te/APKBUILD +++ b/user/aspell-dict-te/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-te pkgver=0.01.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD index fb58477b8..810cffb49 100644 --- a/user/aspell-dict-tet/APKBUILD +++ b/user/aspell-dict-tet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tet pkgver=0.1.1 pkgrel=0 diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD index 11e465c99..dcaf12fcb 100644 --- a/user/aspell-dict-tk/APKBUILD +++ b/user/aspell-dict-tk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tk pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD index 5e35eb565..f2e3782c7 100644 --- a/user/aspell-dict-tl/APKBUILD +++ b/user/aspell-dict-tl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tl pkgver=0.4.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD index ae25e480b..439954c7f 100644 --- a/user/aspell-dict-tn/APKBUILD +++ b/user/aspell-dict-tn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tn pkgver=1.0.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD index 6bbb12b99..4683cd993 100644 --- a/user/aspell-dict-tr/APKBUILD +++ b/user/aspell-dict-tr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tr pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD index d53c59b7c..f23364229 100644 --- a/user/aspell-dict-uk/APKBUILD +++ b/user/aspell-dict-uk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-uk pkgver=1.4.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD index 801711845..28baeb118 100644 --- a/user/aspell-dict-uz/APKBUILD +++ b/user/aspell-dict-uz/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-uz pkgver=0.6.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD index 680cdd9c0..7d767e987 100644 --- a/user/aspell-dict-vi/APKBUILD +++ b/user/aspell-dict-vi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-vi pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD index 8ac0dc480..4dd5b0a0d 100644 --- a/user/aspell-dict-wa/APKBUILD +++ b/user/aspell-dict-wa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-wa pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD index 59f2eb444..30a5c12b6 100644 --- a/user/aspell-dict-yi/APKBUILD +++ b/user/aspell-dict-yi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-yi pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD index 7e4846103..1d9108516 100644 --- a/user/aspell-dict-zu/APKBUILD +++ b/user/aspell-dict-zu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-zu pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index b64c2e0f2..85a16db16 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.34.2 +pkgver=2.38.0 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -28,4 +28,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 at-spi2-atk-2.34.2.tar.xz" +sha512sums="2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528 at-spi2-atk-2.38.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 5788deb50..66b2ebcac 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.36.0 +pkgver=2.38.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6 at-spi2-core-2.36.0.tar.xz" +sha512sums="3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1 at-spi2-core-2.38.0.tar.xz" diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD index 448b2c8bb..87585bcc1 100644 --- a/user/atkmm/APKBUILD +++ b/user/atkmm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=atkmm pkgver=2.28.0 pkgrel=0 diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD index ac1897170..35640633f 100644 --- a/user/atril/APKBUILD +++ b/user/atril/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=atril pkgver=1.22.3 pkgrel=0 diff --git a/user/avahi/APKBUILD b/user/avahi/APKBUILD index f1534a5e5..d831ec801 100644 --- a/user/avahi/APKBUILD +++ b/user/avahi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=avahi pkgver=0.8 -pkgrel=0 +pkgrel=1 pkgdesc="Local network service discovery library" url="https://avahi.org/" arch="all" @@ -40,7 +40,8 @@ build() { --with-distro=gentoo \ --enable-core-docs \ --disable-mono \ - --disable-gdbm + --disable-gdbm \ + --enable-compat-libdns_sd make } diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD index 34effb0c0..24717fa8b 100644 --- a/user/ayatana-ido/APKBUILD +++ b/user/ayatana-ido/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ayatana-ido pkgver=0.8.0 pkgrel=0 diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD index 44df1d5b1..0737141b1 100644 --- a/user/bash-completion/APKBUILD +++ b/user/bash-completion/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=bash-completion 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/bind/APKBUILD b/user/bind/APKBUILD index 2b39c5f1f..44cd5cf30 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -9,7 +9,7 @@ _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p" -pkgrel=0 +pkgrel=1 pkgdesc="The ISC DNS server" url="https://www.isc.org/downloads/bind/" arch="all" diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD index c8774acd6..fd06fefd7 100644 --- a/user/bitlbee/APKBUILD +++ b/user/bitlbee/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=bitlbee pkgver=3.6 pkgrel=0 diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index 6f90834b1..3d7c3736a 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.54 -pkgrel=1 +pkgver=5.55 +pkgrel=0 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" @@ -10,8 +10,8 @@ depends="dbus elogind" makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev linux-headers ncurses-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd - $pkgname-btmon $pkgname-cups $pkgname-deprecated $pkgname-hid2hci - $pkgname-obexd $pkgname-openrc $pkgname-tools" + $pkgname-btmgmt $pkgname-btmon $pkgname-cups $pkgname-deprecated + $pkgname-hid2hci $pkgname-obexd $pkgname-openrc $pkgname-tools" source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz bluetooth.initd @@ -30,6 +30,8 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz " # secfixes: +# 5.55-r0: +# - CVE-2020-27153 # 5.54-r0: # - CVE-2020-0556 @@ -61,7 +63,8 @@ build() { --enable-library \ --enable-deprecated \ --enable-experimental \ - --enable-tools + --enable-tools \ + --enable-hid2hci make } @@ -91,6 +94,12 @@ btmon() { mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/ } +btmgmt() { + pkgdesc="Bluez tool for the Bluetooth Management API" + install -Dm755 "$builddir"/tools/btmgmt -t \ + "$subpkgdir"/usr/bin +} + cups() { pkgdesc="BlueZ backend for CUPS" depends="cups" @@ -132,7 +141,7 @@ tools() { done } -sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe bluez-5.54.tar.xz +sha512sums="9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033 bluez-5.55.tar.xz 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index e8412ef96..c2c423ff8 100644 --- a/user/btrfs-progs/APKBUILD +++ b/user/btrfs-progs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=btrfs-progs -pkgver=5.7 +pkgver=5.9 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16 btrfs-progs-v5.7.tar.xz" +sha512sums="38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94 btrfs-progs-v5.9.tar.xz" diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD index 7e22d21fd..33abf8249 100644 --- a/user/cairomm/APKBUILD +++ b/user/cairomm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cairomm pkgver=1.12.2 pkgrel=0 diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD index 7f32ac1ab..a4a44ded3 100644 --- a/user/caja-dropbox/APKBUILD +++ b/user/caja-dropbox/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=caja-dropbox pkgver=1.24.0 pkgrel=0 diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD index 635e499fb..19895bfd4 100644 --- a/user/caja-extensions/APKBUILD +++ b/user/caja-extensions/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=caja-extensions pkgver=1.24.1 pkgrel=0 diff --git a/user/caja/APKBUILD b/user/caja/APKBUILD index a29500eb0..fe126dc54 100644 --- a/user/caja/APKBUILD +++ b/user/caja/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=caja pkgver=1.24.0 pkgrel=0 diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD index a04ef7f61..d47dda0d0 100644 --- a/user/catfish/APKBUILD +++ b/user/catfish/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=catfish pkgver=1.4.13 pkgrel=0 diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD index 798bb8a1e..17b83ab41 100644 --- a/user/cifs-utils/APKBUILD +++ b/user/cifs-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=cifs-utils -pkgver=6.10 +pkgver=6.11 pkgrel=0 pkgdesc="CIFS filesystem user-space tools" url="https://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -18,6 +18,10 @@ source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 xattr_size_max.patch " +# secfixes: +# 6.11-r0: +# - CVE-2020-14342 + prepare() { default_prepare autoreconf -vif @@ -48,7 +52,7 @@ package() { chmod u+s "$pkgdir"/sbin/mount.cifs } -sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc cifs-utils-6.10.tar.bz2 +sha512sums="064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e cifs-utils-6.11.tar.bz2 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch f3acb4f7873628d67c7dfb2378135c302fe382e314277829ea5569710bac0ddb43684aa6d143327d735aec641997084eaa567823b534138ed884bd74044b652a respect-destdir.patch 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch" diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index 72256b3a5..1554a00da 100644 --- a/user/claws-mail/APKBUILD +++ b/user/claws-mail/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=claws-mail -pkgver=3.17.6 +pkgver=3.17.8 pkgrel=0 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" @@ -15,6 +15,10 @@ makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev subpackages="$pkgname-doc $pkgname-lang" source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz" +# secfixes: +# 3.17.8-r0: +# - CVE-2020-16094 + build() { ./configure \ --build=$CBUILD \ @@ -36,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0 claws-mail-3.17.6.tar.xz" +sha512sums="dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7 claws-mail-3.17.8.tar.xz" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD index 5018779fc..906f45751 100644 --- a/user/cloc/APKBUILD +++ b/user/cloc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cloc pkgver=1.88 pkgrel=0 diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD index ff3469b1e..671c84733 100644 --- a/user/clutter/APKBUILD +++ b/user/clutter/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=clutter pkgver=1.26.4 pkgrel=0 diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index 5cb9f34ef..98330463e 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cogl pkgver=1.22.8 pkgrel=0 diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 093054850..a93426d1c 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=compton-conf pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD index 82b9cc638..e888fc31e 100644 --- a/user/compton/APKBUILD +++ b/user/compton/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=compton pkgver=4 pkgrel=0 diff --git a/user/confuse/APKBUILD b/user/confuse/APKBUILD index 4bdfa851f..fc31d73d1 100644 --- a/user/confuse/APKBUILD +++ b/user/confuse/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=confuse -pkgver=3.2.2 +pkgver=3.3 pkgrel=0 pkgdesc="Small configuration file parser library for C" -url=" " +url="https://github.com/martinh/libconfuse" arch="all" license="ISC" depends="" @@ -12,6 +12,10 @@ makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" +# secfixes: +# 3.3-r0: +# - CVE-2018-19760 + build() { ./configure \ --build=$CBUILD \ @@ -34,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9 confuse-3.2.2.tar.xz" +sha512sums="93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0 confuse-3.3.tar.xz" diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD index 1a90131ba..ca2e18186 100644 --- a/user/dconf/APKBUILD +++ b/user/dconf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=dconf pkgver=0.38.0 pkgrel=0 diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD index 0bce275b4..15654cc28 100644 --- a/user/dina/APKBUILD +++ b/user/dina/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=dina pkgver=2.93 pkgrel=0 diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index 64ac365e5..6f9a8d145 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.14 _pkgvermajor=2.3 pkgrel=0 -_pigeonholever=0.5.11 +_pigeonholever=0.5.14 _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="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 dovecot-2.3.14.tar.gz +c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc dovecot-2.3-pigeonhole-0.5.14.tar.gz fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch 0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch 5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f ssl-paths.patch -ee2e1916c712db77409567b4ded9c7fb7dfed295e044c19694bc369af3d4a7086caf14e97809531f76b630bc578271af6e5137985b7d4e8d2afb2a71f800912f time64.patch -7831276d17386b204ca3aed7fdd9439f00230aa345b367567133d568c07a92bec80ca7512c20b80f692f7f6809cf4a27398c9915aae763e0c9f641650540a73b apop.patch +277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9 test-file-cache-enomem.patch +28e0e3efcb1dd06cd971f1a8caa88989a165dbf14fdebf26ec1ab083020c6831231fec08c2a9d363e6af74003deeeb27122d044eccd02cf7945b464758e04622 time64.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/dovecot/time64.patch b/user/dovecot/time64.patch index c6f8e6261..4cd5c46e1 100644 --- a/user/dovecot/time64.patch +++ b/user/dovecot/time64.patch @@ -1,27 +1,17 @@ ---- dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c.old 2020-08-12 12:20:41.000000000 +0000 -+++ dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c 2020-09-15 14:21:24.285796733 +0000 -@@ -31,13 +31,13 @@ +--- dovecot-2.3.14.orig/src/lib-oauth2/oauth2-jwt.c 2021-03-13 23:56:53.250000000 +0000 ++++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c 2021-03-13 23:57:23.640000000 +0000 +@@ -31,7 +31,7 @@ } - static int get_time_field(const struct json_tree *tree, const char *key, -- long *value_r) -+ long long *value_r) + static int +-get_time_field(const struct json_tree *tree, const char *key, long *value_r) ++get_time_field(const struct json_tree *tree, const char *key, long long *value_r) { const char *value = get_field(tree, key); int tz_offset ATTR_UNUSED; - if (value == NULL) - return 0; -- if ((str_to_long(value, value_r) < 0 && -+ if ((str_to_llong(value, value_r) < 0 && - !iso8601_date_parse((const unsigned char*)value, strlen(value), - value_r, &tz_offset)) || - *value_r < 0) -@@ -283,9 +283,9 @@ - const char *sub = get_field(tree, "sub"); - +@@ -313,7 +313,7 @@ int ret; -- long t0 = time(NULL); -+ long long t0 = time(NULL); + long t0 = time(NULL); /* default IAT and NBF to now */ - long iat, nbf, exp; + long long iat, nbf, exp; diff --git a/user/eigen/APKBUILD b/user/eigen/APKBUILD index 125cf77fe..c44ed3011 100644 --- a/user/eigen/APKBUILD +++ b/user/eigen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: pkgname=eigen -pkgver=3.3.7 +pkgver=3.3.8 pkgrel=0 pkgdesc="Eigen is a C++ template library for linear algebra" url="http://eigen.tuxfamily.org/index.php?title=Main_Page" @@ -11,12 +11,9 @@ license="MPL-2.0" depends="" makedepends="" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::http://bitbucket.org/eigen/$pkgname/get/$pkgver.tar.gz" - -prepare() { - mv "$srcdir"/eigen-eigen-* "$builddir" # directory name contains hash - default_prepare -} +source="https://gitlab.com/libeigen/eigen/-/archive/$pkgver/eigen-$pkgver.tar.gz + assert-compile-error.patch + " package() { mkdir -p "$pkgdir"/usr/include/eigen3 @@ -24,4 +21,5 @@ package() { cp -r "$builddir"/unsupported "$pkgdir"/usr/include/eigen3 } -sha512sums="34cf600914cce719d61511577ef9cd26fbdcb7a6fad1d0ab8396f98b887fac6a5577d3967e84a8f56225cc50de38f3b91f34f447d14312028383e32b34ea1972 eigen-3.3.7.tar.gz" +sha512sums="5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355 eigen-3.3.8.tar.gz +26cdf877d4d3378b322cc08c0430b0628a07279a030732661ba4acb85d6c835956c99474fc4587a170d11437ca6715e56d8eaabb625a1eba7c46ce4d6e4d66f9 assert-compile-error.patch" diff --git a/user/eigen/assert-compile-error.patch b/user/eigen/assert-compile-error.patch new file mode 100644 index 000000000..556474e8b --- /dev/null +++ b/user/eigen/assert-compile-error.patch @@ -0,0 +1,64 @@ +From ef3cc72cb65e2d500459c178c63e349bacfa834f Mon Sep 17 00:00:00 2001 +From: Luke Peterson <hazelnusse@gmail.com> +Date: Thu, 8 Oct 2020 12:16:53 -0700 +Subject: [PATCH] Remove error counting in OpenMP parallelize_gemm + +This resolves a compilation error associated with +Eigen::eigen_assert_exception. It also eliminates the counting of +exceptions that may occur in the OpenMP parallel section. If an +unhandled exception occurs in this section, the behavior is non-conforming +according to the OpenMP specification. +--- + Eigen/src/Core/products/Parallelizer.h | 14 +++++--------- + test/CMakeLists.txt | 2 +- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h +index 67b2442b5..a3cc05b77 100644 +--- a/Eigen/src/Core/products/Parallelizer.h ++++ b/Eigen/src/Core/products/Parallelizer.h +@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth, + + ei_declare_aligned_stack_constructed_variable(GemmParallelInfo<Index>,info,threads,0); + +- int errorCount = 0; +- #pragma omp parallel num_threads(threads) reduction(+: errorCount) ++ #pragma omp parallel num_threads(threads) + { + Index i = omp_get_thread_num(); + // Note that the actual number of threads might be lower than the number of request ones. +@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth, + info[i].lhs_start = r0; + info[i].lhs_length = actualBlockRows; + +- EIGEN_TRY { +- if(transpose) func(c0, actualBlockCols, 0, rows, info); +- else func(0, rows, c0, actualBlockCols, info); +- } EIGEN_CATCH(...) { +- ++errorCount; +- } ++ if(transpose) ++ func(c0, actualBlockCols, 0, rows, info); ++ else ++ func(0, rows, c0, actualBlockCols, info); + } +- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception()); + #endif + } + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 0747aa6cb..b02577780 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -163,7 +163,7 @@ ei_add_test(constructor) + ei_add_test(linearstructure) + ei_add_test(integer_types) + ei_add_test(unalignedcount) +-if(NOT EIGEN_TEST_NO_EXCEPTIONS) ++if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP) + ei_add_test(exceptions) + endif() + ei_add_test(redux) +-- +GitLab + diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD index f77911f28..2750a1841 100644 --- a/user/engrampa/APKBUILD +++ b/user/engrampa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=engrampa pkgver=1.24.1 pkgrel=0 diff --git a/user/eom/APKBUILD b/user/eom/APKBUILD index 2cef9aebf..894927a9f 100644 --- a/user/eom/APKBUILD +++ b/user/eom/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=eom pkgver=1.24.1 pkgrel=0 diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index d3d135619..8657537fb 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=exo pkgver=0.12.11 pkgrel=0 diff --git a/user/f2fs-tools/APKBUILD b/user/f2fs-tools/APKBUILD index 7784c170d..59246c22e 100644 --- a/user/f2fs-tools/APKBUILD +++ b/user/f2fs-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: CyberLeo <cyberleo@cyberleo.net> # Maintainer: CyberLeo <cyberleo@cyberleo.net> pkgname=f2fs-tools -pkgver=1.13.0 +pkgver=1.14.0 pkgrel=0 pkgdesc="Tools for the Flash-Friendly File System (F2FS)" url="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" @@ -13,6 +13,14 @@ makedepends="automake autoconf bsd-compat-headers libtool util-linux-dev linux-h subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz" +#secfixes: +# 1.14.0-r0: +# - CVE-2020-6104 +# - CVE-2020-6105 +# - CVE-2020-6106 +# - CVE-2020-6107 +# - CVE-2020-6108 + prepare() { default_prepare ./autogen.sh @@ -31,4 +39,4 @@ package() { install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/ } -sha512sums="fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f f2fs-tools-1.13.0.tar.gz" +sha512sums="951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d f2fs-tools-1.14.0.tar.gz" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index bae2b7c71..c43f1b2dc 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=featherpad pkgver=0.15.0 pkgrel=0 diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD index b8f5f02a2..b788670d5 100644 --- a/user/ffmpegthumbnailer/APKBUILD +++ b/user/ffmpegthumbnailer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ffmpegthumbnailer pkgver=2.2.2 pkgrel=0 diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 08e2a6e47..91c779505 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -1,5 +1,5 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=fish pkgver=3.1.2 pkgrel=0 diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD index dcd9d98f2..db1aecdd3 100644 --- a/user/flite/APKBUILD +++ b/user/flite/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=flite pkgver=2.1 pkgrel=0 diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD index c0f490ea0..19fa8cf15 100644 --- a/user/free42/APKBUILD +++ b/user/free42/APKBUILD @@ -38,5 +38,5 @@ package() { sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop 470eb88936c65a053860af94955bf979973bad48c4b1f593598818f8ff0c39c4869613a05ad0e82b7a3fc6ce19fa7b8642a38e726d4a48e3fe63a9cbac8a45d6 libx11.patch -33afc0d0deb88143b3ec0a09fd2ba3de14d6ad269c9ecff55c9e89348d7bf76e2bbf880e0eef9a2c71eedb1da9136051a471d4aaaf9aa5acd4e992964a69692b patch.patch +a1ee3f1b6e524d64c7f599072ac5a0e3cae17c5b45cb89a9cc2b5eaa2b2f7337ad92bae2f8566ee01d50772231a3fe68d26e241c8d8a54375a9edbd7160acccc patch.patch 2e2e6c5a00de96f2ca1c61a0039a945bf0416c889b9131abf89c6eca4d8816ff0144c32634ac7c7b112fc1bd8cd6d816f22f2aed31bde59b96a79b9588235a02 unsigned-char.patch" diff --git a/user/free42/patch.patch b/user/free42/patch.patch index f79bb6c8e..8a043fe74 100644 --- a/user/free42/patch.patch +++ b/user/free42/patch.patch @@ -11,7 +11,7 @@ + # ============================================================================== + +-__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 -++__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 12 13 +++__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 + + GetIndex = $(strip $(word 1,$(if $(word $(words $(__INDICES__)),$2), \ + $(error "List too large. Adjust __INDICES__"), \ @@ -22,9 +22,9 @@ +-ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u +-ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 +-ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 -++ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ppc64 ppc armel aarch64 -++ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 -++ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 +++ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ppc64 ppc armel aarch64 armv7l +++ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 +++ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 + ARCH_TYPES := IA32 IA64 EFI2 + + UARCH_LIST := SSE GSSE LRB LRB2 diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index 78c8d96ae..88f531f10 100644 --- a/user/freetype/APKBUILD +++ b/user/freetype/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetype -pkgver=2.10.2 +pkgver=2.10.4 pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" @@ -14,6 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz" # secfixes: +# 2.10.4-r0: +# - CVE-2020-15999 # 2.9.1-r0: # - CVE-2018-6942 # 2.7.1-r1: @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa freetype-2.10.2.tar.xz" +sha512sums="827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f freetype-2.10.4.tar.xz" diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index 54e045d2b..18a0fd9fc 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=garcon pkgver=0.6.4 pkgrel=0 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/gleam/APKBUILD b/user/gleam/APKBUILD index 65271ea38..ebab3492b 100644 --- a/user/gleam/APKBUILD +++ b/user/gleam/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gleam pkgver=0.6.0 pkgrel=0 diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD index e404babdc..df19a6e1f 100644 --- a/user/glibmm/APKBUILD +++ b/user/glibmm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=glibmm pkgver=2.64.2 pkgrel=0 diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index cc92875e1..f61e5bfc2 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ -# Maintainer: +# Maintainer: Nathan <ndowens@artixlinux.org> pkgname=gobject-introspection -pkgver=1.62.0 +pkgver=1.66.1 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -37,4 +37,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638 gobject-introspection-1.62.0.tar.xz" +sha512sums="ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d gobject-introspection-1.66.1.tar.xz" diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 46fd83a7e..3388b82d1 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.36.1 +pkgver=3.38.0 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" @@ -14,6 +14,8 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve prepare() { default_prepare sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in + # Correct pkgconfig install path + sed -i "/install_dir/s,datadir,libdir," meson.build } build() { @@ -29,12 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -dev() { - default_dev - depends="$pkgname" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/share/pkgconfig "$subpkgdir"/usr/lib -} - - -sha512sums="623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8 gsettings-desktop-schemas-3.36.1.tar.xz" +sha512sums="5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756 gsettings-desktop-schemas-3.38.0.tar.xz" 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/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD index e2ed4bb8a..ba2d3ccef 100644 --- a/user/gtkmm+3.0/APKBUILD +++ b/user/gtkmm+3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gtkmm+3.0 pkgver=3.24.2 pkgrel=0 diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD index 82ae71d56..68c2a6e8b 100644 --- a/user/gtksourceview-3.0/APKBUILD +++ b/user/gtksourceview-3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gtksourceview-3.0 pkgver=3.24.11 pkgrel=0 diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index 4b8b298d6..53aeaf4f5 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gucharmap pkgver=13.0.3 _unicode=13.0.0 diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index bffe90b4e..7608d6817 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gvim _pkgreal=vim pkgver=8.2.1900 diff --git a/user/hexchat/APKBUILD b/user/hexchat/APKBUILD index 8ba05d268..9ee927d14 100644 --- a/user/hexchat/APKBUILD +++ b/user/hexchat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=hexchat pkgver=2.14.3 pkgrel=0 diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index b49640561..8d2e480c2 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=horizon -pkgver=0.9.5 -pkgrel=1 +pkgver=0.9.6 +pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" arch="all" @@ -17,9 +17,7 @@ makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev" subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 $pkgname-tools $pkgname-wizard $pkgname-boot" -source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz - bootloader.patch - " +source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -158,5 +156,4 @@ GLOBALS "$subpkgdir"/usr/share/xsessions/horizon.desktop } -sha512sums="373cbf87aa468d0ea41abad07f61cdaa6088cfdcba13c0beff245dbd8e270aa42c3e301a22913299d148e829114bd0b5aa746541c4b4b0c7286da35015c54d88 horizon-0.9.5.tar.xz -88e7c6df4dc2c8c7f6befd5f96f82267fefccb98d0c5e6c26c611323e505f7ee964dcfd2128dbe165c064d953e7afef2787ab49a6c4a834ffe8fd50c00eb26ae bootloader.patch" +sha512sums="d5ffe9bd423e98272ca780c59e6e32c42b284c68f3a0bace07bd693d457e2edcd68d7fc03f638b545960154ea26b7c09feee083dbffa986da2a7cd418be9500f horizon-0.9.6.tar.xz" diff --git a/user/horizon/bootloader.patch b/user/horizon/bootloader.patch deleted file mode 100644 index a09b4a603..000000000 --- a/user/horizon/bootloader.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 3658104dcc622e69a64cf97fbc9ed477f3faed6c Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 30 Sep 2020 19:19:59 -0500 -Subject: [PATCH] meta: Run update-boot when bootloader requested -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the user chooses no-boot or isn't installing Adélie, this will fail -quietly. But if the user is installing Adélie, this is necessary to -generate bootloader configuration. ---- - hscript/meta.cc | 26 ++++++++++++++++++++------ - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/hscript/meta.cc b/hscript/meta.cc -index 4efdc80..84e851a 100644 ---- a/hscript/meta.cc -+++ b/hscript/meta.cc -@@ -823,7 +823,7 @@ bool Bootloader::execute() const { - << std::endl - << "chroot " << script->targetDirectory() - << " grub-install " << _device << std::endl; -- return true; -+ goto updateboot; - } - #ifdef HAS_INSTALL_ENV - if(run_command("/sbin/apk", -@@ -851,8 +851,8 @@ bool Bootloader::execute() const { - mount(nullptr, efipath.c_str(), nullptr, - MS_REMOUNT | MS_BIND | MS_RDONLY | MS_NOEXEC | MS_NODEV | - MS_NOSUID | MS_RELATIME, nullptr); -+ goto updateboot; - #endif /* HAS_INSTALL_ENV */ -- return true; /* LCOV_EXCL_LINE */ - } - else if(method == "grub-bios") { - if(script->options().test(Simulate)) { -@@ -861,7 +861,7 @@ bool Bootloader::execute() const { - << std::endl - << "chroot " << script->targetDirectory() - << " grub-install " << _device << std::endl; -- return true; -+ goto updateboot; - } - #ifdef HAS_INSTALL_ENV - if(run_command("/sbin/apk", -@@ -876,8 +876,8 @@ bool Bootloader::execute() const { - output_error(pos, "bootloader: failed to install GRUB"); - return false; - } -+ goto updateboot; - #endif /* HAS_INSTALL_ENV */ -- return true; /* LCOV_EXCL_LINE */ - } - else if(method == "iquik") { - output_error(pos, "bootloader: iQUIK is not yet supported"); -@@ -891,7 +891,7 @@ bool Bootloader::execute() const { - << "chroot " << script->targetDirectory() - << " grub-install --macppc-directory=/boot/grub " - << _device << std::endl; -- return true; -+ goto updateboot; - } - #ifdef HAS_INSTALL_ENV - if(run_command("/sbin/apk", -@@ -907,9 +907,23 @@ bool Bootloader::execute() const { - output_error(pos, "bootloader: failed to install GRUB"); - return false; - } -+ goto updateboot; - #endif /* HAS_INSTALL_ENV */ -- return true; /* LCOV_EXCL_LINE */ - } - - return false; /* LCOV_EXCL_LINE */ -+ -+updateboot: -+ /* We ignore if update-boot fails, in case the user has chosen no-boot. */ -+ if(script->options().test(Simulate)) { -+ std::cout << "chroot " << script->targetDirectory() -+ << " /usr/sbin/update-boot || true" << std::endl; -+ } -+#ifdef HAS_INSTALL_ENV -+ else { -+ run_command("chroot", -+ {script->targetDirectory(), "/usr/sbin/update-boot"}); -+ } -+#endif /* HAS_INSTALL_ENV */ -+ return true; - } --- -2.25.4 - diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD index 01e567cee..f143b6fc5 100644 --- a/user/i3status/APKBUILD +++ b/user/i3status/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=i3status pkgver=2.13 -pkgrel=1 +pkgrel=2 pkgdesc="Status bar generator for dzen2, xmobar or similar" url="https://i3wm.org/i3status/" arch="all" diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index e7927e44b..48f90891e 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=icewm pkgver=1.8.3 pkgrel=0 diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD index 329b48ddd..dd3f36858 100644 --- a/user/ido/APKBUILD +++ b/user/ido/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ido pkgver=13.10.0 pkgrel=0 diff --git a/user/imlib2/APKBUILD b/user/imlib2/APKBUILD index 09733a11b..698485e04 100644 --- a/user/imlib2/APKBUILD +++ b/user/imlib2/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: Nathan <ndowens@artixlinux.org> pkgname=imlib2 -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Image manipulation library" url="https://sourceforge.net/projects/enlightenment" arch="all" @@ -11,7 +11,9 @@ depends_dev="freetype-dev libxext-dev libsm-dev" makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev libpng-dev libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/enlightenment/$pkgname-src/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/enlightenment/$pkgname-src/$pkgname-$pkgver.tar.bz2 + loader-build.patch + " build() { ./configure \ @@ -41,4 +43,5 @@ package() { make DESTDIR=$pkgdir install } -sha512sums="ecdbdbfe8767ec2b1f22ce664cbab5e1d3f75be7a3c8f37488f5243b3c31dbc433414b8d50d2d1b70c67a80e31e42cc5398161991ce3955e991c114c82ddd58f imlib2-1.6.1.tar.bz2" +sha512sums="078126269565b55f4b167608ee65d558711e37c34283fb6193752b27f7fc59c738cbd38839b17203273defee20c2ffc41a495e44364089deebffbd39c67e6d72 imlib2-1.7.0.tar.bz2 +4f3139fa1caf64aff6f24f7fb95070b02280145119dcf5bb6f379ec1f4ded07d22317cb09eb42f911b12d90de4b84b6391ebf82305b129d6689089e5054c5e26 loader-build.patch" diff --git a/user/imlib2/loader-build.patch b/user/imlib2/loader-build.patch new file mode 100644 index 000000000..44af31f35 --- /dev/null +++ b/user/imlib2/loader-build.patch @@ -0,0 +1,26 @@ +From 92d3153fee9f915cf2bdbc92a7551e5a83985e81 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Sun, 9 Aug 2020 21:00:46 +0200 +Subject: Fix big endian build + +--- + src/modules/loaders/loader_argb.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/modules/loaders/loader_argb.c b/src/modules/loaders/loader_argb.c +index ec58ca3..b915b7b 100644 +--- a/src/modules/loaders/loader_argb.c ++++ b/src/modules/loaders/loader_argb.c +@@ -7,6 +7,9 @@ load2(ImlibImage * im, int load_data) + int w = 0, h = 0, alpha = 0; + DATA32 *ptr; + int y; ++#ifdef WORDS_BIGENDIAN ++ int l; ++#endif + + rc = LOAD_FAIL; + +-- +cgit v1.2.1 + diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index 3e6319e30..67c18a1e7 100644 --- a/user/irssi/APKBUILD +++ b/user/irssi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=irssi pkgver=1.2.2 pkgrel=0 diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD index bf5447aff..4bc9291b6 100644 --- a/user/json-glib/APKBUILD +++ b/user/json-glib/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=json-glib pkgver=1.6.0 pkgrel=0 diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 5df4dd36d..fb0c11c6b 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive pkgver=20.08.1 -pkgrel=0 +pkgrel=1 pkgdesc="Libre video editor" url="https://kdenlive.org/" arch="all" diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD index 63d1a84ca..00cfdc438 100644 --- a/user/keybinder-3.0/APKBUILD +++ b/user/keybinder-3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=keybinder-3.0 pkgver=0.3.2 pkgrel=0 diff --git a/user/libass/APKBUILD b/user/libass/APKBUILD index f39c95ee3..6fa67ae60 100644 --- a/user/libass/APKBUILD +++ b/user/libass/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libass pkgver=0.14.0 pkgrel=0 diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD index f31ad1658..8fc848e1c 100644 --- a/user/libayatana-indicator/APKBUILD +++ b/user/libayatana-indicator/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libayatana-indicator pkgver=0.8.2 pkgrel=0 diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD index e6ff9bc25..9521b129f 100644 --- a/user/libburn/APKBUILD +++ b/user/libburn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libburn pkgver=1.5.2 pkgrel=0 diff --git a/user/libcroco/APKBUILD b/user/libcroco/APKBUILD index 209720aaa..4470ac952 100644 --- a/user/libcroco/APKBUILD +++ b/user/libcroco/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libcroco pkgver=0.6.13 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME CSS 2 parsing and manipulation toolkit" url="https://gitlab.gnome.org/GNOME/libcroco" arch="all" @@ -11,11 +11,15 @@ subpackages="$pkgname-dev" depends="" makedepends="glib-dev libxml2-dev" checkdepends="cmd:which" -source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz" +source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz + CVE-2020-12825.patch + " # secfixes: # 0.6.12-r2: # - CVE-2017-7960 +# 0.6.13-r1: +# - CVE-2020-12825 build() { ./configure \ @@ -34,4 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 libcroco-0.6.13.tar.xz" +sha512sums="038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 libcroco-0.6.13.tar.xz +ae568a259a2a3a90f6cf107b4f0d5a0dbb6cb3a560262a43b96460457a4b72b7c5f45c2df9c061ed1f94c41b71bdcf69bd55582a77bf858e46c2c3c8a55fe6e3 CVE-2020-12825.patch" diff --git a/user/libcroco/CVE-2020-12825.patch b/user/libcroco/CVE-2020-12825.patch new file mode 100644 index 000000000..6fa66f659 --- /dev/null +++ b/user/libcroco/CVE-2020-12825.patch @@ -0,0 +1,187 @@ +From 44cbd1e718d6a08e59b9300280c340218a84e089 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@gnome.org> +Date: Wed, 12 Aug 2020 13:54:15 -0500 +Subject: [PATCH] libcroco: Limit recursion in block and any productions + (CVE-2020-12825) + +If we don't have any limits, we can recurse forever and overflow the +stack. + +This is per https://gitlab.gnome.org/Archive/libcroco/-/issues/8 + +https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1404 +--- + src/cr-parser.c | 44 ++++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 15 deletions(-) + +diff --git a/src/cr-parser.c b/src/st/croco/cr-parser.c +index 07f4ed9e8b..8304b75614 100644 +--- a/src/cr-parser.c ++++ b/src/cr-parser.c +@@ -136,6 +136,8 @@ struct _CRParserPriv { + + #define CHARS_TAB_SIZE 12 + ++#define RECURSIVE_CALLERS_LIMIT 100 ++ + /** + * IS_NUM: + *@a_char: the char to test. +@@ -343,9 +345,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this); + + static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this); + +-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls); + +-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls); + + static enum CRStatus cr_parser_parse_value_core (CRParser * a_this); + +@@ -783,7 +787,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_parser_try_to_skip_spaces_and_comments (a_this); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + } while (status == CR_OK); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, +@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, + FALSE); + goto done; +@@ -929,11 +933,11 @@ cr_parser_parse_selector_core (CRParser * a_this) + + RECORD_INITIAL_POS (a_this, &init_pos); + +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + + } while (status == CR_OK); + +@@ -955,10 +959,12 @@ cr_parser_parse_selector_core (CRParser * a_this) + *in chapter 4.1 of the css2 spec. + *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*; + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *FIXME: code this function. + */ + static enum CRStatus +-cr_parser_parse_block_core (CRParser * a_this) ++cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token = NULL; + CRInputPos init_pos; +@@ -966,6 +972,9 @@ cr_parser_parse_block_core (CRParser * a_this) + + g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token); +@@ -995,13 +1004,13 @@ cr_parser_parse_block_core (CRParser * a_this) + } else if (token->type == CBO_TK) { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } else { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } +@@ -1108,7 +1117,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + ref++; + goto continue_parsing; +@@ -1122,7 +1131,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + if (status == CR_OK) { + ref++; + goto continue_parsing; +@@ -1161,10 +1170,12 @@ cr_parser_parse_value_core (CRParser * a_this) + * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*; + * + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *@return CR_OK upon successfull completion, an error code otherwise. + */ + static enum CRStatus +-cr_parser_parse_any_core (CRParser * a_this) ++cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token1 = NULL, + *token2 = NULL; +@@ -1173,6 +1184,9 @@ cr_parser_parse_any_core (CRParser * a_this) + + g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1); +@@ -1211,7 +1225,7 @@ cr_parser_parse_any_core (CRParser * a_this) + *We consider parameter as being an "any*" production. + */ + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1236,7 +1250,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1264,7 +1278,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +-- +GitLab + diff --git a/user/libebml/APKBUILD b/user/libebml/APKBUILD index e9145cd5a..c7b2b1093 100644 --- a/user/libebml/APKBUILD +++ b/user/libebml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libebml -pkgver=1.3.10 +pkgver=1.4.0 pkgrel=0 pkgdesc="Library to parse Extensible Binary Meta-Language files" url="https://www.matroska.org/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 libebml-1.3.10.tar.xz" +sha512sums="db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230 libebml-1.4.0.tar.xz" diff --git a/user/libfakekey/APKBUILD b/user/libfakekey/APKBUILD index af08c494c..ea1eec3f8 100644 --- a/user/libfakekey/APKBUILD +++ b/user/libfakekey/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libfakekey pkgver=0.3 pkgrel=0 diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 674621204..ac679104b 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libfm-qt pkgver=0.15.1 pkgrel=0 diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD index 9b09c9104..e8dd25f21 100644 --- a/user/libglade/APKBUILD +++ b/user/libglade/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libglade pkgver=2.6.4 pkgrel=0 diff --git a/user/libgnome-keyring/APKBUILD b/user/libgnome-keyring/APKBUILD index 7ecb68377..fdc1af0dd 100644 --- a/user/libgnome-keyring/APKBUILD +++ b/user/libgnome-keyring/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libgnome-keyring pkgver=3.12.0 pkgrel=0 diff --git a/user/libgtop/APKBUILD b/user/libgtop/APKBUILD index 37b1ef0e2..a03e337e9 100644 --- a/user/libgtop/APKBUILD +++ b/user/libgtop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libgtop pkgver=2.40.0 pkgrel=0 diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD index 3c57d570c..a76c9b185 100644 --- a/user/libindicator/APKBUILD +++ b/user/libindicator/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libindicator pkgver=16.10 pkgrel=0 diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD index b870b3be7..3671011b1 100644 --- a/user/libisofs/APKBUILD +++ b/user/libisofs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libisofs pkgver=1.5.2 pkgrel=0 diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index cbecdd1a4..5910e7011 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.4 -pkgrel=1 +pkgver=2.0.5 +pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" @@ -11,7 +11,6 @@ depends="" makedepends="cmake" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz - CVE-2020-13790.patch " case "$CTARGET_ARCH" in @@ -63,5 +62,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz -83752558d0cf60508a9ccd55505b91f4faa22277537916629a045b2aaa0cb3649e2f90b0df26d389687dc4aba78bdf76e64fc5e5eb324a65026ec86cd95dbe6a CVE-2020-13790.patch" +sha512sums="5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 libjpeg-turbo-2.0.5.tar.gz" diff --git a/user/libjpeg-turbo/CVE-2020-13790.patch b/user/libjpeg-turbo/CVE-2020-13790.patch deleted file mode 100644 index aaeec0c9c..000000000 --- a/user/libjpeg-turbo/CVE-2020-13790.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001 -From: DRC <information@libjpeg-turbo.org> -Date: Tue, 2 Jun 2020 14:15:37 -0500 -Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM - -This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to -include binary PPM files with maximum values < 255, thus preventing a -malformed binary PPM input file with those specifications from -triggering an overrun of the rescale array and potentially crashing -cjpeg, TJBench, or any program that uses the tjLoadImage() function. - -Fixes #433 - -diff --git a/rdppm.c b/rdppm.c -index 87bc33090..a8507b902 100644 ---- a/rdppm.c -+++ b/rdppm.c -@@ -5,7 +5,7 @@ - * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2009 by Bill Allombert, Guido Vollbeding. - * libjpeg-turbo Modifications: -- * Copyright (C) 2015-2017, D. R. Commander. -+ * Copyright (C) 2015-2017, 2020, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * -@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) - /* On 16-bit-int machines we have to be careful of maxval = 65535 */ - source->rescale = (JSAMPLE *) - (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, -- (size_t)(((long)maxval + 1L) * -+ (size_t)(((long)MAX(maxval, 255) + 1L) * - sizeof(JSAMPLE))); - half_maxval = maxval / 2; - for (val = 0; val <= (long)maxval; val++) { diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 24ff091bf..d9cd7cfa5 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=liblxqt pkgver=0.15.1 pkgrel=0 diff --git a/user/libmatekbd/APKBUILD b/user/libmatekbd/APKBUILD index cc3c030f6..871efed9d 100644 --- a/user/libmatekbd/APKBUILD +++ b/user/libmatekbd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmatekbd pkgver=1.24.1 pkgrel=0 diff --git a/user/libmatemixer/APKBUILD b/user/libmatemixer/APKBUILD index 50954203b..b2a791106 100644 --- a/user/libmatemixer/APKBUILD +++ b/user/libmatemixer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmatemixer pkgver=1.24.1 pkgrel=0 diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD index 34839685c..4e29d4d8c 100644 --- a/user/libmateweather/APKBUILD +++ b/user/libmateweather/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmateweather pkgver=1.24.1 pkgrel=0 diff --git a/user/libmatroska/APKBUILD b/user/libmatroska/APKBUILD index 076e9a9e2..de30dc6ba 100644 --- a/user/libmatroska/APKBUILD +++ b/user/libmatroska/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libmatroska -pkgver=1.5.2 +pkgver=1.6.2 pkgrel=0 pkgdesc="Library to parse Matroska files" url="https://www.matroska.org/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2 libmatroska-1.5.2.tar.xz" +sha512sums="c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1 libmatroska-1.6.2.tar.xz" diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD index c1fa255fd..f15d1b0fd 100644 --- a/user/libmpd/APKBUILD +++ b/user/libmpd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmpd pkgver=11.8.17 pkgrel=0 diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 9745b8784..d9a3771a0 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=libnftnl -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407 libnftnl-1.1.7.tar.bz2" +sha512sums="173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e libnftnl-1.1.8.tar.bz2" diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD index a03e7c089..f3cea249b 100644 --- a/user/libopenraw/APKBUILD +++ b/user/libopenraw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libopenraw pkgver=0.1.3 pkgrel=0 diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 8f4447b9c..9fc1333a4 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libpeas pkgver=1.28.0 pkgrel=0 diff --git a/user/libproxy/APKBUILD b/user/libproxy/APKBUILD index 1cdb0c9b5..7a13ebc05 100644 --- a/user/libproxy/APKBUILD +++ b/user/libproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libproxy pkgver=0.4.15 -pkgrel=2 +pkgrel=3 pkgdesc="Library providing automatic proxy configuration management" url="http://libproxy.github.io/libproxy/" arch="all" @@ -14,8 +14,15 @@ subpackages="$pkgname-dev $pkgname-bin py3-$pkgname:py" source="$pkgname-$pkgver.tar.gz::https://github.com/libproxy/libproxy/archive/$pkgver.tar.gz libproxy-0.4.7-unistd.patch fix-includes.patch + CVE-2020-25219.patch + CVE-2020-26154.patch " +# secfixes: +# 0.4.15-r3: +# - CVE-2020-25219 +# - CVE-2020-26154 + build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -55,4 +62,6 @@ py() { sha512sums="8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b libproxy-0.4.15.tar.gz 9929c308195bc59c1b9a7ddaaf708fb831da83c5d86d7ce122cb9774c9b9b16aef3c17fb721356e33a865de1af27db493f29a99d292e1e258cd0135218cacd32 libproxy-0.4.7-unistd.patch -e35b4f806e5f60e9b184d64dceae62e6e343c367ee96d7e461388f2665fe2ab62170d41848c9da5322bb1719eff3bfaecb273e40a97ce940a5e88d29d03bd8d9 fix-includes.patch" +e35b4f806e5f60e9b184d64dceae62e6e343c367ee96d7e461388f2665fe2ab62170d41848c9da5322bb1719eff3bfaecb273e40a97ce940a5e88d29d03bd8d9 fix-includes.patch +908fbf49bec18764a8c2ab81ef5d5e6e1fc2423cf9a6608cc7d3a6d5ac44676e171646b0f95b39b7ade108afd62cc2ede8f7b57d6ba0d67025f30b18e5084292 CVE-2020-25219.patch +01c784a8016bb2a2bf5058b6af7fac29250542bfd4e0679a91fa223c821336d651f8f4a968763072edb86a78a743618c312a2daeb2963c8e5207109f2d26a18f CVE-2020-26154.patch" diff --git a/user/libproxy/CVE-2020-25219.patch b/user/libproxy/CVE-2020-25219.patch new file mode 100644 index 000000000..03cfbc00e --- /dev/null +++ b/user/libproxy/CVE-2020-25219.patch @@ -0,0 +1,57 @@ +From a83dae404feac517695c23ff43ce1e116e2bfbe0 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@gnome.org> +Date: Wed, 9 Sep 2020 11:12:02 -0500 +Subject: [PATCH] Rewrite url::recvline to be nonrecursive + +This function processes network input. It's semi-trusted, because the +PAC ought to be trusted. But we still shouldn't allow it to control how +far we recurse. A malicious PAC can cause us to overflow the stack by +sending a sufficiently-long line without any '\n' character. + +Also, this function failed to properly handle EINTR, so let's fix that +too, for good measure. + +Fixes #134 +--- + libproxy/url.cpp | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/libproxy/url.cpp b/libproxy/url.cpp +index ee776b2..68d69cd 100644 +--- a/libproxy/url.cpp ++++ b/libproxy/url.cpp +@@ -388,16 +388,24 @@ string url::to_string() const { + return m_orig; + } + +-static inline string recvline(int fd) { +- // Read a character. +- // If we don't get a character, return empty string. +- // If we are at the end of the line, return empty string. +- char c = '\0'; +- +- if (recv(fd, &c, 1, 0) != 1 || c == '\n') +- return ""; +- +- return string(1, c) + recvline(fd); ++static string recvline(int fd) { ++ string line; ++ int ret; ++ ++ // Reserve arbitrary amount of space to avoid small memory reallocations. ++ line.reserve(128); ++ ++ do { ++ char c; ++ ret = recv(fd, &c, 1, 0); ++ if (ret == 1) { ++ if (c == '\n') ++ return line; ++ line += c; ++ } ++ } while (ret == 1 || (ret == -1 && errno == EINTR)); ++ ++ return line; + } + + char* url::get_pac() { diff --git a/user/libproxy/CVE-2020-26154.patch b/user/libproxy/CVE-2020-26154.patch new file mode 100644 index 000000000..929083327 --- /dev/null +++ b/user/libproxy/CVE-2020-26154.patch @@ -0,0 +1,93 @@ +From 4411b523545b22022b4be7d0cac25aa170ae1d3e Mon Sep 17 00:00:00 2001 +From: Fei Li <lifeibiren@gmail.com> +Date: Fri, 17 Jul 2020 02:18:37 +0800 +Subject: [PATCH] Fix buffer overflow when PAC is enabled + +The bug was found on Windows 10 (MINGW64) when PAC is enabled. It turned +out to be the large PAC file (more than 102400 bytes) returned by a +local proxy program with no content-length present. +--- + libproxy/url.cpp | 44 +++++++++++++++++++++++++++++++------------- + 1 file changed, 31 insertions(+), 13 deletions(-) + +diff --git a/libproxy/url.cpp b/libproxy/url.cpp +index ee776b2..8684086 100644 +--- a/libproxy/url.cpp ++++ b/libproxy/url.cpp +@@ -54,7 +54,7 @@ using namespace std; + #define PAC_MIME_TYPE_FB "text/plain" + + // This is the maximum pac size (to avoid memory attacks) +-#define PAC_MAX_SIZE 102400 ++#define PAC_MAX_SIZE 0x800000 + // This is the default block size to use when receiving via HTTP + #define PAC_HTTP_BLOCK_SIZE 512 + +@@ -478,15 +478,13 @@ char* url::get_pac() { + } + + // Get content +- unsigned int recvd = 0; +- buffer = new char[PAC_MAX_SIZE]; +- memset(buffer, 0, PAC_MAX_SIZE); ++ std::vector<char> dynamic_buffer; + do { + unsigned int chunk_length; + + if (chunked) { + // Discard the empty line if we received a previous chunk +- if (recvd > 0) recvline(sock); ++ if (!dynamic_buffer.empty()) recvline(sock); + + // Get the chunk-length line as an integer + if (sscanf(recvline(sock).c_str(), "%x", &chunk_length) != 1 || chunk_length == 0) break; +@@ -498,21 +496,41 @@ char* url::get_pac() { + + if (content_length >= PAC_MAX_SIZE) break; + +- while (content_length == 0 || recvd != content_length) { +- int r = recv(sock, buffer + recvd, +- content_length == 0 ? PAC_HTTP_BLOCK_SIZE +- : content_length - recvd, 0); ++ while (content_length == 0 || dynamic_buffer.size() != content_length) { ++ // Calculate length to recv ++ unsigned int length_to_read = PAC_HTTP_BLOCK_SIZE; ++ if (content_length > 0) ++ length_to_read = content_length - dynamic_buffer.size(); ++ ++ // Prepare buffer ++ dynamic_buffer.resize(dynamic_buffer.size() + length_to_read); ++ ++ int r = recv(sock, dynamic_buffer.data() + dynamic_buffer.size() - length_to_read, length_to_read, 0); ++ ++ // Shrink buffer to fit ++ if (r >= 0) ++ dynamic_buffer.resize(dynamic_buffer.size() - length_to_read + r); ++ ++ // PAC size too large, discard ++ if (dynamic_buffer.size() >= PAC_MAX_SIZE) { ++ chunked = false; ++ dynamic_buffer.clear(); ++ break; ++ } ++ + if (r <= 0) { + chunked = false; + break; + } +- recvd += r; + } + } while (chunked); + +- if (content_length != 0 && string(buffer).size() != content_length) { +- delete[] buffer; +- buffer = NULL; ++ if (content_length == 0 || content_length == dynamic_buffer.size()) { ++ buffer = new char[dynamic_buffer.size() + 1]; ++ if (!dynamic_buffer.empty()) { ++ memcpy(buffer, dynamic_buffer.data(), dynamic_buffer.size()); ++ } ++ buffer[dynamic_buffer.size()] = '\0'; + } + } + diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD index 2b842085b..a45b2876a 100644 --- a/user/libpsl/APKBUILD +++ b/user/libpsl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libpsl pkgver=0.21.1 pkgrel=0 diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index 7b0e70656..76807b5bf 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libqtxdg pkgver=3.5.0 pkgrel=0 diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD index 943216d01..393d18e77 100644 --- a/user/libsigc++/APKBUILD +++ b/user/libsigc++/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libsigc++ pkgver=2.10.2 pkgrel=0 diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index 7992f7d22..dc5d4c132 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libsoup pkgver=2.70.0 pkgrel=0 diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD index 45a2bc72d..c1724f0d8 100644 --- a/user/libstatgrab/APKBUILD +++ b/user/libstatgrab/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libstatgrab pkgver=0.92 pkgrel=0 diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 6c4e0ffc4..9f20151ed 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libsysstat pkgver=0.4.3 _lxqt_build=0.7.0 diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD index a003a6b92..215b3b850 100644 --- a/user/libwebp/APKBUILD +++ b/user/libwebp/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: pkgname=libwebp pkgver=1.0.3 diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD index 2a33337a0..bf38f30bd 100644 --- a/user/libwnck/APKBUILD +++ b/user/libwnck/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libwnck pkgver=3.36.0 _pkgmaj=${pkgver%.*} diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 62acc0a53..85300dd25 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libxfce4ui pkgver=4.14.1 pkgrel=0 diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 823692e8e..1b3b0c22b 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libxfce4util pkgver=4.14.0 pkgrel=0 diff --git a/user/libxklavier/APKBUILD b/user/libxklavier/APKBUILD index 3effb3cba..a8ecb207c 100644 --- a/user/libxklavier/APKBUILD +++ b/user/libxklavier/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libxklavier pkgver=5.4 pkgrel=2 diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 704f89173..55929a9f1 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contribtor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lua-expat pkgver=1.3.3 pkgrel=0 diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index c4449467b..40d6fd1a8 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lua-filesystem _pkgname=luafilesystem pkgver=1.8.0 diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 7c0197036..18db2ba8b 100644 --- a/user/lua-socket/APKBUILD +++ b/user/lua-socket/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lua-socket _name=luasocket pkgver=3.0_rc1_git20160306 diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index 183fe20c5..7048a179b 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=luarocks pkgver=3.4.0 pkgrel=0 diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index 1dce23e0f..185bb86bb 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lximage-qt pkgver=0.15.0 pkgrel=0 diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD index 903ec3079..22de994d3 100644 --- a/user/lxmenu-data/APKBUILD +++ b/user/lxmenu-data/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxmenu-data pkgver=0.1.5 pkgrel=1 diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 799843b1c..4f65e7a69 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-about pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index 5267f2663..b455996cf 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-admin pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-archiver/APKBUILD b/user/lxqt-archiver/APKBUILD index b3a23905a..0dd3851c0 100644 --- a/user/lxqt-archiver/APKBUILD +++ b/user/lxqt-archiver/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-archiver pkgver=0.2.0 _lxqt=0.15.0 diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index 3439629fe..baf55aab0 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-build-tools pkgver=0.7.0 pkgrel=0 diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 9f7b280df..2e7a56379 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-config pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index af52254f2..4434caeb6 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-desktop pkgver=0.15.0 pkgrel=0 diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index 5e8f3d607..b15bcfdae 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-globalkeys pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD index 8b670254e..dc635ccf6 100644 --- a/user/lxqt-l10n/APKBUILD +++ b/user/lxqt-l10n/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-l10n pkgver=0.13.0 pkgrel=1 diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 186659ef6..6b35346fc 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-notificationd pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index 522c95b77..ead20c606 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-openssh-askpass pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index 612652a82..a089cce0c 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-panel pkgver=0.15.1 _lxqt_build=0.7.0 diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index c1944f330..621c6a3de 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-policykit pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 775735e4c..d92980e83 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-powermanagement pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index e9b2485d8..464689f9e 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-qtplugin pkgver=0.15.1 pkgrel=0 diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index 865c21555..4e9c876df 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-runner pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index a10f61174..0fcd1a3b4 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-session pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index 8014d2bd9..7ee30f853 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-sudo pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index 63ff10079..83b049c99 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-themes pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index 4bd75c160..011cf2822 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lynx pkgver=2.8.9_p1 _relver="${pkgver%_p*}rel.${pkgver#*_p}" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index b138a4789..28dbba45c 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=marco pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-applets/APKBUILD b/user/mate-applets/APKBUILD index 5fdaee9b0..bf91290a6 100644 --- a/user/mate-applets/APKBUILD +++ b/user/mate-applets/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-applets pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD index 6fb270902..6f392b8f4 100644 --- a/user/mate-backgrounds/APKBUILD +++ b/user/mate-backgrounds/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-backgrounds pkgver=1.24.2 pkgrel=0 diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD index 6b78e3749..ab8189e5f 100644 --- a/user/mate-calc/APKBUILD +++ b/user/mate-calc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-calc pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-common/APKBUILD b/user/mate-common/APKBUILD index 910f80563..4670f0a1f 100644 --- a/user/mate-common/APKBUILD +++ b/user/mate-common/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-common pkgver=1.24.2 pkgrel=0 diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD index 1f2373aad..81e7a2590 100644 --- a/user/mate-complete/APKBUILD +++ b/user/mate-complete/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-complete pkgver=1.22.0 pkgrel=1 diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD index 27f932025..5499e8ae3 100644 --- a/user/mate-control-center/APKBUILD +++ b/user/mate-control-center/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-control-center pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD index 725233d44..d62a2bb9d 100644 --- a/user/mate-desktop/APKBUILD +++ b/user/mate-desktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-desktop pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD index eb5431a39..8a7e7a4bf 100644 --- a/user/mate-icon-theme/APKBUILD +++ b/user/mate-icon-theme/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-icon-theme pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-indicator-applet/APKBUILD b/user/mate-indicator-applet/APKBUILD index 1f16d683a..e717b48ec 100644 --- a/user/mate-indicator-applet/APKBUILD +++ b/user/mate-indicator-applet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-indicator-applet pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-media/APKBUILD b/user/mate-media/APKBUILD index 7fd9c64d9..e1b71d207 100644 --- a/user/mate-media/APKBUILD +++ b/user/mate-media/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-media pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD index ced3a050b..bbe2af97f 100644 --- a/user/mate-menus/APKBUILD +++ b/user/mate-menus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-menus pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-netbook/APKBUILD b/user/mate-netbook/APKBUILD index d2ef4243c..cfd970b41 100644 --- a/user/mate-netbook/APKBUILD +++ b/user/mate-netbook/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-netbook pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-notification-daemon/APKBUILD b/user/mate-notification-daemon/APKBUILD index cc0831cf2..2f1981e3d 100644 --- a/user/mate-notification-daemon/APKBUILD +++ b/user/mate-notification-daemon/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-notification-daemon pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-panel/APKBUILD b/user/mate-panel/APKBUILD index 946937eb2..73d5ec980 100644 --- a/user/mate-panel/APKBUILD +++ b/user/mate-panel/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-panel pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-polkit/APKBUILD b/user/mate-polkit/APKBUILD index c634bcd6a..817c0f12a 100644 --- a/user/mate-polkit/APKBUILD +++ b/user/mate-polkit/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-polkit pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-power-manager/APKBUILD b/user/mate-power-manager/APKBUILD index 916684668..9401b77d9 100644 --- a/user/mate-power-manager/APKBUILD +++ b/user/mate-power-manager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-power-manager pkgver=1.24.2 pkgrel=0 diff --git a/user/mate-screensaver/APKBUILD b/user/mate-screensaver/APKBUILD index a42328976..f27fe8a28 100644 --- a/user/mate-screensaver/APKBUILD +++ b/user/mate-screensaver/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-screensaver pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-sensors-applet/APKBUILD b/user/mate-sensors-applet/APKBUILD index 2f3afdd6b..2fe06db71 100644 --- a/user/mate-sensors-applet/APKBUILD +++ b/user/mate-sensors-applet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-sensors-applet pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD index 315e957ff..1f2c4e890 100644 --- a/user/mate-session-manager/APKBUILD +++ b/user/mate-session-manager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-session-manager pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-settings-daemon/APKBUILD b/user/mate-settings-daemon/APKBUILD index 017a8cce7..f2a472f59 100644 --- a/user/mate-settings-daemon/APKBUILD +++ b/user/mate-settings-daemon/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-settings-daemon pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-system-monitor/APKBUILD b/user/mate-system-monitor/APKBUILD index 2ed4de2f0..71951024f 100644 --- a/user/mate-system-monitor/APKBUILD +++ b/user/mate-system-monitor/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-system-monitor pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-terminal/APKBUILD b/user/mate-terminal/APKBUILD index 24deabf94..afc127494 100644 --- a/user/mate-terminal/APKBUILD +++ b/user/mate-terminal/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-terminal pkgver=1.24.1 pkgrel=0 diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD index c9ec36fe0..d0466f14f 100644 --- a/user/mate-user-guide/APKBUILD +++ b/user/mate-user-guide/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-user-guide pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-user-share/APKBUILD b/user/mate-user-share/APKBUILD index d20aae02f..915fc7e52 100644 --- a/user/mate-user-share/APKBUILD +++ b/user/mate-user-share/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-user-share pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-utils/APKBUILD b/user/mate-utils/APKBUILD index 710cfd1bf..1ecd284a0 100644 --- a/user/mate-utils/APKBUILD +++ b/user/mate-utils/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-utils pkgver=1.24.0 pkgrel=0 diff --git a/user/mbuffer/APKBUILD b/user/mbuffer/APKBUILD new file mode 100644 index 000000000..fbcaeaeb9 --- /dev/null +++ b/user/mbuffer/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=mbuffer +pkgver=20200929 +pkgrel=0 +pkgdesc="mbuffer is a tool for buffering data streams." +url="http://www.maier-komor.de/mbuffer.html" +arch="all" +license="GPL-3.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="http://www.maier-komor.de/software/mbuffer/mbuffer-$pkgver.tgz + test-static-file-instead.patch" + +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="332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996 mbuffer-20200929.tgz +28b7c7c7ee2b2130315cd6c4765d492e9d29376670a03ab0a1ab862a1ec5dea93e91e9de5e08604db69fe4139370eedb2a0754f16e5ebec3de9b48dc2a1dbea7 test-static-file-instead.patch" diff --git a/user/mbuffer/test-static-file-instead.patch b/user/mbuffer/test-static-file-instead.patch new file mode 100644 index 000000000..9c549bfaa --- /dev/null +++ b/user/mbuffer/test-static-file-instead.patch @@ -0,0 +1,11 @@ +--- mbuffer-20200929/Makefile.in.orig 2020-11-08 07:47:44.512670020 +0000 ++++ mbuffer-20200929/Makefile.in 2020-11-08 07:48:33.032115323 +0000 +@@ -101,7 +101,7 @@ + test.tar test.md5 mbuffer.md5 idev.so tapetest.so have-af + + test.tar: +- $(TAR) cf test.tar --ignore-failed-read $(TESTTREE) ++ truncate -s 10M test.tar + + test.md5: test.tar + openssl md5 < test.tar > test.md5 diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index d975e1460..5164bae64 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.52.1 +pkgver=0.55.3 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="81e8c5897ba5311ccffc401fd514bd9a67d16caaea1f28a5c5432605766341ecd82b70c05661fbbe0c9a6006ff5ea892950bbaa548e70c3f87350438775ea6fd meson-0.52.1.tar.gz" +sha512sums="afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae meson-0.55.3.tar.gz" diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD index 8913eecd8..843a382ee 100644 --- a/user/mimetic/APKBUILD +++ b/user/mimetic/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mimetic pkgver=0.9.8 pkgrel=0 diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD index 695fdc5c2..8c0e47752 100644 --- a/user/mksh/APKBUILD +++ b/user/mksh/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Marek Benc <dusxmt@gmx.com> # Maintainer: Marek Benc <dusxmt@gmx.com> pkgname=mksh -pkgver=59b +pkgver=59c pkgrel=0 pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter" url="http://mirbsd.de/mksh" arch="all" -license="MirOS OR ISC" +license="MirOS AND Unicode-DFS-2016" depends="" checkdepends="ed perl" makedepends="" @@ -24,6 +24,9 @@ build() { CFLAGS="$CFLAGS -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \ /bin/sh ./Build.sh -r -L mv test.sh test_lksh.sh + + # Build the HTML FAQ: + /bin/sh ./FAQ2HTML.sh } check() { @@ -45,6 +48,7 @@ package() { mkdir -p "$pkgdir"/usr/share/doc/mksh/examples/ install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/ + install -m 644 FAQ.htm "$pkgdir"/usr/share/doc/mksh/ } -sha512sums="4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d mksh-R59b.tgz" +sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340 mksh-R59c.tgz" diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index dce0dca9f..db451478e 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mlt -pkgver=6.20.0 +pkgver=6.22.1 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3 mlt-6.20.0.tar.gz +sha512sums="c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 mlt-6.22.1.tar.gz d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch" diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index f7e87a35d..489ab5cfb 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mousepad pkgver=0.4.2 pkgrel=0 diff --git a/user/mozo/APKBUILD b/user/mozo/APKBUILD index 717eff0f5..d6001e1e9 100644 --- a/user/mozo/APKBUILD +++ b/user/mozo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mozo pkgver=1.24.0 pkgrel=0 diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD index 4324b3565..7da337408 100644 --- a/user/mplayer/APKBUILD +++ b/user/mplayer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mplayer pkgver=1.4 pkgrel=2 diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD index 6f5c53558..115cede24 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mpv pkgver=0.32.0 pkgrel=0 diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD index 59fc8a203..6ffdf8627 100644 --- a/user/mtr/APKBUILD +++ b/user/mtr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: John Keith Hohm <john@hohm.net> # Maintainer: pkgname=mtr -pkgver=0.93 +pkgver=0.94 pkgrel=0 pkgdesc="Full screen ncurses traceroute tool" url="https://www.bitwizard.nl/mtr/" @@ -56,6 +56,6 @@ gtk() { rm -r "$subpkgdir"/usr/share/man } -sha512sums="865c394d8dfa234c472832dc205ddc9ec3cf0552475f565782fd4f4e878251c03f1473e2d28d6799e59da4fcb33c5355049f1e6f02e8610c6bbf681ffb78f53e mtr-0.93.tar.gz +sha512sums="0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11 mtr-0.94.tar.gz 60c11b27c4d20a75010cadc31d5c1ac94094aaaee0c2f0ad14246b00b0d5301f581ef55eaefa48692d4449a8e7580e67abbb58ea3183fae8f449f7969242f1a9 handle-program-suffix.patch ecf7543e0125fad6d3f17c30f29f1fc8a3b1e2e477802fe8464e436c3cdfa30d0630b8543cc3f022c475228e94ac8f92981df4d8fb08fe01d004be3d78d6da77 mtr-gtk.desktop" diff --git a/user/mumble/APKBUILD b/user/mumble/APKBUILD new file mode 100644 index 000000000..5e64e6af5 --- /dev/null +++ b/user/mumble/APKBUILD @@ -0,0 +1,127 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=mumble +pkgver=1.3.3 +pkgrel=0 +pkgdesc="Low-latency, high-quality voice chat (client)" +url="https://www.mumble.info/" +arch="all" +license="BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-2.0+" +depends="qt5-qtbase-sqlite" +makedepends="alsa-lib-dev avahi-dev boost-dev cmd:which libcap-dev + libsndfile-dev libxi-dev opus-dev protobuf-dev pulseaudio-dev + qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev speech-dispatcher-dev + speex-dev speexdsp-dev" +subpackages="$pkgname-doc $pkgname-lang murmur murmur-openrc:openrc:noarch" +install="murmur.pre-install" +pkgusers="murmur" +pkggroups="murmur" +source="https://github.com/mumble-voip/mumble/releases/download/$pkgver/mumble-$pkgver.tar.gz + murmur.initd + default-config.patch + tests-networking.patch + " + +_qmake() { + qmake -recursive "$@" \ + CONFIG+="\ + bundled-celt \ + no-bundled-opus \ + no-bundled-speex \ + no-embed-qt-translations \ + no-g15 \ + no-ice \ + no-pch \ + no-rnnoise \ + no-update \ + " \ + DEFINES+="PLUGIN_PATH=/usr/lib/mumble" +} + +build() { + _qmake main.pro + make release +} + +check() { + cd src/tests + _qmake tests.pro + make check +} + +package() { + _ver=${pkgver%_rc*} + _maj="${_ver%%.*}" + _min="${_ver#*.}" + _min="${_min%%.*}" + + # Binaries + install -Dm755 release/mumble \ + "$pkgdir"/usr/bin/mumble + install -Dm755 release/murmurd \ + "$pkgdir"/usr/bin/murmurd + + # Libraries & plugins + install -Dm755 release/libmumble.so.$_ver \ + "$pkgdir"/usr/lib/mumble/libmumble.so.$_ver + for lib in libmumble.so libmumble.so.$_maj libmumble.so.$_maj.$_min; do + ln -s libmumble.so.$_ver \ + "$pkgdir"/usr/lib/mumble/$lib + done + install -Dm755 release/plugins/liblink.so \ + "$pkgdir"/usr/lib/mumble/liblink.so + install -Dm755 release/libcelt* \ + "$pkgdir"/usr/lib/mumble/ + + # Desktop files + install -Dm644 scripts/mumble.desktop \ + "$pkgdir"/usr/share/applications/mumble.desktop + install -Dm644 icons/mumble.svg \ + "$pkgdir"/usr/share/icons/hicolor/scalable/apps/mumble.svg + + # Man pages + install -Dm644 -t "$pkgdir"/usr/share/man/man1 \ + man/mumble.1 \ + man/murmurd.1 + + # Translations + install -Dm644 -t "$pkgdir"/usr/share/mumble/translations \ + src/mumble/*.qm + + # OpenRC + install -Dm755 "$srcdir"/murmur.initd \ + "$pkgdir"/etc/init.d/murmur +} + +lang() { + pkgdesc="Languages for package mumble" + install_if="$pkgname=$pkgver-r$pkgrel lang" + + cd "$builddir" + mkdir -p "$subpkgdir"/usr/share/mumble + mv "$pkgdir"/usr/share/mumble/translations \ + "$subpkgdir"/usr/share/mumble +} + +murmur() { + pkgdesc="Low latency, high-quality voice chat (server)" + + cd "$builddir" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/murmurd \ + "$subpkgdir"/usr/bin + install -o murmur -g murmur -dm750 \ + "$subpkgdir"/var/lib/murmur + install -g murmur -Dm640 scripts/murmur.ini \ + "$subpkgdir"/etc/murmur.ini +} + +openrc() { + default_openrc + install_if="openrc murmur=$pkgver-r$pkgrel" + pkgdesc="Low latency, high-quality voice chat (server OpenRC init scripts)" +} + +sha512sums="be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3 mumble-1.3.3.tar.gz +59283687466c9ab460017c2191c731e63203baaa6a4a3d30b42075eb8597bafeb2d3494367ab64c785ee37c7b916ea101daf22b68bdfa27844b97e18cb1d71c0 murmur.initd +68c4c81a55663305d1525eb5d43e0b456e54f007ee327d45bf63572c59282edd88650ede7931644a9762a40c2f7e730b338b4900ae5b4da11b944b3af01c5387 default-config.patch +e89c20b39fdb24982153b046ffe41688d6a854eee593205535155d55e49b7e534f6cec14325108a7ebd2550a6043479b01139d7bf900840bcf63188625bca304 tests-networking.patch" diff --git a/user/mumble/default-config.patch b/user/mumble/default-config.patch new file mode 100644 index 000000000..0c93c2225 --- /dev/null +++ b/user/mumble/default-config.patch @@ -0,0 +1,36 @@ +--- mumble-1.3.2/scripts/murmur.ini 2020-07-09 13:06:18.000000000 -0400 ++++ mumble-1.3.2/scripts/murmur.ini 2020-09-13 00:05:08.070133921 -0400 +@@ -13,7 +13,7 @@ + + ; Path to database. If blank, will search for + ; murmur.sqlite in default locations or create it if not found. +-database= ++database=/var/lib/murmur/murmur.sqlite + + ; Murmur defaults to using SQLite with its default rollback journal. + ; In some situations, using SQLite's write-ahead log (WAL) can be +@@ -93,13 +93,13 @@ icesecretwrite= + ; logs to the file 'murmur.log'. If you leave this field blank + ; on Unix-like systems, Murmur will force itself into foreground + ; mode which logs to the console. +-;logfile=murmur.log ++logfile=/var/log/murmur.log + + ; If set, Murmur will write its process ID to this file + ; when running in daemon mode (when the -fg flag is not + ; specified on the command line). Only available on + ; Unix-like systems. +-;pidfile= ++pidfile=/var/run/murmur.pid + + ; The below will be used as defaults for new configured servers. + ; If you're just running one server (the default), it's easier to +@@ -291,7 +291,7 @@ allowping=true + + ; If Murmur is started as root, which user should it switch to? + ; This option is ignored if Murmur isn't started with root privileges. +-;uname= ++uname=murmur + + ; By default, in log files and in the user status window for privileged users, + ; Mumble will show IP addresses - in some situations you may find this unwanted diff --git a/user/mumble/murmur.initd b/user/mumble/murmur.initd new file mode 100644 index 000000000..dfbc46821 --- /dev/null +++ b/user/mumble/murmur.initd @@ -0,0 +1,35 @@ +#!/sbin/openrc-run +description="Mumble VoIP server" +command="/usr/bin/murmurd" +: "${config:=/etc/murmur.ini}" +: "${command_args:=-ini $config}" + +extra_started_commands="reload" +description_reload="Reload TLS settings" + +# As of 1.3.2 murmur will make the PID file *after* it switches to the +# unprivileged user, which is bad. So make start-stop-daemon handle the +# PID file and user switching instead. +command_background=true +command_args="$command_args -fg" + +command_user="$(awk -F= '$1 == "uname" { print $2 }' "$config")" +: "${command_user:=murmur}" + +pidfile="$(awk -F= '$1 == "pidfile" { print $2 }' "$config")" +: "${pidfile:=/var/run/$RC_SVCNAME.pid}" + +# Ignores logfile when -fg is used. +logfile="$(awk -F= '$1 == "logfile" { print $2 }' "$config")" +: "${logfile:=/var/log/murmur.log}" +start_stop_daemon_args="--stdout $logfile --stderr $logfile" + +start_pre() { + checkpath -m 0640 -f -o "$command_user" "$logfile" +} + +reload() { + ebegin "Reloading $RC_SVCNAME TLS settings" + start-stop-daemon --signal USR1 --pidfile "$pidfile" + eend $? +} diff --git a/user/mumble/murmur.pre-install b/user/mumble/murmur.pre-install new file mode 100644 index 000000000..7baafe4d9 --- /dev/null +++ b/user/mumble/murmur.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r murmur 2>/dev/null +useradd -c "Mumble daemon" -s /sbin/nologin -g murmur \ + -m -d /var/lib/murmur -r murmur 2>/dev/null + +exit 0 diff --git a/user/mumble/tests-networking.patch b/user/mumble/tests-networking.patch new file mode 100644 index 000000000..a1decd477 --- /dev/null +++ b/user/mumble/tests-networking.patch @@ -0,0 +1,33 @@ +--- mumble-1.3.2/src/tests/TestServerResolver/TestServerResolver.cpp 2020-07-09 17:06:18.000000000 +0000 ++++ mumble-1.3.2/src/tests/TestServerResolver/TestServerResolver.cpp 2020-09-20 06:15:32.741670504 +0000 +@@ -33,9 +33,7 @@ class TestServerResolver : public QObjec + }; + + void TestServerResolver::simpleSrv() { +-#ifdef USE_NO_SRV +- return; +-#endif ++ return; // network access required + + // Qt 5's SRV resolver does not work in Wine. + // For more info, see https://bugs.winehq.org/show_bug.cgi?id=44296 +@@ -86,9 +84,7 @@ void TestServerResolver::simpleSrv() { + } + + void TestServerResolver::srvCustomPort() { +-#ifdef USE_NO_SRV +- return; +-#endif ++ return; // network access required + + // Qt 5's SRV resolver does not work in Wine. + // For more info, see https://bugs.winehq.org/show_bug.cgi?id=44296 +@@ -139,6 +135,8 @@ void TestServerResolver::srvCustomPort() + + + void TestServerResolver::simpleCNAME() { ++ return; // network access required ++ + ServerResolver r; + QSignalSpy spy(&r, SIGNAL(resolved())); + diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 5e5ebbd46..491855832 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=muparser pkgver=2.3.2 pkgrel=0 diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 8b95a338e..f2554aee4 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=netsurf pkgver=3.10 pkgrel=0 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/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 5c24d7987..a52ef44ff 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=obconf-qt pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD index e34112fc3..60c5f77f1 100644 --- a/user/openvpn/APKBUILD +++ b/user/openvpn/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=openvpn -pkgver=2.4.9 +pkgver=2.4.11 pkgrel=0 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="https://openvpn.net/" @@ -20,6 +20,8 @@ source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz " # secfixes: +# 2.4.11-r0: +# - CVE-2020-15078 # 2.4.9-r0: # - CVE-2020-11810 @@ -63,7 +65,7 @@ pam() { "$subpkgdir"/usr/lib/openvpn/plugins/ } -sha512sums="a05cbd6c73809f26cd1b68bd491ceb8fb4ddf2cde0407f73f4c16d97477a4853722a1618e6dcf0b111283f73d9499b593b25107bb1441d9b38c80e76d6bcc69b openvpn-2.4.9.tar.gz +sha512sums="dc9500406b6f4d195d8039bce6ed39b091c2f46f8cdfd2cc8ca472cf609e70711269023cfff4ee91db27b3c194524bde79c14d39811687460702c0c76111c8a6 openvpn-2.4.11.tar.gz 3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd 6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD index 9681a20ae..2d14e41c3 100644 --- a/user/orage/APKBUILD +++ b/user/orage/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=orage pkgver=4.12.1 pkgrel=2 diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD index ffbf36df1..9c8b5a823 100644 --- a/user/otf-culmus/APKBUILD +++ b/user/otf-culmus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-culmus pkgver=0.133 pkgrel=0 diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD index c7ee2436a..4bde85eb7 100644 --- a/user/otf-exo/APKBUILD +++ b/user/otf-exo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-exo pkgver=2 pkgrel=0 diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD index 0f1ad30b2..d5f2cc7c2 100644 --- a/user/otf-office-code-pro/APKBUILD +++ b/user/otf-office-code-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-office-code-pro pkgver=1.004 pkgrel=0 diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD index 985c7f18e..618bad5d6 100644 --- a/user/otf-proggy-vector/APKBUILD +++ b/user/otf-proggy-vector/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-proggy-vector pkgver=1.1.5 pkgrel=0 diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD index 5e96c1717..0b880690f 100644 --- a/user/otf-source-code-pro/APKBUILD +++ b/user/otf-source-code-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-source-code-pro pkgver=2.030 _pkgver=1.050 diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD index 765bfadf8..ef47f92e6 100644 --- a/user/otf-source-sans-pro/APKBUILD +++ b/user/otf-source-sans-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-source-sans-pro pkgver=3.028 _pkgver=${pkgver%.*}v${pkgver#*.} diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD index e90f45cbd..bb92895c1 100644 --- a/user/otf-source-serif-pro/APKBUILD +++ b/user/otf-source-serif-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-source-serif-pro pkgver=3.001 pkgrel=0 diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD index ae190e40d..d7f6e4501 100644 --- a/user/pangomm/APKBUILD +++ b/user/pangomm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pangomm pkgver=2.42.1 pkgrel=0 diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD index cf55cd657..ad9967bfb 100644 --- a/user/parole/APKBUILD +++ b/user/parole/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=parole pkgver=1.0.5 pkgrel=0 diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index 5b81f0c88..3dd65918d 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pavucontrol-qt pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD index 5c98d4f57..2e60cf25b 100644 --- a/user/pavucontrol/APKBUILD +++ b/user/pavucontrol/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pavucontrol pkgver=4.0 pkgrel=0 diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index a72c1e6ea..e3fd3540f 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pcmanfm-qt pkgver=0.15.1 pkgrel=0 diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD index 806d8b65d..4b2025181 100644 --- a/user/pcmanfm/APKBUILD +++ b/user/pcmanfm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pcmanfm pkgver=1.3.1 pkgrel=0 diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD index d053ee8ee..88798a155 100644 --- a/user/perl-app-licensecheck/APKBUILD +++ b/user/perl-app-licensecheck/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-app-licensecheck _pkgreal=App-Licensecheck diff --git a/user/perl-b-hooks-op-check/APKBUILD b/user/perl-b-hooks-op-check/APKBUILD index b5dae3817..7a79656b2 100644 --- a/user/perl-b-hooks-op-check/APKBUILD +++ b/user/perl-b-hooks-op-check/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-b-hooks-op-check _pkgreal=B-Hooks-OP-Check diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD index 7b67d3047..92c6b95be 100644 --- a/user/perl-bareword-filehandles/APKBUILD +++ b/user/perl-bareword-filehandles/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-bareword-filehandles _pkgreal=bareword-filehandles diff --git a/user/perl-cpan-changes/APKBUILD b/user/perl-cpan-changes/APKBUILD index 0a1f4ddd4..9a0dc30fb 100644 --- a/user/perl-cpan-changes/APKBUILD +++ b/user/perl-cpan-changes/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpan-changes _pkgreal=CPAN-Changes diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD index 1ee807e32..6a6a10896 100644 --- a/user/perl-data-dump/APKBUILD +++ b/user/perl-data-dump/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-dump _pkgreal=Data-Dump diff --git a/user/perl-data-section/APKBUILD b/user/perl-data-section/APKBUILD index 48e7a8759..da9829a28 100644 --- a/user/perl-data-section/APKBUILD +++ b/user/perl-data-section/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-section _pkgreal=Data-Section diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD index 2c41fb4d3..e81937122 100644 --- a/user/perl-devel-hide/APKBUILD +++ b/user/perl-devel-hide/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-devel-hide _pkgreal=Devel-Hide diff --git a/user/perl-importer/APKBUILD b/user/perl-importer/APKBUILD index 3aeb91912..789feb526 100644 --- a/user/perl-importer/APKBUILD +++ b/user/perl-importer/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-importer _pkgreal=Importer diff --git a/user/perl-indirect/APKBUILD b/user/perl-indirect/APKBUILD index d9fe7b5fa..0d7420f12 100644 --- a/user/perl-indirect/APKBUILD +++ b/user/perl-indirect/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-indirect _pkgreal=indirect diff --git a/user/perl-multidimensional/APKBUILD b/user/perl-multidimensional/APKBUILD index 4d7e17f53..90e7b2ba1 100644 --- a/user/perl-multidimensional/APKBUILD +++ b/user/perl-multidimensional/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-multidimensional _pkgreal=multidimensional diff --git a/user/perl-net-dbus/APKBUILD b/user/perl-net-dbus/APKBUILD index 7291dbaa2..58b69ad43 100644 --- a/user/perl-net-dbus/APKBUILD +++ b/user/perl-net-dbus/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-dbus _pkgreal=Net-DBus diff --git a/user/perl-net-snmp/APKBUILD b/user/perl-net-snmp/APKBUILD index ab5d1483c..05178b9e4 100644 --- a/user/perl-net-snmp/APKBUILD +++ b/user/perl-net-snmp/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-snmp _pkgreal=Net-SNMP diff --git a/user/perl-number-range/APKBUILD b/user/perl-number-range/APKBUILD index dd99a6970..083eb2070 100644 --- a/user/perl-number-range/APKBUILD +++ b/user/perl-number-range/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-number-range _pkgreal=Number-Range diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD index fea0b4e57..2111c4d54 100644 --- a/user/perl-parallel-forkmanager/APKBUILD +++ b/user/perl-parallel-forkmanager/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-parallel-forkmanager _pkgreal=Parallel-ForkManager diff --git a/user/perl-path-iterator-rule/APKBUILD b/user/perl-path-iterator-rule/APKBUILD index 785d2ee3c..ac6584335 100644 --- a/user/perl-path-iterator-rule/APKBUILD +++ b/user/perl-path-iterator-rule/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-path-iterator-rule _pkgreal=Path-Iterator-Rule diff --git a/user/perl-pod-constants/APKBUILD b/user/perl-pod-constants/APKBUILD index 69a0129eb..7994f9f2f 100644 --- a/user/perl-pod-constants/APKBUILD +++ b/user/perl-pod-constants/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod-constants _pkgreal=Pod-Constants diff --git a/user/perl-probe-perl/APKBUILD b/user/perl-probe-perl/APKBUILD index c495e0b8e..59e44b060 100644 --- a/user/perl-probe-perl/APKBUILD +++ b/user/perl-probe-perl/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-probe-perl _pkgreal=Probe-Perl diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD index 114d16c3c..f8deb67d6 100644 --- a/user/perl-regexp-common/APKBUILD +++ b/user/perl-regexp-common/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-common _pkgreal=Regexp-Common diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD index 7010d0b86..7c11a498b 100644 --- a/user/perl-regexp-pattern-license/APKBUILD +++ b/user/perl-regexp-pattern-license/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern-license _pkgreal=Regexp-Pattern-License diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 3c400e799..19c72e967 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern _pkgreal=Regexp-Pattern diff --git a/user/perl-software-license/APKBUILD b/user/perl-software-license/APKBUILD index 0e28bc4a4..e8440c012 100644 --- a/user/perl-software-license/APKBUILD +++ b/user/perl-software-license/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-software-license _pkgreal=Software-License diff --git a/user/perl-sort-key/APKBUILD b/user/perl-sort-key/APKBUILD index c79e65b6c..e04e27823 100644 --- a/user/perl-sort-key/APKBUILD +++ b/user/perl-sort-key/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sort-key _pkgreal=Sort-Key diff --git a/user/perl-strictures/APKBUILD b/user/perl-strictures/APKBUILD index 4593d1b79..7b4781597 100644 --- a/user/perl-strictures/APKBUILD +++ b/user/perl-strictures/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-strictures _pkgreal=strictures diff --git a/user/perl-string-copyright/APKBUILD b/user/perl-string-copyright/APKBUILD index ce456a524..600079375 100644 --- a/user/perl-string-copyright/APKBUILD +++ b/user/perl-string-copyright/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-string-copyright _pkgreal=String-Copyright diff --git a/user/perl-string-escape/APKBUILD b/user/perl-string-escape/APKBUILD index ce9e32862..c213c2ba6 100644 --- a/user/perl-string-escape/APKBUILD +++ b/user/perl-string-escape/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-string-escape _pkgreal=String-Escape diff --git a/user/perl-sub-info/APKBUILD b/user/perl-sub-info/APKBUILD index ad01d3757..5a056a5c9 100644 --- a/user/perl-sub-info/APKBUILD +++ b/user/perl-sub-info/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-info _pkgreal=Sub-Info diff --git a/user/perl-term-size-any/APKBUILD b/user/perl-term-size-any/APKBUILD index 2cc51c4d1..6ac6fedfa 100644 --- a/user/perl-term-size-any/APKBUILD +++ b/user/perl-term-size-any/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-size-any _pkgreal=Term-Size-Any diff --git a/user/perl-term-size-perl/APKBUILD b/user/perl-term-size-perl/APKBUILD index 599757534..cd6a0c524 100644 --- a/user/perl-term-size-perl/APKBUILD +++ b/user/perl-term-size-perl/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-size-perl _pkgreal=Term-Size-Perl diff --git a/user/perl-term-table/APKBUILD b/user/perl-term-table/APKBUILD index 9faf22bf0..c88608e01 100644 --- a/user/perl-term-table/APKBUILD +++ b/user/perl-term-table/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-table _pkgreal=Term-Table diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD index a1027ddd4..dd7d6676b 100644 --- a/user/perl-test-command/APKBUILD +++ b/user/perl-test-command/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-command _pkgreal=Test-Command diff --git a/user/perl-test-failwarnings/APKBUILD b/user/perl-test-failwarnings/APKBUILD index 1067e2e07..ba9b0ebf1 100644 --- a/user/perl-test-failwarnings/APKBUILD +++ b/user/perl-test-failwarnings/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-failwarnings _pkgreal=Test-FailWarnings diff --git a/user/perl-test-filename/APKBUILD b/user/perl-test-filename/APKBUILD index 2bb1a9fb6..8af0ec7ac 100644 --- a/user/perl-test-filename/APKBUILD +++ b/user/perl-test-filename/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-filename _pkgreal=Test-Filename diff --git a/user/perl-test-more-utf8/APKBUILD b/user/perl-test-more-utf8/APKBUILD index 330107c88..252149271 100644 --- a/user/perl-test-more-utf8/APKBUILD +++ b/user/perl-test-more-utf8/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-more-utf8 _pkgreal=Test-More-UTF8 diff --git a/user/perl-test-script/APKBUILD b/user/perl-test-script/APKBUILD index 75ce72031..47a095d43 100644 --- a/user/perl-test-script/APKBUILD +++ b/user/perl-test-script/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-script _pkgreal=Test-Script diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 70b9ba7f1..ce26ed312 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test2-suite _pkgreal=Test2-Suite diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD index ff4bb9b8d..8c319a1cf 100644 --- a/user/perl-text-template/APKBUILD +++ b/user/perl-text-template/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-text-template _pkgreal=Text-Template diff --git a/user/perl-xml-namespacesupport/APKBUILD b/user/perl-xml-namespacesupport/APKBUILD index 4de6e775e..b65905d1e 100644 --- a/user/perl-xml-namespacesupport/APKBUILD +++ b/user/perl-xml-namespacesupport/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-namespacesupport _pkgreal=XML-NamespaceSupport diff --git a/user/perl-xml-simple/APKBUILD b/user/perl-xml-simple/APKBUILD index 62d543912..cc081098e 100644 --- a/user/perl-xml-simple/APKBUILD +++ b/user/perl-xml-simple/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-simple _pkgreal=XML-Simple diff --git a/user/pluma/APKBUILD b/user/pluma/APKBUILD index c90ce032f..ceb91b735 100644 --- a/user/pluma/APKBUILD +++ b/user/pluma/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pluma pkgver=1.24.1 pkgrel=0 diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 0c5b872f1..2e8741301 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=prosody pkgver=0.11.6 pkgrel=0 diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index 382f3cfa3..fcaba3da2 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf diff --git a/user/pv/APKBUILD b/user/pv/APKBUILD new file mode 100644 index 000000000..b78efcd77 --- /dev/null +++ b/user/pv/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=pv +pkgver=1.6.6 +pkgrel=0 +pkgdesc="Pipe Viewer - a terminal-based tool for monitoring the progress of data through a pipeline." +url="https://www.ivarch.com/programs/pv.shtml" +arch="all" +license="Artistic-2.0" +depends="" +makedepends="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://www.ivarch.com/programs/sources/pv-$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="cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26 pv-1.6.6.tar.bz2" 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-cython/APKBUILD b/user/py3-cython/APKBUILD new file mode 100644 index 000000000..b5b682b46 --- /dev/null +++ b/user/py3-cython/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-cython +_pkgname=Cython +pkgver=0.29.21 +pkgrel=0 +pkgdesc="Compiler for writing C extensions for the Python language" +url="https://cython.org/" +arch="all" +options="net" # downloads numpy at least +license="Apache-2.0" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://pypi.io/packages/source/C/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 runtests.py --shard_count=${JOBS} +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="6216e63996e83b887cdcee6cd912d42e7da853640336b9190f5115d687848a902ee5a8edd6bfaef645c066b89e17dcd80ca1387688eb80a527ec23a0a4636e8f Cython-0.29.21.tar.gz" diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 5c0807786..3ecdd376c 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-distutils-extra pkgver=2.45 pkgrel=0 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/py3-netifaces/APKBUILD b/user/py3-netifaces/APKBUILD new file mode 100644 index 000000000..154b5e462 --- /dev/null +++ b/user/py3-netifaces/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-netifaces +_pkgname=netifaces +pkgver=0.10.9 +pkgrel=0 +pkgdesc="Portable network interface information" +url="https://pypi.org/project/netifaces/" +arch="all" +license="MIT" +depends="python3" +makedepends="python3-dev" +source="https://pypi.io/packages/source/n/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87 netifaces-0.10.9.tar.gz" diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD index 234102cc4..45d40aaf7 100644 --- a/user/py3-pexpect/APKBUILD +++ b/user/py3-pexpect/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-pexpect _pkgname=${pkgname#*-} _p="${_pkgname#?}" diff --git a/user/py3-ptyprocess/APKBUILD b/user/py3-ptyprocess/APKBUILD index af121ab31..c9a5316a9 100644 --- a/user/py3-ptyprocess/APKBUILD +++ b/user/py3-ptyprocess/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-ptyprocess pkgver=0.6.0 pkgrel=0 diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD index b316f74b7..a8012897e 100644 --- a/user/py3-pycairo/APKBUILD +++ b/user/py3-pycairo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-pycairo pkgver=1.19.1 pkgrel=0 diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index 426485d5c..4ecdab9d1 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-pygobject pkgver=3.38.0 pkgrel=0 diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index 5f884fb45..44b3bd349 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qps pkgver=2.1.0 _lxqt_build=0.7.0 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/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index 462e54241..184dd4344 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qt5ct pkgver=1.1 pkgrel=0 diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index d9704ad7d..ef933d796 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qterminal pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index 3af12cbca..27edbe5be 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qtermwidget pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD index a9501eb3f..659862db8 100644 --- a/user/qtkeychain/APKBUILD +++ b/user/qtkeychain/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qtkeychain pkgver=0.11.1 pkgrel=0 diff --git a/user/re2c/APKBUILD b/user/re2c/APKBUILD index aad7b839e..3293c610d 100644 --- a/user/re2c/APKBUILD +++ b/user/re2c/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk at gmail> # Maintainer: pkgname=re2c -pkgver=1.3 -pkgrel=1 +pkgver=2.0.3 +pkgrel=0 pkgdesc="Fast lexer generator for C and C++" url="http://re2c.org/" arch="all" @@ -12,13 +12,13 @@ checkdepends="bash" makedepends="" subpackages="$pkgname-doc" source="https://github.com/skvadrik/re2c/releases/download/$pkgver/$pkgname-$pkgver.tar.xz - CVE-2020-11958.patch " # secfixes: # 1.3-r1: # - CVE-2020-11958 + build() { ./configure \ --build=$CBUILD \ @@ -38,5 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e re2c-1.3.tar.xz -f4376b8e0724d500f665fa60dfd6fb35685a281af50c500d2ff90d781a829fb78f21e8c93c5745a4519acd55a62ec48a570dbfacf0a9ee977502e06f3e2e474a CVE-2020-11958.patch" +sha512sums="893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c re2c-2.0.3.tar.xz" diff --git a/user/re2c/CVE-2020-11958.patch b/user/re2c/CVE-2020-11958.patch deleted file mode 100644 index b982b87e6..000000000 --- a/user/re2c/CVE-2020-11958.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001 -From: Ulya Trofimovich <skvadrik@gmail.com> -Date: Fri, 17 Apr 2020 22:47:14 +0100 -Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo). - -The crash happened in a rare case of a very long lexeme that doen't fit -into the buffer, forcing buffer reallocation. - -The crash was caused by an incorrect calculation of the shift offset -(it was smaller than necessary). As a consequence, the data from buffer -start and up to the beginning of the current lexeme was not discarded -(as it should have been), resulting in less free space for new data than -expected. ---- - src/parse/scanner.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/parse/scanner.cc b/src/parse/scanner.cc -index 1d6e9efa..bd651314 100644 ---- a/src/parse/scanner.cc -+++ b/src/parse/scanner.cc -@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need) - if (!buf) fatal("out of memory"); - - memmove(buf, tok, copy); -- shift_ptrs_and_fpos(buf - bot); -+ shift_ptrs_and_fpos(buf - tok); - delete [] bot; - bot = buf; - - free = BSIZE - copy; - } - -+ DASSERT(lim + free <= bot + BSIZE); - if (!read(free)) { - eof = lim; - memset(lim, 0, YYMAXFILL); diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 2beebf167..f324f365b 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ristretto pkgver=0.10.0 pkgrel=0 diff --git a/user/rofi/APKBUILD b/user/rofi/APKBUILD index f8e930a0a..014be95c4 100644 --- a/user/rofi/APKBUILD +++ b/user/rofi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=rofi pkgver=1.6.0 pkgrel=0 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/rubberband/APKBUILD b/user/rubberband/APKBUILD index fdc14d6e2..054a90b11 100644 --- a/user/rubberband/APKBUILD +++ b/user/rubberband/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=rubberband pkgver=1.9.0 pkgrel=0 diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index ef366ef0f..2adad7910 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.5.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.0.0 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="994a786b8d725cc98640be102e05a25f033624fbf8762fc53361555f4a721f5be819e282b907ceedaa0c1adbd670c80e1819096dc2ff7e2a2e476098bded3ade s6-dns-2.3.5.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..6683aecdd 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.1.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.0.0 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="4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22 s6-networking-2.4.1.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/samurai/APKBUILD b/user/samurai/APKBUILD index e9de6bfd4..caf9f9fc4 100644 --- a/user/samurai/APKBUILD +++ b/user/samurai/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=samurai pkgver=1.1 pkgrel=0 diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index ab52075ea..60f520f1e 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=screengrab pkgver=2.0.1 pkgrel=0 diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD index dd7aeb4b8..f70823845 100644 --- a/user/socat/APKBUILD +++ b/user/socat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=socat pkgver=1.7.3.4 pkgrel=0 diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index e52d25653..98204837d 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=spectrwm pkgver=3.4.1 _pkgver=$(printf '%s' "$pkgver" | tr . _) 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/tf/APKBUILD b/user/tf/APKBUILD index fe0609d9c..35f164eec 100644 --- a/user/tf/APKBUILD +++ b/user/tf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=tf pkgver=5.0b8 _pkgver=${pkgver%.*}${pkgver#*.} diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index bfbc5a1ce..60dc36691 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=thunar-volman pkgver=0.9.5 pkgrel=0 diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 664fbef09..8bfa1164f 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=thunar pkgver=1.8.15 pkgrel=0 diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD index c55e5453c..a78279253 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=trojita pkgver=0.7 -pkgrel=0 +pkgrel=1 pkgdesc="Qt-based IMAP email client" url="http://trojita.flaska.net/" arch="all" @@ -15,7 +15,15 @@ makedepends="cmake extra-cmake-modules zlib-dev qt5-qtbase-dev qt5-qtwebkit-dev qtkeychain-dev" source="https://sourceforge.net/projects/trojita/files/src/trojita-$pkgver.tar.xz use-qgpgme.patch - fix-gpg.patch" + fix-gpg.patch + CVE-2019-10734.patch + CVE-2020-15047.patch + " + +# secfixes: +# 0.7-r1: +# - CVE-2019-10734 +# - CVE-2020-15047 build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -34,7 +42,8 @@ build() { } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # test_Html_formatting: requires X11 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E test_Html_formatting } package() { @@ -43,4 +52,6 @@ package() { sha512sums="fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 trojita-0.7.tar.xz 740c2410d7236d722482f05dd1d2c681e35543620823cb7c1396710081f9de4f6ae530c5b5442ecf5d08a8e552f0697f3a35bf51e07a3b4336dec7021b665706 use-qgpgme.patch -9d0fbf7c0b0f6975990a7705f9d43043e5807401cee179d7a07f9514856332d6bb1aa8448e84d0083003c34a3bb181080b973e8c1f77d1b5a8930d07d57702da fix-gpg.patch" +9d0fbf7c0b0f6975990a7705f9d43043e5807401cee179d7a07f9514856332d6bb1aa8448e84d0083003c34a3bb181080b973e8c1f77d1b5a8930d07d57702da fix-gpg.patch +db96a566924b5d7b80787ab624af3726d5dd3459653192436a377d6482ab73801a7dcca1df1b1d937cf0d0798b827e04f8ef2c1124f91dc9da3e8036ef61e28a CVE-2019-10734.patch +2477612aca1e558fa3ba2b434a701cc255c573ac7e2001e7b5921c9b991f7c95720f53b70b49824e36bafb53ab53477950cb8d436e637fda4d59c7ec5883ce5f CVE-2020-15047.patch" diff --git a/user/trojita/CVE-2019-10734.patch b/user/trojita/CVE-2019-10734.patch new file mode 100644 index 000000000..d52edb042 --- /dev/null +++ b/user/trojita/CVE-2019-10734.patch @@ -0,0 +1,104 @@ +From 8db7f450d52539b4c72ee968384911b6813ad1e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> +Date: Thu, 25 Jun 2020 21:39:34 +0200 +Subject: [PATCH] Prevent a possible decryption oracle attack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Jens Mueller (Ruhr-Uni Bochum and FH Münster) for reporting +this. The gist is that an attacker can embed arbitrary ciphertext into +their messages. Trojita decrypts that, and when we hit reply, the +original *cleartext* gets quoted and put into a reply for the attacker +to see. + +Fix this by not quoting any plaintext which originated in an encrypted +message. That's pretty draconian, but hey, it works and we never came up +with any better patch. Also, given that Trojita does not encrypt +outgoing messages yet, this is probably also a conservative thing to do. + +Change-Id: I84c45b9e707eb7c99eb7183c6ef59ef41cd62c43 +CVE: CVE-2019-10734 +BUG: 404697 +--- + src/Cryptography/GpgMe++.cpp | 2 ++ + src/Gui/MessageView.cpp | 9 ++++++++- + src/Gui/PartWidget.cpp | 8 ++++++++ + src/Imap/Model/ItemRoles.h | 2 +- + 4 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/src/Cryptography/GpgMe++.cpp b/src/Cryptography/GpgMe++.cpp +index e012f603..716b8aff 100644 +--- a/src/Cryptography/GpgMe++.cpp ++++ b/src/Cryptography/GpgMe++.cpp +@@ -267,6 +267,8 @@ QVariant GpgMePart::data(int role) const + switch (role) { + case Imap::Mailbox::RolePartSignatureVerifySupported: + return m_wasSigned; ++ case RolePartDecryptionSupported: ++ return m_isAllegedlyEncrypted; + case RolePartCryptoNotFinishedYet: + return m_waitingForData || + (m_crypto.valid() && +diff --git a/src/Gui/MessageView.cpp b/src/Gui/MessageView.cpp +index 7d649308..c95e0878 100644 +--- a/src/Gui/MessageView.cpp ++++ b/src/Gui/MessageView.cpp +@@ -354,7 +354,6 @@ bool MessageView::eventFilter(QObject *object, QEvent *event) + QString MessageView::quoteText() const + { + if (auto w = bodyWidget()) { +- QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n'))); + const Imap::Message::Envelope &e = message.data(Imap::Mailbox::RoleMessageEnvelope).value<Imap::Message::Envelope>(); + QString sender; + if (!e.from.isEmpty()) +@@ -362,6 +361,14 @@ QString MessageView::quoteText() const + if (e.from.isEmpty()) + sender = tr("you"); + ++ if (messageModel->index(0, 0) /* fake message root */.child(0, 0) /* first MIME part */.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) { ++ // This is just an UX improvement shortcut: real filtering for CVE-2019-10734 is in ++ // MultipartSignedEncryptedWidget::quoteMe(). ++ // That is required because the encrypted part might not be the root part of the message. ++ return tr("On %1, %2 sent an encrypted message:\n> ...\n\n").arg(e.date.toLocalTime().toString(Qt::SystemLocaleLongDate), sender); ++ } ++ ++ QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n'))); + // One extra newline at the end of the quoted text to separate the response + quote << QString(); + +diff --git a/src/Gui/PartWidget.cpp b/src/Gui/PartWidget.cpp +index bb27604d..96eff338 100644 +--- a/src/Gui/PartWidget.cpp ++++ b/src/Gui/PartWidget.cpp +@@ -378,6 +378,14 @@ void MultipartSignedEncryptedWidget::updateStatusIndicator() + + QString MultipartSignedEncryptedWidget::quoteMe() const + { ++ if (m_partIndex.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) { ++ // See CVE-2019-10734, the point is not to leak cleartext from encrypted content. Even when Trojita starts supporting ++ // encryption of outgoing mail, we will have to check whether the encrypted cleartext is from the same sender, whether ++ // it matches the list of recipients (which is dynamic and can be set later on), etc etc. ++ // TL;DR, this is a can of worms. ++ return tr("[Encrypted message]"); ++ } ++ + return quoteMeHelper(children()); + } + +diff --git a/src/Imap/Model/ItemRoles.h b/src/Imap/Model/ItemRoles.h +index 4588d4d0..00adb3bb 100644 +--- a/src/Imap/Model/ItemRoles.h ++++ b/src/Imap/Model/ItemRoles.h +@@ -193,7 +193,7 @@ enum { + RolePartSignatureVerifySupported, + /** @short Is the format of this particular multipart/encrypted supported and recognized? + +- See RolePartSignatureVerifySupported, this is an equivalent. ++ If true, this message part represents content of an encrypted message that Trojita can attempt to decrypt. + */ + RolePartDecryptionSupported, + /** @short Is there any point in waiting longer? +-- +GitLab + diff --git a/user/trojita/CVE-2020-15047.patch b/user/trojita/CVE-2020-15047.patch new file mode 100644 index 000000000..6199c01fd --- /dev/null +++ b/user/trojita/CVE-2020-15047.patch @@ -0,0 +1,88 @@ +From 77ddd5d44f2bf4155d0c9b6f7d05f01713b32d5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> +Date: Thu, 25 Jun 2020 11:30:51 +0200 +Subject: [PATCH] SMTP: Do not ignore TLS errors + +This fixes a CVE-2020-15047 (category: CWE-295). Since commit 0083eea5ed +which added initial, experimental support for SMTP message submission, +we have apparently never implemented proper SSL/TLS error handling, and +the code has ever since just kept silently ignoring any certificate +verification errors. As a result, Trojita was susceptible to a MITM +attack when sending e-mails. The information leaked include user's +authentication details, including the password, and the content of sent +messages. + +Sorry for this :(. + +Now, this patch re-enabes proper TLS error handling. It was not possible +to directly re-use our code for TLS key pinning which we are using for +IMAP connections. In the Qt TLS code, the decision to accept or not +accept a TLS connection is a blocking one, so the IMAP code relies upon +the protocol state machine (i.e., another layer) for deciding whether to +use or not to use the just-established TLS connection. Implementing an +equivalent code in the SMTP library would be nice, but this hot-fix has +a priority. As a result, SMTP connections to hosts with, e.g., +self-signed TLS certs, are no longer possible. Let's hope that this is +not a practical problem with Lets Encrypt anymore. + +Thanks to Damian Poddebniak for reporting this bug. + +Change-Id: Icd6bbb2b0fb3e45159fc9699ebd07ab84262fe37 +CVE: CVE-2020-15047 +BUG: 423453 +--- + src/MSA/SMTP.cpp | 11 +++++++++-- + src/MSA/SMTP.h | 1 + + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/MSA/SMTP.cpp b/src/MSA/SMTP.cpp +index 3a054516..ac1eefc5 100644 +--- a/src/MSA/SMTP.cpp ++++ b/src/MSA/SMTP.cpp +@@ -21,6 +21,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "SMTP.h" ++#include "UiUtils/Formatting.h" + + namespace MSA + { +@@ -32,8 +33,8 @@ SMTP::SMTP(QObject *parent, const QString &host, quint16 port, bool encryptedCon + user(user), failed(false), isWaitingForPassword(false), sendingMode(MODE_SMTP_INVALID) + { + qwwSmtp = new QwwSmtpClient(this); +- // FIXME: handle SSL errors properly +- connect(qwwSmtp, &QwwSmtpClient::sslErrors, qwwSmtp, &QwwSmtpClient::ignoreSslErrors); ++ // FIXME: handle SSL errors in the same way as we handle IMAP TLS errors, with key pinning, etc. ++ connect(qwwSmtp, &QwwSmtpClient::sslErrors, this, &SMTP::handleSslErrors); + connect(qwwSmtp, &QwwSmtpClient::connected, this, &AbstractMSA::sending); + connect(qwwSmtp, &QwwSmtpClient::done, this, &SMTP::handleDone); + connect(qwwSmtp, &QwwSmtpClient::socketError, this, &SMTP::handleError); +@@ -78,6 +79,12 @@ void SMTP::handleError(QAbstractSocket::SocketError err, const QString &msg) + emit error(msg); + } + ++void SMTP::handleSslErrors(const QList<QSslError>& errors) ++{ ++ auto msg = UiUtils::Formatting::sslErrorsToHtml(errors); ++ emit error(tr("<p>Cannot send message due to an SSL/TLS error</p>\n%1").arg(msg)); ++} ++ + void SMTP::setPassword(const QString &password) + { + pass = password; +diff --git a/src/MSA/SMTP.h b/src/MSA/SMTP.h +index 453407d3..913bb873 100644 +--- a/src/MSA/SMTP.h ++++ b/src/MSA/SMTP.h +@@ -43,6 +43,7 @@ public slots: + virtual void setPassword(const QString &password); + void handleDone(bool ok); + void handleError(QAbstractSocket::SocketError err, const QString &msg); ++ void handleSslErrors(const QList<QSslError>& errors); + private: + QwwSmtpClient *qwwSmtp; + QString host; +-- +GitLab + diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 6c200fa5c..2061b3e23 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ttf-sudo pkgver=0.50 pkgrel=0 diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index fd1543413..0db340268 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ttf-terminus pkgver=4.47.0 pkgrel=0 diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 232f99c9a..78b406db1 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=tumbler pkgver=0.3.0 pkgrel=0 diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index c25bc1baf..6e3c9b234 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=uchardet pkgver=0.0.7 pkgrel=0 diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD index 42ec0b956..cc2aedf7e 100644 --- a/user/unicode-data/APKBUILD +++ b/user/unicode-data/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=unicode-data pkgver=13.0.0 pkgrel=0 diff --git a/user/unixodbc/APKBUILD b/user/unixodbc/APKBUILD index 03f3c78cc..592feea9b 100644 --- a/user/unixodbc/APKBUILD +++ b/user/unixodbc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=unixodbc -pkgver=2.3.7 +pkgver=2.3.9 pkgrel=0 pkgdesc="Unix ODBC driver manager and database drivers" url="http://www.unixodbc.org/" @@ -30,4 +30,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70 unixODBC-2.3.7.tar.gz" +sha512sums="6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb unixODBC-2.3.9.tar.gz" diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD index 2820783cd..bb63fac47 100644 --- a/user/uptimed/APKBUILD +++ b/user/uptimed/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=uptimed pkgver=0.4.3 pkgrel=0 diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 7e3a3e7ab..902d561d4 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vala pkgver=0.50.0 pkgrel=0 diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD index bfeee2132..130775916 100644 --- a/user/vamp-sdk/APKBUILD +++ b/user/vamp-sdk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vamp-sdk pkgver=2.7.1 pkgrel=0 diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 13fefc76c..fb508f43b 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.11 +pkgver=3.0.11.1 pkgrel=0 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" @@ -205,7 +205,7 @@ libs() { default_libs } -sha512sums="8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444 vlc-3.0.11.tar.xz +sha512sums="8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b vlc-3.0.11.1.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch diff --git a/user/vorbis-tools/APKBUILD b/user/vorbis-tools/APKBUILD index 07179decc..4ce488428 100644 --- a/user/vorbis-tools/APKBUILD +++ b/user/vorbis-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Nathan <ndowens@artixlinux.org> pkgname=vorbis-tools pkgver=1.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for Ogg-Vorbis" url="https://www.xiph.org/vorbis" arch="all" @@ -12,9 +12,10 @@ makedepends="curl-dev flac-dev libvorbis-dev libao-dev speex-dev" subpackages="$pkgname-lang $pkgname-doc" source="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$pkgver.tar.gz - vorbis-tools-CVE-2015-6749.patch - vorbis-tools-cve9638-cve9639.patch - vorbis-tools-cve9640.patch" + CVE-2014-9638-and-9639.patch + CVE-2014-9640.patch + CVE-2015-6749.patch + " prepare() { update_config_guess @@ -37,6 +38,6 @@ package() { } sha512sums="d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 vorbis-tools-1.4.0.tar.gz -c1faa062e7035770db533383ebb3ae18efaf167f7a103c12cef81418da4be43545e368eab2915c243c03354c3bf0b8dbb198da90e7eaa59c8e00f1461c65b601 vorbis-tools-CVE-2015-6749.patch -bcf5ae147de547f6463f3000e06398a8b4db326b44eab02bf314ca8ae3b90c45bd25481fb76ccbf39d9a2798a6c9fadb48600f393b6436f01f95ce2a20c04fe8 vorbis-tools-cve9638-cve9639.patch -3bb8a50309f2657a99662039818040abf345d540915543cf35c3e5855d865fd33bf4bbaf296882662e6b11570199a054c7d34cfdd44ef69f9d3c9f45f4d8671f vorbis-tools-cve9640.patch" +fbe006c1de1b5d03dd84a3213d840468658129bc83f1fad9bcb738d53fd0f76b5f2ebc17b95c456d8b73456b313282bad5e08703649ba8b506371e6c8b466557 CVE-2014-9638-and-9639.patch +9cb9ca5a7cc648e75a4b0027f29f59edd81156578864c46cc2ff773435175a35ea2f31da480e983d05c23d1285d59f0f8a0ec97dd57ba8c11ee5786b619fbaa2 CVE-2014-9640.patch +bf49f572e023678a12d764e459d518f067499a07bd9fe6c037e00730349e066d96174a52043f61dff44fd788b336018c68ae4d26ebe279dc6bf0a07852048ff0 CVE-2015-6749.patch" diff --git a/user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch b/user/vorbis-tools/CVE-2014-9638-and-9639.patch index 80238b741..2585b47be 100644 --- a/user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch +++ b/user/vorbis-tools/CVE-2014-9638-and-9639.patch @@ -1,14 +1,23 @@ -... in order to prevent a division by zero (CVE-2014-9638) and integer -overflow (CVE-2014-9639). +From 3bbabc06c4b35c84f6747ed850213161aca568c7 Mon Sep 17 00:00:00 2001 +From: Petter Reinholdtsen <pere@debian.org> +Date: Tue, 22 Sep 2015 15:14:06 +0200 +Subject: [PATCH] oggenc: validate count of channels in the header + (CVE-2014-9638 & CVE-2014-9639) +Author: Kamil Dudka <kdudka@redhat.com> +Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html Bug: https://trac.xiph.org/ticket/2136 Bug: https://trac.xiph.org/ticket/2137 +Bug-Debian: https://bugs.debian.org/776086 +Forwarded: not-needed +Reviewed-By: Petter Reinholdtsen <pere@hungry.com> +Last-Update: 2015-09-22 --- - oggenc/audio.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) + oggenc/audio.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..1167f1b 100644 +index 4921fb9..535a704 100644 --- a/oggenc/audio.c +++ b/oggenc/audio.c @@ -13,6 +13,7 @@ @@ -27,7 +36,7 @@ index 477da8c..1167f1b 100644 if(buf[11]=='C') aifc=1; -@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) +@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) return 0; } @@ -42,11 +51,10 @@ index 477da8c..1167f1b 100644 + fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); + return 0; + } -+ aiff->bigendian = 1; if(aifc) -@@ -416,6 +424,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) +@@ -416,6 +423,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) wav_fmt format; wavfile *wav = malloc(sizeof(wavfile)); int i; @@ -54,7 +62,7 @@ index 477da8c..1167f1b 100644 /* Ok. At this point, we know we have a WAV file. Now we have to detect * whether we support the subtype, and we have to find the actual data -@@ -453,12 +462,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) +@@ -453,12 +461,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) } format.format = READ_U16_LE(buf); @@ -75,3 +83,5 @@ index 477da8c..1167f1b 100644 { if(len<40) -- +GitLab + diff --git a/user/vorbis-tools/CVE-2014-9640.patch b/user/vorbis-tools/CVE-2014-9640.patch new file mode 100644 index 000000000..f21994b58 --- /dev/null +++ b/user/vorbis-tools/CVE-2014-9640.patch @@ -0,0 +1,51 @@ +From 514116d7bea89dad9f1deb7617b2277b5e9115cd Mon Sep 17 00:00:00 2001 +From: Gregory Maxwell <greg@xiph.org> +Date: Wed, 16 Apr 2014 23:55:10 +0000 +Subject: [PATCH] oggenc: fix crash on raw file close, reported by Hanno in + issue #2009. pointer to a non-static struct was escaping its scope. Also fix + a C99-ism. + +svn path=/trunk/vorbis-tools/; revision=19117 +--- + oggenc/oggenc.c | 4 ++-- + oggenc/skeleton.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c +index 4a120f3..e7de0bb 100644 +--- a/oggenc/oggenc.c ++++ b/oggenc/oggenc.c +@@ -97,6 +97,8 @@ int main(int argc, char **argv) + .3,-1, + 0,0,0.f, + 0, 0, 0, 0, 0}; ++ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", ++ N_("RAW file reader")}; + + int i; + +@@ -239,8 +241,6 @@ int main(int argc, char **argv) + + if(opt.rawmode) + { +- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", +- N_("RAW file reader")}; + + enc_opts.rate=opt.raw_samplerate; + enc_opts.channels=opt.raw_channels; +diff --git a/oggenc/skeleton.h b/oggenc/skeleton.h +index cf87dc2..168b8b6 100644 +--- a/oggenc/skeleton.h ++++ b/oggenc/skeleton.h +@@ -41,7 +41,7 @@ typedef struct { + ogg_int64_t granule_rate_d; /* granule rate denominator */ + ogg_int64_t start_granule; /* start granule value */ + ogg_uint32_t preroll; /* preroll */ +- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ ++ unsigned char granule_shift; /* 1 byte value holding the granule shift */ + char *message_header_fields; /* holds all the message header fields */ + /* current total size of the message header fields, for realloc purpose, initially zero */ + ogg_uint32_t current_header_size; +-- +GitLab + diff --git a/user/vorbis-tools/vorbis-tools-CVE-2015-6749.patch b/user/vorbis-tools/CVE-2015-6749.patch index 78e3c810e..b83f70cc2 100644 --- a/user/vorbis-tools/vorbis-tools-CVE-2015-6749.patch +++ b/user/vorbis-tools/CVE-2015-6749.patch @@ -1,9 +1,14 @@ -From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 -From: Mark Harris <mark.hsj@gmail.com> -Date: Sun, 30 Aug 2015 05:54:46 -0700 -Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input +From c1059cd1e5c9278fe73a044d0e0792cac75f44b3 Mon Sep 17 00:00:00 2001 +From: Petter Reinholdtsen <pere@debian.org> +Date: Tue, 22 Sep 2015 14:56:58 +0200 +Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input (CVE-2015-6749). -Fixes #2212 +Author: Mark Harris <mark.hsj@gmail.com> +Origin: https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch +Bug-Debian: https://bugs.debian.org/797461 +Forwarded: https://trac.xiph.org/ticket/2212 +Reviewed-By: Petter Reinholdtsen <pere@hungry.com> +Last-Update: 2015-09-22 --- oggenc/audio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) @@ -37,5 +42,5 @@ index 477da8c..4921fb9 100644 fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); return 0; -- -2.5.0 +GitLab diff --git a/user/vorbis-tools/vorbis-tools-cve9640.patch b/user/vorbis-tools/vorbis-tools-cve9640.patch deleted file mode 100644 index 97d18e0db..000000000 --- a/user/vorbis-tools/vorbis-tools-cve9640.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: vorbis-tools/oggenc/oggenc.c
-===================================================================
---- vorbis-tools/oggenc/oggenc.c (revision 19116)
-+++ vorbis-tools/oggenc/oggenc.c (revision 19117)
-@@ -98,4 +98,6 @@
- 0,0,0.f,
- 0, 0, 0, 0, 0};
-+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
-+ N_("RAW file reader")};
-
- int i;
-@@ -240,6 +242,4 @@
- if(opt.rawmode)
- {
-- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
-- N_("RAW file reader")};
-
- enc_opts.rate=opt.raw_samplerate;
-Index: vorbis-tools/oggenc/skeleton.h
-===================================================================
---- vorbis-tools/oggenc/skeleton.h (revision 19116)
-+++ vorbis-tools/oggenc/skeleton.h (revision 19117)
-@@ -42,5 +42,5 @@
- ogg_int64_t start_granule; /* start granule value */
- ogg_uint32_t preroll; /* preroll */
-- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */
-+ unsigned char granule_shift; /* 1 byte value holding the granule shift */
- char *message_header_fields; /* holds all the message header fields */
- /* current total size of the message header fields, for realloc purpose, initially zero */
diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index d0d22ef67..c95e0dfda 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vte pkgver=0.62.0 pkgrel=0 diff --git a/user/wavpack/APKBUILD b/user/wavpack/APKBUILD index 43aefeb03..f0c45a722 100644 --- a/user/wavpack/APKBUILD +++ b/user/wavpack/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter # Maintainer: pkgname=wavpack -pkgver=5.2.0 -pkgrel=1 +pkgver=5.3.0 +pkgrel=0 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" @@ -59,4 +59,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="456da78fb5d01b33a8ed71b43cb6809a25ca0d54e53858b93bbb3eb26923bfa6de4c6a3c01caca947c0852aea74d1b14667205dae344148a01619e67eb2c7e71 wavpack-5.2.0.tar.bz2" +sha512sums="2c5038abfbe7ab3b51fb30b3fc8b636117e9afe1821c40832fbdfb960d1153e0cb4a68dd84a89b205c3cdc10030d3aa7a7340b296d9c148e8847471c2e7c0cd1 wavpack-5.3.0.tar.bz2" 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/weechat/APKBUILD b/user/weechat/APKBUILD index d4f4097f5..085916ad2 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=weechat pkgver=2.9 pkgrel=0 diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 8b9f11117..60df4133b 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> -_kver="5.4.5-mc0" -pkgver=1.0.20200506 +_kver="5.4.66-mc1" +pkgver=1.0.20210424 pkgrel=0 _pkgname="wireguard-module" pkgname="$_pkgname-$_kver" @@ -38,5 +38,4 @@ _patch() { mkdir -p "$subpkgdir/usr/share/wireguard" "$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" } - -sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074 wireguard-linux-compat-1.0.20200506.tar.xz" +sha512sums="f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b wireguard-linux-compat-1.0.20210424.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 7e283e759..ece7397aa 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20200513 +pkgver=1.0.20210424 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c wireguard-tools-1.0.20200513.tar.xz" +sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59 wireguard-tools-1.0.20210424.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/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index a7c352fa3..85f8f8f89 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.16 +pkgver=1.4.17 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" @@ -46,5 +46,5 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6 xapian-core-1.4.16.tar.xz +sha512sums="3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 xapian-core-1.4.17.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" 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" diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD index 241e80519..12b8d9268 100644 --- a/user/xdg-user-dirs/APKBUILD +++ b/user/xdg-user-dirs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xdg-user-dirs pkgver=0.17 pkgrel=0 diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index 1a5adc93a..c1fb3994b 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfburn pkgver=0.6.2 pkgrel=0 diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 035c79a18..a9b998f33 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-desktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce-desktop pkgver=4.13 pkgrel=0 diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD index 5e4d92920..303c71a16 100644 --- a/user/xfce-plugins/APKBUILD +++ b/user/xfce-plugins/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce-plugins pkgver=0.1 pkgrel=0 diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 187e18781..8c980ffc7 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-appfinder pkgver=4.14.0 pkgrel=0 diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 90aea20eb..66af35833 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-battery-plugin pkgver=1.1.3 pkgrel=0 diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD index 45c7b33fd..ee219ed8e 100644 --- a/user/xfce4-clipman-plugin/APKBUILD +++ b/user/xfce4-clipman-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-clipman-plugin pkgver=1.6.1 pkgrel=0 diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 5a235a42e..4cf5f24d8 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-cpugraph-plugin pkgver=1.1.0 pkgrel=0 diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index cb9291532..91b9fccb1 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-dict pkgver=0.8.3 pkgrel=0 diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD index cc66c040c..66aab4d85 100644 --- a/user/xfce4-diskperf-plugin/APKBUILD +++ b/user/xfce4-diskperf-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-diskperf-plugin pkgver=2.6.2 pkgrel=0 diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD index a8e5f5f97..0c69f688f 100644 --- a/user/xfce4-indicator-plugin/APKBUILD +++ b/user/xfce4-indicator-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-indicator-plugin pkgver=2.3.4 pkgrel=1 diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD index 2101b528a..be6a000b5 100644 --- a/user/xfce4-netload-plugin/APKBUILD +++ b/user/xfce4-netload-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-netload-plugin pkgver=1.3.2 pkgrel=0 diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 6ea50f20a..6b29d1db1 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-notifyd pkgver=0.6.2 pkgrel=0 diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD index 777ace868..ecb1b73e5 100644 --- a/user/xfce4-panel-profiles/APKBUILD +++ b/user/xfce4-panel-profiles/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-panel-profiles pkgver=1.0.10 pkgrel=0 diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 91ac3af01..700482001 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-panel pkgver=4.14.4 pkgrel=0 diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 0592f060e..0b37c5ae2 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-power-manager pkgver=1.6.6 pkgrel=0 diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index e5382749e..be47ca09b 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-pulseaudio-plugin pkgver=0.4.3 pkgrel=0 diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index e3ad324dd..c8bc21481 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-screenshooter pkgver=1.9.7 pkgrel=0 diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index eef3b208f..36041abed 100644 --- a/user/xfce4-sensors-plugin/APKBUILD +++ b/user/xfce4-sensors-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-sensors-plugin pkgver=1.3.92 pkgrel=0 diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 487b737f7..f869781d7 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-session pkgver=4.14.2 pkgrel=0 diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 4e76bb72f..d9a8672fe 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-settings pkgver=4.14.3 pkgrel=0 diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 7600d411e..d1c78c479 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-systemload-plugin pkgver=1.2.3 pkgrel=0 diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index 35644eab4..4fdcce72f 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-taskmanager pkgver=1.2.3 pkgrel=0 diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index 4abf09aa7..f0e3fa277 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-terminal pkgver=0.8.9.2 pkgrel=0 diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 7af85df23..df654f539 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-time-out-plugin pkgver=1.1.1 pkgrel=0 diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index c4a52b993..fc64b01b6 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-timer-plugin pkgver=1.7.1 pkgrel=0 diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD index 432c5cff9..f38ea7695 100644 --- a/user/xfce4-verve-plugin/APKBUILD +++ b/user/xfce4-verve-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-verve-plugin pkgver=2.0.0 pkgrel=1 diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD index 55a0ff0d3..3451a69ed 100644 --- a/user/xfce4-volumed-pulse/APKBUILD +++ b/user/xfce4-volumed-pulse/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-volumed-pulse pkgver=0.2.3 pkgrel=0 diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 986789d40..4f34961d5 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-whiskermenu-plugin pkgver=2.4.6 _pkgmaj=${pkgver%.*} diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index f5b5b681b..0cc2b2eca 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfconf pkgver=4.14.3 pkgrel=0 diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index 7771b5ad8..8d46cf6a9 100644 --- a/user/xfdashboard/APKBUILD +++ b/user/xfdashboard/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfdashboard pkgver=0.7.8 pkgrel=0 diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index a9c3c3d9d..c93f915b8 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfdesktop pkgver=4.14.2 pkgrel=0 diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index c6f9975a0..0dcebc1da 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfmpc pkgver=0.3.0 pkgrel=1 diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 68bf1b9ff..f0087d9cc 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfwm4 pkgver=4.14.5 pkgrel=0 diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD index 1dee09b1e..9de0be3c3 100644 --- a/user/xorg-gtest/APKBUILD +++ b/user/xorg-gtest/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xorg-gtest pkgver=0.7.1 pkgrel=0 diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 4eaad7171..214437813 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xscreensaver -pkgver=5.44 +pkgver=5.45 pkgrel=0 pkgdesc="X Screensaver suite" url="https://www.jwz.org/xscreensaver/" @@ -30,4 +30,4 @@ package() { make install_prefix="$pkgdir" install } -sha512sums="9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae xscreensaver-5.44.tar.gz" +sha512sums="1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14 xscreensaver-5.45.tar.gz" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index c36914b76..17dda70e9 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xterm pkgver=360 pkgrel=0 diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD index 5409c8b37..88a3ae7b7 100644 --- a/user/yubico-c/APKBUILD +++ b/user/yubico-c/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=yubico-c pkgver=1.13 pkgrel=2 diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD index 1db97be94..f1102bd9a 100644 --- a/user/yubikey-personalization/APKBUILD +++ b/user/yubikey-personalization/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=yubikey-personalization pkgver=1.20.0 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform library & tools for personalizing YubiKey devices" url="https://developers.yubico.com/yubikey-personalization/" arch="all" @@ -13,6 +13,7 @@ makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor subpackages="$pkgname-dev $pkgname-doc" source="yubikey-personalization-$pkgver.tar.gz::https://github.com/Yubico/yubikey-personalization/archive/v$pkgver.tar.gz use-asciidoctor.patch + json_c.patch " prepare() { @@ -40,4 +41,5 @@ package() { } sha512sums="a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823 yubikey-personalization-1.20.0.tar.gz -d6777a43e5e57430268bb50ab704641465a7314b15fc821d8bfa7f0c6510829d0118ced426cd5f8730589efe6264df6b82fc70e8bfe3d8b7d735e51339a25af2 use-asciidoctor.patch" +d6777a43e5e57430268bb50ab704641465a7314b15fc821d8bfa7f0c6510829d0118ced426cd5f8730589efe6264df6b82fc70e8bfe3d8b7d735e51339a25af2 use-asciidoctor.patch +a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055 json_c.patch" diff --git a/user/yubikey-personalization/json_c.patch b/user/yubikey-personalization/json_c.patch new file mode 100644 index 000000000..ca5a918d2 --- /dev/null +++ b/user/yubikey-personalization/json_c.patch @@ -0,0 +1,83 @@ +From 0aa2e2cae2e1777863993a10c809bb50f4cde7f8 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Sat, 25 Apr 2020 20:55:28 +0200 +Subject: [PATCH] fix boolean value with json-c 0.14 + +Upstream removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. +--- + ykpers-json.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/ykpers-json.c b/ykpers-json.c +index a62e907..15ad380 100644 +--- a/ykpers-json.c ++++ b/ykpers-json.c +@@ -40,7 +40,7 @@ + #define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) + #else + typedef int json_bool; +-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE ++#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1 + #endif + + static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { +@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP + if(p->mode && (mode & p->mode) == mode) { + json_object *joption; + json_bool ret = yk_json_object_object_get(options, p->json_text, joption); +- if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) { ++ if(ret == 1 && json_object_get_type(joption) == json_type_boolean) { + int value = json_object_get_boolean(joption); + if(value == 1) { + p->setter(cfg, true); +@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) { ++ if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "options", options) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } + +- if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) { ++ if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) { + int target_config = json_object_get_int(jtarget); + int command; + if(target_config == 1) { +@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + if(mode == MODE_OATH_HOTP) { + json_object *jdigits, *jrandom; + ykp_set_tktflag_OATH_HOTP(cfg, true); +- if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) { ++ if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) { + int digits = json_object_get_int(jdigits); + if(digits == 8) { + ykp_set_cfgflag_OATH_HOTP8(cfg, true); + } + } +- if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) { ++ if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) { + int random = json_object_get_boolean(jrandom); + int seed = 0; + if(random == 1) { +@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + goto out; + } else { + json_object *jseed; +- if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) { ++ if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) { + seed = json_object_get_int(jseed); + } + } diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD index 87343a192..c12793018 100644 --- a/user/zenity/APKBUILD +++ b/user/zenity/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=zenity pkgver=3.32.0 pkgrel=0 |