diff options
387 files changed, 2537 insertions, 2181 deletions
diff --git a/system/man-db/APKBUILD b/legacy/man-db/APKBUILD index 136e0720d..136e0720d 100644 --- a/system/man-db/APKBUILD +++ b/legacy/man-db/APKBUILD diff --git a/system/man-db/man-db-2.8.5-iconv.patch b/legacy/man-db/man-db-2.8.5-iconv.patch index c2232920d..c2232920d 100644 --- a/system/man-db/man-db-2.8.5-iconv.patch +++ b/legacy/man-db/man-db-2.8.5-iconv.patch diff --git a/system/man-db/man-db.trigger b/legacy/man-db/man-db.trigger index f9de5961c..f9de5961c 100644 --- a/system/man-db/man-db.trigger +++ b/legacy/man-db/man-db.trigger diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 8b06a3699..7cd92003d 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -14,7 +14,7 @@ _core_depends="apk-tools adelie-keys musl-utils shadow util-linux net-tools nvi sed psmisc less tzdata" depends="adelie-core binutils debianutils file gettys-openrc - kbd libarchive-tools man-db patch sed sharutils sysklogd zsh" + kbd libarchive-tools mandoc patch sed sharutils sysklogd zsh" makedepends="" makedepends_host="$depends" subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 99fb584f3..b25801a20 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=2.6.0 +pkgver=2.7.2 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -25,4 +25,4 @@ package() { make install } -sha512sums="809ca124d110bb96ded253fe8799786b48dc5ff8ab540aa97dc8ed43f5a835841d44a71ed082ded17c1df39b6fe5dc2ce7247be0c771b22d7d354aec40434411 bc-2.6.0.tar.xz" +sha512sums="c2014b16165bf5f8bdadf42bb60ea967a060753c17e13a7c3569d16d218bb3fb644e6a46950e9e7b3aa5a9f6bee4da9b158694909a0ab1fe390b7bb4dc20b303 bc-2.7.2.tar.xz" diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index a053dd0b7..c0a5ed0c2 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.5.3 +pkgver=3.5.4 pkgrel=0 pkgdesc="The GNU general-purpose parser generator" arch="all" @@ -15,6 +15,10 @@ provider_priority=1 subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz" +# secfixes: +# 3.5.4-r0: +# - CVE-2020-14150 + build() { ./configure \ --build=$CBUILD \ @@ -40,4 +44,4 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="888a1e8d4aeda3ff2d7d0a3a88b63bbfe89bdb718cc64d48c244e05fe6c6cd39526fd88143db379fef3071cf6c2dc2ab2fd69834c24acb23ed5f739584ff6308 bison-3.5.3.tar.xz" +sha512sums="92f59122dc4d5cae1debdd5567253f269ef001c98582a5763a2051424fecb78e8710c80a09fc488f6784705e679a8bc82874bc11cc03e4eb83445cb9f418b331 bison-3.5.4.tar.xz" diff --git a/system/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD index 0785ec441..5e75d13d8 100644 --- a/system/ca-certificates/APKBUILD +++ b/system/ca-certificates/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ca-certificates -pkgver=20190131 -pkgrel=1 +pkgver=20200603 +pkgrel=0 pkgdesc="CA root certificates" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" @@ -13,12 +13,11 @@ makedepends_host="openssl-dev" subpackages="$pkgname-doc" triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d" install="$pkgname.post-deinstall" -source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz certhash " build() { - export CFLAGS="$CFLAGS -DSYMLINK_MAX=PATH_MAX" make } @@ -43,5 +42,5 @@ package() { install -D -m755 "$srcdir"/certhash "$pkgdir"/etc/ca-certificates/update.d/certhash } -sha512sums="aec43296636887a8ebefc08abe60c123b67002eb8cf450662b5ff8fcbd2ea10d3d24d17080b5924b13aed9a52b91ba55e93d306e27ed3196ca67cbbe30146328 ca-certificates-20190131.tar.xz +sha512sums="0125600481666979e0b736572aca7d0e3c4bf01169bc67638ef7bdd4fc97a0ebbb70798df7275eac92dfc2d03b16de3f0adc8ad382fc9e2fb4d8223c923b2eef ca-certificates-20200603.tar.gz 1efe48235f150052da6b872d2ebff174359825ab3bd66086c9d7f4c18dcd8aa8953c634dbf1aa8416d30d5623babf589660a25cf6e3a4cdcce707c14cc2f348a certhash" diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 8303e6d75..fdf8be1e2 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -10,7 +10,7 @@ url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" -makedepends_build="groff perl" +makedepends_build="perl" makedepends_host="zlib-dev openssl-dev libssh2-dev" makedepends="$makedepends_build $makedepends_host" source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz" diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD index 8abd44b65..a21f42a2f 100644 --- a/system/dash/APKBUILD +++ b/system/dash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=dash -pkgver=0.5.10.2 +pkgver=0.5.11 pkgrel=0 pkgdesc="Small and fast POSIX-compliant shell" url="http://gondor.apana.org.au/~herbert/dash/" @@ -41,4 +41,4 @@ binsh() { ln -s /bin/dash "$subpkgdir"/bin/sh } -sha512sums="0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 dash-0.5.10.2.tar.gz" +sha512sums="41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1 dash-0.5.11.tar.gz" diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD index d3f7d1ce8..ef7ba098e 100644 --- a/system/debianutils/APKBUILD +++ b/system/debianutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=debianutils -pkgver=4.9.1 +pkgver=4.11 pkgrel=0 pkgdesc="Miscellaneous utilities from Debian" url="https://packages.qa.debian.org/d/debianutils.html" @@ -37,4 +37,4 @@ which() { mv "${pkgdir}-doc"/usr/share/man/man1/which* "$subpkgdir"/usr/share/man/man1/ } -sha512sums="b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1 debianutils_4.9.1.tar.xz" +sha512sums="87f6b7d9fecbaff615a5529328d384d8adf4ed69c8cc00acc54681d91fc146f4241a761dde2c9b092cb279b63d30dcaa6c2d0309ef4d29d6a2b09600c53c0ac6 debianutils_4.11.tar.xz" diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index bc7328ea3..9565e76d5 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.6.0.2 +pkgver=2.6.1.0 pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -61,5 +61,4 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } - -sha512sums="915823af0d557fc7a181e088ce319568e62ea4bf743704e498786422c97b991e6b09447c7cff7d7dda520d391773ef4b2fea68e44479c02766966256719bb4c0 execline-2.6.0.2.tar.gz" +sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e execline-2.6.1.0.tar.gz" diff --git a/system/help2man/APKBUILD b/system/help2man/APKBUILD index 0bb2530e1..d3f811aad 100644 --- a/system/help2man/APKBUILD +++ b/system/help2man/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=help2man -pkgver=1.47.13 +pkgver=1.47.15 pkgrel=0 pkgdesc="Create simple man pages from --help output" url="https://www.gnu.org/software/help2man" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a help2man-1.47.13.tar.xz" +sha512sums="2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad help2man-1.47.15.tar.xz" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index 31c22df59..a9ee99fdd 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.37 +pkgver=1.38 pkgrel=0 pkgdesc="GnuPG runtime library" url="https://www.gnupg.org" @@ -36,4 +36,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179 libgpg-error-1.37.tar.bz2" +sha512sums="b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de libgpg-error-1.38.tar.bz2" diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index 78b079435..eb9f4a933 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libucontext -pkgver=0.10 +pkgver=0.11 pkgrel=0 pkgdesc="Implementation of software-defined threading" url=" " @@ -9,9 +9,7 @@ license="ISC" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz - git.patch - " +source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz" case "$CTARGET_ARCH" in aarch64_be) LIBUCONTEXT_ARCH="aarch64" ;; @@ -33,5 +31,4 @@ package() { make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install } -sha512sums="ef04485f66edd94711a15681953aed12652ea3821036e6a5b10d1ba3c0371ffabd689c85ee2403bc6a94544932e64855d8f5412f46b50d8b5a934f70a771fcb1 libucontext-0.10.tar.xz -f3f5da2f76302fb3aeba8cca6e3485f264714ad12160e83ef92785a5f2a318cb4cea88e350df71dd6c976d075525361f36e67467ffb82b30fed6acee11be8095 git.patch" +sha512sums="afc8ea6e03b5f1757aec0035090e0553c58d84c03bab6809cf00df8f12a0a3d5aa6c3516f258f1fb531ff38ba7d39e3f72e450903a159df6e85d22da850cb3bb libucontext-0.11.tar.xz" diff --git a/system/libucontext/git.patch b/system/libucontext/git.patch deleted file mode 100644 index d42ee0803..000000000 --- a/system/libucontext/git.patch +++ /dev/null @@ -1,115 +0,0 @@ -From d7688a41df4cbe51e52bfebbab7d411548ed7738 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 30 Mar 2020 02:22:43 -0500 -Subject: [PATCH 1/3] README: Remove support section - -This is no longer a member of the gcompat family of projects; -remove the mention of that and the gcompat mailing list link. ---- - README.md | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/README.md b/README.md -index 97a03b6..1db0516 100644 ---- a/README.md -+++ b/README.md -@@ -38,8 +38,3 @@ $ make ARCH=x86_64 check - $ make ARCH=x86_64 DESTDIR=out install - ``` - -- --## support -- --`libucontext` is offered as part of the `gcompat` project. Accordingly, please address all questions --and bug reports to gcompat@lists.adelielinux.org. - -From e2178de76a7d3f41fed7cc5bef3e68eea623a72a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 30 Mar 2020 08:21:20 +0000 -Subject: [PATCH 2/3] Makefile: Add LIBDIR variable - -This ensures that it can be installed into custom location and also - -Upstream-Status: Submitted -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index a8dedc2..74ebdbf 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,6 +3,7 @@ ifeq ($(ARCH),$(filter $(ARCH),i386 i686)) - override ARCH = x86 - endif - -+LIBDIR := /lib - CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH} -Iarch/common - - LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c) -@@ -13,8 +14,8 @@ LIBUCONTEXT_SOVERSION = 0 - LIBUCONTEXT_NAME = libucontext.so - LIBUCONTEXT_STATIC_NAME = libucontext.a - LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} --LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} --LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} -+LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME} -+LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME} - - all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} - -@@ -39,9 +40,9 @@ clean: - ${LIBUCONTEXT_OBJ} test_libucontext - - install: all -- install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}/${LIBUCONTEXT_PATH} -- install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}/${LIBUCONTEXT_STATIC_PATH} -- ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}/lib/${LIBUCONTEXT_NAME} -+ install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH} -+ install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_STATIC_PATH} -+ ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME} - - check: test_libucontext ${LIBUCONTEXT_SONAME} - env LD_LIBRARY_PATH=$(shell pwd) ./test_libucontext - -From 467ee2916d0eacbd32af10ead14e5d86e365fa2b Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 30 Mar 2020 17:25:30 -0500 -Subject: [PATCH 3/3] x86: Update copyright statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit d0ccf2f96f12bfa040cc056f7dc26b3fd25c168d contains the makecontext -fix from Adélie commit aaeb73ea701388e55b7640e32509a5f6a57f6350[1], as -seen at AdelieLinux/libucontext@aaeb73ea – but it didn't include the -addition of my author line. - -The full commit text, for future documentation/reference, was: - -``` -x86: Write link pointer at correct stack offset - -It must come *after* the parameters, not *before*. -``` - -Fixes: d0ccf2f96f12 ("x86: modernize") -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> - -[1]: https://code.foxkit.us/adelie/libucontext/commit/aaeb73ea701388e55b7640e32509a5f6a57f6350 ---- - arch/x86/makecontext.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/x86/makecontext.c b/arch/x86/makecontext.c -index ee9c2e2..bc8163c 100644 ---- a/arch/x86/makecontext.c -+++ b/arch/x86/makecontext.c -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2018 Ariadne Conill <ariadne@dereferenced.org> -+ * Copyright (c) 2019 A. Wilcox <awilfox@adelielinux.org> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above diff --git a/system/man-pages/APKBUILD b/system/man-pages/APKBUILD index b543f78c6..81f54970d 100644 --- a/system/man-pages/APKBUILD +++ b/system/man-pages/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-pages -pkgver=5.05 +pkgver=5.07 _posixver=2013-a pkgrel=0 pkgdesc="Linux man pages" @@ -49,5 +49,5 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/localedef* } -sha512sums="4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395 man-pages-5.05.tar.xz +sha512sums="701837b6a8dd3bf9e0fa3d0234384bcc8af4ba8b6a4fdce01a441a146c5101bb14b96cfd68b48613c2ddd2237d01c63fb24a8478c4fff5482265f6605bcbe2f5 man-pages-5.07.tar.xz e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 man-pages-posix-2013-a.tar.xz" diff --git a/system/mandoc/APKBUILD b/system/mandoc/APKBUILD new file mode 100644 index 000000000..b3a4c018c --- /dev/null +++ b/system/mandoc/APKBUILD @@ -0,0 +1,94 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=mandoc +pkgver=1.14.5 +pkgrel=0 +pkgdesc="Manual page database, compiler, and viewer" +url="https://mandoc.bsd.lv/" +arch="all" +license="ISC AND BSD-2-Clause AND BSD-3-Clause" +replaces="man-db" +depends="less" +makedepends="zlib-dev" +checkdepends="perl" +subpackages="$pkgname-doc $pkgname-cgi" +install="$pkgname.post-deinstall" +triggers="$pkgname.trigger=/usr/share/man" +source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz + configure.patch + empty-tbl-null-deref.patch + tbl-colwidth-oob.patch + less.patch + doc.patch + cgi-adelie.patch + cgi-gz.patch + cgi-search.patch + " + +prepare() { + default_prepare + cat >"configure.local" <<-EOF + PREFIX=/usr + MANDIR=/usr/share/man + WWWPREFIX=/var/lib/mandoc-cgi + # remove /usr/X11R6 from the following. + MANPATH_BASE=/usr/share/man + MANPATH_DEFAULT=/usr/share/man:/usr/local/share/man + # groff also provides a soelim. + BINM_SOELIM=mandoc-soelim + + CFLAGS="$CFLAGS" + LDFLAGS="$LDFLAGS" + LN="ln -sf" + OSNAME="Adelie Linux" + UTF8_LOCALE=C.UTF-8 + + BUILD_CATMAN=1 + BUILD_CGI=1 + EOF + + cat >"cgi.h" <<-EOF + #define SCRIPT_NAME "" + #define MAN_DIR "/var/lib/mandoc-cgi" + #define CSS_DIR "" + #define CUSTOMIZE_TITLE "Adelie Linux manual pages" + EOF +} + +build() { + ./configure + make +} + +check() { + make regress +} + +package() { + make DESTDIR="$pkgdir" install + install -Dm644 -t "$pkgdir"/usr/share/man/man8 man.cgi.8 + + mkdir -p "$pkgdir"/etc + cat >"$pkgdir"/etc/man.conf <<-EOF + # See man.conf(5). + #manpath /usr/share/man + #manpath /usr/local/share/man + EOF +} + +cgi() { + pkgdesc="$pkgdesc (web interface)" + depends="$pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir"/var/lib + mv "$pkgdir"/var/lib/mandoc-cgi \ + "$subpkgdir"/var/lib +} + +sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 mandoc-1.14.5.tar.gz +074dc73b45c71b5c178750db6c7a4a45e97d97b5388fa5d6028faa90600358dd2b954781280ca41d17da3c577ad5a1a7a13ddc4dbea72ac5e86f1652e03ecde7 configure.patch +c4055371a92be958f0d385c83b4788dc4c18bc990b1f780137309c83e174b8d3e65cae077aba3c5286a97fcee1514d61f6b7507ca25bd5155b8d577a7e8acd3a empty-tbl-null-deref.patch +9a8953f17e2db75bf3667e1d51c7db21ccc5e3042c59035ed6178094963eac919b7367f96708c9bcc81450ffc13842d12c23edd9bca3330be730149625db88e7 tbl-colwidth-oob.patch +4b17b144b53ee30f9aae87c7824597151e16e6f5ad795e7b03e701f2d13ca47a62c696cb837689c75d5f34d3c190255c8f0583bc91a0f83f61afde7563a6fb2b less.patch +f35268ed507d5c6431f8cafe5a311d1ffe990083c6e1d22f5db479e19745d486cd45a699b64c4fb6757d1c0ab588c3e8d0778bfd75e98e751d1a786e89e8b925 doc.patch +0dfe9e39570a2b6764303708b98f29b2b57114e124a0f37e9c77d4d33f25d474a79d271df46babd700e4cc93e3385a02356f19caa44ebe4e9b056fa4be96b95b cgi-adelie.patch +957bbaef888fb2ea15f9b795b15952332e65aed70d2e70f3142305a4fb9313ade455eae6dfc923af3ef008834e771b1a85d71389b86cd0ff9a1c31e84fef861c cgi-gz.patch +37be119308814b060ed9d5517b54eb02b210d677ffb085385929b6aa0e8e8bef2c6c1ab2055713ed8c72f2bc85593bf8744d2d0f163dd1aff65ce439c474b640 cgi-search.patch" diff --git a/system/mandoc/cgi-adelie.patch b/system/mandoc/cgi-adelie.patch new file mode 100644 index 000000000..66ce6a9ba --- /dev/null +++ b/system/mandoc/cgi-adelie.patch @@ -0,0 +1,60 @@ +Adjustments for Adélie manual sections and architecture names. + +--- mandoc-1.14.5/cgi.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/cgi.c 2020-06-05 15:54:05.681060852 -0500 +@@ -101,36 +101,28 @@ static const char *scriptname = SCRIPT_ + + static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; + static const char *const sec_numbers[] = { +- "0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9" ++ "0", "0p", "1", "1p", "2", "3", "3p", "3pm", "4", "5", "6", "7", "8" + }; + static const char *const sec_names[] = { + "All Sections", ++ "0p - POSIX C Headers", + "1 - General Commands", ++ "1p - POSIX Commands", + "2 - System Calls", + "3 - Library Functions", +- "3p - Perl Library", ++ "3p - POSIX C Library Functions", ++ "3pm - Perl Library", + "4 - Device Drivers", +- "5 - File Formats", ++ "5 - File formats and configuration files", + "6 - Games", +- "7 - Miscellaneous Information", +- "8 - System Manager\'s Manual", +- "9 - Kernel Developer\'s Manual" ++ "7 - Overview, conventions, and miscellaneous", ++ "8 - System Administrator\'s Manual" + }; + static const int sec_MAX = sizeof(sec_names) / sizeof(char *); + + static const char *const arch_names[] = { +- "amd64", "alpha", "armv7", "arm64", +- "hppa", "i386", "landisk", +- "loongson", "luna88k", "macppc", "mips64", +- "octeon", "sgi", "socppc", "sparc64", +- "amiga", "arc", "armish", "arm32", +- "atari", "aviion", "beagle", "cats", +- "hppa64", "hp300", +- "ia64", "mac68k", "mvme68k", "mvme88k", +- "mvmeppc", "palm", "pc532", "pegasos", +- "pmax", "powerpc", "solbourne", "sparc", +- "sun3", "vax", "wgrisc", "x68k", +- "zaurus" ++ "aarch64", "armv7", "pmmx", ++ "ppc", "ppc64", "x86_64", + }; + static const int arch_MAX = sizeof(arch_names) / sizeof(char *); + +@@ -655,7 +661,7 @@ pg_searchres(const struct req *req, stru + == NULL) ? 3 : + ((archend = strchr(arch + 1, '/')) + == NULL) ? 0 : +- strncmp(arch, "amd64/", ++ strncmp(arch, "ppc64/", + archend - arch) ? 2 : 1; + if (archprio < archpriouse) { + archpriouse = archprio; diff --git a/system/mandoc/cgi-gz.patch b/system/mandoc/cgi-gz.patch new file mode 100644 index 000000000..ac506b797 --- /dev/null +++ b/system/mandoc/cgi-gz.patch @@ -0,0 +1,77 @@ +Handle the case where some of the entries in the manpath are gzipped by +removing the .gz extension and allowing mparse_open to add it back and +mark the page as gzipped. This is part of the documented contract for +mparse_open, see mandoc(3). + +--- mandoc-1.14.5/cgi.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/cgi.c 2020-06-05 15:54:05.681060852 -0500 +@@ -93,7 +93,7 @@ static void resp_searchform(const stru + static void resp_show(const struct req *, const char *); + static void set_query_attr(char **, char **); + static int validate_arch(const char *); +-static int validate_filename(const char *); ++static int validate_filename(char *); + static int validate_manpath(const struct req *, const char *); + static int validate_urifrag(const char *); + +@@ -517,8 +509,13 @@ validate_arch(const char *arch) + } + + static int +-validate_filename(const char *file) ++validate_filename(char *file) + { ++ char *cp; ++ ++ cp = strrchr(file, '.'); ++ if (cp != NULL && ! strcmp(cp + 1, "gz")) ++ *cp = '\0'; + + if ('.' == file[0] && '/' == file[1]) + file += 2; +@@ -854,14 +862,15 @@ resp_format(const struct req *req, const + int fd; + int usepath; + +- if (-1 == (fd = open(file, O_RDONLY, 0))) { +- puts("<p>You specified an invalid manual file.</p>"); +- return; +- } +- + mchars_alloc(); + mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 | + MPARSE_VALIDATE, MANDOC_OS_OTHER, req->q.manpath); ++ ++ if (-1 == (fd = mparse_open(mp, file))) { ++ puts("<p>You specified an invalid manual file.</p>"); ++ goto out; ++ } ++ + mparse_readfd(mp, fd, file); + close(fd); + meta = mparse_result(mp); +@@ -882,10 +891,11 @@ resp_format(const struct req *req, const + html_man(vp, meta); + + html_free(vp); +- mparse_free(mp); +- mchars_free(); + free(conf.man); + free(conf.style); ++out: ++ mparse_free(mp); ++ mchars_free(); + } + + static void +@@ -904,8 +914,8 @@ resp_show(const struct req *req, const c + static void + pg_show(struct req *req, const char *fullpath) + { +- char *manpath; +- const char *file; ++ char *manpath; ++ char *file; + + if ((file = strchr(fullpath, '/')) == NULL) { + pg_error_badrequest( diff --git a/system/mandoc/cgi-search.patch b/system/mandoc/cgi-search.patch new file mode 100644 index 000000000..dd74be9ef --- /dev/null +++ b/system/mandoc/cgi-search.patch @@ -0,0 +1,48 @@ +Don't exit immediately if mansearch returns some paths that man.cgi +considers invalid, in particular translated manpages (e.g. +./de/man1/chfn.1). Just mark them as invalid (section 10, see struct +manpage in mansearch.h) and skip them later. + +--- mandoc-1.14.5/cgi.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/cgi.c 2020-06-05 15:54:05.681060852 -0500 +@@ -605,13 +602,20 @@ pg_searchres(const struct req *req, stru + size_t i, iuse; + int archprio, archpriouse; + int prio, priouse; ++ int results = 0; + + for (i = 0; i < sz; i++) { +- if (validate_filename(r[i].file)) ++ if (validate_filename(r[i].file)) { ++ results = 1; + continue; ++ } + warnx("invalid filename %s in %s database", + r[i].file, req->q.manpath); +- pg_error_internal(); ++ r[i].sec = 10; ++ } ++ ++ if (! results) { ++ pg_noresult(req, "No results found."); + return; + } + +@@ -642,6 +646,8 @@ pg_searchres(const struct req *req, stru + priouse = 20; + archpriouse = 3; + for (i = 0; i < sz; i++) { ++ if (r[i].sec == 10) ++ continue; + sec = r[i].file; + sec += strcspn(sec, "123456789"); + if (sec[0] == '\0') +@@ -681,6 +687,8 @@ pg_searchres(const struct req *req, stru + if (sz > 1) { + puts("<table class=\"results\">"); + for (i = 0; i < sz; i++) { ++ if (r[i].sec == 10) ++ continue; + printf(" <tr>\n" + " <td>" + "<a class=\"Xr\" href=\"/"); diff --git a/system/mandoc/configure.patch b/system/mandoc/configure.patch new file mode 100644 index 000000000..2fda25409 --- /dev/null +++ b/system/mandoc/configure.patch @@ -0,0 +1,21 @@ +--- mandoc-1.14.5/test-recvmsg.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/test-recvmsg.c 2020-06-04 20:08:33.420299034 -0500 +@@ -4,5 +4,6 @@ + int + main(void) + { +- return recvmsg(-1, NULL, 0) != -1; ++ struct msghdr buf; ++ return recvmsg(-1, &buf, 0) != -1; + } +--- mandoc-1.14.5/configure 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/configure 2020-06-04 20:03:24.790295729 -0500 +@@ -41,7 +41,7 @@ OSENUM= + OSNAME= + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` ++CC=cc + CFLAGS= + LDADD= + LDFLAGS= diff --git a/system/mandoc/doc.patch b/system/mandoc/doc.patch new file mode 100644 index 000000000..955a5f205 --- /dev/null +++ b/system/mandoc/doc.patch @@ -0,0 +1,132 @@ +--- mandoc-1.14.5/mandoc.1 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/mandoc.1 2020-06-05 02:12:50.320533119 -0500 +@@ -897,7 +897,7 @@ An + macro references a manual page that is not found in the base system. + The path to look for base system manuals is configurable at compile + time and defaults to +-.Pa /usr/share/man : /usr/X11R6/man . ++.Pa /usr/share/man . + .El + .Ss Style suggestions + .Bl -ohang +--- mandoc-1.14.5/mandoc.db.5 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/mandoc.db.5 2020-06-05 02:14:48.380534383 -0500 +@@ -189,10 +189,6 @@ followed by the number 0. + .Bl -tag -width /usr/share/man/mandoc.db -compact + .It Pa /usr/share/man/mandoc.db + The manual page database for the base system. +-.It Pa /usr/X11R6/man/mandoc.db +-The same for the +-.Xr X 7 +-Window System. + .It Pa /usr/local/man/mandoc.db + The same for + .Xr packages 7 . +--- mandoc-1.14.5/man.conf.5 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/man.conf.5 2020-06-05 02:11:34.650532308 -0500 +@@ -117,7 +117,6 @@ installing it is equivalent to not havin + file at all. + .Bd -literal -offset indent + manpath /usr/share/man +-manpath /usr/X11R6/man + manpath /usr/local/man + .Ed + .Sh SEE ALSO + +--- mandoc-1.14.5/man.1 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/man.1 2020-06-05 02:51:15.910557811 -0500 +@@ -174,28 +174,32 @@ Only select manuals from the specified + The currently available sections are: + .Pp + .Bl -tag -width "localXXX" -offset indent -compact ++.It 0p ++POSIX C headers. + .It 1 + General commands + .Pq tools and utilities . ++.It 1p ++POSIX commands. + .It 2 + System calls and error numbers. + .It 3 + Library functions. + .It 3p ++POSIX C library functions. ++.It 3pm + .Xr perl 1 + programmer's reference guide. + .It 4 + Device drivers. + .It 5 +-File formats. ++File formats and configuration files. + .It 6 + Games. + .It 7 +-Miscellaneous information. ++Overview, conventions, and miscellaneous information. + .It 8 + System maintenance and operation commands. +-.It 9 +-Kernel internals. + .El + .Pp + If not specified and a match is found in more than one section, +--- mandoc-1.14.5/man.cgi.8 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/man.cgi.8 2020-06-05 16:26:12.541081488 -0500 +@@ -342,7 +342,7 @@ page to acquire the named parameters it + .El + .Sh FILES + .Bl -tag -width Ds +-.It Pa /var/www ++.It Pa /var/lib/mandoc-cgi + Default web server + .Xr chroot 2 + directory. +@@ -366,13 +366,7 @@ This is part of the web server configura + A style sheet for + .Xr mandoc 1 + HTML styling, referenced from each generated HTML page. +-.It Pa /man +-Default +-.Nm +-data directory containing all the manual trees. +-Can be overridden by +-.Dv MAN_DIR . +-.It Pa /man/manpath.conf ++.It Pa /manpath.conf + The list of available manpaths, one per line. + If any of the lines in this file contains a slash + .Pq Sq / +@@ -380,13 +374,13 @@ or any character not contained in the + .Sx Restricted character set , + .Nm + reports an internal server error and exits without doing anything. +-.It Pa /man/header.html ++.It Pa /header.html + An optional file containing static HTML code to be inserted right + after opening the <BODY> element. +-.It Pa /man/footer.html ++.It Pa /footer.html + An optional file containing static HTML code to be inserted right + before closing the <BODY> element. +-.It Pa /man/OpenBSD-current/man1/mandoc.1 ++.It Pa /OpenBSD-current/man1/mandoc.1 + An example + .Xr mdoc 7 + source file located below the +--- mandoc-1.14.5/soelim.1 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/soelim.1 2020-06-05 16:38:40.101089494 -0500 +@@ -25,10 +25,10 @@ + .\" SUCH DAMAGE. + .\" + .Dd $Mdocdate: July 4 2017 $ +-.Dt SOELIM 1 ++.Dt MANDOC-SOELIM 1 + .Os + .Sh NAME +-.Nm soelim ++.Nm mandoc-soelim + .Nd interpret .so requests in manpages + .Sh SYNOPSIS + .Nm diff --git a/system/mandoc/empty-tbl-null-deref.patch b/system/mandoc/empty-tbl-null-deref.patch new file mode 100644 index 000000000..3e14ce32b --- /dev/null +++ b/system/mandoc/empty-tbl-null-deref.patch @@ -0,0 +1,62 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Received: from localhost (fantadrom.bsd.lv [local]) + by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 25e99424 + for <source@mandoc.bsd.lv>; + Mon, 18 Mar 2019 03:01:04 -0500 (EST) +Date: Mon, 18 Mar 2019 03:01:04 -0500 (EST) +X-Mailinglist: mandoc-source +Reply-To: source@mandoc.bsd.lv +MIME-Version: 1.0 +From: schwarze@mandoc.bsd.lv +To: source@mandoc.bsd.lv +Subject: mandoc: fix a NULL pointer access on empty tbl(7) data cells that +X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ +Content-Type: text/plain; charset=utf-8 +Message-ID: <e3f22222366ad31d@fantadrom.bsd.lv> +Archived-At: <http://inbox.vuxu.org/mandoc-source/e3f22222366ad31d@fantadrom.bsd.lv/> +List-Archive: <http://inbox.vuxu.org/mandoc-source/> +List-Post: <mailto:source@mandoc.bsd.lv> + +Log Message: +----------- +fix a NULL pointer access on empty tbl(7) data cells +that bentley@ found in syncthing-bep(7) + +Modified Files: +-------------- + mandoc: + tbl_term.c + +Revision Data +------------- +Index: tbl_term.c +=================================================================== +RCS file: /home/cvs/mandoc/mandoc/tbl_term.c,v +retrieving revision 1.69 +retrieving revision 1.70 +diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.69 -r1.70 +--- a/tbl_term.c ++++ b/tbl_term.c +@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct + + lw = cpp == NULL || cpn == NULL || + (cpn->pos != TBL_CELL_DOWN && +- (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) ++ (dpn == NULL || dpn->string == NULL || ++ strcmp(dpn->string, "\\^") != 0)) + ? hw : 0; + tbl_direct_border(tp, BHORIZ * lw, + col->width + col->spacing / 2); +@@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct + + rw = cpp == NULL || cpn == NULL || + (cpn->pos != TBL_CELL_DOWN && +- (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) ++ (dpn == NULL || dpn->string == NULL || ++ strcmp(dpn->string, "\\^") != 0)) + ? hw : 0; + + /* The line crossing at the end of this column. */ +-- + To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv + diff --git a/system/mandoc/less.patch b/system/mandoc/less.patch new file mode 100644 index 000000000..19d567365 --- /dev/null +++ b/system/mandoc/less.patch @@ -0,0 +1,58 @@ +Default to using less(1) instead of more(1) if MANPAGER and PAGER are +unset, and also set a pretty prompt and smart case searching like man-db +does if less is used as a pager. + +The name of the manpage is not available in the scope of the patched +function - maybe add it at some point. + +--- mandoc-1.14.5/main.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/main.c 2020-06-05 01:59:10.640524340 -0500 +@@ -1170,8 +1170,9 @@ spawn_pager(struct tag_files *tag_files) + pager = getenv("MANPAGER"); + if (pager == NULL || *pager == '\0') + pager = getenv("PAGER"); +- if (pager == NULL || *pager == '\0') +- pager = "more -s"; ++ if (pager == NULL || *pager == '\0') { ++ pager = "less"; ++ } + cp = mandoc_strdup(pager); + + /* +@@ -1195,10 +1196,24 @@ spawn_pager(struct tag_files *tag_files) + /* For less(1), use the tag file. */ + + use_ofn = 1; +-#if HAVE_LESS_T + if ((cmdlen = strlen(argv[0])) >= 4) { + cp = argv[0] + cmdlen - 4; + if (strcmp(cp, "less") == 0) { ++ /* ++ * Set a few options like man-db does. ++ * -i: smart case search ++ * -mPm: set prompt to following string terminated by $ ++ */ ++ argv[argc++] = "-imPm" \ ++ " Manual page" \ ++ /* ++ * print " (END)" if EOF, else % in file followed by % sign. ++ * ?X if X:else not X. ++ */ ++ "?e (END):?pB %pB\\%.. " \ ++ "(press h for help or q to quit)" \ ++ "$"; ++#if HAVE_LESS_T + argv[argc++] = mandoc_strdup("-T"); + argv[argc++] = tag_files->tfn; + if (tag_files->tagname != NULL) { +@@ -1206,9 +1221,9 @@ spawn_pager(struct tag_files *tag_files) + argv[argc++] = tag_files->tagname; + use_ofn = 0; + } ++#endif + } + } +-#endif + if (use_ofn) + argv[argc++] = tag_files->ofn; + argv[argc] = NULL; diff --git a/system/mandoc/mandoc.post-deinstall b/system/mandoc/mandoc.post-deinstall new file mode 100644 index 000000000..0a8d5b9df --- /dev/null +++ b/system/mandoc/mandoc.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh + +exec rm -f /usr/share/man/mandoc.db 2>/dev/null diff --git a/system/mandoc/mandoc.trigger b/system/mandoc/mandoc.trigger new file mode 100644 index 000000000..34fc1decc --- /dev/null +++ b/system/mandoc/mandoc.trigger @@ -0,0 +1,3 @@ +#!/bin/sh + +exec makewhatis -a -T utf8 "$@" diff --git a/system/mandoc/tbl-colwidth-oob.patch b/system/mandoc/tbl-colwidth-oob.patch new file mode 100644 index 000000000..0b7b0acad --- /dev/null +++ b/system/mandoc/tbl-colwidth-oob.patch @@ -0,0 +1,62 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Received: from localhost (fantadrom.bsd.lv [local]) + by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 0ff00a97 + for <source@mandoc.bsd.lv>; + Fri, 29 Mar 2019 16:27:36 -0500 (EST) +Date: Fri, 29 Mar 2019 16:27:36 -0500 (EST) +X-Mailinglist: mandoc-source +Reply-To: source@mandoc.bsd.lv +MIME-Version: 1.0 +From: schwarze@mandoc.bsd.lv +To: source@mandoc.bsd.lv +Subject: mandoc: Set the maximum column index in a tbl(7) to the maximum *right* +X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ +Content-Type: text/plain; charset=utf-8 +Message-ID: <e3fceff42218668d@fantadrom.bsd.lv> +Archived-At: <http://inbox.vuxu.org/mandoc-source/e3fceff42218668d@fantadrom.bsd.lv/> +List-Archive: <http://inbox.vuxu.org/mandoc-source/> +List-Post: <mailto:source@mandoc.bsd.lv> + +Log Message: +----------- +Set the maximum column index in a tbl(7) to the maximum *right* edge +of any cell span, not to the maximum *left* edge, which may be smaller +if the last column of the table is only reached by horizontal spans, +but not by any regular cell in any row of the table. +Otherwise, the algorithm calculating column widths accessed memomy +after the end of the colwidth[] array, while it was trying to handle +the rightmost column(s). + +Crash reported by Jason Thorpe <thorpej at NetBSD> +via https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54069 +and via Thomas Klausner (wiz@). +Christos@ Zoulas sent a (correct, but slightly confusing) patch. +The patch i'm committing here is easier to understand. + +Modified Files: +-------------- + mandoc: + out.c + +Revision Data +------------- +Index: out.c +=================================================================== +RCS file: /home/cvs/mandoc/mandoc/out.c,v +retrieving revision 1.77 +retrieving revision 1.78 +diff -Lout.c -Lout.c -u -p -r1.77 -r1.78 +--- a/out.c ++++ b/out.c +@@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struc + gp = &first_group; + for (dp = sp->first; dp != NULL; dp = dp->next) { + icol = dp->layout->col; +- while (icol > maxcol) ++ while (maxcol < icol + dp->hspans) + tbl->cols[++maxcol].spacing = SIZE_MAX; + col = tbl->cols + icol; + col->flags |= dp->layout->flags; +-- + To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv + diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index f7596ebb5..8517b148b 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=0 +pkgrel=1 pkgdesc="System library (libc) implementation" url="https://www.musl-libc.org/" arch="all" @@ -26,6 +26,7 @@ source="https://musl.libc.org/releases/$pkgname-$pkgver.tar.gz 3001-make-real-lastlog-h.patch handle-aux-at_base.patch fgetspent_r.patch + threads_minus_1.patch ldconfig getent.c @@ -121,6 +122,7 @@ f01ab92b9d385c15369c0bb7d95e1bc06a009c8851e363517d0ba1bae3fc2647af69fc2f363b5d96 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch +68830961e297d9a499f3b609be84848ad5d3326a1af56e9e54a40ecd972c48da11532c51da572d45e0df3574d63191e7ae0d3a1b84a029365f8d00691de96952 threads_minus_1.patch cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/threads_minus_1.patch b/system/musl/threads_minus_1.patch new file mode 100644 index 000000000..05307d97c --- /dev/null +++ b/system/musl/threads_minus_1.patch @@ -0,0 +1,267 @@ +https://www.openwall.com/lists/musl/2020/05/22/10 + +From 4d5aa20a94a2d3fae3e69289dc23ecafbd0c16c4 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 22 May 2020 17:35:14 -0400 +Subject: [PATCH 1/4] reorder thread list unlink in pthread_exit after all + locks + +since the backend for LOCK() skips locking if single-threaded, it's +unsafe to make the process appear single-threaded before the last use +of lock. + +this fixes potential unsynchronized access to a linked list via +__dl_thread_cleanup. +--- + src/thread/pthread_create.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c +index 5f491092..6a3b0c21 100644 +--- a/src/thread/pthread_create.c ++++ b/src/thread/pthread_create.c +@@ -90,14 +90,7 @@ _Noreturn void __pthread_exit(void *result) + exit(0); + } + +- /* At this point we are committed to thread termination. Unlink +- * the thread from the list. This change will not be visible +- * until the lock is released, which only happens after SYS_exit +- * has been called, via the exit futex address pointing at the lock. */ +- libc.threads_minus_1--; +- self->next->prev = self->prev; +- self->prev->next = self->next; +- self->prev = self->next = self; ++ /* At this point we are committed to thread termination. */ + + /* Process robust list in userspace to handle non-pshared mutexes + * and the detached thread case where the robust list head will +@@ -121,6 +114,16 @@ _Noreturn void __pthread_exit(void *result) + __do_orphaned_stdio_locks(); + __dl_thread_cleanup(); + ++ /* Last, unlink thread from the list. This change will not be visible ++ * until the lock is released, which only happens after SYS_exit ++ * has been called, via the exit futex address pointing at the lock. ++ * This needs to happen after any possible calls to LOCK() that might ++ * skip locking if libc.threads_minus_1 is zero. */ ++ libc.threads_minus_1--; ++ self->next->prev = self->prev; ++ self->prev->next = self->next; ++ self->prev = self->next = self; ++ + /* This atomic potentially competes with a concurrent pthread_detach + * call; the loser is responsible for freeing thread resources. */ + int state = a_cas(&self->detach_state, DT_JOINABLE, DT_EXITING); +-- +2.21.0 + +From e01b5939b38aea5ecbe41670643199825874b26c Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Thu, 21 May 2020 23:32:45 -0400 +Subject: [PATCH 2/4] don't use libc.threads_minus_1 as relaxed atomic for + skipping locks + +after all but the last thread exits, the next thread to observe +libc.threads_minus_1==0 and conclude that it can skip locking fails to +synchronize with any changes to memory that were made by the +last-exiting thread. this can produce data races. + +on some archs, at least x86, memory synchronization is unlikely to be +a problem; however, with the inline locks in malloc, skipping the lock +also eliminated the compiler barrier, and caused code that needed to +re-check chunk in-use bits after obtaining the lock to reuse a stale +value, possibly from before the process became single-threaded. this +in turn produced corruption of the heap state. + +some uses of libc.threads_minus_1 remain, especially for allocation of +new TLS in the dynamic linker; otherwise, it could be removed +entirely. it's made non-volatile to reflect that the remaining +accesses are only made under lock on the thread list. + +instead of libc.threads_minus_1, libc.threaded is now used for +skipping locks. the difference is that libc.threaded is permanently +true once an additional thread has been created. this will produce +some performance regression in processes that are mostly +single-threaded but occasionally creating threads. in the future it +may be possible to bring back the full lock-skipping, but more care +needs to be taken to produce a safe design. +--- + src/internal/libc.h | 2 +- + src/malloc/malloc.c | 2 +- + src/thread/__lock.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/internal/libc.h b/src/internal/libc.h +index ac97dc7e..c0614852 100644 +--- a/src/internal/libc.h ++++ b/src/internal/libc.h +@@ -21,7 +21,7 @@ struct __libc { + int can_do_threads; + int threaded; + int secure; +- volatile int threads_minus_1; ++ int threads_minus_1; + size_t *auxv; + struct tls_module *tls_head; + size_t tls_size, tls_align, tls_cnt; +diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c +index 96982596..2553a62e 100644 +--- a/src/malloc/malloc.c ++++ b/src/malloc/malloc.c +@@ -26,7 +26,7 @@ int __malloc_replaced; + + static inline void lock(volatile int *lk) + { +- if (libc.threads_minus_1) ++ if (libc.threaded) + while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); + } + +diff --git a/src/thread/__lock.c b/src/thread/__lock.c +index 45557c88..5b9b144e 100644 +--- a/src/thread/__lock.c ++++ b/src/thread/__lock.c +@@ -18,7 +18,7 @@ + + void __lock(volatile int *l) + { +- if (!libc.threads_minus_1) return; ++ if (!libc.threaded) return; + /* fast path: INT_MIN for the lock, +1 for the congestion */ + int current = a_cas(l, 0, INT_MIN + 1); + if (!current) return; +-- +2.21.0 + +From f12888e9eb9eed60cc266b899dcafecb4752964a Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 22 May 2020 17:25:38 -0400 +Subject: [PATCH 3/4] cut down size of some libc struct members + +these are all flags that can be single-byte values. +--- + src/internal/libc.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/internal/libc.h b/src/internal/libc.h +index c0614852..d47f58e0 100644 +--- a/src/internal/libc.h ++++ b/src/internal/libc.h +@@ -18,9 +18,9 @@ struct tls_module { + }; + + struct __libc { +- int can_do_threads; +- int threaded; +- int secure; ++ char can_do_threads; ++ char threaded; ++ char secure; + int threads_minus_1; + size_t *auxv; + struct tls_module *tls_head; +-- +2.21.0 + +From 8d81ba8c0bc6fe31136cb15c9c82ef4c24965040 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 22 May 2020 17:45:47 -0400 +Subject: [PATCH 4/4] restore lock-skipping for processes that return to + single-threaded state + +the design used here relies on the barrier provided by the first lock +operation after the process returns to single-threaded state to +synchronize with actions by the last thread that exited. by storing +the intent to change modes in the same object used to detect whether +locking is needed, it's possible to avoid an extra (possibly costly) +memory load after the lock is taken. +--- + src/internal/libc.h | 1 + + src/malloc/malloc.c | 5 ++++- + src/thread/__lock.c | 4 +++- + src/thread/pthread_create.c | 8 ++++---- + 4 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/internal/libc.h b/src/internal/libc.h +index d47f58e0..619bba86 100644 +--- a/src/internal/libc.h ++++ b/src/internal/libc.h +@@ -21,6 +21,7 @@ struct __libc { + char can_do_threads; + char threaded; + char secure; ++ volatile signed char need_locks; + int threads_minus_1; + size_t *auxv; + struct tls_module *tls_head; +diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c +index 2553a62e..a803d4c9 100644 +--- a/src/malloc/malloc.c ++++ b/src/malloc/malloc.c +@@ -26,8 +26,11 @@ int __malloc_replaced; + + static inline void lock(volatile int *lk) + { +- if (libc.threaded) ++ int need_locks = libc.need_locks; ++ if (need_locks) { + while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); ++ if (need_locks < 0) libc.need_locks = 0; ++ } + } + + static inline void unlock(volatile int *lk) +diff --git a/src/thread/__lock.c b/src/thread/__lock.c +index 5b9b144e..60eece49 100644 +--- a/src/thread/__lock.c ++++ b/src/thread/__lock.c +@@ -18,9 +18,11 @@ + + void __lock(volatile int *l) + { +- if (!libc.threaded) return; ++ int need_locks = libc.need_locks; ++ if (!need_locks) return; + /* fast path: INT_MIN for the lock, +1 for the congestion */ + int current = a_cas(l, 0, INT_MIN + 1); ++ if (need_locks < 0) libc.need_locks = 0; + if (!current) return; + /* A first spin loop, for medium congestion. */ + for (unsigned i = 0; i < 10; ++i) { +diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c +index 6a3b0c21..6bdfb44f 100644 +--- a/src/thread/pthread_create.c ++++ b/src/thread/pthread_create.c +@@ -118,8 +118,8 @@ _Noreturn void __pthread_exit(void *result) + * until the lock is released, which only happens after SYS_exit + * has been called, via the exit futex address pointing at the lock. + * This needs to happen after any possible calls to LOCK() that might +- * skip locking if libc.threads_minus_1 is zero. */ +- libc.threads_minus_1--; ++ * skip locking if process appears single-threaded. */ ++ if (!--libc.threads_minus_1) libc.need_locks = -1; + self->next->prev = self->prev; + self->prev->next = self->next; + self->prev = self->next = self; +@@ -339,7 +339,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att + ~(1UL<<((SIGCANCEL-1)%(8*sizeof(long)))); + + __tl_lock(); +- libc.threads_minus_1++; ++ if (!libc.threads_minus_1++) libc.need_locks = 1; + ret = __clone((c11 ? start_c11 : start), stack, flags, args, &new->tid, TP_ADJ(new), &__thread_list_lock); + + /* All clone failures translate to EAGAIN. If explicit scheduling +@@ -363,7 +363,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att + new->next->prev = new; + new->prev->next = new; + } else { +- libc.threads_minus_1--; ++ if (!--libc.threads_minus_1) libc.need_locks = 0; + } + __tl_unlock(); + __restore_sigs(&set); +-- +2.21.0 + diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 67df0d1b7..73f5d922b 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -12,7 +12,7 @@ depends="" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz" +source="https://mirrormaster.adelielinux.org/source/upstream/ncurses-$_ver.tgz" builddir="$srcdir"/ncurses-$_ver diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 944668272..65295d30d 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.51 +pkgver=3.52 _ver=$(printf '%s' "$pkgver" | tr . _) -pkgrel=1 +pkgrel=0 pkgdesc="Mozilla Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" arch="all" @@ -18,7 +18,6 @@ source="https://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/s nss-util.pc.in nss-softokn.pc.in nss-config.in - add_spi+cacert_ca_certs.patch " # secfixes: @@ -44,6 +43,7 @@ build() { export FREEBL_NO_DEPEND=0 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_WERROR=0 + export NSS_ENABLE_ECC=1 export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` case "$CARCH" in @@ -61,8 +61,7 @@ build() { export NSS_DISABLE_ALTIVEC=1 make -j 1 -C nss/coreconf - make -j 1 -C nss/lib/dbm - make -j 1 -C nss + make -C nss } package() { @@ -157,9 +156,8 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd nss-3.51.tar.gz +sha512sums="a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6 nss-3.52.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in -2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b nss-config.in -6e04556858499aec465d6670818465327ba2cb099061c2afee4b5cac8aa61938e0095906acfb38df6a1b70a6bde6dd69f08bb4c00a9d188e4cb3131b26c1bc16 add_spi+cacert_ca_certs.patch" +2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b nss-config.in" diff --git a/system/nss/add_spi+cacert_ca_certs.patch b/system/nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index ccf973103..000000000 --- a/system/nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,561 +0,0 @@ ---- a/nss/lib/ckfw/builtins/certdata.txt -+++ b/nss/lib/ckfw/builtins/certdata.txt -@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/system/pax-utils/APKBUILD b/system/pax-utils/APKBUILD index 6c121b48a..481a7077e 100644 --- a/system/pax-utils/APKBUILD +++ b/system/pax-utils/APKBUILD @@ -12,7 +12,7 @@ depends="scanelf" makedepends_build="" makedepends_host="linux-headers libcap-dev" makedepends="$makedepends_build $makedepends_host" -source="http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz +source="https://mirrormaster.adelielinux.org/source/upstream/pax-utils-$pkgver.tar.xz fix-eitype.patch" subpackages="$pkgname-doc scanelf:_scanelf" diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD index 49d76d0ae..546f8b443 100644 --- a/system/pkgconf/APKBUILD +++ b/system/pkgconf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pkgconf -pkgver=1.6.3 +pkgver=1.7.2 pkgrel=0 pkgdesc="Toolkit for maintaining development package metadata" url="http://pkgconf.org/" @@ -46,4 +46,4 @@ dev() { mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/ } -sha512sums="437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1 pkgconf-1.6.3.tar.xz" +sha512sums="b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd pkgconf-1.7.2.tar.xz" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index c3985d7d3..2c67660c3 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.4.0 +pkgver=1.0.4.1 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 -depends="execline s6 s6-linux-init-common" +_skalibs_version=2.9.2.1 +_s6_version=2.9.2.0 +depends="execline s6>=$_s6_version s6-linux-init-common" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev" subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run" @@ -119,7 +120,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="791e376911c9217adace72c6048a295d4b486fc51c0a73578a40a0b020a735d9444f58e5f49d613e99a81aadd63d016ae60c8b056c49c1b50693a7b054890926 s6-linux-init-1.0.4.0.tar.gz +sha512sums="b5935d87a7fd37d7d1a07c14130325b7b8f7f0b592becbf451c8a310f8a4743b60722f4ca94b5f8d845ca285136cb2cc1406fc8cfddd808cec4a63f55f78565b s6-linux-init-1.0.4.1.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index cc7148513..b56132a15 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc pkgver=0.5.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.1.0 -_s6_version=2.9.0.1 +_skalibs_version=2.9.2.1 +_s6_version=2.9.2.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index e2a601690..4909c3daf 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.9.1.0 +pkgver=2.9.2.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -66,5 +66,4 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } - -sha512sums="190660ed3af678b304230c688d3364a20dfb8d6e944314506bc27c90fc2ccf1062c7b2931df93620dd3b6f5f794d6119d984f28cb2f4562c1abb8609270b90f5 s6-2.9.1.0.tar.gz" +sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 3bad54e5e..00acefd4f 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -3,13 +3,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=sudo -pkgver=1.8.28 +pkgver=1.9.0 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else _realver=$pkgver fi -pkgrel=1 +pkgrel=0 pkgdesc="Give certain users the ability to run some commands as root" url="https://www.sudo.ws/sudo/" arch="all" @@ -26,12 +26,22 @@ source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz SIGUNUSED.patch " builddir="$srcdir"/$pkgname-$_realver +somask="audit_json.so + group_file.so + libsudo_noexec.so + libsudo_util.so.0 + sample_approval.so + sudoers.so + system_group.so + " # secfixes: # 1.8.20_p2-r0: # - CVE-2017-1000368 -# 1.8.28: +# 1.8.28-r0: # - CVE-2019-14287 +# 1.9.0-r0: +# - CVE-2019-19232 build() { ./configure \ @@ -46,7 +56,10 @@ build() { --without-skey \ --with-passprompt="[sudo] Password for %p: " \ --with-insults=disabled \ - --with-all-insults + --with-all-insults \ + --enable-python=no \ + --disable-log-server \ + --disable-log-client # Workaround until SIGUNUSED.patch is not needed anymore rm lib/util/mksiglist.h lib/util/mksigname.h @@ -67,7 +80,7 @@ package() { rm -rf "$pkgdir"/var/run } -sha512sums="09e589cdfd18d7c43b0859a0e11c008b3cb995ae4f8c89c717c5242db9e5696361eb574ebe74a0b5316afffb3a8037f7a7f3c249176e8ed9caffeb4cd860ddc7 sudo-1.8.28.tar.gz +sha512sums="f2a191ea5fc65865718b110d4aca187cb5e2cd55c9c891fab32f21401e56f825f34c373e346c55c64fa49cec4d802efb63ccebf3d4a4e31d9a433077daf013b1 sudo-1.9.0.tar.gz f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch 2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch" diff --git a/system/unzip/APKBUILD b/system/unzip/APKBUILD index ea8f7e6fa..9b3f696f3 100644 --- a/system/unzip/APKBUILD +++ b/system/unzip/APKBUILD @@ -5,7 +5,7 @@ pkgname=unzip pkgver=6.0 _pkgver=$(printf '%s' "$pkgver" | tr -d .) _debver=25 -pkgrel=4 +pkgrel=5 pkgdesc="Extract PKZIP-compatible .zip files" url="http://www.info-zip.org/UnZip.html" arch="all" @@ -14,6 +14,9 @@ subpackages="$pkgname-doc" # normally ftp://ftp.info-zip.org/pub/infozip/src/$pkgname$_pkgver.zip source="$pkgname-$pkgver.tgz::https://distfiles.adelielinux.org/source/$pkgname$_pkgver.tgz http://deb.debian.org/debian/pool/main/u/unzip/unzip_$pkgver-$_debver.debian.tar.xz + cflags.patch + format-secure.patch + unzipsfx-bomb-32bit.patch " builddir="$srcdir/$pkgname$_pkgver" @@ -30,17 +33,19 @@ builddir="$srcdir/$pkgname$_pkgver" # - CVE-2019-13232 prepare() { - default_prepare + cd "$builddir" while read -r i; do msg "$i" patch -p1 -i "../debian/patches/$i" done < ../debian/patches/series + default_prepare } build() { make -f unix/Makefile \ CC="${CHOST}-gcc" \ - LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \ + LOCAL_UNZIP="${CFLAGS} ${CPPFLAGS}" \ + STRIP=: \ prefix=/usr generic } @@ -57,4 +62,7 @@ package() { } sha512sums="0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d unzip-6.0.tgz -13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 unzip_6.0-25.debian.tar.xz" +13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 unzip_6.0-25.debian.tar.xz +029447a48972234e60c6b45c58b01dbe411594b1ffe0db00d028810b0bcfa7244dcc89f765e1ee6e8805ba2d2db9bc1d05a1e30ef0d9dd08d33ff6f04af811ab cflags.patch +4bdf55937a181d496261a8f426a97d63844ba96f23beea7906c5e4f7064f55c188ee5ec3ae2d6f2011b5f26b6ac0941dcffb83c06370ed9648b2262917cde64d format-secure.patch +81777dfa1ad707046b238fa9205f8be0f48363f0f23bc0d2d83b67b143ceeba6818cc11058355195a03432cdd6ed4f392202ff3029e14d4b1435c9e2cb5ca6bf unzipsfx-bomb-32bit.patch" diff --git a/system/unzip/cflags.patch b/system/unzip/cflags.patch new file mode 100644 index 000000000..f85192155 --- /dev/null +++ b/system/unzip/cflags.patch @@ -0,0 +1,20 @@ +--- unzip60/unix/configure 2009-04-16 14:25:12.000000000 -0500 ++++ unzip60/unix/configure 2020-06-13 22:59:57.259771113 -0500 +@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS} + IZ_BZIP2=${3} + CFLAGS="${CFLAGS} -I. -DUNIX" + LFLAGS1="" +-LFLAGS2="-s" ++LFLAGS2="" + LN="ln -s" + + CFLAGS_OPT='' +@@ -130,6 +130,8 @@ _EOF_ + fi + fi + ++CFLAGS_OPT="" ++ + # optimization flags + if test -n "${CFLAGS_OPT}"; then + CFLAGSR="${CFLAGSR} ${CFLAGS_OPT}" diff --git a/system/unzip/format-secure.patch b/system/unzip/format-secure.patch new file mode 100644 index 000000000..5b766f31d --- /dev/null +++ b/system/unzip/format-secure.patch @@ -0,0 +1,93 @@ +Cherry picked from Fedora +https://src.fedoraproject.org/rpms/unzip/blob/874f1688f1662bb3baf76021969277cafeea6ea8/f/unzip-6.0-format-secure.patch + +diff --git a/extract.c b/extract.c +index eeb2f57..a0a4929 100644 +--- a/extract.c ++++ b/extract.c +@@ -472,8 +472,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + */ + Info(slide, 0x401, ((char *)slide, + LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1)); +- Info(slide, 0x401, ((char *)slide, +- LoadFarString(ReportMsg))); ++ Info(slide, 0x401, ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; + } + reached_end = TRUE; /* ...so no more left to do */ +@@ -752,8 +752,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + + #ifndef SFX + if (no_endsig_found) { /* just to make sure */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); +- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg))); ++ Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg))); + if (!error_in_archive) /* don't overwrite stronger error */ + error_in_archive = PK_WARN; + } +diff --git a/list.c b/list.c +index 15e0011..f7359c3 100644 +--- a/list.c ++++ b/list.c +@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -507,7 +507,8 @@ int list_files(__G) /* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) + ) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ++ ((char *)slide,"%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + +@@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + ---------------------------------------------------------------------------*/ + + if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; + } + if (*nmember == 0L && error_in_archive <= PK_WARN) +diff --git a/zipinfo.c b/zipinfo.c +index 6e22cc8..ac5c61b 100644 +--- a/zipinfo.c ++++ b/zipinfo.c +@@ -771,7 +771,7 @@ int zipinfo(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; /* sig not found */ + break; + } +@@ -960,7 +960,8 @@ int zipinfo(__G) /* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) + ) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ++ ((char *)slide,"%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + diff --git a/system/unzip/unzipsfx-bomb-32bit.patch b/system/unzip/unzipsfx-bomb-32bit.patch new file mode 100644 index 000000000..f834a919b --- /dev/null +++ b/system/unzip/unzipsfx-bomb-32bit.patch @@ -0,0 +1,14 @@ +Explicitly cast literal 0 to the expected bound_t type because K&R C is +awful. + +--- unzip60/extract.c 2020-06-13 22:51:33.799778287 -0500 ++++ unzip60/extract.c 2020-06-14 00:00:50.669719055 -0500 +@@ -520,7 +520,7 @@ int extract_or_test_files(__G) /* ret + return PK_MEM; + } + if ((G.extra_bytes != 0 && +- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ cover_add((cover_t *)G.cover, (bound_t)0, G.extra_bytes) != 0) || + (G.ecrec.have_ecr64 && + cover_add((cover_t *)G.cover, G.ecrec.ec64_start, + G.ecrec.ec64_end) != 0) || diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index b60248950..c78339725 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps pkgver=0.0.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index cb2f7090f..09888c25e 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vim -pkgver=8.2.0529 +pkgver=8.2.0959 _pkgver=${pkgver%.*.*}${pkgver#*.} _pkgver=${_pkgver%.*} pkgrel=0 @@ -79,5 +79,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="73cd3eb1522189f603c65ef1e80c0d1c860ce7332817967ab289aa8f2fdf376235fc9c30af53a66164cfe83a882b55003b4073b27852061295ca9b5fe203501d vim-8.2.0529.tar.gz +sha512sums="040c0a72bb27dfd428c06f103e7f0b919f9680b91da798a91c34634c559f349332fc8ebd3d9c6889cd6319666005bb889322e9541d62754ed6d839bb06b06b49 vim-8.2.0959.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc" diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD index 7542e1305..c15955678 100644 --- a/system/yaml/APKBUILD +++ b/system/yaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yaml -pkgver=0.2.2 +pkgver=0.2.5 pkgrel=0 pkgdesc="YAML 1.1 parser and emitter written in C" url="https://pyyaml.org/wiki/LibYAML" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01419a58083090ce85fccd4d6901a620ceb9f1190078cc0830bc0ce769bb024f51 yaml-0.2.2.tar.gz" +sha512sums="dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02 yaml-0.2.5.tar.gz" diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD index 4996402cb..d63dd1819 100644 --- a/user/adwaita-icon-theme/APKBUILD +++ b/user/adwaita-icon-theme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adwaita-icon-theme -pkgver=3.36.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="GNOME system icon set" url="https://www.gnome.org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5414e4e38d9ffdd5ae8e14cb2f467fc449ca833b3ffd888fa8dde8708ba0cd9292bec8d3c0bc9d917c3117a8d21f828d4113a85c3786d5dcadde46367659934 adwaita-icon-theme-3.36.0.tar.xz" +sha512sums="5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9 adwaita-icon-theme-3.36.1.tar.xz" diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 8681e7991..60280c4c2 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2 akonadi-contacts-19.12.3.tar.xz" +sha512sums="886add1508397de3d726da95357f27874bb532f6652191a4b8756d3f356b4838ca1ac92d4d7feb6341a675b8697e4784e17f35573cd56d5caf6f1cdaa06690bb akonadi-contacts-20.04.2.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 013d8e49c..b4bf169b9 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251 akonadi-mime-19.12.3.tar.xz" +sha512sums="e00f306bea494e03b876435b1bc923649dd98549b49346f3b70448a44db9f138b826d13ebfc7eb2123f67c03eeb1a0e2e7d0b1a68f1e3566a625f19208cad432 akonadi-mime-20.04.2.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 2b8ba158a..5fe4a9346 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -18,6 +18,7 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc + atomics.patch " build() { @@ -47,5 +48,6 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0 akonadi-19.12.3.tar.xz -b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" +sha512sums="9c2b5dac71bc802c2b0eeb10948818ad856880ae30473827c7b24b76947267a563eb660d559e14b7c37ed8a0b1a2fa7cd9d5ca04a5af57c96eae0b20f6274623 akonadi-20.04.2.tar.xz +b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc +6cdeece137523f0b67fac0384de446562ddca7530cf4a9cc7736d3eb582b6630e24a125f3648778f76b2b576b47e33d5b99a6bfd96770afa0dad97d1a1260cd1 atomics.patch" diff --git a/user/akonadi/atomics.patch b/user/akonadi/atomics.patch new file mode 100644 index 000000000..078501362 --- /dev/null +++ b/user/akonadi/atomics.patch @@ -0,0 +1,10 @@ +--- akonadi-20.04.2/src/server/CMakeLists.txt.old 2020-06-02 07:09:51.000000000 +0000 ++++ akonadi-20.04.2/src/server/CMakeLists.txt 2020-06-16 00:56:48.253282683 +0000 +@@ -170,6 +170,7 @@ + set_target_properties(libakonadiserver PROPERTIES OUTPUT_NAME akonadiserver) + target_link_libraries(libakonadiserver + akonadi_shared ++ atomic + KF5AkonadiPrivate + Qt5::Core + Qt5::Network diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index f4e12d964..64c388713 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9 analitza-19.12.3.tar.xz" +sha512sums="9bd7b746e819e629a6fb1d04054dbcd014e73e99f118bce7297f9df3d33819878ebddc1526a400a2f892c39a963104d37efa4ad0575e2d4bbdfae9be3aedc006 analitza-20.04.2.tar.xz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index f6240a428..2264913df 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a ark-19.12.3.tar.xz" +sha512sums="35f0d17655e9a38c4d9ff4d9777a4198416258cb73d368085d8eaa6eb40622a3e8f8573826789fb978794b84519f131f9e0193b8b279598015dcd89597187cb5 ark-20.04.2.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index a66845948..78c14597c 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32 artikulate-19.12.3.tar.xz" +sha512sums="031ed50318c5aabc31fb141e880a1f08cfdeb025f8ce109de50ed7727be6224c99f2d4931491e15e3b799c3afcf6ecaecdcd9b29c518d29b1811fb60f1df04a6 artikulate-20.04.2.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index 7688326f4..efd8f2489 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="225bec1c0e54ce1c13273aeb8ea2350c15f147c0d68c6a4427b5da381f72dfb5817eabb5f2a798cece49d14b111ca205b21576222ed8eeb8000b7fa760a1d30d attica-5.68.0.tar.xz" +sha512sums="14034b8eb2967aeaf9c1e76a0a32356252a8705d52dddadb188809e57575a21791000ff5fb7c4af4cc433d1b37cc6310a607edc90a59b1fac512f10dfc656b2a attica-5.71.0.tar.xz" diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index 3b9fca102..7fd39917d 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins -pkgver=4.0.1 +pkgver=4.0.4 pkgrel=0 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6611a9204f3f6e70b126ec4712078ba3e5a317b8a41e6d753a24e37e9b19894444ae091654240c6aa0c4d13d53b72d722549edf6077a565ebdd8caf3000823a0 audacious-plugins-4.0.1.tar.bz2" +sha512sums="d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8 audacious-plugins-4.0.4.tar.bz2" diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD index 473e37ff2..bb7048441 100644 --- a/user/audacious/APKBUILD +++ b/user/audacious/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious -pkgver=4.0.1 +pkgver=4.0.4 pkgrel=0 pkgdesc="A playlist-oriented media player with multiple interfaces" url="https://audacious-media-player.org/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bd1387af281e7f533d4a21bf9fdb8ae49d5a406c051bcfa3a509b9d3cf8fdf6faff21dee841fad9ce1c9bf1a24ce1c08d9dc27a7a28b78ade3f0075fa89aad3d audacious-4.0.1.tar.bz2" +sha512sums="76bafb2cece861b58650e52cc8c338a0645387e43b7d3548b23528024195605c11789479d8fb2ae25d5986cd5ccb03182eb2427c9ba394d4fd6611f06359f94d audacious-4.0.4.tar.bz2" diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index dcdb6d85e..213415e32 100644 --- a/user/baloo-widgets/APKBUILD +++ b/user/baloo-widgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo-widgets -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f baloo-widgets-19.12.3.tar.xz" +sha512sums="48a769b9ab7666135158c1fb205f4eee6cbfb1d81162a0d173b9268d47018015174b2227001d357ee83af6eac9afda47fbb7667089252295ac47cd1a131310d2 baloo-widgets-20.04.2.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 4f84cbb32..7a98f610e 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -54,5 +54,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="54aa3d9a8e135fbc76b0583b2e5261bf027163addafabc7179e990a6c8c92eadc49195b6f66d77408a3ad74c2f7a3ab4328bc7afb243d1be519e78d0223ea2a6 baloo-5.68.0.tar.xz +sha512sums="3738a3c37aa0252146bdbe0a7ce42645a90cf2e163fc90232e60fa9d90de472d7898cb6a34f573e423a299d400dc90450f05968800a6c4af309979ea0244925b baloo-5.71.0.tar.xz a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch" diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 1ec66b771..b0dc7cae7 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938 blinken-19.12.3.tar.xz" +sha512sums="b465c16b6fcab3ad6e427cb2276d737f949ef7d68f3414399af622296b5a019511cfb9113b5ad7447539cbc3dbeb939ddc989a87a69c8478443119768dd63d19 blinken-20.04.2.tar.xz" diff --git a/user/bluez-qt/APKBUILD b/user/bluez-qt/APKBUILD index 2f4fc80a2..dece5e364 100644 --- a/user/bluez-qt/APKBUILD +++ b/user/bluez-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez-qt -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt integration with BlueZ" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c11a43b29f1c04fc67abf2c7f5a2e53e098cdeeddde84ed88a46a15d1dce537442d24422c245f23506840aef2d84d5d828b4c7951362537725b59d31a9a402c7 bluez-qt-5.68.0.tar.xz" +sha512sums="1bbee416a3aa05b8dfefc274c7cb246e3bb53a2e7e2cbed5c300009b9a6b54407a4156a4ac7482cd7c7b0e3265c8e3421858015d909065ed61daafbd3f3cd89c bluez-qt-5.71.0.tar.xz" diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index af4f09ba8..44cc8d6a1 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.53 -pkgrel=1 +pkgver=5.54 +pkgrel=0 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" @@ -29,6 +29,10 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz time64.patch " +# secfixes: +# 5.54-r0: +# - CVE-2020-0556 + prepare() { default_prepare @@ -128,7 +132,7 @@ tools() { done } -sha512sums="62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74 bluez-5.53.tar.xz +sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe bluez-5.54.tar.xz 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd diff --git a/user/bolt/APKBUILD b/user/bolt/APKBUILD index b14289263..b9b75ff19 100644 --- a/user/bolt/APKBUILD +++ b/user/bolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bolt -pkgver=0.8 +pkgver=0.9 pkgrel=0 pkgdesc="Thunderbolt 3 device manager" url=" " @@ -10,9 +10,7 @@ license="LGPL-2.1-only" depends="" makedepends="eudev-dev glib-dev meson ninja polkit-dev" subpackages="" -source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz - wakeup.patch - " +source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz" build() { meson \ @@ -32,5 +30,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 bolt-0.8.tar.gz -487f2c7824edba318692d40ffc4e55f893602587b1380b18877d9dca3b5b22b14e27001b3547369a8ec1a6c5fe7a5facc1fa97e92b3a5011a67ec967afce25ea wakeup.patch" +sha512sums="427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 bolt-0.9.tar.gz" diff --git a/user/bolt/wakeup.patch b/user/bolt/wakeup.patch deleted file mode 100644 index a10d420c4..000000000 --- a/user/bolt/wakeup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ea3e3e30eb3ce76f6a0ae816a0f35809872f4edf Mon Sep 17 00:00:00 2001 -From: Christian Kellner <christian@kellner.me> -Date: Mon, 13 Jan 2020 17:38:47 +0100 -Subject: [PATCH] manager: ignore wakeup device uevents for probing - -The probing detection code should ignore wakeup device uevents -because these virtual devices can be added (and removed) without -and correspondence to any physical thunderbolt device (un-)plug -events. ---- - boltd/bolt-manager.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/boltd/bolt-manager.c b/boltd/bolt-manager.c -index 877c008..c8b60da 100644 ---- a/boltd/bolt-manager.c -+++ b/boltd/bolt-manager.c -@@ -2043,6 +2043,16 @@ device_is_thunderbolt_root (struct udev_device *dev) - bolt_streq (driver, "thunderbolt"); - } - -+static gboolean -+device_is_wakeup (struct udev_device *dev) -+{ -+ const char *subsys; -+ -+ subsys = udev_device_get_subsystem (dev); -+ -+ return bolt_streq (subsys, "wakeup"); -+} -+ - static gboolean - probing_add_root (BoltManager *mgr, - struct udev_device *dev) -@@ -2080,6 +2090,12 @@ manager_probing_device_added (BoltManager *mgr, - if (syspath == NULL) - return; - -+ /* ignore events for wakeup devices which get removed -+ * and added at random time without any connection to -+ * any physical thunderbolt device */ -+ if (device_is_wakeup (dev)) -+ return; -+ - roots = mgr->probing_roots; - for (guint i = 0; i < roots->len; i++) - { --- -2.24.1 - diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 029cb84a2..378135157 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bomber -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb bomber-19.12.3.tar.xz" +sha512sums="1551c235eae2e9e1c4a781b5985f1a4fca7fb58050cb8843738832e3a34825802f59fbb2151a79de61ebb0e3f3646f1eed407770dac0a9d6e7344e5f60269a98 bomber-20.04.2.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 4f98235e9..f14f7d768 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bovo -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855 bovo-19.12.3.tar.xz" +sha512sums="914249bb6a4af4c2586aba204c353f97dc72b0a2d8085f54bef6af063a07417d4b889522ec2f367d43f52efc8219c71487b48533fd817025424e0516578591b1 bovo-20.04.2.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 2142678a6..d4d4d229d 100644 --- a/user/breeze-icons/APKBUILD +++ b/user/breeze-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-icons -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -45,4 +45,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="d66ee651d8d69e5e162cf2f74f1f84255db121e90e8a2150813a06a918af8642b41a23b3b5885b8b10d23ec0a3bdb654affca78790b6d2158833a34e7bc1d7d3 breeze-icons-5.68.0.tar.xz" +sha512sums="b2181034c08739291dd859f331e524019efd4538458543a6c8d53e3a9bcfbe35b899f0b40ba0395888c594035689f98a8fef5ea643fba00d443b2661d8bca14d breeze-icons-5.71.0.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index 079282295..54a167762 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.4.1 +pkgver=5.6.1 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="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f btrfs-progs-v5.4.1.tar.xz" +sha512sums="8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6 btrfs-progs-v5.6.1.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index e7e1a9b11..a53aa0483 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a cantor-19.12.3.tar.xz" +sha512sums="f2f65a1cecfbb2edc2ade5fcecc80f9ccfba92a61960ba2e7038f30ef7260220eb2b6c20cefe74a9cedf96160baaf0a4b8b6b99693db45031210733d492c4196 cantor-20.04.2.tar.xz" diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD index 8d0a30b7e..286a05da5 100644 --- a/user/cbindgen/APKBUILD +++ b/user/cbindgen/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Samuel Holland <samuel@sholland.org> # Maintainer: Molly Miller <sysvinit@adelielinux.org> pkgname=cbindgen -pkgver=0.13.2 +pkgver=0.14.2 pkgrel=0 pkgdesc="Tool to generate C bindings from Rust code" url="https://github.com/eqrion/cbindgen" @@ -22,6 +22,7 @@ c2-chacha-0.2.3 cfg-if-0.1.10 clap-2.33.0 getrandom-0.1.13 +heck-0.3.1 itoa-0.4.4 libc-0.2.66 log-0.4.8 @@ -43,6 +44,7 @@ syn-1.0.11 tempfile-3.1.0 textwrap-0.11.0 toml-0.5.5 +unicode-segmentation-1.6.0 unicode-width-0.1.7 unicode-xid-0.2.0 vec_map-0.8.1 @@ -102,7 +104,7 @@ package() { } -sha512sums="2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66 cbindgen-0.13.2.tar.gz +sha512sums="d3ab0a4c217c9047bc3ada7911d4ae1bdfc09092835f78d232bb56ef0d9a499df43e358532dfb828a04df61a0cacccd7e57214cd15f466791eb1b8edd9f92ed0 cbindgen-0.14.2.tar.gz a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz @@ -110,6 +112,7 @@ ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 getrandom-0.1.13.tar.gz +134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz @@ -131,6 +134,7 @@ ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.tar.gz +80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e unicode-segmentation-1.6.0.tar.gz 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 unicode-width-0.1.7.tar.gz 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD index c05fdc470..328305587 100644 --- a/user/cloc/APKBUILD +++ b/user/cloc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cloc -pkgver=1.84 +pkgver=1.86 pkgrel=0 pkgdesc="Perl utility for counting lines of code in various languages" url="https://github.com/AlDanial/cloc" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" -C Unix install } -sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" +sha512sums="dc88f7499ab371eef5ae39352e10539a507bd77fa7b83d562e3b9774e053872ea56529ea937db9fafd50971900e03d95236450348d8981fa0123f936e893975c cloc-1.86.tar.gz" diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index 81910704b..5cb9f34ef 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cogl -pkgver=1.22.6 +pkgver=1.22.8 pkgrel=0 pkgdesc="GObject-based GL/GLES abstraction library" url="https://gnome.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483 cogl-1.22.6.tar.xz" +sha512sums="702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f cogl-1.22.8.tar.xz" diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD index 6becb4de9..0142a6618 100644 --- a/user/comic-neue/APKBUILD +++ b/user/comic-neue/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=comic-neue -pkgver=2.4 +pkgver=2.5 pkgrel=0 pkgdesc="Casual typeface" url="http://comicneue.com/" @@ -15,7 +15,7 @@ source="$pkgname-$pkgver.zip::https://github.com/crozynski/comicneue/archive/v$p builddir="$srcdir/comicneue-$pkgver" package() { - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/OTF/*.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/Fonts/OTF/ComicNeue/*.otf } -sha512sums="12c93efc00e1caecd6be9080de37ecf2049384185c4043dc250945b7cb47fbbe3fcc973ebdf7d58f3351ba11f87341c24af7e1039b873d463b0d84da9c72f0b8 comic-neue-2.4.zip" +sha512sums="32cc6370f127dd7d773ce80a1c0530c9fe329a5e06fab6e416e1075f99f27a9eb551f3e27c0bec307862b171130d5ae774f32f8385618c3f91a2abb796c3715c comic-neue-2.5.zip" diff --git a/user/command-not-found/APKBUILD b/user/command-not-found/APKBUILD index ed9919343..c91ff15a4 100644 --- a/user/command-not-found/APKBUILD +++ b/user/command-not-found/APKBUILD @@ -4,7 +4,7 @@ pkgname=command-not-found pkgver=0.3 pkgrel=0 pkgdesc="Provide suggestions for missing commands via APK" -url="https://git.dereferenced.org/kaniini/command-not-found" +url=" " arch="noarch" options="!check" # No test suite. license="MIT" diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 3899919dd..2bdf92aec 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -4,7 +4,7 @@ pkgname=compton-conf pkgver=0.14.1 pkgrel=0 pkgdesc="GUI configuration tool for the Compton X compositor" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index d9a305186..4ff57480f 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dbus -pkgver=1.12.16 -pkgrel=1 +pkgver=1.12.18 +pkgrel=0 pkgdesc="IPC/message bus system, allowing user applications to communicate" -url="http://www.freedesktop.org/wiki/Software/dbus/" +url="https://www.freedesktop.org/wiki/Software/dbus/" pkggroups="messagebus" pkgusers="messagebus" arch="all" @@ -23,7 +23,9 @@ source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz # secfixes: # 1.12.16-r0: -# - CVE-2019-12749 +# - CVE-2019-12749 +# 1.12.18-r0: +# - CVE-2020-12049 build() { ./configure \ @@ -65,5 +67,5 @@ x11() { mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/ } -sha512sums="27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb dbus-1.12.16.tar.gz +sha512sums="817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13 dbus-1.12.18.tar.gz df74e7d6a4f76f777d356e94bd23422b17656aa51a5b2d3c655fcabb32c84f2f06b9f5cd8827920d51842f89e8c0d968a6e723315e4bf216e55711fcda9b0ee9 dbus.initd" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index c7ffa7108..ec86a7719 100644 --- a/user/dolphin/APKBUILD +++ b/user/dolphin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dolphin -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5 dolphin-19.12.3.tar.xz" +sha512sums="7896dcbd8a476b4c1c6ff4d6b0696c345aad8fd3611f7dedd9ec412d1bab9579651ce72c3802c83adbde373b9df400116ba785e0c7b4d905b6f79d60a5547802 dolphin-20.04.2.tar.xz" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index f0d269483..66143c83c 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8 dragon-19.12.3.tar.xz" +sha512sums="b22aad43fab5fbdf6b332f10abe9c34e8ca085418cb5ae3ae2c235f4dc98d2da489e1ab57e16a2f67bfea9e4416a53e9062fc490a18d74ae6a004422b5b90a08 dragon-20.04.2.tar.xz" diff --git a/user/elixir/APKBUILD b/user/elixir/APKBUILD index e23466f18..d37c550bf 100644 --- a/user/elixir/APKBUILD +++ b/user/elixir/APKBUILD @@ -11,7 +11,10 @@ license="Apache-2.0" depends="erlang" makedepends="erlang-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/elixir-lang/elixir/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/elixir-lang/elixir/archive/v$pkgver.tar.gz + tests1.patch + tests2.patch + " build() { make @@ -25,4 +28,6 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install } -sha512sums="66b18b983e5374afbd4d94c43a880c5e46a9aa150fa6f38be74ff7f58a19eaaee00248b202d9ae3f6b78e2495fc8d5cec755de644256a731be367766c3812855 elixir-1.10.3.tar.gz" +sha512sums="66b18b983e5374afbd4d94c43a880c5e46a9aa150fa6f38be74ff7f58a19eaaee00248b202d9ae3f6b78e2495fc8d5cec755de644256a731be367766c3812855 elixir-1.10.3.tar.gz +4b014bc616c729dba673693b8157e1923eff840d83798051aeb297056383c7b3490fb9d0749eb21ba6c09f6128b36510f1c943e2d8daf393d4c719d021693978 tests1.patch +fa2f24514e4859449ec260cb179a1e523580d8681a9ad55aff7e447ae4feee6f5a09a4f1857b481a973d4f8e759cb194ffdd9b2b230ec8a59bd33fd53ad47730 tests2.patch" diff --git a/user/elixir/tests1.patch b/user/elixir/tests1.patch new file mode 100644 index 000000000..7c74074a9 --- /dev/null +++ b/user/elixir/tests1.patch @@ -0,0 +1,87 @@ +From aaae97992d33ba11374a9140e2ad8aa9aca45e32 Mon Sep 17 00:00:00 2001 +From: Jonny Stoten <jonny@jonnystoten.com> +Date: Mon, 13 Jan 2020 08:37:20 +0000 +Subject: [PATCH] Don't GPG sign commits or tags in git tests (#9719) + +If the machine/user git config is set to sign all commits/tags, +these tests fail. +--- + lib/mix/test/mix/tasks/escript_test.exs | 2 +- + lib/mix/test/test_helper.exs | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/lib/mix/test/mix/tasks/escript_test.exs b/lib/mix/test/mix/tasks/escript_test.exs +index 5d9eb8390a..f8f1baaf15 100644 +--- a/lib/mix/test/mix/tasks/escript_test.exs ++++ b/lib/mix/test/mix/tasks/escript_test.exs +@@ -351,7 +351,7 @@ defmodule Mix.Tasks.EscriptTest do + """) + + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) + + send(self(), {:mix_shell_input, :yes?, true}) + Mix.Tasks.Escript.Install.run(["git", File.cwd!()]) +diff --git a/lib/mix/test/test_helper.exs b/lib/mix/test/test_helper.exs +index b652cd07b2..65e41aa1d1 100644 +--- a/lib/mix/test/test_helper.exs ++++ b/lib/mix/test/test_helper.exs +@@ -218,7 +218,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "bad"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "bad"]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -237,8 +237,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) +- System.cmd("git", ~w[tag without_module]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[tag --no-sign without_module]) + end) + + File.write!(Path.join(target, "lib/git_repo.ex"), """ +@@ -279,8 +279,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "lib"]) +- System.cmd("git", ~w[tag with_module]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "lib"]) ++ System.cmd("git", ~w[tag --no-sign with_module]) + end) + end + +@@ -309,7 +309,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m without-dep]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m without-dep]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -336,7 +336,7 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m with-dep]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m with-dep]) + end) + end + +@@ -364,7 +364,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) + end) + end + diff --git a/user/elixir/tests2.patch b/user/elixir/tests2.patch new file mode 100644 index 000000000..f44b028df --- /dev/null +++ b/user/elixir/tests2.patch @@ -0,0 +1,159 @@ +From 3d1c1b4e2396e9891d38d00185889bd4a421db1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co> +Date: Sat, 13 Jun 2020 10:01:10 +0200 +Subject: [PATCH] Use global gitconfig instead of individual options on + commands + +Closes #10098. +--- + lib/mix/lib/mix/scm/git.ex | 7 ++-- + lib/mix/test/mix/tasks/escript_test.exs | 2 +- + lib/mix/test/test_helper.exs | 45 +++++++++++++------------ + 3 files changed, 29 insertions(+), 25 deletions(-) + +diff --git a/lib/mix/lib/mix/scm/git.ex b/lib/mix/lib/mix/scm/git.ex +index 2c07b9515f..6f66202052 100644 +--- a/lib/mix/lib/mix/scm/git.ex ++++ b/lib/mix/lib/mix/scm/git.ex +@@ -251,8 +251,11 @@ defmodule Mix.SCM.Git do + opts = cmd_opts(into: into, stderr_to_stdout: true) + + case System.cmd("git", args, opts) do +- {response, 0} -> response +- {_, _} -> Mix.raise("Command \"git #{Enum.join(args, " ")}\" failed") ++ {response, 0} -> ++ response ++ ++ {response, _} -> ++ Mix.raise("Command \"git #{Enum.join(args, " ")}\" failed with reason: #{response}") + end + end + +diff --git a/lib/mix/test/mix/tasks/escript_test.exs b/lib/mix/test/mix/tasks/escript_test.exs +index f8f1baaf15..5d9eb8390a 100644 +--- a/lib/mix/test/mix/tasks/escript_test.exs ++++ b/lib/mix/test/mix/tasks/escript_test.exs +@@ -351,7 +351,7 @@ defmodule Mix.Tasks.EscriptTest do + """) + + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[commit -m "ok"]) + + send(self(), {:mix_shell_input, :yes?, true}) + Mix.Tasks.Escript.Install.run(["git", File.cwd!()]) +diff --git a/lib/mix/test/test_helper.exs b/lib/mix/test/test_helper.exs +index 88c6434816..1dec2be0b0 100644 +--- a/lib/mix/test/test_helper.exs ++++ b/lib/mix/test/test_helper.exs +@@ -182,18 +182,23 @@ defmodule MixTest.Case do + end + end + +-## Set up Mix home with Rebar ++## Set up globals + +-home = MixTest.Case.tmp_path(".mix") ++home = MixTest.Case.tmp_path(".home") + File.mkdir_p!(home) +-System.put_env("MIX_HOME", home) ++System.put_env("HOME", home) ++ ++mix = MixTest.Case.tmp_path(".mix") ++File.mkdir_p!(mix) ++System.put_env("MIX_HOME", mix) ++ + System.delete_env("XDG_DATA_HOME") + System.delete_env("XDG_CONFIG_HOME") + + rebar = System.get_env("REBAR") || Path.expand("fixtures/rebar", __DIR__) +-File.cp!(rebar, Path.join(home, "rebar")) ++File.cp!(rebar, Path.join(mix, "rebar")) + rebar = System.get_env("REBAR3") || Path.expand("fixtures/rebar3", __DIR__) +-File.cp!(rebar, Path.join(home, "rebar3")) ++File.cp!(rebar, Path.join(mix, "rebar3")) + + ## Copy fixtures to tmp + +@@ -207,6 +212,8 @@ Enum.each(fixtures, fn fixture -> + end) + + ## Generate Git repo fixtures ++System.cmd("git", ~w[config --global user.email "mix@example.com"]) ++System.cmd("git", ~w[config --global user.name "mix-repo"]) + + # Git repo + target = Path.expand("fixtures/git_repo", __DIR__) +@@ -220,11 +227,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "bad"]) ++ System.cmd("git", ~w[commit -m "bad"]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -243,8 +248,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) +- System.cmd("git", ~w[tag --no-sign without_module]) ++ System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[tag without_module]) + end) + + File.write!(Path.join(target, "lib/git_repo.ex"), """ +@@ -285,8 +290,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "lib"]) +- System.cmd("git", ~w[tag --no-sign with_module]) ++ System.cmd("git", ~w[commit -m "lib"]) ++ System.cmd("git", ~w[tag with_module]) + end) + end + +@@ -311,11 +316,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m without-dep]) ++ System.cmd("git", ~w[commit -m without-dep]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -342,7 +345,7 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m with-dep]) ++ System.cmd("git", ~w[commit -m with-dep]) + end) + end + +@@ -366,11 +369,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[commit -m "ok"]) + end) + end + diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index 6ddc8cf92..c4c70ac42 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince -pkgver=3.36.0 +pkgver=3.36.5 pkgrel=0 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="914c182f0ca71a0df99036339fe18f7c93514bae461ddecd719c5659c1cc67701f825e7a58b1eb203051ec55ccd402371fc70d3a27134ccdf915966e5bad8b7a evince-3.36.0.tar.xz" +sha512sums="d1fb4cef61ad5de383e9962881ce940b362c85cd200354fba214c7caf61e7d24af93b077ab8002661713e4e422488bcf3c5471158f812eaed71ee32f4b4a127f evince-3.36.5.tar.xz" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 37a599524..2e4294d73 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -37,5 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e3d7d9c6fd58dbf87923ec35709bbf11386d65038f698461de51bdb65a9f05c84fe9902184f97f47b133dfb88118d6306f30f6eeee912f89b9c41a3e30ffac1 extra-cmake-modules-5.68.0.tar.xz +sha512sums="234c3e42fac4a0f926d9420592a8de10e36aa4a164b3d9c15381f2593fce195456f8524c4389179af820e00138a997d5485d94339fcf6311ebcca45c402733c2 extra-cmake-modules-5.71.0.tar.xz a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index e88d1344e..848ca9e9b 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=featherpad -pkgver=0.13.1 +pkgver=0.14.2 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,5 +31,5 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="287a97907baba93a760751f8f28472b12d6c65ebb0855fcf684e126d8635adbc4e00b2fb4703bbabdc182b8a337dd9281b5b2c97add4b571fca976d90ecc7db9 FeatherPad-0.13.1.tar.gz +sha512sums="d66b999b11fb42de0ffe270b01186a9fbdedd211bf03f81c3b2adc717c2d427f5292008c1e5319c01a90e50ec23bc92767940741a80780fa9160fd3ce4839016 FeatherPad-0.14.2.tar.gz 471714eec9a376b138cc4c6c7b7d1339c9767091309c95b11ef2a8536250c796367b1544dca9610cc10babdbd08ac1436784d71292680b9da90e681dd855aaf0 hunspell-link.patch" diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 82d7730c7..ff0a23156 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpegthumbs -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191 ffmpegthumbs-19.12.3.tar.xz" +sha512sums="dde766b8ed1e57a1ab575a5eff031202a1bdc22883c84855391ccc7b17fffeb36af15509204360d0ed7aa6a34bbae0daa9a479a84dfb006589a46fbeba045499 ffmpegthumbs-20.04.2.tar.xz" diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index 7f061b427..ef9dee55b 100644 --- a/user/fluidsynth/APKBUILD +++ b/user/fluidsynth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fluidsynth -pkgver=2.1.1 +pkgver=2.1.3 pkgrel=0 pkgdesc="Real-time, software synthesiser based on SoundFont 2" url="http://www.fluidsynth.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f8776c59aa0aa4a25fe3c38973c994e8608f8fad8a2e478db0d0232d4c787983dfdcba200c558cd810e892930b50184af4bc4a7f3c98ec5c38e147fd715e51b8 fluidsynth-2.1.1.tar.gz" +sha512sums="cc956a3d8926a5d5368c4d36472a9706e5da1597bab76f1b59132e6253a888f422d9f74723c74f801963a90d9e0f6b36267114cd168977c47b1b935ea3dc8927 fluidsynth-2.1.3.tar.gz" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index 8b7f57f3f..49937cf7d 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3aa3c8cd7d5c1b7d444be504fbf1d3ff3cabdd4c043d98436e82d57415c8d9f99158f90065cf3f06b007585dfd2d4a5a8ee978795f4f7285f0e50c52dc74e372 frameworkintegration-5.68.0.tar.xz" +sha512sums="a6a934acd284df0f2e5842eec851ae77890d40ea6e9d7a9e7205c10b746057f908d1e19ef405a783d15eb64656e98b074a0794bacdf89ab830f2c7f70bf91838 frameworkintegration-5.71.0.tar.xz" diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index 3687b3cdc..0dd8562cf 100644 --- a/user/freetds/APKBUILD +++ b/user/freetds/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetds -pkgver=1.1.6 +pkgver=1.1.40 pkgrel=0 pkgdesc="Library for accessing Sybase and MS SQL Server databases" url="https://www.freetds.org/" @@ -13,6 +13,10 @@ subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.freetds.org/pub/freetds/stable/$pkgname-$pkgver.tar.gz fix-includes.patch" +# secfixes: +# 1.1.40-r0: +# - CVE-2019-13508 + build() { ./configure \ --build=$CBUILD \ @@ -36,5 +40,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="fcd3ed52ffbf482535d8d343b2d45c999875d2bfcbf13ef72a15f4440c791ff138b839798bad05593428c0839981e667133473f7d76570e0de3ebf9e474ea632 freetds-1.1.6.tar.gz +sha512sums="03f6d1e7f57f69068771e1706bbe4a3131e82b00f0191c988ec7d25f571d07caba9ef61598dc381eace1b1e88bc74af8f8506bd79236f9be15a56419a3e5c4c0 freetds-1.1.40.tar.gz d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index cc04fd333..78c8d96ae 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.1 +pkgver=2.10.2 pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 freetype-2.10.1.tar.xz" +sha512sums="cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa freetype-2.10.2.tar.xz" diff --git a/user/glfw/APKBUILD b/user/glfw/APKBUILD index ab55f9771..7acd66438 100644 --- a/user/glfw/APKBUILD +++ b/user/glfw/APKBUILD @@ -1,22 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glfw -pkgver=3.2.1 +pkgver=3.3.2 pkgrel=0 pkgdesc="OpenGL desktop development library" -url="http://www.glfw.org/" +url="https://www.glfw.org/" arch="all" options="!check" # Tests require X11, GL, and manual intervention. license="Zlib" depends="" depends_dev="mesa-dev" makedepends="$depends_dev cmake doxygen libx11-dev libxrandr-dev libxcursor-dev - libxinerama-dev" + libxi-dev libxinerama-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/glfw/glfw/releases/download/3.2.1/glfw-$pkgver.zip" +source="https://github.com/glfw/glfw/releases/download/$pkgver/glfw-$pkgver.zip" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,24 +24,22 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_SHARED_LIBS=ON \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_EXAMPLES=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} \ + . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -d "$builddir"/docs/html "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="73dd6d4a8d28a2b423f0fb25489659c1a845182b7ef09848d4f442cdc489528aea90f43ac84aeedb9d2301c4487f39782b647ee4959e67e83babb838372b980c glfw-3.2.1.zip" +sha512sums="3084f405f6ecfa182df0841ffb44248b716fc03282afd8e6dc9a1361897fe62a1ce049b95f662d79aaae45aa52208bb552b8c649284f7f6d9c12623ac3728e60 glfw-3.3.2.zip" diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index f847f2914..c54a49822 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric -pkgver=1.12.46 +pkgver=1.12.47 pkgrel=0 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea gnumeric-1.12.46.tar.xz" +sha512sums="f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab gnumeric-1.12.47.tar.xz" diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index 3056c30a3..1822b64be 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.19 +pkgver=2.2.20 pkgrel=0 pkgdesc="Complete and free implementation of the OpenPGP standard" url="https://www.gnupg.org/" @@ -52,7 +52,7 @@ package() { install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d } -sha512sums="d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd gnupg-2.2.19.tar.bz2 +sha512sums="3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc gnupg-2.2.20.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch 4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 616793f57..e75b1d552 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,12 +2,11 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.11.1 +pkgver=3.6.14 pkgrel=0 pkgdesc="A TLS protocol implementation" -url="http://www.gnutls.org/" +url="https://www.gnutls.org/" arch="all" -options="!check" # https://gitlab.com/gnutls/gnutls/issues/560 license="LGPL-2.1+" makedepends="libtasn1-dev libunistring-dev nettle-dev p11-kit-dev texinfo unbound-dev cmd:which zlib-dev" @@ -23,11 +22,16 @@ case $pkgver in ;; esac source="https://www.gnupg.org/ftp/gcrypt/gnutls/v${_v}/$pkgname-$pkgver.tar.xz - gnulib-tests-dont-require-gpg-passphrase.patch" + gnulib-tests-dont-require-gpg-passphrase.patch + disable-certtool-test.patch + " # secfixes: # 3.5.13-r0: # - CVE-2017-7507 +# 3.6.14-r0: +# - CVE-2020-11501 +# - CVE-2020-13777 build() { LIBS="-lgmp" ./configure \ @@ -79,5 +83,6 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489 gnutls-3.6.11.1.tar.xz -abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" +sha512sums="b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604 gnutls-3.6.14.tar.xz +abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch +25400be364c1f27b88451002a471cbf841b9738dd93c42dcbeaf7644c3deea6afc85300b40d5ae32d29dc4d441237e8b311f3e07f0af2fb4788701ee4e240c0f disable-certtool-test.patch" diff --git a/user/gnutls/disable-certtool-test.patch b/user/gnutls/disable-certtool-test.patch new file mode 100644 index 000000000..2ae16a38e --- /dev/null +++ b/user/gnutls/disable-certtool-test.patch @@ -0,0 +1,33 @@ +If GNUTLS_PIN is not available in the environment, the test will fail +because it cannot ask for the password: + +Generating a self signed certificate... +No PIN given. +note: when operating in batch mode, set the GNUTLS_PIN or GNUTLS_SO_PIN environment variables +cert generation failed +FAIL certtool (exit status: 1) + +The comment above this line says "some CI runners need GNUTLS_PIN +(GNUTLS_PIN=${PASS})" (i.e. GNUTLS_PIN=1234). When this is passed +instead, the test fails again because "No password was asked" (it greps +for "Enter password" in the output, but this won't happen because +GNUTLS_PIN is set). + +The folks at Nix believe this is an incompatibility due to musl's +getpass not falling back to stdin/stderr if it cannot connect to a tty, +as glibc does. + +https://gitlab.com/gnutls/gnutls/-/issues/945 + +--- gnutls-3.6.13/tests/cert-tests/certtool 2020-01-01 14:10:19.000000000 -0600 ++++ gnutls-3.6.13/tests/cert-tests/certtool 2020-06-02 20:36:20.380039844 -0500 +@@ -20,6 +20,9 @@ + + #set -e + ++echo 'this test is not compatible with musl' ++exit 77 ++ + srcdir="${srcdir:-.}" + CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" + DIFF="${DIFF:-diff -b -B}" diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 6a60b2ce1..13ba8b6d4 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice -pkgver=0.10.46 +pkgver=0.10.47 pkgrel=0 pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" url="https://www.gnome.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3 goffice-0.10.46.tar.xz" +sha512sums="0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76 goffice-0.10.47.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index d4973d5ff..d540090b8 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=granatier -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5 granatier-19.12.3.tar.xz" +sha512sums="6b207cec8e279c63f79541ce670b1666553a87399a3de35c7ad60d145225af398b039737f27448a2bb03d7c7325a31c4db98b621d17ba8b62d81532eb16f1b12 granatier-20.04.2.tar.xz" diff --git a/system/groff/APKBUILD b/user/groff/APKBUILD index 1045af000..1045af000 100644 --- a/system/groff/APKBUILD +++ b/user/groff/APKBUILD diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index af6b363ae..c21bf34c2 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gvim _pkgreal=vim -pkgver=8.2.0529 +pkgver=8.2.0959 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -71,4 +71,4 @@ package() { ln -s gvim rgvim } -sha512sums="73cd3eb1522189f603c65ef1e80c0d1c860ce7332817967ab289aa8f2fdf376235fc9c30af53a66164cfe83a882b55003b4073b27852061295ca9b5fe203501d vim-8.2.0529.tar.gz" +sha512sums="040c0a72bb27dfd428c06f103e7f0b919f9680b91da798a91c34634c559f349332fc8ebd3d9c6889cd6319666005bb889322e9541d62754ed6d839bb06b06b49 vim-8.2.0959.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index a9a767f1a..6d30c53bd 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0 gwenview-19.12.3.tar.xz" +sha512sums="28e152dd353273a19c31e5fb324e6ed09586a70ca96a5e4071ef70d8afc795eaad1b8907519acc4144b11d69eb88afb155e8585cbb59d0330560c6525e3d3baf gwenview-20.04.2.tar.xz" diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index af90a5f0e..cc6281b98 100644 --- a/user/http-parser/APKBUILD +++ b/user/http-parser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=http-parser -pkgver=2.9.3 +pkgver=2.9.4 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -11,7 +11,9 @@ depends="" depends_dev="" makedepends="$depends_dev" subpackages="$pkgname-dev" -source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz" +source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz + remove-bogus-sizeof-test.patch + " build() { make @@ -25,4 +27,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b http-parser-2.9.3.tar.gz" +sha512sums="b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd http-parser-2.9.4.tar.gz +aaf666728ab860a19398a631276d7caaf696d29bfbce39408bbcd65775f23d452e477af481333631b8dd07eacb8ba44fb4c58d1216dc5fb0dfac88062c7f478b remove-bogus-sizeof-test.patch" diff --git a/user/http-parser/remove-bogus-sizeof-test.patch b/user/http-parser/remove-bogus-sizeof-test.patch new file mode 100644 index 000000000..5f912fb5b --- /dev/null +++ b/user/http-parser/remove-bogus-sizeof-test.patch @@ -0,0 +1,14 @@ +Upstream issues: +https://github.com/nodejs/http-parser/issues/507 +https://github.com/nodejs/http-parser/pull/510 + +--- http-parser-2.9.4/test.c 2020-03-24 05:54:06.000000000 -0500 ++++ http-parser-2.9.4/test.c 2020-06-15 22:54:06.020315073 -0500 +@@ -4221,7 +4221,6 @@ main (void) + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); + + //// API + test_preserve_data(); diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 51804b714..a23bf4866 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=icewm -pkgver=1.6.5 +pkgver=1.6.6 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7914031fa2df42ed337aa9c65c04f959746210c255dc799361b636042f1614949e1f9a3b9a2357fe39f469f2ed9a75d4c916c7b4c3e61c7b7ab6dc2cf9d3d9be icewm-1.6.5.tar.lz" +sha512sums="6d9848924253fee5f57be488d2eb0b602767f168ce623b10c768a73197dfc6265daee7e70373d45ff5fae1c15b029d62c77ad13f0f631283bbf13aaaa9c6234d icewm-1.6.6.tar.lz" diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD index 3c470fda1..929582b23 100644 --- a/user/iptables/APKBUILD +++ b/user/iptables/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Molly Miller <adelie@m-squa.red> +# Maintainer: Molly Miller <sysvinit@adelielinux.org> pkgname=iptables -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="https://www.netfilter.org/projects/iptables/index.html" @@ -60,7 +60,7 @@ package() { install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables } -sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb iptables-1.8.4.tar.bz2 +sha512sums="6a6baa541bb7aa331b176e0a91894e0766859814b59e77c71351ac34d6ebd337487981db48c70e476a48c67bcf891cfc663221a7582feb1496ad1df56eb28da8 iptables-1.8.5.tar.bz2 726dfa1aa598d9dff802b99347138c861703b3dd28b2721a6b79b12f87d988369d3b4b9daee7cb2f9a930daac8921600de1e5342a347b3eae3791f0b9f0acbeb iptables.initd cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 896a990a4..81721b787 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.4 +pkgver=4.5.0 pkgrel=0 pkgdesc="Lists of country, language, and currency names" url="https://salsa.debian.org/iso-codes-team/iso-codes" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="fecb169889e86e87fa90b9ffbbb79d12d4ce4f0ea7b4f699b2ff978f88bdbb790e5b37120d9b696fb13db56845727b6ff102049878e06bbc26b258214eeb3c05 iso-codes-iso-codes-4.4.tar.bz2" +sha512sums="49ad3fad7ab7e489df9fd421a582e09fb116149af7e409d7b592704c95c50e2043880791403f20978f9027c2875ea57dec04c4fe5bdf623c7544edae3f90a084 iso-codes-iso-codes-4.5.0.tar.bz2" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index ed6cdf89f..2a1cdea41 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kcompletion-dev kcrash-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kdoctools-dev kio-dev kjobwidgets-dev ktextwidgets-dev knotifications-dev kxmlgui-dev kwallet-dev kwidgetsaddons-dev - kwindowsystem-dev taglib-dev phonon-dev" + kwindowsystem-dev taglib-dev phonon-dev kitemmodels-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/juk-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb juk-19.12.3.tar.xz" +sha512sums="ee503ae6119823ea66f187e9bf84ee68c9ec0b2b0620624a5916ea006e25cbf7b7bcbafe32fb496d43db8473e1672ae7841f377acd1a2223a665ec4d1cd62a96 juk-20.04.2.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 5c8cc99c9..8f02552f7 100644 --- a/user/kactivities-stats/APKBUILD +++ b/user/kactivities-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities-stats -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ba4241d0aa0b76639d7d7231ef3cf6f38db710dc6df8d9553242c1faac40839853437710cfcfb1f246c68e7e26a4fe887eb5b058421798e885b43777b0360be9 kactivities-stats-5.68.0.tar.xz" +sha512sums="969ca260d925619128a37e890502fc6e09376198279291470f086e265e49fd05856cce06ea171c3564a4d93b334b512126b540de40902530befabd342923f875 kactivities-stats-5.71.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index cbe2c27f1..d8b1dff68 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="1490834305965cff0c8ddc4e38be4960a88266f10806478e41cd976f0461a83ae4b6a4e9f3566fd90d5afcf3f38a291609179bea0781b939831ce8f788acc552 kactivities-5.68.0.tar.xz" +sha512sums="4206603664e8d6db51940ed70d6e57461c95f49e3bebab1463fddff43c9e07f4ba5acc7b73abd44f0e9ff1bdd03ba335a45f58ed3cdc3bbb4fd07c9bc9bab7a9 kactivities-5.71.0.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 319d4fec1..ebbcf7eb1 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bc1957f8e851bc0d39a6e8953913d23f245f0bb1338c34e465d1cdddafd144bf80677335f1ae43530754530a2fd75c4bec8f6b3904082fee18bb235011611ab kalgebra-19.12.3.tar.xz" +sha512sums="6160e4c2da6f5bf739c66972429868535e011aa05a93fe7550492b36a5801ceadaebf2e3c453d50e50da002280881a00f53aaa0067ed9f60022f92bb231c5600 kalgebra-20.04.2.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 9d5e3cb16..824e7bc51 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b kalzium-19.12.3.tar.xz" +sha512sums="92af798e642832967ba01305fbabf6b31f56d56cfbac5d1593ee203aca04e7569f7d01eb58fabc6cdfc5dd3c8b091d20fe1b8d46058156e13fc581ce8b714db2 kalzium-20.04.2.tar.xz" diff --git a/user/kamera/APKBUILD b/user/kamera/APKBUILD index 649746130..4834564b8 100644 --- a/user/kamera/APKBUILD +++ b/user/kamera/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kamera -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Digital camera support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da kamera-19.12.3.tar.xz" +sha512sums="a79b0a6c270f07f679ac62d830e50ffd24b01d355b3355c60d40f7edfde230e7e3cd1b8967254d400410d894a440c9bd61e49bedf605c2b165b672146874b884 kamera-20.04.2.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index d2d98aa08..488182c1d 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0 kanagram-19.12.3.tar.xz" +sha512sums="055042d1cfb1a1e61ce711ceccd5592068beb06f597bd4aff3ba3bf394405ac009a8910813e42d7ff83f88d430f89c1c449f0c6491b6f3fdc10d799af5479f0a kanagram-20.04.2.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index cc65b5056..2318069b4 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapman -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34 kapman-19.12.3.tar.xz" +sha512sums="e649c1a94e3f3d5d7179c42083a596a2bd8617889d9e6d4bdf6710ab9b7083c16461f5e50f486f22678202b7d00cc6b55b726c77b6d00fdd7da4e60c1b14318d kapman-20.04.2.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 6760b73cf..028071b81 100644 --- a/user/karchive/APKBUILD +++ b/user/karchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=karchive -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0d14773c4eb27281178d5f00f789256cc44aab057bc20239237a0031750d82765a7afae7cd804b200f713a8f93cd95f5a78828641a748e9b38a6d3c84aff3cc karchive-5.68.0.tar.xz" +sha512sums="ce480a7de68fafb6c8f334b5f626627d0aeae445b838b46219357eab07d2062bcd89d1bc443d8ce28a76ddaa91478939205422804fab2df26b9ad6527d8b388b karchive-5.71.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index d9df73288..af22c259b 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -85,4 +85,4 @@ kwrite_lang() { done } -sha512sums="aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817 kate-19.12.3.tar.xz" +sha512sums="eee887549ed22b5d0bab966936f1d509bb47a79cad4162cf44ef5a44b97f9c4ea5aac2316e234def6bbf6cae506347e309b26fb24e20c7ac1cc582c12ad6f911 kate-20.04.2.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 24acd289a..0a058343d 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=katomic -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411 katomic-19.12.3.tar.xz" +sha512sums="0ffa63eee6a267d801b606f552857f926f43ffdf7bb353c99010e9a05123ad75af3bae0a6b30c6efbe7b0954e149da1d5df3779dc7a182700de2f5d29723511d katomic-20.04.2.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index 525a86fd4..100cf1617 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="006ed4eb03276546f99525ede235e721ea4092da3b00735afe2f06f35c146d6a75b64e3e1b872feb6f1a986680ae6415f0d4a3dbdf4ecad07d94aaac1061d605 kauth-5.68.0.tar.xz" +sha512sums="1b34583c37a10250cbbfb8a8a4da7f72c1b358e8946909985f0906b7464ed94a8e7c5a5c6c346ebd72e957278b72627433cb3014028d02c1718fe468eee4e2aa kauth-5.71.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 1dd52516e..706a84f23 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblackbox -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a41aec30b0b193536526f0177a7efae247fa62e100240718e8b86befe7183ca6068b9546aa0f2d7ffc233618b8e8408612c94365ccca7388d18e97687d27fa43 kblackbox-19.12.3.tar.xz" +sha512sums="08a26e1b56148acaf0ce7a645ac15257bbed1864960f673aebea981d354c60d3c1e30585926b4e578485c5da640c5ba2e98f21e13b0b0069408e32b1f804326d kblackbox-20.04.2.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index e89b067ee..25ac79457 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblocks -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6 kblocks-19.12.3.tar.xz" +sha512sums="ccd3a63e5d2f9fa12ac7adaf6d26e9285400e51e355c428427ebd1fbf8ea449e4a2f02b9be827764183c41f27aff5b85148066661652962e3eb49a151c6de10c kblocks-20.04.2.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 396ce7df1..c9edd73f2 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56712cd6312d534f33459c18b05f12141546df82a1c1a822a74ddfbde515fc4c67b7d66a6dbd0b7221808d714e2d8c0f72d18f6857ea624bb6a768b9ffffde7e kbookmarks-5.68.0.tar.xz" +sha512sums="3f8f284c35a07d2dd657ccc7073b3eccc1a63b4be4fefee2c1ffd1fadafda06dbf1fbc6ffa1ac40417423638a543d5fd18e31372ddd2b4654f9067ecde19dbf7 kbookmarks-5.71.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 88d847de4..a73b2dda3 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbounce -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0acae3dfcf082efdf6b79c044685abee9c8b0334a5271ca78bf91ffaafef7c2d2ebe2e7ffbfb78735247b88090a07fb20d11e94e2315b357cba9d9b500764b79 kbounce-19.12.3.tar.xz" +sha512sums="d47954ae3d664cde22e54239f55b4b7962e131b9b5ffdc21c3a568a96a0c8c1a2bf0f722dff0e02244e34a86192150958aee4138a41f5c98c1e6fb7a8a0966c7 kbounce-20.04.2.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index f416cc759..051ce54da 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbreakout -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="983c9c034708c0af0012bdf47788b5b70c36ff1f6b24552f0c6ee8d088f805886ef89d81694750c302e6d254ed13672151f7122c6ba55f68821c62405cf28e9d kbreakout-19.12.3.tar.xz" +sha512sums="008bedf2baf1444beb7a72133f1d86518db3f9f5801a7929431c045098ea3d30760760ef3eb1964f4e2fb565a17e926bc677c31a57a61f237b61c175456211db kbreakout-20.04.2.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 927ebda72..e97b03544 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b660706d6132b0b2aa9e91a09a2f132e40de76ae956308926ff83890fab1bf2e171fbd29a8b1b78979929556931b6b1e4f52cacc3fc2db4248d5f95be5af9c61 kbruch-19.12.3.tar.xz" +sha512sums="b1ce5068c6fbfecb57bea475cb7207322ff4060fb79d6d696b9ce816ff278c63fbce561bd3e6d5f3507490360cf454e1588f97502e6128fb3d114138297163eb kbruch-20.04.2.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 8c547e6d5..23fe355e0 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c00474637775a100832d787ddf5d09aafa7dd40bdc58a3d9c596af0215f85011602078fd03d02e5ee3725cb65af1b8aafca390f851caac59bc79b8860f074013 kcachegrind-19.12.3.tar.xz" +sha512sums="bb41afcb7190bff86489403402ea057386b4bcc8a6e33fe6acfba200c8bccf88db4927fcb11beab63d566d83f464d0b11f6da1e400e79b80906024e07a948a88 kcachegrind-20.04.2.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index da3c019b0..c957ab916 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalc -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7323acc0e71186a2ce83ab5596a97adc122d6a95a343f5c1f7176330e93b3ee5e23108ab79186f842c7c04a91d31bee592846e44b9dad8ba2e334f244cafe2eb kcalc-19.12.3.tar.xz" +sha512sums="33c92a0fa652a9351c8a265000203417aa398aeb1b5b29d8fdc7029a705956d6d495c1317c09f782c2978efb75f68b1ba1bd2c816818d868a96e8958491a8ee3 kcalc-20.04.2.tar.xz" diff --git a/user/kcalendarcore/APKBUILD b/user/kcalendarcore/APKBUILD index 23cf88fa2..21babbebc 100644 --- a/user/kcalendarcore/APKBUILD +++ b/user/kcalendarcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalendarcore -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="256bcd4bbc0c3f2d53d05503955de505d937011fcc88006e1c52aaec9b8780e52ec18d229a4ce751df41c7ca2ddac07ba56cb5b743807a034fe7fb3f62dd7d0e kcalendarcore-5.68.0.tar.xz" +sha512sums="77e707d6448cabb5eb3d324d40500f8231269ab46d04792c339729e769e2ab3eeb7796a1127fcb251d108cc99ae295963cbe53ea0d41fce39c53220c9e2f2fc5 kcalendarcore-5.71.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 4d903a763..020ea3bd3 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcharselect -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006 kcharselect-19.12.3.tar.xz" +sha512sums="47f84a4e193accb13febf3270bf2c00e52e0d5c70fa19d2b345ce6dcb9a54332ea3b29fcbdf449d78e00b49fd1b4d6f91b506c41d77bf4777c17d721fa39792b kcharselect-20.04.2.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index 8d3e41c5c..13c78e234 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" arch="all" +options="!check" # Test suite requires running X11 session. license="LGPL-2.1-only AND LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kitemviews-dev kservice-dev @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d930874680c489465e72fd4fc7d0d920dfccccbe6e05213c654055d726bea8add2745ffe230ba2a3895dca860c4d93b0039ebe7db6397fb8c53b3c5f6edb7812 kcmutils-5.68.0.tar.xz" +sha512sums="5f91a241122529a815b780337b705cef7fb46e77be86cd03ef53a213c35cf6d575a0b124aeafbd8e3c408a11c3b33e094566f04ef554d07ed7fb9485e34c16d9 kcmutils-5.71.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index 446bcca99..7f468476a 100644 --- a/user/kcodecs/APKBUILD +++ b/user/kcodecs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcodecs -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -15,7 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz" # secfixes: -# 5.68.0-r0: +# 5.71.0-r0: # - CVE-2013-0779 build() { @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1edf80355d7d986338adfaff3067b0acd80d0fca47c7c81db0c510b1d32acb6ba8dcea33bd577a8ff0da60c4b4e8812c6981948a1eda84ce1acd8a05c87cd67d kcodecs-5.68.0.tar.xz" +sha512sums="2178a079897ab38004243d03d6cc8ef143bdb50e2d5f3942bf9d9f25259e4019ed0641081b37131299a7e4ccdb85f2f5c904867e27332130a11398ea07277569 kcodecs-5.71.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 2dc03be53..742c5da86 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffffd9a945be3f24813f92fb1f9ec434c045fc3225977de45a4ca6fc9b15926ae3786a573ce05e16acd254e5e3bafd078cae940737517fcf7144302a435605ca kcolorchooser-19.12.3.tar.xz" +sha512sums="520843dccf02287811ab7ebb1142655ff46ba1524ec779ef3d291a19f84a407ebc9b9a0d92f0b03beb25de93ae7c20625a7d90704463eb7dc19955d815d25eff kcolorchooser-20.04.2.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index d0363ad66..c8b0ec70f 100644 --- a/user/kcompletion/APKBUILD +++ b/user/kcompletion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcompletion -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05c434549610404a8a9972fa88dd33245ec9b6e9b402a3602e2081b3ca3692127993307ceb56f8790b91d0a990a2241cf1258a54e316dedef1980b72741cb62e kcompletion-5.68.0.tar.xz" +sha512sums="9314690c326170492b3909f4bf167ee7bbc0bc94ad5ac5caa99f587a4394a6daacf978ade7554eea38562e3955f8eec370ec29794a5d2cd5276be6f380967bbe kcompletion-5.71.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 6e118e487..7f13d3842 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670 kconfig-5.68.0.tar.xz" +sha512sums="9cbcc54e983ce4bddcf2ddcabbfba6e195a5f551780c05471e55387620cfcf12529b5d1a082b2794d7edf760c3c1d81fc81d43ec32a1b00a2a2c1ccd684c1c4a kconfig-5.71.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index ab6e3b9c8..3435921c0 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="db93c37920dd92180cc7e019f1c96d91ba5aaaa9cfd3b1d98d3e5b1b7cc828c204bb27ac83694836234eb41faef3278a0d14d3df974b3228aec631e26cb0e9e6 kconfigwidgets-5.68.0.tar.xz" +sha512sums="f9616427f5164146d2e9c1c3d802eebd4d7757172fea5ca4a99937a40c69da693582d74ead02e6a9996786485a0eb6cd189c74c25fb1a8d60b8a169297319b3e kconfigwidgets-5.71.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 1fe5bd35c..54009a6ba 100644 --- a/user/kcontacts/APKBUILD +++ b/user/kcontacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcontacts -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59734f680473ba97bae3406c04f9859997ddb29233d1870865c7f147b7271b7a3dde6ed05bf4cc8ebabd7639c8492bae1f8bab38437c3947495f3bc50190341f kcontacts-5.68.0.tar.xz" +sha512sums="4a8c5103fb3cf1c45f633b3455e178a9355ce1b0fb24ca0bee7b39b07ea882642ea53fede7cf271040184aea7be4dab04ca06ac9cc18fa7761314a62d77120b2 kcontacts-5.71.0.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index f6c1ce99e..34038b1fd 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a76e9f05d2a1fcec509f3a02ac6554b284ece1edf96e201c4f129826d16957fa1c1bd6c1f56debb10614c5222d794b094af1fee0d133a05d17ac9c18249cd1b8 kcoreaddons-5.68.0.tar.xz +sha512sums="86a9724cc17deb408c2d5d19847acfc5bc1dde21cd8bdb92bc2d364151ba46f236418712ead51ce2cee98856b4d159c9e4798ab3efea16479955981c1dd81d53 kcoreaddons-5.71.0.tar.xz d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 04bbc7458..edb85f604 100644 --- a/user/kcrash/APKBUILD +++ b/user/kcrash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcrash -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a26607886537a2d6259c624907e0e5db133f58f0a55ea47845a83e4aa07c86be7f8030a21afddddef58cdac82ca42bed0c288737aaf57d424c6bf67916782811 kcrash-5.68.0.tar.xz" +sha512sums="4b58f21f65aa238756623eb6a326e70c5f50aee1690bca991f1bbc6dbe2ffe63133ccef90b410735a97ae245b2db7ec626dde530f5d6b5fbe8d36dee3a6024dc kcrash-5.71.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index d4d6a1ede..60aad3e8a 100644 --- a/user/kdbusaddons/APKBUILD +++ b/user/kdbusaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdbusaddons -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9d8be0a886037ce4804cbf6a3603350d08f805fac04b5ec5a5007e8ae01300e7cef7161ea13715e87bba544bf32062cc15f77a7890c3ca5699a59b7c5f11bd7 kdbusaddons-5.68.0.tar.xz" +sha512sums="fd84a73a7e53e7db1fa406f536b96d5dd9db9cad9ba09f3dba747170b94eed7da8ef46d4e9726b8deffcdd0e675e9e16b46fab354ee2a4b6a1cada6c7367a8b6 kdbusaddons-5.71.0.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index dbeb83fc9..cff66bb90 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 764bea813..65c526c7d 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 891f92179..00006b445 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index 186b142e1..a828ab740 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 9f9c2802b..3d155db21 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index 55833148a..1b17b2f15 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-utilities -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index b31caeb3c..e1c8bed20 100644 --- a/user/kdeclarative/APKBUILD +++ b/user/kdeclarative/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeclarative -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c3253b1374e66c59436e4c88b8fd296dc60f7a19ef64fa750663afaf86f144b16323cde5af79c0a55d6f5e780085d671deac923d84410d6c31c2b88564ad363 kdeclarative-5.68.0.tar.xz" +sha512sums="aab2e6083a8fb84e9d54f864a519f65b7ec7179a90f032e0a5a7a21e3b66fe4155252ade5b176cc4f16e48c2483c68be358102722d6876b802f2319ee058c0c9 kdeclarative-5.71.0.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index b22a075ac..e364735f7 100644 --- a/user/kded/APKBUILD +++ b/user/kded/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kded -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0f1073ea2e57ae6fdd615a496c213393881f29193bd0904bdef752eec3d74463ac775c20b9c90c55f03e2aed34a86988833848b78835b52115fa46d99dbe999 kded-5.68.0.tar.xz" +sha512sums="0601d7bc7f3c24ebed9f198ae66d970de19e8abadc56ff9df5ae19401a43e85080ad61f2ec1fad7c51b5b80c5f2805f6d55ba98cbab3eb70e6c943fb518ae5b7 kded-5.71.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index 0cc01f082..4ef03e02a 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdegraphics-thumbnailers -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="515703d8a22578f09a6e6105e38fc27c0546ad0e61d9c30a052e40a9068f942d586bc8f6411eed0f057f3da0791b94a49a5e378c04ff1f6af20b8c663a154470 kdegraphics-thumbnailers-19.12.3.tar.xz" +sha512sums="419c2b179d7c6d1c09cd8c0c5a7947618cac7f214d33ab3a6f8cc16877d35ba1c712cfa2bf831403b9c86c18591eced58bba12d638e7c0fa587a694681cf8786 kdegraphics-thumbnailers-20.04.2.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 57d2eb9b4..c656e48cd 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9862e320f028e4a80f33db4532b9e865a8b8d642d434e064988fc1f72d9270e3f5883c17caca61f307b86dbf24b4a070bf27ddf12f1777d84a742749d0b8dc42 kdelibs4support-5.68.0.tar.xz" +sha512sums="f624396e2893262c5777eaf2c521ced647445941bad3fe92779cb8a43aa5afe1de31e259dce78fa54f8d499523e621832c613faa639a5eab741a4cf5a027b7b7 kdelibs4support-5.71.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 39c3b74f5..672301de6 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -11,14 +11,14 @@ options="!check" # keyframetest.cpp seems to be broken: # and then abort(3)s with an assertion in QAbstractItemModel # I believe the fakeit/Mock code is subtly broken somewhere. license="GPL-2.0-only" -depends="" +depends="qt5-qtquickcontrols2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev qt5-qtsvg-dev qt5-qtdeclarative-dev kxmlgui-dev karchive-dev kcrash-dev kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev - kdeclarative-dev qt5-qtmultimedia-dev rttr-dev" + kdeclarative-dev qt5-qtmultimedia-dev rttr-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad kdenlive-19.12.3.tar.xz" +sha512sums="f7bfc35121f5a27b01ab7c16b0911f90b758eb113bd55ca22783a5142d3df92493b7170c6bf31352aa44d4ca8d8a7fd12491d75f44a137551dfc531c4c1a5d10 kdenlive-20.04.2.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index 755c94066..34f550b0c 100644 --- a/user/kdesignerplugin/APKBUILD +++ b/user/kdesignerplugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesignerplugin -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8d7103e223274377a109a961530ea0c5aa630134467b4baaf3c26b762319aac62f34357512e9a6c0fed9dacf61c1f71521f0a08d947cc5f2b845257a3e5faef kdesignerplugin-5.68.0.tar.xz" +sha512sums="550de8c6c9b204968246aa4a99bf51e9c2c20d1b882c5f402085e8929e5a4df53710cdea356f201a3666253358f5fe98cc17c0d69334d51904291193045de7ac kdesignerplugin-5.71.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index a0a2c23d2..a72c122d3 100644 --- a/user/kdesu/APKBUILD +++ b/user/kdesu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesu -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd31b83be237adb2b13896714ee07af659780b1028149e04ce797edf737d03dd0a7e1f2733c2ae28786c38e382806b558725f1f424910747df13719d35fad5f2 kdesu-5.68.0.tar.xz" +sha512sums="7e43aa2a9fe1be70510d6952caa4c7bab9f771c66908253fa2fa938ca2086e48a089227172fac8b0b57059f2fa019206818f95ab7acd3e396842cbb4693673ea kdesu-5.71.0.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index b980489f7..d79cdebdd 100644 --- a/user/kdewebkit/APKBUILD +++ b/user/kdewebkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdewebkit -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be885bc7234551adf38faadd03f863fec60588f46bb710558702570bb1a40dff44ea35155c2cf30624c2f9f7ae13dfe57cdc2f088538c35e11157189ba803594 kdewebkit-5.68.0.tar.xz" +sha512sums="b1f164534077a388bb07f4d59f575cfd2d246dcb5bf3311b6c7dd4eb59a07e2d50b2defa04a1dc5318f1d35b9317b33026119afec93d288f1e59590d26b53f49 kdewebkit-5.71.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 214475d1b..55334dbd0 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdf -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46639acdaca1f29d215bde691a2844ae24234fe747081a5d6cca1c81a0c09f862b1f6eb066e1d301a8b57345b82096a4c9c7a771a2a29e7bbf21dd1b62d2582a kdf-19.12.3.tar.xz" +sha512sums="56e944cd96c4c2114bfda85f61f8889070f7575a3bdf27b273407abb5ffdc2b5649517342469c93caa42b78654021c009503fa7cbb431ebf973fc9ca3753700e kdf-20.04.2.tar.xz" diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD index 6fbff8e0a..8db99f14d 100644 --- a/user/kdiagram/APKBUILD +++ b/user/kdiagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiagram -pkgver=2.6.2 +pkgver=2.7.0 pkgrel=0 pkgdesc="Charting libraries used by KDE" url="https://www.kde.org/" @@ -10,8 +10,8 @@ options="!check" # Tests require X11 license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" -makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" -subpackages="$pkgname-dev $pkgname-lang" +makedepends="cmake doxygen extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz" build() { @@ -25,6 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ ${CMAKE_CROSSOPTS} . make } @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="008688e76e30b933576523e2204b029ce2a5f5d232002d481c7c49f4ad2955b3f46cbe4b51a046a771130f3584225127b21df30efc042cddc9440f81ea8f495a kdiagram-2.6.2.tar.xz" +sha512sums="d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d kdiagram-2.7.0.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index fe347e5db..1739e2d7a 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiamond -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268 kdiamond-19.12.3.tar.xz" +sha512sums="ba5a0c0e39d8b3ccb19b93e526792e4336228b1d08272a9badb30a88495876cb5b0659a31dce24613923f6d3ad91330ab40a1b43dac099c6185b6b49bdf27528 kdiamond-20.04.2.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 49398a2b0..62e6c2aed 100644 --- a/user/kdnssd/APKBUILD +++ b/user/kdnssd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdnssd -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ada02627e705fabfa50ccbd7221969d123f0b9bdf51edb390c78a6cfaef545f1237fed91dad868d17800b85d677597df9e4d7906156a0816cb54f744ded89857 kdnssd-5.68.0.tar.xz" +sha512sums="453505a58e6d6852a450c9047cc9651ae3c3849800cf39f7bb44e6ed7bf035fc55275f797a988405159a504d8181fba77dcbbad48364095b13ef9188bdbcdf56 kdnssd-5.71.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index ec2771be6..ff39b3816 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f39e0193bf8cbad90a579394730e72fce741673ef7a600198b5d05fac0bd25bb785c8edd68ed9d852a4b1b4be856db4fd9d37ec5719a7943177cc19a6ccd34b kdoctools-5.68.0.tar.xz" +sha512sums="d20bceb3aaa8cef68f95d6e209af35215f37b96e8a6f039a50da8c299fe4714ffa21bc2cbe825744ec14f248823a147883f4833f1201de28c64d6032c63ed2d6 kdoctools-5.71.0.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 89f47bb2c..a48122700 100644 --- a/user/kemoticons/APKBUILD +++ b/user/kemoticons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kemoticons -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="44ef3ec99997ae99d90bd0c4318930db0ca2805f812ad8fd18166b801424d940a40a499266bfa20f6f9169cdd4608a42a206069e72af015956e16d95b9b5e731 kemoticons-5.68.0.tar.xz" +sha512sums="3d40cd8bf02876e4af99d4fcfe939e5dc3ed52926e4f85bedbe28a9d753bf0baf51bdc74991ad81403e76f6136a77cac7f7c9ace043d4e2f5bc894821ddcca72 kemoticons-5.71.0.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 5c5e7374c..f56e3c4af 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8e10b45b6c2790f1f0e41ea8f0a474d6a6b4e6c6bc73d53d26887b24b06f7c95c1fc3a81fc9096759c8506e64fd30f6b7f822ea6dc238ea787b812ba685f8bf kfilemetadata-5.68.0.tar.xz +sha512sums="745a124ea48218d1be7b207393c045b6c2c6fdf063925340ed434593663c8fa28e45b622f52a12edf0d0bba7258449e7505d0b9d3ab8318bf969c7d5ce8decb1 kfilemetadata-5.71.0.tar.xz 17aad7d1e223c5668d7b61b125843d89d7f2598e94173d451e731f96d6322d93ab7b967a9f04dd83020e77cd2f84471c46d81b595b2ea484d2b423af6d1c332b test-mimetype.patch" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index e2da48d02..5252e2f98 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfind -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3e0572d12c0ffb4ca60774e91237f82ae2d424558ac91636a83075d1a1c11c2ff8848f1093360a4c3149b3c4d8233dff9bd5ac0914547af873aa9f1bba8dff5 kfind-19.12.3.tar.xz" +sha512sums="9e02fb3179752aed72ccc6e4ca56024b653ce6e97a16708446d500f8a8bfa00f34f95036812b65360a8ca20511587b29c99feb3cbc5dc0d3c9b0be44742a7046 kfind-20.04.2.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 0c30fd2cc..f8bfe6040 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfloppy -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26a3664af62ac5b39bb527c4b1c3b16ea34f68b5e8a28368747dc563bdcfac850aba488c5362616f93e5a60555540aadb2607fe5570341c0eb14f3844cb0aeba kfloppy-19.12.3.tar.xz" +sha512sums="9ade1519ab0c546dece22925de449a73d741aedd0be78e404057cb0aba01f9317a00c338e5ea9a6bc1d8b4ff490ed1c33af2af0854857ba400064a2215a11a9e kfloppy-20.04.2.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 12c8a62f9..b02d30d2b 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfourinline -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8738836d6f0a850f3fa563f1f6571757ec8b8001b31ac122ced617a4b64a311fa710cb449655bf3ae3fc170ce1c53c0126d023c089a03c94b8b8ef1a6e9097df kfourinline-19.12.3.tar.xz" +sha512sums="d8dacd537043387deca39d8ac5ba101c519d0f399ca0f6c7f1b183ae5e1fa0617faf6e1e789f69ed0951673b3674651787b8630241e29204c05f376ca9f3c34d kfourinline-20.04.2.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index a536493d7..a2d0a6676 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcd99351c80750c79b50ec78bfb0864f5f3fb08d9ec94af5d2fb6907a537c02bae9ff2c70437eb58f22c4a873ecdce4ac7e1ab0d55a8140d2671d6ed89b743d3 kgeography-19.12.3.tar.xz" +sha512sums="6a115dae1c0a29dfa83f6c34ae31e6529679dc7003f2a4c653978107a0903d5237053076bd8e58f1c031ba1f913286c877e12907c7ab332df953503c5f81b505 kgeography-20.04.2.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 033ab8603..e6a9057ed 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67adf59577ab08895d8107b9ae828db34174efe5546d53bcec48cfa273cf4443ae2e2dfc1c189781a48305fdbd0aa1e2d2aedbacd242a6e14d0ac1ad9b3aa887 kget-19.12.3.tar.xz" +sha512sums="28fff868dd9a6bd778dc540bafd8ec3fd7f05e3c33ec9a174535be8c0b22ad725a1614e4426b7a1c2574fa1bdfc7dd02ecba701e83a02e1537c66e49fe7c1a99 kget-20.04.2.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 03f2be72a..8af410188 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66929e86dd09acca739e71a88dff5818bf6602417fe257b6f195f2a194f1bb030ca44e25b37d9383f4bc4960da95ddcaa7330f3c2cfceb1772be50d80763796e kglobalaccel-5.68.0.tar.xz" +sha512sums="2d8ef6160e0303b31fae00379aaf29673f928dc067072096e034fe844d1c6b0ef52c05078f6c58e655c58f33263feb9c4d369edd7dc11ff0a8c3c5bd97c6130d kglobalaccel-5.71.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index e10b5e835..aeaa52183 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgoldrunner -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af90c483e94a335080d4091264213df33c5bfe5b4abbf95336dfb5c0885037caed8fd844371c1b1bcba41a8cc5de88ee8bef9feeb91a22a087c56e44e85abbd3 kgoldrunner-19.12.3.tar.xz" +sha512sums="a27670d2282ce8eac1965e9480fbea34ca92d1d1b4a81ebb76c31b1d13d8ffd2bb07ac183f2c7f31b4feb3cc18216ac47d84767bf522ff9cafc80c6a0f147fdd kgoldrunner-20.04.2.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index c815bf81a..e377f971c 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="465d0b57ed96be41b226bfdc484c5472c0866f293eb0c57816ac3536aef20d81cf320b2244f1d20110d8b86e1014ff578be730dac84331896b41ae9dc7960109 kgpg-19.12.3.tar.xz" +sha512sums="7b01374cd9c70c48fb79567c929eb02ca1f4a3b4ea5abdaecc6a4bafb80e3ce74b0526766218a67a6c0d4bba25d68a419e0263f400590f6ea34f35b9c2b50b5b kgpg-20.04.2.tar.xz" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index 9b0559805..72212ba9b 100644 --- a/user/kguiaddons/APKBUILD +++ b/user/kguiaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kguiaddons -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9547c8717f5ea32a46165ddfc5cd9b3d02b0f318a0efd580ed22d6183d7fa3b43b8068e43cefc25aa811a3a7e1f692e33a517055204c8171b6ca569d43683f00 kguiaddons-5.68.0.tar.xz" +sha512sums="23ee3a69b8345bbee6c2ba8d926fff708a03b4c16d81f68abac61f327b416795eacfaa2373758b831c3f625a46421a2e37c9093583ff97f77d9eb037c11cba2a kguiaddons-5.71.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 2db471d89..df124bff5 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d653bc8c48d84a46634ed4c3fb711a80ace9b5e3b12c8ba05cc6d76e71978b98f85f28f1d4454b1960b1edf589dcebf1788c22451383a85a395c2f7e1cd0b526 khangman-19.12.3.tar.xz" +sha512sums="3bef4b5aaea2bb2a650fbc2093380d66971c90d6b75db7d421e08b5a0e5026da578f1832deb8a01c39a5f9ad4e0cb1cdace586639d2f5b1292500e132244dc80 khangman-20.04.2.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index a332d276c..868c107a4 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khelpcenter -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8aef5f562a23a65f807218f5c7746afdd4f97e74de127bfd81037b5bba9d1024337082954752b33fd478896f462e565796ec567f32ebf0d006e2c73de3880c6 khelpcenter-19.12.3.tar.xz" +sha512sums="0b7c62f1b7305fbf5ef03aa92f1a4d3ac9be50dc8c061f10613892dc54b380a2c916ec3ceeadf20563a0ae84afdaf1410c3630eeeefe4579921b648a75c60d1f khelpcenter-20.04.2.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index f3af735bc..7cc97d024 100644 --- a/user/kholidays/APKBUILD +++ b/user/kholidays/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kholidays -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad4ab73880862104cc7aa1fff2dd91c5b9fe36f8f8ee0fb1f217a0e159ca4184984767ba5bebbb3ef0bd6a1fd6cbff09a019fe3c26826ab4df5cfabcb80ce9a3 kholidays-5.68.0.tar.xz" +sha512sums="a4cc8459ca0a52232d8870f4b069d040162d63318be1a95d81e54c90365446f8cbabf9678f4f38f1826cad090420bfb0f220226d64f1de6e83efbcfc27e3e1b9 kholidays-5.71.0.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index 747a25921..14a714944 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a306f5da7bf03f77111af4f3e4d4a2b21e483861e7e5d4265941e914f788e58079fce11ab2667bb802d512d7c84fa70653a94a16cdb14221ce1aebbe300ce2ee khtml-5.68.0.tar.xz" +sha512sums="d5ed8efaa1083b7d8690001495888a2e540ed0a7fa341437f5fbcabcaf9584ae77f8684f6ac57c358d8af3f60c5d7d98c607def12baaf957e81daca6e2e6db35 khtml-5.71.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index e2cd6c3b9..a39983043 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2256e06a40761b7f948cd83caf527e8533035afd2ecda266535b67dab9030571154a6eab75744db94da4c13c27bcc67d1d2dcdfb3b9de92e75abcf3f517e52e7 ki18n-5.68.0.tar.xz" +sha512sums="6bf20ecbbf72011851f829a2abb016863d455502132108e72d8f67aec50f8a6e1cb2ff59fe08bc04c096a800f5bbcb1923c9b045f7daa43f44e85a04112fdfea ki18n-5.71.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 126088b51..e3337c29a 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiconthemes -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b kiconthemes-5.68.0.tar.xz" +sha512sums="6a12a23540fc6813089142dca03303ddb284b1fa109b2e52f85ceec5c055455d9d914231eac8a125a14322345e00e10fe48a750f5833c0c0fa195c5e74abe85b kiconthemes-5.71.0.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index f7769d45d..13f38c8f1 100644 --- a/user/kidletime/APKBUILD +++ b/user/kidletime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidletime -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c803de25cf6f26b2d320ec7e35ba598f134e75575dd8f1c06b41461975c99a6b46e7d60bb34b09ed2d799837cf7682bc3d09ba720b2b7dbb1b1bee668fdb1b01 kidletime-5.68.0.tar.xz" +sha512sums="d5a6af8739c52fc02282f28962f50cfd6a5fa6cb9724cd8d76cb5a68fcf784cd52d773efe299cf681efbceef78400f7d7e5b519592e9be3ae993f7d7e15451ea kidletime-5.71.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 707245af9..5ca6edb14 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url="https://www.kde.org/applications/education/kig/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109 kig-19.12.3.tar.xz" +sha512sums="54055ceae86d780b6be44b97cd56dfe252db5a8e3b9d9bdd66320a500fbec3769b79731260f2b5a40f5c6cd9deb8c26fa0e2cab5dbb9ccf0b7c0da19c4b31fa5 kig-20.04.2.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index b458397ef..5adbc8927 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kigo -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebb8b7fd3da4b47c1a26642b894e57d174a0046fce7123cd222d1a527a2158cf1cca42a7e54ab029a11d2419f0c8cb69f3f8343fa07454593d293f7d84d252ce kigo-19.12.3.tar.xz" +sha512sums="f15d88a7cc4ff1644e3bd1da3217f983f005940d251934b1932f7f32378c4ec8bca33bab20c0e21185d7f36caa21fc46363008bc516a6df5bd3d931a962bdb79 kigo-20.04.2.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 706c3efe2..316359624 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=killbots -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e5554f03f91210ceb25429bd6f4917100bcf9246db563058c31f10a2ed2cd5b095898320f742db021b2f8d3ee211a9271364544fbad1cdc3de9f39fd2827514 killbots-19.12.3.tar.xz" +sha512sums="9ee56d3a71df17b75cf76bb8ce4ca27ce8877518bf86f94f3a5c7c9af21f5bc8afd8a3a056165d555caec9f281772685b3ebd8cab8759962dceb0223dc46a9d3 killbots-20.04.2.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index b80261ce0..be1367ece 100644 --- a/user/kinit/APKBUILD +++ b/user/kinit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinit -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66d39c7bb330e7237ba4334938451ba5d1faad3f38e1c577036061cd75e2770c858c897317543222b208f8a694e29c30eb142483f4617e30954a34813e941530 kinit-5.68.0.tar.xz" +sha512sums="c2a6871a333c8fc4a4e30994fa1aa18ba8e31b8408ff6088c3beba26cb9d306c2626fabe1c7d5381836da3e806bbcdd21be1b5bb646932b69d41e0cd161682f5 kinit-5.71.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 8fdc83304..6961d83f8 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -17,9 +17,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kactivities-stats-dev" makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz - D17205-nfs-tirpc.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -44,5 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7 kio-extras-19.12.3.tar.xz -dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch" +sha512sums="50c895f678ca4b8b7b60e1b7dd4821fc5e665159a0b48cf5d1fbccef8ef83ef129e08cb0792cf2d4b243ccff021269ed47b9bfa4c4f8628cfa424a06071e16a1 kio-extras-20.04.2.tar.xz" diff --git a/user/kio-extras/D17205-nfs-tirpc.patch b/user/kio-extras/D17205-nfs-tirpc.patch deleted file mode 100644 index b12c0a2c5..000000000 --- a/user/kio-extras/D17205-nfs-tirpc.patch +++ /dev/null @@ -1,143 +0,0 @@ -Subject: Build kio_nfs against standalone libtirpc -From: asturmlechner -Date: Wed 28 Nov 07:41:00 UTC 2018 - -Summary - -Since glibc-2.26, cmake skipped over nfs when standalone tirpc -was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...) - -Use FindTIRPC and make kio_nfs optional that way -FindTIRPC taken from https://phabricator.kde.org/D12761 - -Test Plan - -Built with libtirpc successfully. - -https://phabricator.kde.org/D17205 - -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,6 +132,11 @@ - set_package_properties(KF5KHtml PROPERTIES TYPE OPTIONAL - PURPOSE "Needed to build the man kioslave" - ) -+ -+ find_package(TIRPC) -+ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL -+ PURPOSE "Needed to build the NFS kioslave" -+ ) - else() - # FIXME: on windows we ignore support until trash gets integrated - endif() -@@ -174,9 +179,7 @@ - if(Gperf_FOUND AND KF5KHtml_FOUND) - add_subdirectory( man ) - endif() -- check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) -- add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave") -- if(HAVE_RPC_RPC_H) -+ if(TIRPC_FOUND) - add_subdirectory( nfs ) - endif() - endif() -diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake -new file mode 100644 ---- /dev/null -+++ b/cmake/FindTIRPC.cmake -@@ -0,0 +1,60 @@ -+# - Try to find TI-RPC -+# -+# The following variables will be available once found : -+# -+# TIRPC_INCLUDE_DIRS - The TI-RPC headers location -+# TIRPC_LIBRARIES - Link these to use TI-RPC -+# TIRPC_VERSION - The TIRPC version -+# -+#============================================================================= -+# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr> -+# -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+#============================================================================= -+ -+find_package(PkgConfig QUIET) -+pkg_check_modules(PC_TIRPC libtirpc) -+ -+find_path(TIRPC_INCLUDE_DIRS -+ NAMES netconfig.h -+ PATH_SUFFIXES tirpc -+ HINTS ${PC_TIRPC_INCLUDE_DIRS} -+) -+ -+find_library(TIRPC_LIBRARIES -+ NAMES tirpc -+ HINTS ${PC_TIRPC_LIBRARY_DIRS} -+) -+ -+set(TIRPC_VERSION ${PC_TIRPC_VERSION}) -+ -+include(FindPackageHandleStandardArgs) -+ -+find_package_handle_standard_args(TIRPC -+ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS -+ VERSION_VAR TIRPC_VERSION -+) -+ -+mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES) -diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt ---- a/nfs/CMakeLists.txt -+++ b/nfs/CMakeLists.txt -@@ -1,10 +1,12 @@ - ## Check for XDR functions --include(CheckFunctionExists) -+include(CheckSymbolExists) - --CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T) --CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T) --CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER) --CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T) -+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES}) -+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS}) -+check_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T) -+check_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T) -+check_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER) -+check_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T) - - if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T) - message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!") -@@ -24,9 +26,10 @@ - endif (HAVE_XDR_U_LONGLONG_T) - - add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\") -+include_directories(${TIRPC_INCLUDE_DIRS}) - - add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c) --target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network) -+target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES}) - set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs") - - install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio) - diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 8f56f536e..a53d48073 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f962631383719a7265a9b300881c812d00eda566198c1f68ad134a21407717245b49fd383901440a13d403245a0b9b3bab98432ec31c22e3dbe78b09240840e7 kio-5.68.0.tar.xz +sha512sums="713ce4782816a3755983ed5286b8b4a23bbc7ac8fc1096a9223a2e9253f35233b7ea26c18b373c5cf1ec24d98951a86f363fee2bfbacf1558a717e32e3791215 kio-5.71.0.tar.xz a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index 4c0ec71dc..ae78b3c8d 100644 --- a/user/kirigami2/APKBUILD +++ b/user/kirigami2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami2 -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f9f84893dec3298066e7dd3f283a118a488403d23895992875b9229d26d3b3ad14ff14bdd7a5afc79591d96ac431556ea15fcb65dffe23c42a3144f1fbe88f21 kirigami2-5.68.0.tar.xz" +sha512sums="ca633b1e7ffa374adcd561828e5bd3908eac1228dfcd1335a1b0fc29f9d68a1746571e434933e333bc8b948d5a2251fb385c1b28e409fe3cad514c2e93e3a74f kirigami2-5.71.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 8c1a5bbc1..7258b5b40 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiriki -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1f225e0761b4e57141731ba7ae093fcc74f0c435fcf7f812c713652fd47115f93e89a3b6275509a8d90de3abf8755c9c3078b7f4510724420921c207a84f0ece kiriki-19.12.3.tar.xz" +sha512sums="212afd8007464f476a3960190f5a5ca08d915b0bdd45148e5b5fe4830d92f8836e1f3ae808324f681cc9add98c25073a30624f875ead28a0c5d0a06808d36b99 kiriki-20.04.2.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index b329016d1..3d2d66f47 100644 --- a/user/kitemmodels/APKBUILD +++ b/user/kitemmodels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemmodels -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dcdb8ad9783f84b8838d7c87516f4813b0a257eca4af83cbb2225d4d5f5d17eb21b25ce35afb7a4e5dc1471f56ffd8e2c5598d797cf21eb4baf613e5b132c421 kitemmodels-5.68.0.tar.xz" +sha512sums="3055e5ee04ba3bd86df2381db46784e0332dda3a90d3914350ae98cd6c0d390594ac88ff9ed85d2abf9e9ded366949e11a6de4134b4e571dc6b5812e8ca55f6f kitemmodels-5.71.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index 1c340843c..242de7459 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59d744473ddb697e89adc54cd74c4b5688b7244b0ddb17bb26cb6bc762faf8b39018b4d4498c89a9c8df05e241d75bffe00d01c02bb0d70a8f9b1f64b7d9c313 kitemviews-5.68.0.tar.xz" +sha512sums="05275cc17c627de39cecafe250b9ab0970976140082840ec8b5d0da3fbabca039970872abc8e9fc1507e877b54cbfd0e5bb91e404740e0d3bb1c98a5fce71a0a kitemviews-5.71.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index ed9df5a20..f441b0633 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="74481a65c0823d2da598544fef6b5a8b7c5788adaf8804af29a0d4092767e67ff788a0a294f910ea63bc1ee7ceedb3ccf25fe8e929cc453e5ee85307fe851526 kiten-19.12.3.tar.xz" +sha512sums="dfe8c3ae54dd2534a5f0f9183ec9f1c0757319922699e6b8c3d3482dd4aef292aca5b5b82fa122745fa7e3f91e41b039b7dafc6276ed9f7e07156b800187e6f6 kiten-20.04.2.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index f1d68af28..02a10bcb9 100644 --- a/user/kjobwidgets/APKBUILD +++ b/user/kjobwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjobwidgets -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1db735d465b3df1081bdde0eeefecbe6c86d20e520ef18842375f7c583abdfd8ee9017688de2ec193b220712f4c9742b379492612b55bc3495aea3996fed015 kjobwidgets-5.68.0.tar.xz" +sha512sums="cbf92021afddea3b0e0f2a1ca28abb246f17ccbb37a2222081d2ae35e3324568d3c617ff13dbfb185273c893dc03f4b6e15cf545d1cba6c69400b5a27b96c37e kjobwidgets-5.71.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index ff7755686..0624c3bb1 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0daf43ef5fb1c50114e3df6cdff19d162fb8d53b13188a201250c3e7fe1e1b72691389ae73ffaa5b2880343492f5f7efdd3f85245673edf2d6cf9b12b34e27f4 kjs-5.68.0.tar.xz" +sha512sums="dd1397304f486f6998be24afbd7177cfca1d2677b0afbc5c4af7b83ee4a0b4828b8d2910208e680b03f96db365401a21b44e3971604c62cf00659d158eff75ea kjs-5.71.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 2e3c29afd..5491b449e 100644 --- a/user/kjsembed/APKBUILD +++ b/user/kjsembed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjsembed -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2fcab72f43bf66f69f8b5a2463ca50baaacf239d84f9d99ba75f8e9661b30303cb8e2601d53280b54743436481a32d9294b97d3b4a9eaceb401274d0169bf1c0 kjsembed-5.68.0.tar.xz" +sha512sums="029351e5954f6b776320bf85a004bff75d44d26977591f183cfb11ef8c46f2ff0a7efa0c7a24a8a3a56a63a8a11a2c3659ee9ae3c963171a160b43f603950c0f kjsembed-5.71.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 76e54d98d..5d5bf86b7 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjumpingcube -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2ca3330a6775393f7512b17ae3072b6586109450ae07689bcb4db00bc90c77e0d2c53406cfef766aabacae04a2c3d3fc989b382e8b45cf0daf22fd8a3a8f5ca kjumpingcube-19.12.3.tar.xz" +sha512sums="ca38c7508518be4c6c6e155a092ce282fd563614d2c539c75266e7330577262a05014bbe392232b038c9d77cca7bc6979eb9dbfc4badcf576c7962a1b4273749 kjumpingcube-20.04.2.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index ecfead943..8128f75fa 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kleopatra -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e217a7a05d4ab22ba520c02a3a09abbcf3711de1ad2f42c79f3d375580fafbc3aa33a3cab05a5b6c201fb11c0b0b92a655a9566043dd0c400acbe3ead913f85a kleopatra-19.12.3.tar.xz" +sha512sums="3dc7367469ec590f4aa63bd1a16e26415058cb67c97f5991e88baff0669ef726fdd3d8fa06fa7358210a4e9103337f8ce527b279e14eb2241a80d67d149b994b kleopatra-20.04.2.tar.xz" diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index eb1357a8c..13e7b9647 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b26f5d4e3424e3870f8165736d21abcbf22cddd6d122cff8c0fa4fade58d1345052bfb4bd14bc8215bcd62fa490b92945f0c25b147fdd7facbabcb33e7cf8f3 klettres-19.12.3.tar.xz" +sha512sums="d51841e81c6fe0acc00d3e947c438864efdc415b9c5e739af1788e146162f34b8da5f49229c9c72c0bdb2edc6d96261e979daf7ea43da3f2774bd6a67511138e klettres-20.04.2.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 70c9f3b30..93bb9131c 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klickety -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1b4f59e3fd4ebaaf5f36fc4f3e4f7385fdc126df9fb3e1cb38104ed886a447995fed3e286c3e706318affcbb3572f41ea118d5b7a08afab6c571b6fa04110b0 klickety-19.12.3.tar.xz" +sha512sums="21a7b864cfbc44593e8e8320a538c3b194311a4ff236c52bbc8c3243a0a9620bae566db59b57dffd19d5f6b0f916ea4baa955da79b7f59f244d4618d19fefba2 klickety-20.04.2.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 1f0f4c0ff..dbc7d1f99 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klines -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e272cbdffa530cefffa74726a46cc937b5d09307b69e98477a07d1eb61889d5b280a72a0ef129fb192733b284f86fe1e86f7128f15ca2f79f320633b4f7bcbf klines-19.12.3.tar.xz" +sha512sums="e6b2065daed386548d49883cea637396204539efebe291bd1fd3e3bc5fb990d7a2c5085f394782302bd3b82b9ec333e4735389807f96745270104a2e1db36c76 klines-20.04.2.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index f2637de08..42d2a5fe2 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmag -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6f3dc983be2efe249e77b30429d4fb01f7b9c28552c56db27c1906de0312f1071658b9bc5fa9c5b5de35df54d7d50e9f1f540eec13cb40255b1ea9441db5afe3 kmag-19.12.3.tar.xz" +sha512sums="e1ea0637b793989ae8733974de51f754483e21539e37e61f787bade8166f420878b4fe120b1d92fed87f66983866bb52704e495a02344150188ce05bb9bcfd4a kmag-20.04.2.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 33970e576..b166206e9 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmahjongg -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f62a61b221ff6059a95c781a04364e60023bcf3a450648b9cb831f29d545973d171422d9f26c2ea6a6765bbdbdeb78ce9f60f412c7d1e2564d91d285bfb77c5 kmahjongg-19.12.3.tar.xz" +sha512sums="017fe9d1224e5e3a153efb2a76262959c16cdc05842cb28f8a22e2bccf30e6f1fb86d9a0c058ed7dbb62e627cba656df012087fc2f874091241a467d882ddf99 kmahjongg-20.04.2.tar.xz" diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index 4d5566cf1..9a8fc30c6 100644 --- a/user/kmediaplayer/APKBUILD +++ b/user/kmediaplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmediaplayer -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca3cb02ed23492495d2c5e2f8e75d542daae61542fa9dcc3f632b421be82cf4373d01afcba47512c029f03bb0418c09625da56b7090d84e5d3d763cf650652a6 kmediaplayer-5.68.0.tar.xz" +sha512sums="3ed59d63635d91454c7de3d6eb58fba2a7f22c44f618f6107fab4ed366756d32db39e548c25159f1589cc34b15df956f2156f5695d53fc691e1447c13fab1fd4 kmediaplayer-5.71.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index bd4858607..c066a9179 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ff150d983432cf8fff336f5dc24e02b798a26d51f0fb86ded1a04899bde529c1fde11f46202961b88f357aa311819fc876de5500f0d4cc29b43e28d048c15cb5 kmime-19.12.3.tar.xz" +sha512sums="976262d2852ac54267fd66e463c6d56985fdcd7fb6ffbc691c000a7189ceb213c32b786b752b9af03b3b35a3bc76c8129b8180b3ff5f7bc5837eeb2e4ac15922 kmime-20.04.2.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 34c37429d..4491ccc72 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmines -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0ab3ea04071887d6778caa846ecdd6bfbd16b54d1da8e4629bfe446261a7adfe0366255f8ff96364722db50b5a7fffd838537e6e4947bee7ab38c60bb39871b kmines-19.12.3.tar.xz" +sha512sums="be1ad8fa06f39d459d50ca07da623655e026b63c841d2096217a56d6fd5ba3f43d3318d5f1078854f3be0f4ca5ddaa656bc2875b43ec23cc2ef3ea91a34269de kmines-20.04.2.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 664764ae1..813d13a84 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2 kmix-19.12.3.tar.xz" +sha512sums="b68fbb0c737182ca229623ffb58c427dbf0bf9a1ce26308007743b9b4ca4c8d4ba04405547af34281abd15444b000762e022447fb541de73b17ae3e5320abcb0 kmix-20.04.2.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index b483246a6..46bcf0cd8 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmousetool -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bf453675ffa67c8be5e8d5da1ed99b4b803f7b34da483055442468b1fa55ebc0a5910813c2bb1654653807c637f43fd313a769448de85d5e16d3be7d066a9f00 kmousetool-19.12.3.tar.xz" +sha512sums="85f8b0c1e33062a7f26b6bc3822499bdfb82bf2c3cdef7cc9f8a1c2262d9f35f385b30250b50276677a296c52732ec6d053db2300a9d9057462d6b6fa57061b0 kmousetool-20.04.2.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 71ed030d8..ebc21263b 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33a72a15d2b6045bd95d75dd70d44b75b2e045b55dacf787dbc4427e9ee26918b2dcce2a45ef98a9ff1d4ae2c1faf6fd69bcd21b18d3fac302687ac1872c9d95 kmplot-19.12.3.tar.xz" +sha512sums="bb77a61b98ebcd8f40bee0fe957c25c69ae4f14fe2000e65ffdce389ad9bac848b3a601f6f1c3133749eb24acf439c67bc4b067a66bd1c100ea7cea3c0861a7d kmplot-20.04.2.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index ca553dc8a..ab8acb554 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="01475c680c012324767f69c95582b14f913cd5f61d4e1bd4d05099949031ec396c5bc5904cc1d690ade4bf982f3d0c246c2859dfaefc6a6d93e7bda263703100 knavalbattle-19.12.3.tar.xz" +sha512sums="d592191a0804625e6ef840c5c984d8b839013e22d57ab02c5c251ea2cf6ec1566d8f86e808310e3ccc528d2eb1cfe1d05907c140af278db5aef1b32e8d2e8734 knavalbattle-20.04.2.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index e40238805..e19ae4b1f 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knetwalk -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b7d74d18f32d613ea32fb4bdd36d3b9c8523a6d93d88fff9ec34ea3eeef4bccd17922e177eee25720a0886b93cf1ffbab3a663a6a9c217181b180766504040e knetwalk-19.12.3.tar.xz" +sha512sums="bac83300dc0a441d3870be0431901ced822a746551149d99753ee8eeebc79fd8f2ef97a04c3a5a13911461d35f27090ef43f9065f8113786c7f919d2eab42879 knetwalk-20.04.2.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index ec88617c9..06497b307 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev attica-dev kconfig-dev kservice-dev kxmlgui-dev openssl-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev karchive-dev kcompletion-dev kcoreaddons-dev kio-dev - ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev + ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev kpackage-dev ktextwidgets-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knewstuff-$pkgver.tar.xz" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37e4aabd22eddb1ad216bc07d275006215008845af7979ee5aed9123b7fc2b8742cd07259294876b03c04706a417f1f648f26ef6355f8937d8d9b927e9ce6e5d knewstuff-5.68.0.tar.xz" +sha512sums="0b5a65086d0ca08ac3288523262762e70a03a208400068409cd1c964bb805f1328a7314692164d9ab70b3e07d3438f291b8d18bca99bbdd134a3f7ea658e5297 knewstuff-5.71.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 5952a53f6..aac9502db 100644 --- a/user/knotifications/APKBUILD +++ b/user/knotifications/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifications -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="301b300a6da4631d49c1e0004938872091c857bfbf312ab85aaa8f0ce3ce28425cbcdfa380a7ed46211d6e95776ea91cf9fd2a5521add05d5956de5e97f3958e knotifications-5.68.0.tar.xz" +sha512sums="025ba6117463843ea15ad4c3097327ea80c799b3313b7f81a516806bf76f860b7159648af5c5b9feaf1bcea25be5cfee7eb6f0023462427942d16f4cb17dc5fd knotifications-5.71.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 88bb47763..90a3e9650 100644 --- a/user/knotifyconfig/APKBUILD +++ b/user/knotifyconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifyconfig -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de9269b4654fec05b7b87aaf91c35158b9fcc7a9afb18d42f7810c493dfdbe6ff82ed6fa044d369186b8fb087d524d6a5597365c3f967e95d93be54a03b13568 knotifyconfig-5.68.0.tar.xz" +sha512sums="70272a068ae92bc053cf23ebe1cf332615720a6e4b2d7814b6c2e0bcaccf03d19d5115d4c9a6f2fa3a4571a3e203d9b54ec012ab69c5460579feee8dfef8c493 knotifyconfig-5.71.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index 44e8fee1b..49703cd64 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="447f8b8966bb8549802fbb5129f5178e182b12b546731c2cb7abf95a8777eb1ba7148cb155fe2428d5df3a47134b3dc695fb9b8bd60af5fba0dcdaeb483031ee kolf-19.12.3.tar.xz" +sha512sums="26d319fd851361e41a930de5b748d7bc765adaa6c71a3b7dc4f9efcf27d795e9d583fd1aaf4653225a8840a7beada2663ae3ffc49908dbaf3a99499ab347f279 kolf-20.04.2.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 9585e0db6..9ecb98db8 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kollision -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141 kollision-19.12.3.tar.xz" +sha512sums="72002fa09dc4f8ce4c6ab3bd67e6943507157bc595b5625024bb7df1ae8c75a3f0849b7a4e8dc14f7248918e89ca76ab26b50e835317fa287f5d6b44458e8f5d kollision-20.04.2.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 0b1c2f4b6..8274b1afe 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8697ada6f407426bb48e8f62dcc9337630631a0aed17d5efd3390dfedd7039c3c7a9f7c88e46dfe2475fea5f25f73387a4dd40b624c8811fdb019e1e5f6e85bf kolourpaint-19.12.3.tar.xz" +sha512sums="b08b14b6dc92d8c1df16edd552ecd5701c8cf6d8ed6d28319c7aa623d0a3b3386c2a81f79d92654c1c304bebef13b9ab13bfb1a60d1fe8b0002d6250eede8f1c kolourpaint-20.04.2.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index d91dd1e03..387523dec 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konquest -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0be29664cc43f647caf0c4dea5f92e1f38bf708bb67923b8ff916a0e0aacb1e8896cb2c38279f803b368ff09ab253ec67e785964ccb23d32fac9bc4af5af4dd7 konquest-19.12.3.tar.xz" +sha512sums="fb5f3687129ab2b18c0fd74fa5c5b37f3e543825aaf3a17b4f302b19cca79e366bf58d0c5da39509ad10007c37d21a65a3e3f24a798b8c7477c9e376ed805b3c konquest-20.04.2.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 5b700fe16..ed44b5e3e 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konsole -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289 konsole-19.12.3.tar.xz" +sha512sums="0f998c6f69bac905385b51c2d2af3b4ed1e835e1a33208c59238e3950c6c5cf3580a435ea5acacfbd031eecf2308e2c96e9df30f1ccf44154a2a637ca073906d konsole-20.04.2.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index 29ad6f8da..09bb1b410 100644 --- a/user/kpackage/APKBUILD +++ b/user/kpackage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpackage -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b77c8656c34a40962eed49e67a8368dcb43a842ad4009505778fefc90be96de2baed382c693eaf3ebf499b6f9e6117584cea839993e14ba94290a2c4f67f70ef kpackage-5.68.0.tar.xz" +sha512sums="ea4eed5aa20ba3125bdeefe03cf58d377ec81ad54d8da1b6e6f57d7de87d0f8ad54a7426d8730e9c3a15520cfe81dc07cbd97135fdcd083f0ed1d7b785628b82 kpackage-5.71.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 37a314abc..4bb83f67f 100644 --- a/user/kparts/APKBUILD +++ b/user/kparts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kparts -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7fa0575ab194e8921b22f54f80f3aa85aa0ec608364d920e0202295f142ee7919fce0f79e1de840be5cc3fa6a2dc99e47e6cb94d95df5c7f151b76dcb713d20b kparts-5.68.0.tar.xz" +sha512sums="12b598c19bf9703ed5e520be2ca25c904cc7189d917780ad120364ad7c15ffacec82dfa13dbf95909d51a63c798bbeace18793c1ffab5f6c293b44112f4c98bf kparts-5.71.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 7205b2642..93b7b5376 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c19651e717b7c99ccf533c72876ee9d848cfed04680b2e580f0e61028045bc1aecdf8d449d5f40a5e4f0d2de29207cb6d1344874126fa831462805c64b6b24c7 kpat-19.12.3.tar.xz" +sha512sums="60ebb6b4278a9dd91d34ab17b04d8adb1d4c48039527b0b86df8cfe91bcadc517462ebcbdcfb536946db3fb666be837cd31f2540ef81ed061e939d7b720485d5 kpat-20.04.2.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 5ac60fc11..a05b19e7b 100644 --- a/user/kpeople/APKBUILD +++ b/user/kpeople/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpeople -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Provides access to all contacts and groups them by physical person" url="https://api.kde.org/frameworks/kpeople/html/index.html" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f249fa3cc21a378824d13050919554dec6058277e9c737730bedbc2651d1191833dd7f5ecbfb74158c78808504a300861b5463e23058fef522e1ae3f21aa8e1 kpeople-5.68.0.tar.xz +sha512sums="96ffd829b33fa41d40772fe5360f585bca6aa3a8df0e20b73901fb0d8828a7ceeffead57fe4646dd4b77b3f1e68be9237641a17cac61c356a476f7e05f8f0005 kpeople-5.71.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 40a274b58..ca7875d7e 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpimtextedit -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="116d54e99f89e064acd6a699155b395327a4e64b8e63087f83cad8e652cbc8f7fa6a892f607f21bc7d6a998e5e7ba8e472a95ddfc490534602198930bac30a6a kpimtextedit-19.12.3.tar.xz" +sha512sums="045fdf526c3d0d0befb48050cb7e7035e56f157ac6da96c113e1c463f020ffcf93508e9ddf35c61f9d508f948f4371957d053e1d84f0788f2612d0b6b94db0e4 kpimtextedit-20.04.2.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 1661cf6f1..572469521 100644 --- a/user/kplotting/APKBUILD +++ b/user/kplotting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kplotting -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f4b5158afc2eb4d38278618a475dbc26482682cc77d7ae0e3bb799b25a43f156946791156f73a1fd030b7602fb691364e491bef4686d36bc4f955ac2b8033e1b kplotting-5.68.0.tar.xz" +sha512sums="645b852b27ecb1adc75fc6d5000e773aabe6f63d26085bc8c02d775884e95be4bcade5b617e50ee62b1addf3bc607e81e983b91bac7ac4c351d2d3c869e7bd43 kplotting-5.71.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index e71c433e1..7b545ae61 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9ea1452994e66d92a99595f4cbf53f94abe3af4d35f7adb57deb1a2ae7ab6d95524a7e8bd82af90ca7ade39644f6af9002ebbfee751a0395a705e38b1e8b4e23 kpty-5.68.0.tar.xz" +sha512sums="cdd86d968f95c0abd103a91796d5b877ca8d7994ef2f010ff426de59f3df25a029f820f50a7b187a21c7703becc1798a7bca7b8674cce7e8eab7749a225442fa kpty-5.71.0.tar.xz" diff --git a/user/kquickcharts/APKBUILD b/user/kquickcharts/APKBUILD index 7adaa073f..f3eeac510 100644 --- a/user/kquickcharts/APKBUILD +++ b/user/kquickcharts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kquickcharts -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="A QtQuick plugin providing high-performance charts" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90d50f5aa211d97656e3b8c1dcc0c069675e432ebaf0c33b0fa956e69319d670feaaedd38d24e587f3188b8cf8816d1d0fbdb33010447b3c4c1175ab9062f5c7 kquickcharts-5.68.0.tar.xz" +sha512sums="1c6d276c68b845fc834273d0281634bc83a6e358e985a57b96840bc380b14dd51522dc9ca443d9e014281414722d42713f89cb129f05d5f9f343bd3b98491902 kquickcharts-5.71.0.tar.xz" diff --git a/user/krb5/APKBUILD b/user/krb5/APKBUILD index 24269bd32..731bc7c08 100644 --- a/user/krb5/APKBUILD +++ b/user/krb5/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krb5 -pkgver=1.17 +pkgver=1.18.2 pkgrel=0 case $pkgver in *.*.*) _ver=${pkgver%.*};; @@ -87,7 +87,7 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52 krb5-1.17.tar.gz +sha512sums="7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c krb5-1.18.2.tar.gz 5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 603f52565..2c885a991 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474 krdc-19.12.3.tar.xz" +sha512sums="b57689ac2e3a06aadfc256458b826c081717291b6d40660d736ee34cd3f2f1bcc18508697e6049248e11b9dbd6e4fa9f5a932b233659119483a6e42f26d36692 krdc-20.04.2.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index b2e8a65a9..7ccea04b3 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kreversi -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="244edb7cc223f8882b4f2ce77318f91de79d360ccace318fc3f441fde30aad2438e672693f449fcf7a27da72736d50aef26889ac13823a3b9c5517b015c5cda0 kreversi-19.12.3.tar.xz" +sha512sums="cd085a6079616bd830641fb94a7d840c9434338aa2cfdf95d252375097e6d68ed9be840f0398de6c4fcd2dd89c81d1836fded8ea2313ad14cb43a68fe0ff83de kreversi-20.04.2.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 1c606cb71..c70d8187a 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krfb -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36 krfb-19.12.3.tar.xz" +sha512sums="3435f095faa9e01338fc2f8937ad81aa61efe177f4efe2bf22d40dc95df5e4c100bd6f822c7a6bf788a05a40c034cbe57c00c6c478f607d846ebdf50b2c47358 krfb-20.04.2.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 0150420b8..7fc0f09a5 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.2.8.2 +pkgver=4.2.9 pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" @@ -17,7 +17,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev libraw-dev quazip-dev giflib-dev poppler-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/4.2.8/krita-$pkgver.tar.gz +source="https://download.kde.org/stable/krita/4.2.9/krita-$pkgver.tar.gz fix-nullptr-deref.patch " @@ -47,5 +47,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="aab4096bef81a7205a04e3a4080d95ccbd1ba84a0cdb959fca8a0e6e7e8183f79857bde0b301dd9db642bd71042ef43b99768dbb7cd91d32e93df3da391d1a4b krita-4.2.8.2.tar.gz +sha512sums="39152d3cd5d2155b67a7fc79b0a80328aa4756d3b0b0fc32d549ad30041dc8d1106e0578accabd4e5a2b6ad67d06710598672bd6592887e80983b29cfb7ec7c8 krita-4.2.9.tar.gz fd43f21da937c29f550e24d459e83ad9714befe82fe0cae493b28cad6526b11f80a5e3d350be1fa910a62c07284774a6f5fac4bbf4801be378987fbfaef61254 fix-nullptr-deref.patch" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index f9aa5ceca..ed14b8651 100644 --- a/user/kross/APKBUILD +++ b/user/kross/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kross -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3e610248a2f6328b805d59fe8007bba02bd7af02edc93756626f5b3449a494207ed73c27ff504b85aa2d03c70f1a78b8a60289f39cdd6afdfe53c5386e429f23 kross-5.68.0.tar.xz" +sha512sums="5a2d0cfb3b9e0ebb25fc4083c41321a5407caa13fed5494364139c68bf2e938c824e6ac4dd404dfe6e76b6f4938d0077592978972a4f00784d85520038825502 kross-5.71.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index b87df305b..59f20d5e6 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0 kruler-19.12.3.tar.xz" +sha512sums="be3b87dff820f33387493eab6cb31527b61029246b11c9506caf5c646fe8adaaa278d67a3644946f3286ce3f1b1089b3d7b803cc8794e6ad9b4554e1b3e6d14e kruler-20.04.2.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 9d291a1f2..5e537364c 100644 --- a/user/krunner/APKBUILD +++ b/user/krunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krunner -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f3c7bb4afbd1b30405d9ab5265804b62e2928249d4334bbbcd1094cf28c8d9c587995182008f0c8fb4eab8a7a0ace5a18b9aa518139481b786cd54e5f081b47 krunner-5.68.0.tar.xz" +sha512sums="9d265bab79912c43af2b9eab9c07c79aa574f6be26705a072391b6eea0346ee034afa344cc285ba9f29b31e41ab07a0b0c08eb81b4979b98b1dfe188c5535d0d krunner-5.71.0.tar.xz" diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index d8a092326..3a9c6780c 100644 --- a/user/kservice/APKBUILD +++ b/user/kservice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kservice -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="3581b7ec51317a0b2b63fac7e0491e89da8ba03cd90ba0ef745fc84792af4cd247c80eeec0396069a26f8bc73b971f8444e80ac7749d05b379c29138df6725ec kservice-5.68.0.tar.xz" +sha512sums="7710c635fe7d26125389d82f89299d772e39647fa900a305cbb4fea80a646ed9797460f65f54a78e08f6b77e5cc5f5ff92060921776b4f34d4b2ee7bf60bf33f kservice-5.71.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 9015a6e74..c14f923a8 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kshisen -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32e842b7c9de58ac8d9715c1f947295a73d88b940727990a8c5d7981b807171849eb95d68a623ec6c1819525cd0271777f283a40672a97b80278d4a6074557eb kshisen-19.12.3.tar.xz" +sha512sums="e8036e3dd535087f4b4911873302f91277211e85ddee130b522a28262b776529d46b63bacfbedf7d90bcd72ba4b76cd507d77fdebe3e0f3d64b914032b652728 kshisen-20.04.2.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 0319102ea..8c5f3304d 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="105442d9c3229cda57d4bafa5f77b5fbf639d6488eabfe405ee82ce0365781efc17526a3dc903a1c730617474c61f037fd81059b72227575920769fba7bff8bb ksirk-19.12.3.tar.xz" +sha512sums="fcec410a67bb2bf34a688e677b794da1b0f11afb869f79560c7e563f2f7a2a82b851c9097f5e992a9673f05bf167dd2547124c8a23aec44d2ca367c8b1de158f ksirk-20.04.2.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index c8340b11f..9aa8ec778 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksnakeduel -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3923b4614a9134595aeca0d831f473b39ea94651bd2a997b3cafc98feda141991dec273becc1dfaa9cf8651fc2a7bd13fea31b84529ca0d4966a6dd84d30da6 ksnakeduel-19.12.3.tar.xz" +sha512sums="9e0c73aeb691a2492b08bedba30f17ea1d3441bc83cc04216ebe5c057be8501447f2a394fa83435c6100e240bd465422782caa13d63aadc422615970ab9c0ba7 ksnakeduel-20.04.2.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 5405515bb..da42727a7 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a7965b55fd521bb5aba8c9aa9dfaa1e86c3d88fddbd76176dd4fcb52db1e76fd1bf4c44aa255a46568c812729efb76e4becc532b48761adcec91f834cb610ca1 kspaceduel-19.12.3.tar.xz" +sha512sums="4bb5fe8fe09b12a967336b3213ff0a894e68bac076e9217634850034726aa068a19ebc0fca38e22ec1ee69b26c974fd4f85a247c404857a22e61049cb7546b70 kspaceduel-20.04.2.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 847a5a2ab..81e9c40ee 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksquares -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0b4fd109f2873da18a9ae5df837eb0574419ae8cac0e885bcc5c3ac577a0bd2dc57105147aab46e58fab7ee66dd19e68ea1d1686f06fb8dc69d6e4e1afd6760 ksquares-19.12.3.tar.xz" +sha512sums="f89f7e086867b5cba79a992b45f5b7b406adb448d1f9fa318f100df592e946bd6ed738beb308349eb5fecf14d6273f133735d69870ad343fbe96943ebf9e1069 ksquares-20.04.2.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 3792a7b3b..df4488d3d 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" arch="all" +options="!check" # Requires FITS library. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev @@ -27,6 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING:BOOL=OFF \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -41,4 +43,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af kstars-3.4.1.tar.xz" +sha512sums="10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304 kstars-3.4.2.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index e6b2ab920..e43ab0b4e 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksudoku -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f9bd802525ce6a3215f92c142322143532d37a82dff8f4502eb848280ee74e712fe540ad40f477e99854a23fecde777dd5de7f6b5185a277b21908703b88f64 ksudoku-19.12.3.tar.xz" +sha512sums="7555e2ecd8b9f6f73c2e4689d50658b99b4ac56c588561e84cf0b3048631f89e03a9f3ecc8c6863db336f5521f0323dbd67c4e975f27b6c416c8bc28694522a1 ksudoku-20.04.2.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index e6616b810..4e4676dd4 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88b12d12210b628d6470b1a73f28f0f01946158c3bb35be6bda14cfe5d3b75990149d2bf7f2077d030f5bc34df0dfea1192161c27128927d62d11d2bde8de530 ksystemlog-19.12.3.tar.xz" +sha512sums="31bd99d2e389fe10be6d33442c950bad25477b58e6df6f525b7cbda547749f40911239b2841e541c33142f7dc7b1e4ec18eb9720864cc01b90be0f3bad279a65 ksystemlog-20.04.2.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 9e99e9e6a..589909fb9 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kteatime -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e35cacc4c4fa2c1a37915134687a43225701933f15683916ae094a0cc5fa033da6dc3f34e6116490c0d6d1532755dc7ee16046e8e2e0b853529cb4626a89df77 kteatime-19.12.3.tar.xz" +sha512sums="b3bc1b7c737d6630ec2bd26edfbbf0960cb5c81e4d435f9e07853485df349c94d3fa58219033809f1c006660303ebfc392dede371fdb56378adf6e289c41c626 kteatime-20.04.2.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index c1f2a264c..65da1b4c6 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88cf4826cd0d0811a1f1d9193fb505e1fd6221192b22b14cca1d491f923dbad1816b9c29d540ff733c2f165c3ac456ac3b425c318a45b9aefd506a2b36e6fb43 ktexteditor-5.68.0.tar.xz" +sha512sums="ed18da1b06f7b3bf68c92946d6e66dbbdaa67dee1b55b28b912dc40012f2ef1f5c196ee51c6ad78bbc3ecfb14206acda63b130204866335bb23fbf07129fbb25 ktexteditor-5.71.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index a9d90c430..cae5cbde1 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="75bcf0f0f3ff55770768a95eb3376cf97f6f56cf97dd0223d5615c29bbdf98692db4a1179c802a848a88aeb65a3f1ba2cad0599cf983351cdcf2be555c32bbef ktextwidgets-5.68.0.tar.xz" +sha512sums="f8fef771f53542e9aa9c5cfe6cf4cb31203d7888ef9423b89aa32d3ff38dca4ae7baeac2d0986114333b9f65b45ee8c7f616b5892fab1c68493904c71fc6beeb ktextwidgets-5.71.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 30d577ba8..3cce0b51d 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktimer -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da075774292f911cdfbc28d3ce76b53cf6e9c3a91ff42c8b18334e8c680a87d08e3f22faf9b646342a7318c7096ed14de740e9e3558a71aed6ca7449b6d11358 ktimer-19.12.3.tar.xz" +sha512sums="9c4b9e261f6107e1e8f15b28f1c131e55596f16d094f54c7efef671571ced23288e2f2311b5fa4ed235404ff540fb6982c2635383eb8900025dddb3d6ea882e1 ktimer-20.04.2.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index d64205f64..7f0c2af1a 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktorrent -pkgver=5.1.2 +pkgver=5.2.0 pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 ktorrent-5.1.2.tar.xz" +sha512sums="141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387 ktorrent-5.2.0.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index f54a8937b..f5450e61e 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a3dc798e5e5c8d63419fbc2d9a70e3f872f00527575dd04cd5a8770fce0412a5445cd57c8716b9a6d613a360895f1f1e269acd963fcb3ccc99161b4efb412c6 ktouch-19.12.3.tar.xz" +sha512sums="05711ba7bf5013f584ca2d24405e7e9d1f317db792dcab68357d4762f8de86eae44387074332bd5054fe4e59fcbd98e5b3b37881c74aa3c51f1abb4a1bd7676e ktouch-20.04.2.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index abf428ce8..529872a7a 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktuberling -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="35d9038db7ca568d4666c126421f20eb24ff5a84c790892d1bf772f14a346cebb4761979772f5a62be4e3777698f0c866d3057dd23a24f7acf6d4a14063e818f ktuberling-19.12.3.tar.xz" +sha512sums="5fc843114e2ddaf72613145e23420ef618d6b3d9b2a854b7a1e9fc0d637a71ae15c9495d89990fd456b6d9821491609865dbd8162e837d918775fbe87e530536 ktuberling-20.04.2.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 8720725d7..2268f4cb3 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbf30fab10d9b49b03941309013f29f1481bf4ac8db1f9d5ad10fbaddd6ec6cf3adfd5a59c35163b47cdc3fd0526050434e2f44a05e903ae3b42968bd358151a kturtle-19.12.3.tar.xz" +sha512sums="9af77f2276448dcb4687e9b9c076047654ccd8c1990f9180d54eb53c72ca09672a52295defc95b1c4d40e90fdb35ff4a47259288159412e30019379420fab3da kturtle-20.04.2.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index f8630b026..fa2d56fe9 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kubrick -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce6c6163f8dbc36900b02126636219c0e1c0cd150deace706b7d622786e72ee2b77e8f1764e490d3a809c293f8fa81a13783153b79fa84293a69f1e85e94a3a9 kubrick-19.12.3.tar.xz" +sha512sums="c5c90630b64c05fa6ff55a5a6e40f35a4b6cc0596484acff9bb95e9ca86985705fc7f84d8b471e6b93bcbd69ac031cd9a45efee3ed90bdb5a9a295b8b8ceb9c3 kubrick-20.04.2.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 5994321cd..1eb0613eb 100644 --- a/user/kunitconversion/APKBUILD +++ b/user/kunitconversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kunitconversion -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="38e26fc71d9080e876db1f458d0f76d4a102cb40d506c721e4f1fd53dcf7a5fe1de963b3c2aeb16e51c903208c976d6455b34787670032e33c88f30a9e5a15b9 kunitconversion-5.68.0.tar.xz" +sha512sums="99775543a26aa60a8b496a4ecd0e5823c76fe8706092345a7c6576e564392cba053219a4970cb112477f2cdf4599f395eb37314cf625a51581a9391179a02aab kunitconversion-5.71.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 3c1b192f7..5a6006d7e 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0a410a9040cb8f157ff01cfbc976f49dac90d0fda0b4dbc8e760cb0549073ed9be5d442bde03b4f6bf27aa16a397671a1a0285c179aea3760bbf441e22cf004 kwallet-5.68.0.tar.xz -edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" +sha512sums="d9a8a3bf2612033b0f6b7324d9c52758e1033ebf4ae27be253653435edc2c040b3c289ab3720638f58fe9290436ac0aef861fae24c03315fa6d684d4bf36c4a8 kwallet-5.71.0.tar.xz +229e001354c00832d15442b6ee2cd6062e759a560d67e9ded024735e5012aeec022f8e12ed346e090bbe2967c3bd335e5dd73b3fe5b7da93b89f1a7842411e3e kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch index 9d76cc25c..81c475c28 100644 --- a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch +++ b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch @@ -1,6 +1,6 @@ --- kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc.old 2016-12-03 21:12:17.000000000 +0000 +++ kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc 2017-01-29 18:02:10.193293280 +0000 -@@ -31,9 +31,7 @@ +@@ -31,12 +31,7 @@ #include "blowfishtables.h" @@ -8,6 +8,9 @@ -// We need to live with -Wundef until someone really figures out the problem. -//#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends +#include <QtGlobal> // for Q_BYTE_ORDER and friends +-// Workaround for -Wundef +-#define Q_BIG_ENDIAN 1 +-#define Q_BYTE_ORDER Q_BIG_ENDIAN BlowFish::BlowFish() { diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index ddee7952f..7b7ebacee 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32cf7765c68a7cd4c44e4ce081ddd02de238fafc3644c1c45c7cdca4fd7a658f34bd7473e5bcad42ca6944069a805a1b9499ce949b3c42533ad71ed566678b4e kwalletmanager-19.12.3.tar.xz" +sha512sums="a4e7e4813c33368d86c83003e0f77388924db028204068c43ed1edfd629b48554f7588ba30268189a426522f3c102d9896c445956a9b2fbbd8fe8a69d1fc8c71 kwalletmanager-20.04.2.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 89664524c..d592496b2 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -44,6 +44,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33c045e85aebc4e7ef599a801ebeaf413ce4335fafce109a542cd8af5f83f3748d603698aab48586824cb12a573c6325d7ee20e78d6492a990e7a6650c67e9ba kwave-19.12.3.tar.xz +sha512sums="7a2697ca87533858af7bc8943c3ac1c7a31acf6d977fd311035bb129e4d8133987bc4ba2cd44d442b29bec2db9b743fde9ded39981e4d6d5d339c504719c2691 kwave-20.04.2.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index d8df26b71..b736d6d87 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwayland -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -11,7 +11,8 @@ license="LGPL-2.1-only OR LGPL-3.0-only" depends="" depends_dev="qt5-qtbase-dev wayland-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz - qt5-qttools-dev wayland-protocols" + qt5-qttools-dev qt5-qtwayland qt5-qtwayland-dev qt5-qtwayland-tools + wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz" @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="384628349c53a92925aa072941821ff153208415ff08fd9d32523a3e0b362d4fbf6539ebc0b3790112a570c70782989daa4cf1bf0ece26621cc8cc2d499654c8 kwayland-5.68.0.tar.xz" +sha512sums="89c89a9baa6b57724f663a0e6636154d1009f9d6971d9f22eff6402fc8407ed59b4a103c82a0fc8a643d83184381325c07bd70468b0bfbbc606ebe30abe188b3 kwayland-5.71.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index a1ce477e6..abfa09578 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwidgetsaddons -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64556563d0d45cbffa68b4eecc3c7c31d3597a598a63e713ac29377cf544354c25232cda78973bc15999d3e0b305810b480556a06fba45e811b8b0fe7c97cf23 kwidgetsaddons-5.68.0.tar.xz" +sha512sums="2be20dc1d923a8f5dd9ad0245d1960d88ab94d8029ab2c176b948463ed1b7fa3bda2da601224858f4dc8491d882276b9969fd4849593ced0c5d3cd864a6c6d4a kwidgetsaddons-5.71.0.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index 80a107032..e9c1fd6e8 100644 --- a/user/kwindowsystem/APKBUILD +++ b/user/kwindowsystem/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwindowsystem -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1c7abbdcd3d4b32c4e04eecabafe319f6b7d40d8634e769db4ec3871cfb68030ed6d402ea78ab5de1c873ec710aedff2a80fce6a56135ee57dd81c69c32a03f9 kwindowsystem-5.68.0.tar.xz" +sha512sums="16e2e8a2610c1c7518d937fa7490e297c22bd8862c543f6e472ea2c94c8713fb372812d181846858855601707848d44e535c9ab86e836f67fa3a40bc37747d4a kwindowsystem-5.71.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 0d096c2ea..ea1f67f41 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cfdf267585a6bfc5de06da3a0de6372cb2beec7c6abe7482551f28356b464d4b67f092998a251991b4678131b47a6278745c409f0c4203c457fed8a38081baf6 kwordquiz-19.12.3.tar.xz" +sha512sums="95d63a8e1b10cf684417d859ea387427616094e814e0afb9e33a5fcd31ee9f688ceccf42d521c15afb2eac25b99e08267001286865eb919463af028e56493404 kwordquiz-20.04.2.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 55c6b6ac2..94c490a28 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlgui -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de98fab8c9a878b24081ec0676fef35da39f44391689ce7087c367d8e54c3122f13214cac8fda3fa9bf59c1515a1328bc704b550bf0c0cc1ca11dc898a01d430 kxmlgui-5.68.0.tar.xz" +sha512sums="1426e49481eee84ef790de3fe4f55982729d953be7a313b1ca4acf916594de6a4ca08c7c2a128a481b948673417b61024b841a47d7d9079228984a85336301d1 kxmlgui-5.71.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 0586cc70d..6e8ace923 100644 --- a/user/kxmlrpcclient/APKBUILD +++ b/user/kxmlrpcclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlrpcclient -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev ki18n-dev kio-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kxmlrpcclient-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kxmlrpcclient-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89350795c4c3601fca751fc80cf4c331bd4e692d85f672c50bdd1871cfb72809004d4ec0bc0826020c42a21c38d18962481477ac3f95ecbf219f4b88aa586aad kxmlrpcclient-5.68.0.tar.xz" +sha512sums="fd0148c2b984d413fb2f89dfd6eb1bdadb1b5e2b184175bd38da72894e3345810f719af1d58d51758637a6a228be66507c2de98fabbea7d4bb07b882c33fcd24 kxmlrpcclient-5.71.0.tar.xz" diff --git a/user/lcms2/APKBUILD b/user/lcms2/APKBUILD index c1df9d6d2..d096b78cc 100644 --- a/user/lcms2/APKBUILD +++ b/user/lcms2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lcms2 -pkgver=2.9 +pkgver=2.11 pkgrel=0 pkgdesc="Colour management engine using ICC standard" url="http://www.littlecms.com/" @@ -14,6 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" source="http://www.littlecms.com/lcms2-$pkgver.tar.gz" # secfixes: +# 2.11-r0: +# - CVE-2018-16435 # 2.8-r1: # - CVE-2016-10165 @@ -48,4 +50,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="70b1c51fa8d137d5072425e580745ff1fbf49c6e8bb1da0a8adb0647d3b7c095208793cb02de1e8d1a01363b8575fa60c61bedbff99bbec57a44228239cb00e5 lcms2-2.9.tar.gz" +sha512sums="96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e lcms2-2.11.tar.gz" diff --git a/user/libaacs/APKBUILD b/user/libaacs/APKBUILD index 11bb90c18..b4243813f 100644 --- a/user/libaacs/APKBUILD +++ b/user/libaacs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libaacs -pkgver=0.9.0 +pkgver=0.10.0 pkgrel=0 pkgdesc="Library to decrypt Advanced Access Content System content" url="https://www.videolan.org/developers/libaacs.html" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 libaacs-0.9.0.tar.bz2" +sha512sums="4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e libaacs-0.10.0.tar.bz2" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 934c901f8..b10b69d05 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev -pkgver=2.23 +pkgver=2.24 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 libblockdev-2.23.tar.gz" +sha512sums="92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6 libblockdev-2.24.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index 4357d589c..dc548d86c 100644 --- a/user/libbluray/APKBUILD +++ b/user/libbluray/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbluray -pkgver=1.1.2 +pkgver=1.2.0 pkgrel=0 pkgdesc="Library for Blu-Ray disc playback" url="https://www.videolan.org/developers/libbluray.html" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2" +sha512sums="d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324 libbluray-1.2.0.tar.bz2" diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD index 3c91d3cb2..cb97a469d 100644 --- a/user/libbytesize/APKBUILD +++ b/user/libbytesize/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbytesize -pkgver=2.2 +pkgver=2.3 pkgrel=0 pkgdesc="Library for working with sizes in bytes" url="https://github.com/storaged-project/libbytesize/" @@ -23,9 +23,6 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --without-python2 - # XXX We do not have a msgfilter app in gettext-tiny. - # This would be required to ship a Serbian translation. - rm po/sr* make } @@ -44,5 +41,5 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1 libbytesize-2.2.tar.gz +sha512sums="23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a libbytesize-2.3.tar.gz 5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d no-msgcat.patch" diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index 99534d596..cc0811c9b 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.101 +pkgver=2.4.102 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -42,4 +42,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz" +sha512sums="386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index 8e9083d17..281501cc0 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.8.0 +pkgver=1.9.0 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz" +sha512sums="6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index 3e864cc4f..999ca10ac 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -4,7 +4,7 @@ pkgname=libevent pkgver=2.1.11 pkgrel=0 pkgdesc="An event notification library" -url="http://libevent.org/" +url="https://libevent.org/" arch="all" license="BSD-3-Clause" depends="" diff --git a/user/libexif/APKBUILD b/user/libexif/APKBUILD index 06e1e832a..320b87492 100644 --- a/user/libexif/APKBUILD +++ b/user/libexif/APKBUILD @@ -1,19 +1,17 @@ # Maintainer: pkgname=libexif -pkgver=0.6.21 -pkgrel=4 +pkgver=0.6.22 +_pkgver=$(printf '%s' "$pkgver" | tr . _) +pkgrel=0 pkgdesc="Library to parse EXIF metadata" -url="https://sourceforge.net/projects/libexif" +url="https://libexif.github.io/" arch="all" license="LGPL-2.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" makedepends="" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - CVE-2016-6328.patch - CVE-2017-7544.patch - CVE-2018-20030.patch - CVE-2019-9278.patch +source="https://github.com/libexif/libexif/releases/download/libexif-$_pkgver-release/libexif-$pkgver.tar.xz + CVE-2020-0198.patch " # secfixes: @@ -23,6 +21,14 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 # 0.6.21-r4: # - CVE-2016-6328 # - CVE-2019-9278 +# 0.6.22-r0: +# - CVE-2020-0093 +# - CVE-2020-0182 +# - CVE-2020-0198 +# - CVE-2020-12767 +# - CVE-2020-13112 +# - CVE-2020-13113 +# - CVE-2020-13114 prepare() { default_prepare @@ -45,8 +51,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35 libexif-0.6.21.tar.bz2 -c0d4c74207993efc373615ef2c797d720162a2ee6fd7ad026edf2ced4198d9b1165b88790c2af3194f6bb7c2de88d4672c041c2cff8a82c8914700633332b8c5 CVE-2016-6328.patch -d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d CVE-2017-7544.patch -0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch -c30c03fefea94d175b94c9f0c4d60cbb3aa0ad78b0d29008975fbbb15c17f2907a16fd50970e5fa18d533d0ce291a5ee9b62934210cb40b0f463693460607738 CVE-2019-9278.patch" +sha512sums="0a9e7bf0258ed98a794b667d45e8fc65299101a2a2d2e39c358715b20b003beff258782f0736cd5b53978428a2f878a989f303bee249a978850a065f33c534af libexif-0.6.22.tar.xz +7df084f9acdc09bd05fadfb66332956d8587fcaac9d693000f47fadeba17b3c49eafa402d1e2c9b7d394e697feccd1f760bab8b64378deaea1777c5a3b90c3b2 CVE-2020-0198.patch" diff --git a/user/libexif/CVE-2016-6328.patch b/user/libexif/CVE-2016-6328.patch deleted file mode 100644 index 0568f27d2..000000000 --- a/user/libexif/CVE-2016-6328.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:44:44 +0200 -Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax - makernote entries. - -This should fix: -https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 ---- - libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c -index d03d159..ea0429a 100644 ---- a/libexif/pentax/mnote-pentax-entry.c -+++ b/libexif/pentax/mnote-pentax-entry.c -@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - case EXIF_FORMAT_SHORT: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 2) -+ break; - vs = exif_get_short (data, entry->order); - snprintf (val+len, maxlen-len, "%i ", vs); - len = strlen(val); - data += 2; -+ sizeleft -= 2; - } - } - break; - case EXIF_FORMAT_LONG: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 4) -+ break; - vl = exif_get_long (data, entry->order); - snprintf (val+len, maxlen-len, "%li", (long int) vl); - len = strlen(val); - data += 4; -+ sizeleft -= 4; - } - } - break; -@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - break; - } - -- return (val); -+ return val; - } diff --git a/user/libexif/CVE-2017-7544.patch b/user/libexif/CVE-2017-7544.patch deleted file mode 100644 index 534817417..000000000 --- a/user/libexif/CVE-2017-7544.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:38:56 +0200 -Subject: [PATCH] On saving makernotes, make sure the makernote container tags - has a type with 1 byte components. - -Fixes (at least): - https://sourceforge.net/p/libexif/bugs/130 - https://sourceforge.net/p/libexif/bugs/129 ---- - libexif/exif-data.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..91f4c33 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - diff --git a/user/libexif/CVE-2018-20030.patch b/user/libexif/CVE-2018-20030.patch deleted file mode 100644 index 837d003d7..000000000 --- a/user/libexif/CVE-2018-20030.patch +++ /dev/null @@ -1,115 +0,0 @@ -Edited slightly to backport to stable - -From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich <dan@coneharvesters.com> -Date: Fri, 12 Oct 2018 16:01:45 +0200 -Subject: [PATCH] Improve deep recursion detection in - exif_data_load_data_content. - -The existing detection was still vulnerable to pathological cases -causing DoS by wasting CPU. The new algorithm takes the number of tags -into account to make it harder to abuse by cases using shallow recursion -but with a very large number of tags. This improves on commit 5d28011c -which wasn't sufficient to counter this kind of case. - -The limitation in the previous fix was discovered by Laurent Delosieres, -Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned -the identifier CVE-2018-20030. ---- - libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++-------- - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index e35403d..a6f9c94 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -35,6 +35,7 @@ - #include <libexif/olympus/exif-mnote-data-olympus.h> - #include <libexif/pentax/exif-mnote-data-pentax.h> - -+#include <math.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) { \ - break; \ - } - -+/*! Calculate the recursion cost added by one level of IFD loading. -+ * -+ * The work performed is related to the cost in the exponential relation -+ * work=1.1**cost -+ */ -+static unsigned int -+level_cost(unsigned int n) -+{ -+ static const double log_1_1 = 0.09531017980432493; -+ -+ /* Adding 0.1 protects against the case where n==1 */ -+ return ceil(log(n + 0.1)/log_1_1); -+} -+ - /*! Load data for an IFD. - * - * \param[in,out] data #ExifData -@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) { \ - * \param[in] d pointer to buffer containing raw IFD data - * \param[in] ds size of raw data in buffer at \c d - * \param[in] offset offset into buffer at \c d at which IFD starts -- * \param[in] recursion_depth number of times this function has been -- * recursively called without returning -+ * \param[in] recursion_cost factor indicating how expensive this recursive -+ * call could be - */ - static void - exif_data_load_data_content (ExifData *data, ExifIfd ifd, - const unsigned char *d, -- unsigned int ds, unsigned int offset, unsigned int recursion_depth) -+ unsigned int ds, unsigned int offset, unsigned int recursion_cost) - { - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; -@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 30) { -+ if (recursion_cost > 170) { -+ /* -+ * recursion_cost is a logarithmic-scale indicator of how expensive this -+ * recursive call might end up being. It is an indicator of the depth of -+ * recursion as well as the potential for worst-case future recursive -+ * calls. Since it's difficult to tell ahead of time how often recursion -+ * will occur, this assumes the worst by assuming every tag could end up -+ * causing recursion. -+ * The value of 170 was chosen to limit typical EXIF structures to a -+ * recursive depth of about 6, but pathological ones (those with very -+ * many tags) to only 2. -+ */ - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", -- "Deep recursion detected!"); -+ "Deep/expensive recursion detected!"); - return; - } - -@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - CHECK_REC (EXIF_IFD_EXIF); -- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - CHECK_REC (EXIF_IFD_GPS); -- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - CHECK_REC (EXIF_IFD_INTEROPERABILITY); -- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - thumbnail_offset = o; diff --git a/user/libexif/CVE-2019-9278.patch b/user/libexif/CVE-2019-9278.patch deleted file mode 100644 index bd15e8d13..000000000 --- a/user/libexif/CVE-2019-9278.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 75aa73267fdb1e0ebfbc00369e7312bac43d0566 Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <meissner@suse.de> -Date: Sat, 18 Jan 2020 09:29:42 +0100 -Subject: [PATCH] fix CVE-2019-9278 - -avoid the use of unsafe integer overflow checking constructs (unsigned integer operations cannot overflow, so "u1 + u2 > u1" can be optimized away) - -check for the actual sizes, which should also handle the overflows -document other places google patched, but do not seem relevant due to other restrictions - -fixes https://github.com/libexif/libexif/issues/26 ---- - libexif/exif-data.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index a6f9c94..6332cd1 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry, - doff = offset + 8; - - /* Sanity checks */ -- if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) { -+ if (doff >= size) { - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Tag data past end of buffer (%u > %u)", doff+s, size); -+ "Tag starts past end of buffer (%u > %u)", doff, size); -+ return 0; -+ } -+ -+ if (s > size - doff) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -+ "Tag data goes past end of buffer (%u > %u)", doff+s, size); - return 0; - } - -@@ -315,13 +321,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, - unsigned int ds, ExifLong o, ExifLong s) - { - /* Sanity checks */ -- if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { -- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Bogus thumbnail offset (%u) or size (%u).", -- o, s); -+ if (o >= ds) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); -+ return; -+ } -+ if (s > ds - o) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); - return; - } -- - if (data->data) - exif_mem_free (data->priv->mem, data->data); - if (!(data->data = exif_data_alloc (data, s))) { -@@ -947,7 +954,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 0 at %i.", (int) offset); - -- /* Sanity check the offset, being careful about overflow */ -+ /* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */ - if (offset > ds || offset + 6 + 2 > ds) - return; - -@@ -956,6 +963,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - - /* IFD 1 offset */ - n = exif_get_short (d + 6 + offset, data->priv->order); -+ /* offset < 2<<16, n is 16 bit at most, so this op will not overflow */ - if (offset + 6 + 2 + 12 * n + 4 > ds) - return; - -@@ -964,8 +972,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 1 at %i.", (int) offset); - -- /* Sanity check. */ -- if (offset > ds || offset + 6 > ds) { -+ /* Sanity check. ds is ensured to be above 6 above, offset is 16bit */ -+ if (offset > ds - 6) { - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, - "ExifData", "Bogus offset of IFD1."); - } else { diff --git a/user/libexif/CVE-2020-0198.patch b/user/libexif/CVE-2020-0198.patch new file mode 100644 index 000000000..e0358c220 --- /dev/null +++ b/user/libexif/CVE-2020-0198.patch @@ -0,0 +1,58 @@ +From ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Mon, 8 Jun 2020 17:27:06 +0200 +Subject: [PATCH] fixed another unsigned integer overflow + +first fixed by google in android fork, +https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0 + +(use a more generic overflow check method, also check second overflow instance.) + +https://security-tracker.debian.org/tracker/CVE-2020-0198 +--- + libexif/exif-data.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 8b280d3..b495726 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -47,6 +47,8 @@ + #undef JPEG_MARKER_APP1 + #define JPEG_MARKER_APP1 0xe1 + ++#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize )) ++ + static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; + + struct _ExifDataPrivate +@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); + return; + } +- if (s > ds - o) { ++ if (CHECKOVERFLOW(o,ds,s)) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + } + + /* Read the number of entries */ +- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) { ++ if (CHECKOVERFLOW(offset, ds, 2)) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Tag data past end of buffer (%u > %u)", offset+2, ds); ++ "Tag data past end of buffer (%u+2 > %u)", offset, ds); + return; + } + n = exif_get_short (d + offset, data->priv->order); +@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + offset += 2; + + /* Check if we have enough data. */ +- if (offset + 12 * n > ds) { ++ if (CHECKOVERFLOW(offset, ds, 12*n)) { + n = (ds - offset) / 12; + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "Short data; only loading %hu entries...", n); diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 62110c28a..674621204 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libfm-qt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="Qt library for file management and bindings for libfm" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" depends_dev="libfm-dev menu-cache-dev libexif-dev" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qttools-dev qt5-qtx11extras-dev $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-qt-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7 libfm-qt-0.14.1.tar.xz" +sha512sums="9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5 libfm-qt-0.15.1.tar.xz" diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD index bfa1a39b3..246642192 100644 --- a/user/libgit2/APKBUILD +++ b/user/libgit2/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgit2 -pkgver=0.28.4 +pkgver=0.28.5 pkgrel=0 pkgdesc="Pure C re-entrant library for custom Git applications" url="https://libgit2.org/" @@ -37,11 +37,12 @@ build() { } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Don't run online tests by default. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E online } package() { make DESTDIR="$pkgdir" install } -sha512sums="b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15 libgit2-0.28.4.tar.gz" +sha512sums="abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a libgit2-0.28.5.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 1e2c6d670..ca6c869a6 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.15.4 +pkgver=1.15.5 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -32,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz" +sha512sums="a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a libinput-1.15.5.tar.xz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index ad4a4076a..cbecdd1a4 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" @@ -10,7 +10,9 @@ license="IJG AND BSD-3-Clause AND Zlib" depends="" makedepends="cmake" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" -source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz + CVE-2020-13790.patch + " case "$CTARGET_ARCH" in pmmx | x86 | x86_64) makedepends="$makedepends nasm" ;; @@ -19,11 +21,20 @@ esac # secfixes: # 2.0.3-r0: # - CVE-2019-2201 +# 2.0.4-r1: +# - CVE-2020-13790 build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/344 + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 + case "$CARCH" in + ppc) _floattest=64bit;; + esac + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \ @@ -32,6 +43,7 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_STATIC=OFF \ -DWITH_JPEG8=ON \ + ${_floattest:+-DFLOATTEST="$_floattest"} \ ${CMAKE_CROSSOPTS} . make } @@ -51,4 +63,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz" +sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz +83752558d0cf60508a9ccd55505b91f4faa22277537916629a045b2aaa0cb3649e2f90b0df26d389687dc4aba78bdf76e64fc5e5eb324a65026ec86cd95dbe6a CVE-2020-13790.patch" diff --git a/user/libjpeg-turbo/CVE-2020-13790.patch b/user/libjpeg-turbo/CVE-2020-13790.patch new file mode 100644 index 000000000..aaeec0c9c --- /dev/null +++ b/user/libjpeg-turbo/CVE-2020-13790.patch @@ -0,0 +1,35 @@ +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/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 982cb008a..4027e04b6 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdcraw -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a2df5e98adedb6ca79804530b0560d606c7c79aa7e4d432c97c06acd0643ea0a138bc2f30fd586ae3a7db42aaa56bf2b05f3512614a167dae42628cad87720d libkdcraw-19.12.3.tar.xz" +sha512sums="938ca11e5cde85617c7bd7e4c4ad1a5fafc468323a7fa233c24832682af689d294db6cdb9b42b73b1e81a358ad717877a233ae8bcc5e4af39aa1f845d3273a13 libkdcraw-20.04.2.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 1d1243c7a..aea89dac7 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -60,4 +60,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b libkdegames-19.12.3.tar.xz" +sha512sums="15e6145dbdbc98a33e1527616ee9c2cc45e090ad5e382be62941de851d3d2621ffc696f38bf7ada0cd214fdf4c74615f4f4760adac677587b7308cbf6c20fb81 libkdegames-20.04.2.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index 2dde5afba..6aa08a176 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f8cc3a90767710f7a93f7549257831998c6faec274e3a66ef1a40fbf9efe1234a09147c85a7f37be1cf18fa38453682a4be1b72c8631ba949ed69329b2c6d063 libkeduvocdocument-19.12.3.tar.xz" +sha512sums="7366547d1118f197437e335378077408c934477939632575813d06da920966a2da875b1634a07c4f052713294b21d1f65a1269948f1cc51bb953181d993bde09 libkeduvocdocument-20.04.2.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 094839e20..ec432f46b 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="243dad5ebab2384567e3ff09d7bf49525abfc126169fcf0d20bdf42fe88b3df9c9f40f7d36c1db3c69d37be54fc633a4a44eb1a75bc5c2fe3e6cc339f5ea8644 libkexiv2-19.12.3.tar.xz" +sha512sums="2c03a3796b31dc98919e2d715cf50ca15845820931f79baceff66e5a8da3bcd5042594289a3c0e4e8a78b0901572881ed82bd37bf0f0b16fed8990e83459577c libkexiv2-20.04.2.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 67b24bc4f..3fa62339d 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09e624aef5fc3de085820d8803dd5a579d2b3f5c72f8b4fba0633c9725ccfe6ff0ed552ee16dfea233c20c8b85e477272734c6c1fb4cc1e6037c725be956bac9 libkipi-19.12.3.tar.xz" +sha512sums="5b81354cff75f0970a2907a47e8f4283760d31ab885cf4796adf3930affc6b1dee5b253e7bdc0774c5a8d7c65c0c9c4c86dc1d0893fbd6077c41e0f0cd9c0d56 libkipi-20.04.2.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 594c36564..85f315a78 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkleo -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88dfb85673dda645c4ca9c40527907e0bdcff83be353643826c8f5e4ab113a7e93c69bca95939879fd9ec352cef4ae07795a063bd1bd927b6d915b5a566fe45e libkleo-19.12.3.tar.xz" +sha512sums="59ed7b0775ef5781469a0c4cf28af286b2eb236878e2b80b37da6035995b7aee6a0612b86dd49bd42dae9d1dad4efce17c098f35efd6168bfec6f8a6cc88a281 libkleo-20.04.2.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index b8645ac60..8611b8cc5 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkmahjongg -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90491bda908453aca3f5a438fbcfbbb8efbbfb5a5a625b2df84fd26b20ba2a8dfd0ee47400727b3087f435bb7d91e85cb847db708521942b931355d3b49dcc09 libkmahjongg-19.12.3.tar.xz" +sha512sums="1578ed57934f84c1ff3119d54032f889b477da86cbe6d55e04b8f4f0c9b761550e6fd4b45e8e9036eba2c540e48098928435e48ca932611bda97d71e31bbcec9 libkmahjongg-20.04.2.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 0430b4e9b..580339411 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83c397edcce693e0f9d82a36c16aff771d33015a78af308c00d0c815ee878c9decf558217dcc57c062aaf7bdb15fdcbf610fc3eb9a71e4710ec3208ac3696121 libksane-19.12.3.tar.xz" +sha512sums="66ddde2eee94f9636b1835f3928bb00a514b8d430de6eba7ba19fc546af20955ea86710c96351bb8cd7bd8b930b617c66694fcb9879f7c367d031bb03576676d libksane-20.04.2.tar.xz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index 1ab72541a..b801a4063 100644 --- a/user/libktorrent/APKBUILD +++ b/user/libktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libktorrent -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Torrent handling library for KDE" url="https://www.kde.org/" @@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev boost-dev qca-dev libgcrypt-dev" makedepends="cmake extra-cmake-modules $depends_dev doxygen ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz" +source="https://download.kde.org/stable/ktorrent/5.2.0/libktorrent-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37 libktorrent-2.1.1.tar.xz" +sha512sums="2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a libktorrent-2.2.0.tar.xz" diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 020e173ee..24ff091bf 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=liblxqt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="Core LXQt library" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.3.1 - kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.5.0 + kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.7.0" subpackages="$pkgname-dev" source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba liblxqt-0.14.1.tar.xz" +sha512sums="a0eb00ca5b228ef32d1a3952d3cb4702273dda16c9e70cc75046bfe1f51e5a7849d5306cca9d616ff82bd91715d97d703c458d406ba9e2425aa3fd26f155493c liblxqt-0.15.1.tar.xz" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 2456f0522..7bd6e28b1 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Molly Miller <sysvinit@adelielinux.org> pkgname=libnftnl -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -33,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d libnftnl-1.1.6.tar.bz2 -" +sha512sums="80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407 libnftnl-1.1.7.tar.bz2" diff --git a/user/libnice/APKBUILD b/user/libnice/APKBUILD index cd7579a03..d50182820 100644 --- a/user/libnice/APKBUILD +++ b/user/libnice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnice -pkgver=0.1.16 +pkgver=0.1.17 pkgrel=0 pkgdesc="GLib-based Interactive Connectivity Establishment (ICE) library" url="https://nice.freedesktop.org/wiki/" @@ -36,5 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fdf0f9fcf43c0fdffbdcb61988a7f9e14bd13bb1bc561d2b9faf493deb18151da14d484740571a302fa203ec7109d45c361ea791e81a2b29932a26220ce902c libnice-0.1.16.tar.gz +sha512sums="177ee47712233af379f422cbe24befaa1b744444241723a6575f17db30f7032aa8a34b1c6e160f6f406545fc42c1e7e3ca36c274bea5adb169b02434712c908e libnice-0.1.17.tar.gz c81aff0f8a674315997f2ecc1f0cbc501b54d49c142949aee68af42aaccf2a2f61d5eb46ce8c123b05fb98c2cd5ef5751b9228783e5e221b12be06b805da0ad3 dont-error-on-socket-close.patch" diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index 60f967c06..7b0e70656 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libqtxdg -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=0 pkgdesc="Qt5-based library implementing the XDG spec" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # Test suite requires X11. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qtbase-dev qt5-qtsvg-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qtbase-dev qt5-qtsvg-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$pkgver.tar.xz" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6 libqtxdg-3.4.0.tar.xz" +sha512sums="014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653 libqtxdg-3.5.0.tar.xz" diff --git a/user/libsass/APKBUILD b/user/libsass/APKBUILD index c466b1750..e6a0e891a 100644 --- a/user/libsass/APKBUILD +++ b/user/libsass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsass -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=0 pkgdesc="Library for preprocessing CSS" url="https://sass-lang.com/libsass" @@ -24,4 +24,4 @@ package() { make BUILD="shared" PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="e290f2045784ba1cf84e87e5bd33129b5452fec1d25da657b084b3561ec76df195a75595248a493dbd85c6a1215ed600332477945922309c021d9e416ebb29ee libsass-3.6.3.tar.gz" +sha512sums="1f79553be31949d45adf440dcbcf4b828a7e4f71c6f63f288f99451fccc490ebf0c68c58d91deabede37962e35a8cf9af8b0d60d89349fd0adea1ac061c8c2c8 libsass-3.6.4.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index cf4630962..23846af80 100644 --- a/user/libsecret/APKBUILD +++ b/user/libsecret/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsecret -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857 libsecret-0.20.2.tar.xz" +sha512sums="020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22 libsecret-0.20.3.tar.xz" diff --git a/user/libshout/APKBUILD b/user/libshout/APKBUILD index 1672399d8..a4624bb2c 100644 --- a/user/libshout/APKBUILD +++ b/user/libshout/APKBUILD @@ -4,7 +4,7 @@ pkgname=libshout pkgver=2.4.3 pkgrel=0 pkgdesc="Library for accessing a Icecast server" -url="http://www.icecast.org/" +url="https://www.icecast.org/" arch="all" options="!check" # No test suite. license="LGPL-2.0+" diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 92acda745..6c4e0ffc4 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libsysstat -pkgver=0.4.2 +pkgver=0.4.3 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Library for querying system information & statistics" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools qt5-qtbase-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build + qt5-qtbase-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libsysstat/releases/download/$pkgver/libsysstat-$pkgver.tar.xz" @@ -32,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df libsysstat-0.4.2.tar.xz" +sha512sums="a34511e4f9fe1ed977ffc65b11948459922760f9a22b225d48d1c7cae9fc6c94b315c1394768f4c7b94ffc28c1267410c21ba55ff89e54976526ea1e5e4d7a56 libsysstat-0.4.3.tar.xz" diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index e7322c37b..7ed91e7b7 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtirpc -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=0 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="https://sourceforge.net/projects/libtirpc/" @@ -13,7 +13,6 @@ makedepends="$depends_dev autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 bsd-types.patch - endian-header.patch " build() { @@ -29,6 +28,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 libtirpc-1.2.5.tar.bz2 -237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch -0a7a21a3d08bb0ff0110b993b8f8ddca41513ddaa0a468028a53eac9732a2a2e5070abe7da0a3ecff265b3800490c82f08810bd34e9d0af2e75345c86ef7d638 endian-header.patch" +sha512sums="bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a libtirpc-1.2.6.tar.bz2 +237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch" diff --git a/user/libtirpc/endian-header.patch b/user/libtirpc/endian-header.patch deleted file mode 100644 index 9f9523305..000000000 --- a/user/libtirpc/endian-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix location of endian.h. Yay for POSIX next. - ---- libtirpc-1.2.5/src/xdr_float.c.old 2019-12-19 18:55:48.000000000 +0000 -+++ libtirpc-1.2.5/src/xdr_float.c 2019-12-29 18:54:28.408092748 +0000 -@@ -83,7 +83,7 @@ - }; - #else - --#include <bits/endian.h> -+#include <endian.h> - #define IEEEFP - - #endif /* vax */ diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD index 73d53a4e1..a3b80b05a 100644 --- a/user/libuninameslist/APKBUILD +++ b/user/libuninameslist/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuninameslist -pkgver=20200313 +pkgver=20200413 pkgrel=0 pkgdesc="Library of Unicode names and annotation data" url=" " @@ -38,4 +38,4 @@ py3() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="7f42d839b251859d94cca44d4f8a789aeed0554ce86bbdba38f25da2c2ce0626d95801679a1ce3c9f691ceb4988960c56f1268478e55175d94744a969e1bd6c3 libuninameslist-dist-20200313.tar.gz" +sha512sums="88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3 libuninameslist-dist-20200413.tar.gz" diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index d42e22efa..8e5efebfe 100644 --- a/user/libva/APKBUILD +++ b/user/libva/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libva -pkgver=2.6.1 +pkgver=2.7.1 pkgrel=0 pkgdesc="Video Acceleration (VA) API for Linux" url="https://github.com/intel/libva" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d libva-2.6.1.tar.bz2" +sha512sums="f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126 libva-2.7.1.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 2c8b32cb0..00208172d 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.3 +pkgver=1.4 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.3/libvdpau-$pkgver.tar.bz2" +source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$pkgver/libvdpau-$pkgver.tar.bz2" build() { meson -Dprefix=/usr \ @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2" +sha512sums="68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01 libvdpau-1.4.tar.bz2" diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD index 7058ad208..8992096b8 100644 --- a/user/libvncserver/APKBUILD +++ b/user/libvncserver/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvncserver -pkgver=0.9.12 -pkgrel=1 +pkgver=0.9.13 +pkgrel=0 pkgdesc="Library to make writing a vnc server easy" url="https://libvnc.github.io/" arch="all" @@ -14,11 +14,7 @@ depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev libxi-dev libxinerama-dev libxrandr-dev libxtst-dev" makedepends="$depends_dev cmake" subpackages="$pkgname-dev" -source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz - CVE-2018-15127.patch - CVE-2019-15681.patch - CVE-2019-15690.patch - " +source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz" builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # secfixes: @@ -30,6 +26,9 @@ builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # 0.9.12-r1: # - CVE-2019-15681 # - CVE-2019-15690 +# 0.9.13-r0: +# - CVE-2019-20788 +# - CVE-2020-14401 build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,6 +36,7 @@ build() { fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -54,7 +54,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 LibVNCServer-0.9.12.tar.gz -8b5b6742e6c3a181c60652484b15ec42cc0a3acc1e82cef38e82b61f43f1de456d09731976f4e5dfab44abf3e551e22aaf4300cb8418cd8e136d705fcb2a7dbe CVE-2018-15127.patch -5ecb5a26813f3f07440ef6c54eebaca4e9b4f7c1cf2ba13375e3b23b950a9b818d068d4eef5532d7ea4d7ae084c4356af7257c45426101ff51afe2b7da338a1f CVE-2019-15681.patch -52f62a65c3e91b7c7a11b5ad6e1432d697e1314bf6c938b5cb0c9cc8bdffbf1c25612c33e05282c11d59c6523e208b882f963fca8bcd34a5c72dd476427e7542 CVE-2019-15690.patch" +sha512sums="18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 LibVNCServer-0.9.13.tar.gz" diff --git a/user/libvncserver/CVE-2018-15127.patch b/user/libvncserver/CVE-2018-15127.patch deleted file mode 100644 index 146243670..000000000 --- a/user/libvncserver/CVE-2018-15127.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Mon, 7 Jan 2019 10:40:01 +0100 -Subject: [PATCH] Limit lenght to INT_MAX bytes in - rfbProcessFileTransferReadBuffer() - -This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap -out-of-bound write access in rfbProcessFileTransferReadBuffer() when -reading a transfered file content in a server. The former fix did not -work on platforms with a 32-bit int type (expected by rfbReadExact()). - -CVE-2018-15127 -<https://github.com/LibVNC/libvncserver/issues/243> -<https://github.com/LibVNC/libvncserver/issues/273> ---- - libvncserver/rfbserver.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 7af84906..f2edbeea 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -88,6 +88,8 @@ - #include <errno.h> - /* strftime() */ - #include <time.h> -+/* INT_MAX */ -+#include <limits.h> - - #ifdef LIBVNCSERVER_WITH_WEBSOCKETS - #include "rfbssl.h" -@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) - 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF - will safely be allocated since this check will never trigger and malloc() can digest length+1 - without problems as length is a uint32_t. -+ We also later pass length to rfbReadExact() that expects a signed int type and -+ that might wrap on platforms with a 32-bit int type if length is bigger -+ than 0X7FFFFFFF. - */ -- if(length == SIZE_MAX) { -+ if(length == SIZE_MAX || length > INT_MAX) { - rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); - rfbCloseClient(cl); - return NULL; diff --git a/user/libvncserver/CVE-2019-15681.patch b/user/libvncserver/CVE-2019-15681.patch deleted file mode 100644 index e328d8792..000000000 --- a/user/libvncserver/CVE-2019-15681.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. ---- - libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 3bacc891..310e5487 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - sct.type = rfbServerCutText; diff --git a/user/libvncserver/CVE-2019-15690.patch b/user/libvncserver/CVE-2019-15690.patch deleted file mode 100644 index 7fe36e454..000000000 --- a/user/libvncserver/CVE-2019-15690.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 54220248886b5001fbbb9fa73c4e1a2cb9413fed Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Sun, 17 Nov 2019 17:18:35 +0100 -Subject: [PATCH] libvncclient/cursor: limit width/height input values - -Avoids a possible heap overflow reported by Pavel Cheremushkin -<Pavel.Cheremushkin@kaspersky.com>. - -re #275 ---- - libvncclient/cursor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c -index 67f45726..40ffb3b0 100644 ---- a/libvncclient/cursor.c -+++ b/libvncclient/cursor.c -@@ -28,6 +28,8 @@ - #define OPER_SAVE 0 - #define OPER_RESTORE 1 - -+#define MAX_CURSOR_SIZE 1024 -+ - #define RGB24_TO_PIXEL(bpp,r,g,b) \ - ((((uint##bpp##_t)(r) & 0xFF) * client->format.redMax + 127) / 255 \ - << client->format.redShift | \ -@@ -54,6 +56,9 @@ rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int h - if (width * height == 0) - return TRUE; - -+ if (width >= MAX_CURSOR_SIZE || height >= MAX_CURSOR_SIZE) -+ return FALSE; -+ - /* Allocate memory for pixel data and temporary mask data. */ - if(client->rcSource) - free(client->rcSource); diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 8e6681499..19db97113 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Lieutenant Skat, an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed lskat-19.12.3.tar.xz" +sha512sums="5ac2498465b20107e3d7f46b930ca3f6d21ddae60205985174e44495315c5a866b54c79f53190cccbee6ff02e8a8cbbeec555d70cafc6e12bdd11d6e785e4f27 lskat-20.04.2.tar.xz" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index 11e166311..c4449467b 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lua-filesystem _pkgname=luafilesystem -pkgver=1.7.0.2 +pkgver=1.8.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) _rockver=${pkgver%.*}-${pkgver##*.} -pkgrel=1 +pkgrel=0 pkgdesc="Filesystem functions for Lua" url="http://keplerproject.github.io/luafilesystem/" arch="all" @@ -30,4 +30,4 @@ package() { echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } -sha512sums="a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511 luafilesystem-1.7.0.2.tar.gz" +sha512sums="79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247 luafilesystem-1.8.0.tar.gz" diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index b5a76d86d..1dce23e0f 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lximage-qt -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=0 pkgdesc="Image viewer and screenshot tool for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 libexif-dev libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev kwindowsystem-dev" source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd lximage-qt-0.14.1.tar.xz" +sha512sums="980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23 lximage-qt-0.15.0.tar.xz" diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD index a8d4d4b92..903ec3079 100644 --- a/user/lxmenu-data/APKBUILD +++ b/user/lxmenu-data/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxmenu-data pkgver=0.1.5 pkgrel=1 pkgdesc="Menu definition files for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 767194b42..799843b1c 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-about -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Dialog window providing information about LXQt and the running system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0" + lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0" source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a lxqt-about-0.14.1.tar.xz" +sha512sums="0572db83f7f11abe2b17c69ba3d1bcefc5daa011a3c474aa8217f2cf8cc1db54a5de1db4a0678381c4d37caf1d1ebbe4026ed63e17e2fbbaa4133d1e781c6e44 lxqt-about-0.15.0.tar.xz" diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index a464f20d0..5267f2663 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-admin -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Administrative tools for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="lxqt-policykit" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" + lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373 lxqt-admin-0.14.1.tar.xz" +sha512sums="830de1f3f65913b939b286adeeddfdfc22318bf09ea0ff7b705521c5c06f8edefa189b08bd4f6281116a12fc3255ace68a35ee56f3f7bec0e0f1cceea3b47c22 lxqt-admin-0.15.0.tar.xz" diff --git a/user/lxqt-archiver/APKBUILD b/user/lxqt-archiver/APKBUILD new file mode 100644 index 000000000..b3a23905a --- /dev/null +++ b/user/lxqt-archiver/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=lxqt-archiver +pkgver=0.2.0 +_lxqt=0.15.0 +_lxqt_build=0.7.0 +pkgrel=0 +pkgdesc="Archive management utility for the LXQt desktop" +url="https://lxqt.github.io/" +arch="all" +options="!check" # No test suite +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules json-glib-dev libfm-qt-dev>=$_lxqt + lxqt-build-tools>=$_lxqt_build qt5-qttools-dev qt5-qtx11extras-dev" +source="https://github.com/lxqt/lxqt-archiver/releases/download/$pkgver/lxqt-archiver-$pkgver.tar.xz" +builddir="$srcdir/$pkgname-$pkgver/build" + +prepare() { + mkdir -p "$builddir" && cd "$builddir"/.. + default_prepare +} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest .. +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7 lxqt-archiver-0.2.0.tar.xz" diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index a2ffa3160..3439629fe 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-build-tools -pkgver=0.6.0 +pkgver=0.7.0 pkgrel=0 pkgdesc="Toolchain for building and packaging LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" # no tests to run; this package just provides a common base for scaffolding. options="!check" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a lxqt-build-tools-0.6.0.tar.gz" +sha512sums="4dc169a743f7ed549929cc2d3286098f94c851b8c2c2f689956bb123565940cfe142eaee006c1d50204943b59a45c1228ade042ce2491df9813e168b54c72ac7 lxqt-build-tools-0.7.0.tar.gz" diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 5f64da9ce..9f7b280df 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,17 +1,19 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-config -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Collection of tools for configuring LXQt and the underlying system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 libxcursor-dev eudev-dev - kwindowsystem-dev libkscreen-dev xf86-input-libinput-dev libxi-dev" + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=$_lxqt_build + libxcursor-dev eudev-dev kwindowsystem-dev libkscreen-dev + xf86-input-libinput-dev libxi-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz" @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f lxqt-config-0.14.1.tar.xz" +sha512sums="68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d lxqt-config-0.15.0.tar.xz" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index 6ad593a75..af52254f2 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -1,18 +1,19 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-desktop -pkgver=0.13.0 -pkgrel=1 +pkgver=0.15.0 +pkgrel=0 arch="noarch" pkgdesc="Complete LXQt desktop" -url="https://lxqt.org" +url="https://lxqt.github.io/" license="NCSA" options="!check" # meta package, no tests needed. depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox lxqt-panel lxqt-runner lxqt-qtplugin qterminal pcmanfm-qt lxqt-sudo lxqt-session lxqt-powermanagement lxqt-policykit lxqt-openssh-askpass lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about - lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab" + lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab + lxqt-archiver" makedepends="" subpackages="$pkgname-doc" source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1" diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index da75788ad..5e8f3d607 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-globalkeys -pkgver=0.14.3 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Daemon and configuration utility for global shortcuts in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c lxqt-globalkeys-0.14.3.tar.xz" +sha512sums="95beba4ce6c2324582d93a6f3f56d57681ec7d992db80a8d9fae34a637ba1612260932944e3865c3c749982e6aa111b3495558bc5d36e8b4c8e21027775e346e lxqt-globalkeys-0.15.0.tar.xz" diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD index b13843f75..8b670254e 100644 --- a/user/lxqt-l10n/APKBUILD +++ b/user/lxqt-l10n/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxqt-l10n pkgver=0.13.0 pkgrel=1 pkgdesc="Localization files for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 137b19cf8..186659ef6 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-notificationd -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Daemon for notifications in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 - lxqt-build-tools>=0.6.0 kwindowsystem-dev" + lxqt-build-tools>=$_lxqt_build kwindowsystem-dev" source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz" build() { @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795 lxqt-notificationd-0.14.1.tar.xz" +sha512sums="0febe3ff61caaf4303e3853df6bc494ce8eb4a931e6d8600a2e38c07317ecadbe3d7060ac234d139326a726c43ac555153dde6b2d4d05e95ab357873457c9632 lxqt-notificationd-0.15.0.tar.xz" diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index 0778adc3d..522c95b77 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-openssh-askpass -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Graphical LXQt utility for inputting passwords for SSH agents" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf lxqt-openssh-askpass-0.14.1.tar.xz" +sha512sums="e9dd41dd75892be234e6381670fa0b836bf040b00b7c59c7f23cadc9a916e8c646c4d44645a49183a305c6b755a01e6b8e6a3c0f84aa7c374cdb3ddd577e2f44 lxqt-openssh-askpass-0.15.0.tar.xz" diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index 8f8a38643..612652a82 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,19 +1,21 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-panel -pkgver=0.14.1 +pkgver=0.15.1 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Panel for LXQt desktop" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev - libdbusmenu-qt-dev kwindowsystem-dev solid-dev menu-cache-dev - lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev pulseaudio-dev - lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev libstatgrab-dev - libsysstat-dev qt5-qttools-dev libxkbcommon-dev libxcomposite-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build + kguiaddons-dev libdbusmenu-qt-dev kwindowsystem-dev solid-dev + menu-cache-dev lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev + pulseaudio-dev lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev + libstatgrab-dev libsysstat-dev qt5-qttools-dev libxkbcommon-dev + libxcomposite-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz" @@ -40,4 +42,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687 lxqt-panel-0.14.1.tar.xz" +sha512sums="8eb9856faa2ce56c56df7514772d3ae6d31339a10d16e1ed659be0a2affc57fd16e01e05cb67c4205dfb773234ca9b8a69f414f742ccc30495bf4e2acfa0513f lxqt-panel-0.15.1.tar.xz" diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index 7b677a646..c1944f330 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-policykit -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="PolicyKit agent for LXQT" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev polkit-qt-1-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 qt5-qttools-dev + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=$_lxqt_build qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$pkgver.tar.xz" @@ -38,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940 lxqt-policykit-0.14.1.tar.xz" +sha512sums="2dbbe6d626ef5da816f080354caf564a1aa58270ae299483b9a4ce35d5f1bdb3c652dcb5f12d2668a0ea82556414b00320d2bd88fcadb37fbbdbf724a17e3c41 lxqt-policykit-0.15.0.tar.xz" diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 0b3097cdd..775735e4c 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-powermanagement -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Power management utilities for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build upower-dev liblxqt-dev>=${pkgver%.*}.0 kidletime-dev qt5-qtsvg-dev qt5-qttools-dev solid-dev kwindowsystem-dev" source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10 lxqt-powermanagement-0.14.1.tar.xz" +sha512sums="8ea0765bad3885e6a8e574b382d6bea0bd5065b760241b5fa641e17096fffb43c5472577729365c36918caa4ca0d058fa1a24538dfe157e32ac519d94a4db039 lxqt-powermanagement-0.15.0.tar.xz" diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index 9d237c3f6..e9b2485d8 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-qtplugin -pkgver=0.14.0 +pkgver=0.15.1 pkgrel=0 pkgdesc="Qt plugin for platform integration with LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qttools-dev libfm-qt-dev>=${pkgver%.*}.0 liblxqt-dev>=${pkgver%.*}.0 libdbusmenu-qt-dev" source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c lxqt-qtplugin-0.14.0.tar.xz" +sha512sums="6fc19cf5f763d7879e5a052c5638b5b396f659f4e199493c8b87cdb661c910921ecda865de2900a047c96dd63c3ef6dbfa486d1dbe0257c26984a25a139dce2f lxqt-qtplugin-0.15.1.tar.xz" diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index 7acd62c9b..865c21555 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-runner -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based application launcher for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 lxqt-globalkeys-dev>=${pkgver%.*}.0 muparser-dev kwindowsystem-dev menu-cache-dev qt5-qttools-dev qt5-qtsvg-dev" @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c lxqt-runner-0.14.1.tar.xz" +sha512sums="559a5ef627f311ee4894891445a7f1bf70349d7f89ec3eb1d5550f8e87486d695d03fb70a8ec936b074e83c82c29ff26c07ee3edeebbbf8dade2d9a5f4dacdba lxqt-runner-0.15.0.tar.xz" diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index d6cc987a0..a10f61174 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-session -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Session management utilities for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="xdg-user-dirs" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build eudev-dev liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz" @@ -39,4 +40,4 @@ package() { rm "$pkgdir"/usr/share/man/man1/start* } -sha512sums="9274564f3eabe33744bbe8555b1177d8ff6f241f5849bef29f0bb344f506e590e1deab87bf2fdeb867872ebaa0262cda0400f16179951fd66fbcb4d9f7358c4c lxqt-session-0.14.1.tar.xz" +sha512sums="96ef9e58ca25303ac0213f1cb5faee5efddb61ac3705484ac55b39db56c9302ff646e317dbc753b213a5e2ea38818b247244a2be5219fbe6db9e419b8c638591 lxqt-session-0.15.0.tar.xz" diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index c65fe652c..8014d2bd9 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-sudo -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Graphical LXQt utility for sudo/su" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="sudo" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222 lxqt-sudo-0.14.1.tar.xz" +sha512sums="94c96a1eac5d1ec6e84c99ecbd08e7ecb8184d4e1ada0bce137c2c8d9508cd840b56dae38e3f418cb208a3eae5b3420bf33e0b9a1bb96969f2bd4d207e89304c lxqt-sudo-0.15.0.tar.xz" diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index 6881e5a4d..63ff10079 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-themes -pkgver=0.14.0 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Core themes for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake lxqt-build-tools>=0.6.0" +makedepends="cmake lxqt-build-tools>=$_lxqt_build" source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$pkgver.tar.xz" build() { @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2 lxqt-themes-0.14.0.tar.xz" +sha512sums="7ef0c5af9945ef450d78e4991e482781728867e7d4f6793832c822135a47288b0c08d883d207ee7f275585fa7ae17f2e6bdbdaf01295ae2810e01c43330f2f9d lxqt-themes-0.15.0.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 214373d24..0b0cf9c6b 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639 marble-19.12.3.tar.xz" +sha512sums="44a0a6ad7aa77452482d86ffc88083ed1adc187b1ecb34dd5d5c211e6a692019cfa06579647a7943c423fdc911300e0efb8352de95da84ce9c27aeb4f1365b55 marble-20.04.2.tar.xz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 2cc6eb4d7..49089fc63 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0 minuet-19.12.3.tar.xz" +sha512sums="cfb6a1eb0e4b35d49f9aef7d8665c4233761146d50a890bb03727636fbdccab49b7e429f8d34e59d653f209bd546990c0b412a2c187d7fe95a3948171d06c2bc minuet-20.04.2.tar.xz" diff --git a/user/modemmanager-qt/APKBUILD b/user/modemmanager-qt/APKBUILD index 0b84de2ea..59937f449 100644 --- a/user/modemmanager-qt/APKBUILD +++ b/user/modemmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager-qt -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt framework for ModemManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6314130e61e11d2a916e55630df4173ecf60a2c58bbca9b05b865505b916f783deec32fd3cd310bfe6a1171c9723ce84d4428f94c29aaa0aa033901909a4e19b modemmanager-qt-5.68.0.tar.xz" +sha512sums="6323bb57db3cbb671e2684e56bdf7bb1deaf70e6c751af54c6a5d95c28c58d8c6112091043c0c74c4ea4d43df05cc329efe529e609bf8a49a79373983b5153c7 modemmanager-qt-5.71.0.tar.xz" diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 0c9fc7e8b..8b95a338e 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=netsurf -pkgver=3.9 +pkgver=3.10 pkgrel=0 pkgdesc="Modern, lightweight GTK-based browser" url="http://www.netsurf-browser.org/" @@ -10,25 +10,21 @@ options="!check" # No tests license="MIT AND GPL-2.0-only WITH openssl-exception" depends="" makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev - openssl-dev expat-dev gperf gtk+2.0-dev librsvg-dev - perl-html-parser" + openssl-dev expat-dev gperf gtk+3.0-dev librsvg-dev libwebp-dev + perl-html-parser vim" source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz - Makefile.config + netsurf.desktop " builddir="$srcdir/netsurf-all-$pkgver" -prepare() { - default_prepare - cp "$srcdir"/Makefile.config "$builddir"/netsurf -} - build() { - make PREFIX=/usr NETSURF_USE_VIDEO=YES + make TARGET=gtk3 PREFIX=/usr NETSURF_USE_VIDEO=NO } package() { - make PREFIX=/usr DESTDIR="$pkgdir" install + make TARGET=gtk3 PREFIX=/usr DESTDIR="$pkgdir" install + install -D -m644 "$srcdir"/netsurf.desktop "$pkgdir"/usr/share/applications/netsurf.desktop } -sha512sums="3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987 netsurf-all-3.9.tar.gz -cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" +sha512sums="fc4c300eef07c540a7e07f8034db25b7e5fb731b5956029af2220f8638802aa38c055ad54b5683c14501aef9c22fb781b96613c16ae9a6996c3833ceede6f9bf netsurf-all-3.10.tar.gz +81cce213162cc49ea6a85b81c143c480ed202e2d2d06bb79d2eea803d7e8361b063d29c74904451cc2ba4e31cdad3524098344eb140cd5080f83beaf43aa8dbd netsurf.desktop" diff --git a/user/netsurf/Makefile.config b/user/netsurf/Makefile.config deleted file mode 100644 index 0e58d6e7d..000000000 --- a/user/netsurf/Makefile.config +++ /dev/null @@ -1 +0,0 @@ -override NETSURF_USE_VIDEO := NO diff --git a/user/netsurf/netsurf.desktop b/user/netsurf/netsurf.desktop new file mode 100644 index 000000000..c899cbbaa --- /dev/null +++ b/user/netsurf/netsurf.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=3.10 +Name=NetSurf +Comment=A minimalist web browser +Icon=web-browser +Categories=Internet +Exec=netsurf-gtk3 diff --git a/user/networkmanager-qt/APKBUILD b/user/networkmanager-qt/APKBUILD index 22d4d65d0..5e03e1912 100644 --- a/user/networkmanager-qt/APKBUILD +++ b/user/networkmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager-qt -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt framework for NetworkManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9b81c9720db55c4d403df06b6d56e7003adb08a437b9869a7e18fd1d3621fd24e73c254f957d41ee428b4449eb5484a06add15486a79bb901c2234d2db36f8f networkmanager-qt-5.68.0.tar.xz" +sha512sums="1e33b1bdbad21ed67fd9d1be06cc91b64b4e62e4ec9493e1e30ddcb635255cfcce08242f2cc8d00c8a8f219e16e4eb30ae8ba0d5f7014abac9a2e853c6149625 networkmanager-qt-5.71.0.tar.xz" diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index bc96a18f1..4b188bbb7 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Molly Miller <sysvinit@adelielinux.org> pkgname=nftables -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=0 pkgdesc="Netfilter tables userspace tools" url="https://netfilter.org/projects/nftables" @@ -47,7 +47,7 @@ package() { install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0 nftables-0.9.4.tar.bz2 +sha512sums="fc306984e951c3d036ce0d5bc0cd9dc07dd773a129ceb2df13db6636fbeeeb08ddd1586ef7116f3a0c3a08d1366da230ebcbcdb65e5fe29c07e24d612426f352 nftables-0.9.5.tar.bz2 f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 41dd0bc58..063bc9b0f 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,17 +1,22 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.40.0 +pkgver=1.41.0 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" arch="all" +options="!check" # Requires cunit, which we don't currently ship license="MIT" depends="" makedepends="c-ares-dev libev-dev libxml2-dev openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz" +# secfixes: +# 1.41.0-r0: +# - CVE-2020-11080 + build() { ./configure \ --build=$CBUILD \ @@ -37,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce nghttp2-1.40.0.tar.xz" +sha512sums="c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d nghttp2-1.41.0.tar.xz" diff --git a/user/node/APKBUILD b/user/node/APKBUILD index d60a359af..c74516b71 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -1,15 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=node -pkgver=10.19.0 +pkgver=10.21.0 pkgrel=0 pkgdesc="JavaScript runtime" url="https://nodejs.org/" arch="all" -license="MIT AND ICU AND BSD-3-Clause AND BSD-2-Clause AND ISC AND OpenSSL AND Public-Domain AND Zlib AND Artistic-2.0 AND Apache-2.0 AND CC0-1.0" +options="net" # Required in check() +license="MIT AND ICU AND BSD-3-Clause AND BSD-2-Clause AND ISC AND Public-Domain AND Zlib AND Artistic-2.0 AND Apache-2.0 AND CC0-1.0" depends="" makedepends="c-ares-dev http-parser-dev icu-dev libexecinfo-dev libuv-dev - nghttp2-dev python3 zlib-dev" + nghttp2-dev>=1.41 openssl-dev python3 zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://nodejs.org/download/release/v$pkgver/node-v$pkgver.tar.xz https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz @@ -30,11 +31,15 @@ builddir="$srcdir/$pkgname-v$pkgver" # - CVE-2019-9516 # - CVE-2019-9517 # - CVE-2019-9518 +# 10.21.0-r0: +# - CVE-2020-7598 +# - CVE-2020-8174 unpack() { default_unpack [ -z $SKIP_PYTHON ] || return 0 + # TODO: when bumping to 12.x, python3 should be usable msg "Killing all remaining hope for humanity and building Python 2..." cd "$srcdir/Python-2.7.15" [ -d ../python ] && rm -r ../python @@ -47,7 +52,6 @@ unpack() { build() { export PATH="$srcdir/python/bin:$PATH" - # We can't use --shared-openssl until 1.1 is available. python ./configure.py \ --prefix=/usr \ --with-intl=system-icu \ @@ -55,15 +59,24 @@ build() { --shared-http-parser \ --shared-libuv \ --shared-nghttp2 \ - --openssl-no-asm \ + --shared-openssl \ + --openssl-use-def-ca-store \ --shared-zlib # keep DESTDIR set, to avoid a full rebuild in package() make DESTDIR="$pkgdir" } check() { + case "$CARCH" in + pmmx) + # https://bts.adelielinux.org/show_bug.cgi?id=306 + _skip="parallel/test-http-invalid-te,parallel/test-worker-stdio" + ;; + esac + export PATH="$srcdir/python/bin:$PATH" - make DESTDIR="$pkgdir" test-only + make DESTDIR="$pkgdir" test-only \ + ${_skip:+CI_SKIP_TESTS="$_skip"} } package() { @@ -71,7 +84,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee node-v10.19.0.tar.xz +sha512sums="613d3c1bca79ea5f127dc6793de2b5cfdfa056c01ec092e3b7ee79205894b21ca5ec4a367265122641dd1d360c675cfb36a4f7892894194ddd18abd1b2206544 node-v10.21.0.tar.xz 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz 8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch 6d37794c7c78ef92ebb845852af780e22dc8c14653b63a8609c21ab6860877b9dffc5cf856a8516b7978ec704f312c0627075c6440ace55d039f95bdc4c85add ppc32.patch diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 08ad8f475..5c24d7987 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=obconf-qt -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt5-based Openbox configuration tool" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build openbox-dev liblxqt-dev qt5-qttools-dev" source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed obconf-qt-0.14.1.tar.xz" +sha512sums="a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279 obconf-qt-0.15.0.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 4e9567438..bbe52bb34 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=19.12.3 -pkgrel=1 +pkgver=20.04.2 +pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" @@ -18,7 +18,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz es-doc-fix.patch - CVE-2020-9359.patch " # secfixes: @@ -49,6 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz -de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch -02b27bd206006dbbafbe74e60665ad5159ef6ea32b8bf1526b9c655c046cb6de08630f28d64c9935e73d5707a30d0835f2ab8cd4521740e5236cefc3d3057d29 CVE-2020-9359.patch" +sha512sums="1f6f22a221701d25a0e0eef094cb60b8b66722ac158c0ac499010448504b507c72fedd33814b3920ba3ab5eb53a2c8b09505b7a7697bde589d89407e0cdbf961 okular-20.04.2.tar.xz +de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch" diff --git a/user/okular/CVE-2020-9359.patch b/user/okular/CVE-2020-9359.patch deleted file mode 100644 index 34ff3e2ce..000000000 --- a/user/okular/CVE-2020-9359.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Tue, 10 Mar 2020 23:07:24 +0100 -Subject: [PATCH] Document::processAction: If the url points to a binary, don't - run it - ---- - core/document.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/core/document.cpp b/core/document.cpp -index 3215a1abc..0aa5b6980 100644 ---- a/core/document.cpp -+++ b/core/document.cpp -@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action ) - { - const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url); - // KRun autodeletes -- new KRun( realUrl, d->m_widget ); -+ KRun *r = new KRun( realUrl, d->m_widget ); -+ r->setRunExecutables(false); - } - } - } break; --- -2.25.2 - diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 30f2059ff..1743a4e6d 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> # # secfixes: +# 2.4.50-r0: +# - CVE-2020-12243 # 2.4.48-r0: # - CVE-2019-13057 # - CVE-2019-13565 @@ -11,7 +13,7 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.49 +pkgver=2.4.50 pkgrel=0 pkgdesc="LDAP Server" url="https://www.openldap.org/" @@ -29,7 +31,7 @@ subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc pkgusers="ldap" pkggroups="ldap" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" -source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz +source="https://www.$pkgname.org/software/download/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz openldap-2.4-ppolicy.patch openldap-2.4.11-libldap_r.patch fix-manpages.patch @@ -60,7 +62,6 @@ done prepare() { default_prepare - update_config_sub sed -i '/^STRIP/s,-s,,g' build/top.mk libtoolize --force && aclocal && autoconf @@ -198,7 +199,7 @@ _submv() { done } -sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49 openldap-2.4.49.tgz +sha512sums="f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae openldap-2.4.50.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 44417d5a2..3831b7b86 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.10.0 +pkgver=1.10.2 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -28,4 +28,4 @@ package() { make install } -sha512sums="f1727b81a059aa04bea1fb6a9a89ae0619942d6406a77f99e642a60ea9416daa215bbd0cbd183747c2df5f6dea81766b7e04493a52211e55522e8b2642db701a openttd-1.10.0-source.tar.xz" +sha512sums="03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683 openttd-1.10.2-source.tar.xz" diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 5251ec8b0..1fbcc5e17 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -4,7 +4,7 @@ pkgname=opus pkgver=1.3.1 pkgrel=0 pkgdesc="Codec designed for speech and audio transmission" -url="http://www.opus-codec.org/" +url="https://www.opus-codec.org/" arch="all" license="BSD-3-Clause" depends="" diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD index c0208b12d..6b04b9199 100644 --- a/user/opusfile/APKBUILD +++ b/user/opusfile/APKBUILD @@ -3,7 +3,7 @@ pkgname=opusfile pkgver=0.11 pkgrel=0 pkgdesc="High-level API for decoding and seeking within .opus files" -url="http://www.opus-codec.org/" +url="https://www.opus-codec.org/" arch="all" license="BSD-3-Clause" depends="" diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index 397e87ce7..8a073b053 100644 --- a/user/oxygen-icons5/APKBUILD +++ b/user/oxygen-icons5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen-icons5 -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7ba6906823b0e4c6a724b98b587808d8136e29a7f3bdf6fdb8309cbb9bfd43bc903a79cf5629c5f5cbf15510de3526332728f538d8ff624c52c021488b4ca6c oxygen-icons5-5.68.0.tar.xz" +sha512sums="571e1d989d1c58f15aee8a9f1abbffb0e99ed2cba085f77e389e9896ad68a86c11494d78cb8fe4579f2826cb0c578d31810d23cfa362b2aafd88d8466cb88059 oxygen-icons5-5.71.0.tar.xz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 793560380..a2b54131a 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4ffda823a8046f36ae2e43e556c9c780e565c98c395cf54e4ff175acce8fa96b5ffa0fc0bab06f6fa8cd533ffaa1714c5a536f4d7ce0ef898cfd638c2e655676 palapeli-19.12.3.tar.xz" +sha512sums="bdbe7b78e4dc63677d476377753a8f0b7a38ad7a8e86688689c4b4829be2a2fd45033354c5db754b1b80c8a21588ac587ed123d1705c1262d2ea3655825ff82f palapeli-20.04.2.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index c3201a64d..699b8238d 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20200301 +pkgver=20200602 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="8b9f0a9b0fdb676365d6b30af8ba8dee71ff433a4c4317151899f09614da3fc9764e5e9c48743cdf7c8fde6eea53a1d3ab37eb890f1486fc54ce328e6af9b348 papirus-icons-20200301.tar.gz" +sha512sums="c860efd6ab863cbeb7b5f0d3afb7e652bbd9daca9c5028b0c466d1930f7bacba137fce40220f858b2cff0ef575d1c9eb979d7ba1c79481d7dccdbd6a273953c0 papirus-icons-20200602.tar.gz" diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index e8254c58e..5b81f0c88 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pavucontrol-qt -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt port of pavucontrol, a PulseAudio mixer" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev - lxqt-build-tools>=0.6.0" + lxqt-build-tools>=$_lxqt_build" source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-qt-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494 pavucontrol-qt-0.14.1.tar.xz" +sha512sums="c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600 pavucontrol-qt-0.15.0.tar.xz" diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index a48274c4f..a72c1e6ea 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pcmanfm-qt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="File manager and desktop icon manager for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 liblxqt-dev>=${pkgver%.*}.0 libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e pcmanfm-qt-0.14.1.tar.xz" +sha512sums="db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559 pcmanfm-qt-0.15.1.tar.xz" diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index fb047de4e..e3aa2c6b3 100644 --- a/user/plasma-framework/APKBUILD +++ b/user/plasma-framework/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-framework -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e4e0ef5fff99518061f79f7eb03fe8048fa8c5d863e8092f05f98dfa0fec8cb1f097d042ffb417434a1b0bd424c0997c4a2c38068bcae30e39324d001ea3ffd0 plasma-framework-5.68.0.tar.xz" +sha512sums="900172458cd4d16e6374f6116470c2a5bf6cf16e52da5910b976b86e03a3c69182f1eefdc01aea2eac0471ae7416c82542e5e87c7af42ed15c9d9f3f228805ef plasma-framework-5.71.0.tar.xz" diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 2fa79cc16..50fa8fbe8 100644 --- a/user/prison/APKBUILD +++ b/user/prison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=prison -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -44,4 +44,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="dc3606bf25ec07f3702b9c5cb51fbb29c410d864349ca65fc5f86d26619be24ce42a14e969a2db4a11b8f1f57dca8705a0bd163e5bea468fe5edfa06a409f1c3 prison-5.68.0.tar.xz" +sha512sums="fc82066f704a0576bc50698ecf7ba7146bc0f77151ac8f596ebc48145db9c05dd57ab8b0eff398d3d3f55c922c5d2d7c8bb96817b42ec8981dba7a23414efac9 prison-5.71.0.tar.xz" diff --git a/user/purpose/APKBUILD b/user/purpose/APKBUILD index dbad62201..6592d9f77 100644 --- a/user/purpose/APKBUILD +++ b/user/purpose/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=purpose -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="KDE context menu framework" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8103026b5b7bef1dd4fd28912eaefbace466c39967a474a7b8abf1e074be58c5b3d68527c132fa79adf2785a059ae8a09537735b6a51b53aa553113b6d48aad purpose-5.68.0.tar.xz" +sha512sums="594e3de6d3a083189eadb2c7ae704fbcbe5296d63a0e173abe044dbda932115422886c50ce9154d279789c2c136f5779b8d891d7591831200c42b2f766db29e8 purpose-5.71.0.tar.xz" diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index aa822053a..c72cef87c 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-pygobject -pkgver=3.36.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="e07375e758d1ca0aefa7f12c9af739301371a857154577b62a17f3179adf1d9d37889d4f432cb6ac7804fb4c23f68a05d3ac5446df2800ecbca6fa27ed9b783d pygobject-3.36.0.tar.xz" +sha512sums="5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f pygobject-3.36.1.tar.xz" diff --git a/user/py3-pyyaml/APKBUILD b/user/py3-pyyaml/APKBUILD index e2ce44251..afbf6f336 100644 --- a/user/py3-pyyaml/APKBUILD +++ b/user/py3-pyyaml/APKBUILD @@ -2,11 +2,12 @@ # Maintainer: pkgname=py3-pyyaml _pkgname=pyyaml -pkgver=5.1.2 +pkgver=5.3.1 pkgrel=0 pkgdesc="YAML parser and emitter for Python" url="https://pyyaml.org/wiki/PyYAML" arch="noarch" +# Certified net clean license="MIT" depends="python3 yaml" makedepends="python3-dev yaml yaml-dev" @@ -14,6 +15,10 @@ subpackages="" source="$pkgname-$pkgver.tar.gz::https://github.com/yaml/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" +# secfixes: +# 5.3.1-r0: +# - CVE-2020-1747 + build() { # Seems like they need Cython to build the C extension now, so it falls back to pure Python. # Once we ship Cython we can probably change this. @@ -28,4 +33,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7bc3dceadcfd512ede67581625887d00822464f20d3b646904f4a73afce8cf3b9766829c6004b626c31757edf8e2eedc27e60d96bee13afa68d3296a8a7f33bb py3-pyyaml-5.1.2.tar.gz" +sha512sums="27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 py3-pyyaml-5.3.1.tar.gz" diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index bc3744541..3398b6537 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -454,7 +454,7 @@ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55 c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch -87f659800b78b31731ea1828a27a3762662ef124d10e942f6029b332d5e8cf4487f62a3d742ad59709c2eb9e3ae8af36fa849d6cbac89978a282d29786b9b41a time64.patch +44db77cab330075da601cc6083678c5f3ed1528936a8fd81148875bc67ed53332b21466c79ac6e5cf2b2e7d3824392dd7a52d0aaed03689be9b2dfddd5abba06 time64.patch d7de79ea74e36702cac4a59e472564a55f0a663be7e63c3755e32b4b5dfbc04b390ee79f09f43f6ae706ee2aec9e005eade3c0fd4a202db60d11f436874a17d7 MAP_SYNC-fix.patch 0ea3745c45507c00c3c036241992d594b5f7e9aa1f0fa9b425dd222390066e1ea2d0aa4923bde0e7f27b7cc2f759a122ae4b600c2fa682a5aad509e7d03ccad9 CVE-2020-1711.patch 5d9e7e065c6716024eab4984331071f42dcd5363c5456023f81a3ef0329ae578348d0f875868f85c9e1fee5e435d86e2eb7e342a957c36cd099cb5d5d9f3a78d CVE-2020-11102.patch diff --git a/user/qemu/time64.patch b/user/qemu/time64.patch index 8ec9f45df..342231146 100644 --- a/user/qemu/time64.patch +++ b/user/qemu/time64.patch @@ -18,3 +18,23 @@ evdev.type = le16_to_cpu(event->type); evdev.code = le16_to_cpu(event->code); evdev.value = le32_to_cpu(event->value); +--- qemu-4.2.0/contrib/vhost-user-input/main.c.old 2019-12-12 18:20:47.000000000 +0000 ++++ qemu-4.2.0/contrib/vhost-user-input/main.c 2020-06-15 04:46:15.198762807 +0000 +@@ -115,13 +115,16 @@ + static void vi_handle_status(VuInput *vi, virtio_input_event *event) + { + struct input_event evdev; ++ struct timeval tv; + int rc; + +- if (gettimeofday(&evdev.time, NULL)) { ++ if (gettimeofday(&tv, NULL)) { + perror("vi_handle_status: gettimeofday"); + return; + } + ++ evdev.input_event_sec = tv.tv_sec; ++ evdev.input_event_usec = tv.tv_usec; + evdev.type = le16toh(event->type); + evdev.code = le16toh(event->code); + evdev.value = le32toh(event->value); diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index ec708c3c0..5f884fb45 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,16 +1,18 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qps -pkgver=2.0.0 +pkgver=2.1.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based task manager" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxrender-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxrender-dev lxqt-build-tools>=$_lxqt_build + liblxqt-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/qps/releases/download/$pkgver/qps-$pkgver.tar.xz qps-1.10.17-compile-fixes.patch @@ -39,5 +41,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019 qps-2.0.0.tar.xz +sha512sums="e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2 qps-2.1.0.tar.xz 32c154f1d3c9e74dda3eabfd2e3b9e9f3c1d77f808dfacc9dd05c904066832d92d361ca56ef9d784d945fad60cf67d6c909cbb730a0ffed1fea3bf44c3aad5a2 qps-1.10.17-compile-fixes.patch" diff --git a/user/qqc2-desktop-style/APKBUILD b/user/qqc2-desktop-style/APKBUILD index 2281459a7..f3de76a45 100644 --- a/user/qqc2-desktop-style/APKBUILD +++ b/user/qqc2-desktop-style/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qqc2-desktop-style -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="6f3a9c54715140971b92d88822e00fca2d84ab61819e60be8819629b2ab78444aa5215f3bcf4470d572691230e9ff9589788e313b9b439aa92b38e78b3a41605 qqc2-desktop-style-5.68.0.tar.xz" +sha512sums="463acd397543d8fcad140ee074eb78f98c2997953a79e2a5643331d2d9f2a900f0cf2a322128c54582f805316b6f5a01ca4ed980ca3aa13f90eebc9664cd25b1 qqc2-desktop-style-5.71.0.tar.xz" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD new file mode 100644 index 000000000..daea318a5 --- /dev/null +++ b/user/qt5-qtwayland/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtwayland +_pkgname=qtwayland-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Unstable Qt platform module for experimental Wayland display system" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" +subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +client() { + pkgdesc="Qt client library for experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libQt5WaylandClient* "$subpkgdir"/usr/lib/ +} + +compositor() { + pkgdesc="Unstable Qt compositor library for experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libQt5WaylandCompositor* "$subpkgdir"/usr/lib/ +} + +tools() { + pkgdesc="Tools for Qt integration with experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib/qt5 + mv "$pkgdir"/usr/lib/qt5/bin "$subpkgdir"/usr/lib/qt5/ +} + +sha512sums="6d066d2f65f2727b9a1c7e71b973c81f8a8d2e6210c4c998403fcbb9e4cca2543fa11160b573c0646967a3351d33504c9f44ed98b1bb282735bf17e82808a4f4 qtwayland-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index f54023654..1aa673cea 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qt5ct -pkgver=0.41 +pkgver=1.0 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -21,4 +21,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009 qt5ct-0.41.tar.bz2" +sha512sums="f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2 qt5ct-1.0.tar.bz2" diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index 2ccd6bdf2..d9704ad7d 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qterminal -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based terminal for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build qtermwidget-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$pkgver.tar.xz" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf qterminal-0.14.1.tar.xz" +sha512sums="03c690fd090fc87e0475f5a34e19ff1d5aeaea146fe5c62aa09540b6abfa0363506c44c3e82c5d3957e351b883ac9fdd014da66ce7d44e7d3e5fecc8fcd7bcac qterminal-0.15.0.tar.xz" diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index 916d2e1f4..3af12cbca 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qtermwidget -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based terminal widget, used in QTerminal" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" depends_dev="libutempter-dev" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - lxqt-build-tools>=0.6.0 $depends_dev" + lxqt-build-tools>=$_lxqt_build $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidget-$pkgver.tar.xz fix-linking.patch @@ -41,5 +42,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 qtermwidget-0.14.1.tar.xz +sha512sums="95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7 qtermwidget-0.15.0.tar.xz f2d43f12479a3a3a01be9ebee9ce349b0f4e60b07dfc79e8666ed913d5682987f81b08a397ee8ca628c36f5770ddfe63f5abafa94dff6c1c1e090adc1637af35 fix-linking.patch" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 4d17de4ea..29c1875cc 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rocs -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -10,13 +10,11 @@ options="!check" # All tests require X11. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev - grantlee-dev qt5-qtwebkit-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev - karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev - ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev" + grantlee-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev + kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev ki18n-dev + kitemviews-dev ktexteditor-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz - webkit.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b4839197e5b40460a517221da4328c9283e4618eadf0dbeb20b7d5019a97f8fbac26dbf7c6a1b9b481bc4da8436ea6e632e38c1d6b33b1cb235055c76855984 rocs-19.12.3.tar.xz -0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3 webkit.patch" +sha512sums="2baa648476076d080a56ead5c95d4d7515f937d5ac9620563af133db7456386d7d7dc946c10c9c96442196f5bf94de40cc04e6d2d22fb8a0456f65e6db6bad55 rocs-20.04.2.tar.xz" diff --git a/user/rocs/webkit.patch b/user/rocs/webkit.patch deleted file mode 100644 index 87ba9e747..000000000 --- a/user/rocs/webkit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rocs-19.12.0/src/CMakeLists.txt.old 2019-12-05 19:44:59.000000000 +0000 -+++ rocs-19.12.0/src/CMakeLists.txt 2020-01-05 05:05:52.820317770 +0000 -@@ -103,7 +103,7 @@ - Qt5::Core - Qt5::Quick - Qt5::QuickWidgets -- Qt5::WebKit -+ Qt5::WebKitLegacy - Qt5::WebKitWidgets - Qt5::XmlPatterns - ) diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index b738b4c16..01a984414 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.2 +pkgver=2.2.2.4 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ed7df36757780201ccfc0c35a4ab1f6eab16f9fd8a23a6c739a469b9b82862dbb60823748e82c4c902fac835a801f3f0ab0f3d90f20628d6ac8bf744a4fb44a2 s6-portable-utils-2.2.2.2.tar.gz" +sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz" diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index 2418064f5..ab52075ea 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=screengrab -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=0 pkgdesc="Cross-platform Qt-based software for taking screenshots" url="https://github.com/lxqt/screengrab" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - kwindowsystem-dev libqtxdg-dev>=3.3.1" + kwindowsystem-dev libqtxdg-dev>=3.5.0" subpackages="$pkgname-doc" source="https://github.com/lxqt/screengrab/releases/download/$pkgver/screengrab-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7 screengrab-2.0.0.tar.xz" +sha512sums="f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02 screengrab-2.0.1.tar.xz" diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index 994c3bb6f..fc75a3641 100644 --- a/user/solid/APKBUILD +++ b/user/solid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=solid -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df0a7520b698c28324c1881585d551aac885f43edb6e2dda4e95dc3a9fbb6d7609807a64042acf02bae72c55d6081205033228a1e250ada06b61ede5c3f544b7 solid-5.68.0.tar.xz" +sha512sums="506d18c8eb7612e35369613d1f75927ecc5efcd1e9d4f3791ecf732226e3f20f81d36c708e5600f23d74a23caf28f20f64877f4cebb9987392fcac18f74b12db solid-5.71.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index 74ac2fd11..43da83fba 100644 --- a/user/sonnet/APKBUILD +++ b/user/sonnet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sonnet -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -47,4 +47,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="add681532d2cfe371662306376da07bd337446f67d2b375a878bf53355e08407d24e1e63155f313e31b737a70014a052c19a1d120bbc67aeffd6be525f0aada3 sonnet-5.68.0.tar.xz" +sha512sums="f8a277db375b0d7c6767a6b3c7a7df062ad58c89b9c2b14e7fab326bf0c967e651076cfa57935ec6c658fa1de55b9ed05222fed8f8066431540f9601261f7924 sonnet-5.71.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 00793ced6..54e0cfe5a 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spectacle -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6bc10c376a63d6558c478e5844c5bc1c099d58c04593d5dc9bf2d0b17543fce62c202d8c3b9c2ade144566e205d9621546b777c134d1159529e7a3bc7b9d6766 spectacle-19.12.3.tar.xz -36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch" +sha512sums="acbc058c85d9d8cc38e71ac01353f2a39a75b8ff29bff8c60982b6e3ffa5952d5eaccada8ae0cf15adecaa225c9064dea7238dd7a5435c1736a2f94f36b71e99 spectacle-20.04.2.tar.xz +4bade3af7f06a1b2eb9568eee2905db04d8aa8647fa9414ba1da32cc2ea5e7029b9db2ad121381a04754b1abea36508b82e68a326db726759943aac5206fb455 no-wayland.patch" diff --git a/user/spectacle/no-wayland.patch b/user/spectacle/no-wayland.patch index 554e64d34..50c7cc8b7 100644 --- a/user/spectacle/no-wayland.patch +++ b/user/spectacle/no-wayland.patch @@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3395c1b..06009f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -68,7 +68,6 @@ find_package( +@@ -67,7 +67,6 @@ find_package( NewStuff GlobalAccel XmlGui @@ -31,7 +31,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ff1b30..80e50dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -84,7 +84,6 @@ target_link_libraries( +@@ -87,7 +87,6 @@ target_link_libraries( KF5::NewStuff KF5::GlobalAccel KF5::XmlGui @@ -52,7 +52,7 @@ index 41e5858..92ced06 100644 #include <QGuiApplication> #include <QScreen> #include <QtCore/qmath.h> -@@ -52,7 +50,7 @@ const int QuickEditor::magZoom = 5; +@@ -53,7 +51,7 @@ const int QuickEditor::magZoom = 5; const int QuickEditor::magPixels = 16; const int QuickEditor::magOffset = 32; @@ -61,7 +61,7 @@ index 41e5858..92ced06 100644 QWidget(parent), mMaskColor(QColor::fromRgbF(0, 0, 0, 0.15)), mStrokeColor(palette().highlight().color()), -@@ -91,19 +89,7 @@ QuickEditor::QuickEditor(const QPixmap &thePixmap, KWayland::Client::PlasmaShell +@@ -91,18 +89,6 @@ dprI = 1.0 / devicePixelRatioF(); setGeometry(0, 0, static_cast<int>(mPixmap.width() * dprI), static_cast<int>(mPixmap.height() * dprI)); @@ -70,18 +70,16 @@ index 41e5858..92ced06 100644 - using namespace KWayland::Client; - winId(); - auto surface = Surface::fromWindow(windowHandle()); -- if (!surface) { -- return; +- if (surface) { +- PlasmaShellSurface *plasmashellSurface = plasmashell->createSurface(surface, this); +- plasmashellSurface->setRole(PlasmaShellSurface::Role::Panel); +- plasmashellSurface->setPanelTakesFocus(true); +- plasmashellSurface->setPosition(geometry().topLeft()); - } -- PlasmaShellSurface *plasmashellSurface = plasmashell->createSurface(surface, this); -- plasmashellSurface->setRole(PlasmaShellSurface::Role::Panel); -- plasmashellSurface->setPanelTakesFocus(true); -- plasmashellSurface->setPosition(geometry().topLeft()); - } -+ - if (config->rememberLastRectangularRegion()) { - QRect cropRegion = config->cropRegion(); - if (!cropRegion.isEmpty()) { + if (Settings::rememberLastRectangularRegion() || Settings::alwaysRememberRegion()) { + auto savedRect = Settings::cropRegion(); + QRect cropRegion = QRect(savedRect[0], savedRect[1], savedRect[2], savedRect[3]); diff --git a/src/QuickEditor/QuickEditor.h b/src/QuickEditor/QuickEditor.h index 8dd6586..8187995 100644 --- a/src/QuickEditor/QuickEditor.h @@ -182,11 +180,10 @@ index 3e90a99..8994995 100644 using MainWindowPtr = std::unique_ptr<KSMainWindow>; using EditorPtr = std::unique_ptr<QuickEditor>; -@@ -98,4 +92,3 @@ class SpectacleCore: public QObject +@@ -93,4 +87,3 @@ class SpectacleCore: public QObject bool mIsGuiInited; bool mCopyToClipboard; - KWayland::Client::PlasmaShell *mWaylandPlasmashell; }; -- 2.22.1 - diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD index fb44cc0ec..e8a558036 100644 --- a/user/spice-gtk/APKBUILD +++ b/user/spice-gtk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=spice-gtk pkgver=0.38 -pkgrel=0 +pkgrel=1 pkgdesc="A GTK+ widget for SPICE clients" url="https://www.spice-space.org/" arch="all" @@ -13,7 +13,7 @@ depends="gst-plugins-good" depends_dev="gobject-introspection-dev gtk+3.0-dev" makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev gst-plugins-base-dev gstreamer-dev gstreamer-tools gtk-doc - json-glib-dev libjpeg-turbo-dev libucontext-dev + json-glib-dev libjpeg-turbo-dev libxrandr-dev lz4-dev meson openssl-dev opus-dev polkit-dev py3-pyparsing py3-six spice-protocol zlib-dev" @@ -24,8 +24,6 @@ source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz " build() { - export CFLAGS="$CFLAGS -lucontext" - # Note: pulseaudio support is disabled because it's deprecated. # Audio is still supported through gstreamer. # @@ -41,6 +39,7 @@ build() { -Dcelt051=disabled \ -Dpulse=disabled \ -Dusbredir=disabled \ + -Dcoroutine=gthread \ . output ninja -C output } diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD index aa902f9bc..90332a07c 100644 --- a/user/spleen/APKBUILD +++ b/user/spleen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spleen -pkgver=1.5.0 +pkgver=1.7.0 pkgrel=0 pkgdesc="Monospace bitmap typeface from OpenBSD" url="https://www.cambus.net/spleen-monospaced-bitmap-fonts/" @@ -20,4 +20,4 @@ package() { done } -sha512sums="0d03ea534f872c3509c1ab7f2947e4a6e2edf4436daa65db23f83622599c820c59c373f1fd97edebfaa728606109736de09a173443054f84259f7c09175d81df spleen-1.5.0.tar.gz" +sha512sums="a6b675fd302644477f70304f20f915ac598b9e09faa82ab93579b2b5856d2d857f33b73e958e3ec4674ad6638b43982f77d2412fb1afdb3970acf9a773008212 spleen-1.7.0.tar.gz" diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD index 85003c4b9..a42f9b93e 100644 --- a/user/sprunge/APKBUILD +++ b/user/sprunge/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=sprunge -pkgver=0.6 +pkgver=0.7 pkgrel=0 pkgdesc="Helper script to paste things to http://sprunge.us" url="http://sprunge.us" @@ -20,10 +20,10 @@ package() { } tpaste() { - url="http://tpaste.us" + url="https://tpaste.us" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin - printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' http://tpaste.us" > \ + printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' https://tpaste.us" > \ "$subpkgdir"/usr/bin/tpaste chmod 755 "$subpkgdir"/usr/bin/tpaste } diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 08fb2ce0e..1f3f5b207 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1 step-19.12.3.tar.xz" +sha512sums="8186f32bc7919c2b3eb993598e397e2efdd10d16f3b8caf582d605ec836e26aa15dae4913a5f60e29ac9d0df95fee4714d7b103f4f68a755c416c3cb1fe701d7 step-20.04.2.tar.xz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 5716c32c0..6d74c8812 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=syntax-highlighting -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffb4b1e57bd912ed76c93b8ea074af3fd8343cd094a584647bef42870366cd089c6ba2070670a57e4997ba6ac122775af5066d5bae4891f3533e4b7bfecf1fee syntax-highlighting-5.68.0.tar.xz" +sha512sums="d2d79821172e59ced6de1053960d265c96cd08897cc638b6a64ea412364490b8857661a48b710bfb0906bbb2b9749cff867fbfc23767558fc26f9e9c535d8e17 syntax-highlighting-5.71.0.tar.xz" diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index cd127de65..ab1e54b17 100644 --- a/user/threadweaver/APKBUILD +++ b/user/threadweaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=threadweaver -pkgver=5.68.0 +pkgver=5.71.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1473867df5d5143e69f076899159016f489df40b898be79f41e4ea35f4e1b95feab5f145dbabf17af50516a6301db0c8dc9813b9f48f2cb26149c8c09b158a8 threadweaver-5.68.0.tar.xz" +sha512sums="6acaeeebdad5dfaef719c3f6368614390bb63e972250cfabfa55b42cbabe09b6ad8e8bd2016338c345628e5a2471aa450adaf140b31f57d797a4e898a7f761f3 threadweaver-5.71.0.tar.xz" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index fd25092a2..664fbef09 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=thunar -pkgver=1.8.14 +pkgver=1.8.15 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce6da526e6378ffc90686f6ae25e56109e8af7d0c592345aca3de4603f4c5b3d089255bc313f2a60ee454cc3f0af52106584663c72ecd542a9c92769559c6787 thunar-1.8.14.tar.bz2" +sha512sums="50020084105daf5d5464cdcd29827fa212b121b0f6a385b6e2820fd120b6880cffafe63f51e737bc33d13f174f83de5c165f2ce155ff6aae74cc1b285cbdc8db thunar-1.8.15.tar.bz2" diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 23d44cdb2..9d5b07819 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ttf-sudo -pkgver=0.40 +pkgver=0.42 pkgrel=0 pkgdesc="Monospaced font family for programming and console users" url="https://www.kutilek.de/sudo-font/" @@ -20,4 +20,4 @@ package() { done } -sha512sums="c585866ff72bf94ed4bd452a238bfd7d603c813b9105d0d57f1c91dc5c14d5bbee6f8707497a1644b5be1657d81f6a337fc4f16a79ddad519d208c7c03a2f045 sudo.zip" +sha512sums="e48016ed1a4f6cc29f7301667a7e6a4cb7c09c85a2410c8eea3cfadb0b89ed29495834c5ac007f05b3fa25d63f3597118ac468fba4c2913282810cc23dd755e0 sudo.zip" diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index 153dfc63b..c25bc1baf 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=uchardet -pkgver=0.0.6 +pkgver=0.0.7 pkgrel=0 pkgdesc="Universal character encoding detection library" url="https://www.freedesktop.org/wiki/Software/uchardet/" @@ -10,7 +10,8 @@ license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+" depends="" makedepends="cmake" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz" +source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz + no-debug-suffix.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,4 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" +sha512sums="ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f uchardet-0.0.7.tar.xz +2e6f9d34daa6ba7dab07843368017448a17162d4d55bbc01665d00afa61a36f8b44fd6149706b806c8980632bdf33d073e0a93559d809852e18460551f330ecb no-debug-suffix.patch" diff --git a/user/uchardet/no-debug-suffix.patch b/user/uchardet/no-debug-suffix.patch new file mode 100644 index 000000000..f12bb565e --- /dev/null +++ b/user/uchardet/no-debug-suffix.patch @@ -0,0 +1,14 @@ +diff -Nurd uchardet-0.0.7/CMakeLists.txt uchardet-0.0.7.new/CMakeLists.txt +--- uchardet-0.0.7/CMakeLists.txt 2020-04-23 09:48:58.000000000 +0000 ++++ uchardet-0.0.7.new/CMakeLists.txt 2020-06-13 08:26:38.946585352 +0000 +@@ -12,10 +12,6 @@ + set (UCHARDET_VERSION_MINOR 0) + set (UCHARDET_VERSION_REVISION 7) + +-if (CMAKE_BUILD_TYPE MATCHES Debug) +- set (version_suffix .debug) +-endif (CMAKE_BUILD_TYPE MATCHES Debug) +- + set ( + UCHARDET_VERSION + ${UCHARDET_VERSION_MAJOR}.${UCHARDET_VERSION_MINOR}.${UCHARDET_VERSION_REVISION}${version_suffix} diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index ae1798e8e..8d51fdb65 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f5edf5021bf5568053bd9f79dfc1f5ca586fa27c2b8e6660100d09f06bfd6c69867f7bbe16010a11703f30b02383edd965d0e2834e62b650504d00b76e8e269a umbrello-19.12.3.tar.xz +sha512sums="34a509a1899e7de82bdf0fceb74d75048f8ca5b1bcd7140a68b15d0aae9ecd61d2a63a648b22b98ba87e5ae9dd40ff73ca04218e6912bed99311e8fdf5590c5d umbrello-20.04.2.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 78b7a4e36..2307fb6e5 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vala -pkgver=0.48.3 +pkgver=0.48.6 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e73eade8b0cfa312d896c81b76e045bc9b8b71bd89298c0f8d78b2f596eebf64dc0eea8d1e266b2c17a774105560ed47590fbe00d65b1fda8db6823ac3ba4bb4 vala-0.48.3.tar.xz" +sha512sums="220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375 vala-0.48.6.tar.xz" diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index d55cd91b5..88a7cfb4b 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vte -pkgver=0.60.1 +pkgver=0.60.3 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -27,5 +27,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="123a8fcc14f4dba450411f95f43eb60108fee95c328d0e7331c9366d96ba2caa548dece3e95a8b779dda19d322d6879d02abc6ac68e36450e4e72f17a0963c30 vte-0.60.1.tar.xz +sha512sums="3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 vte-0.60.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 0aa0fdd1f..9025a7fa0 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-notifyd -pkgver=0.4.4 -pkgrel=1 +pkgver=0.6.1 +pkgrel=0 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,7 +11,7 @@ depends="" makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notifyd-$pkgver.tar.bz2" build() { LIBS="-lintl -lX11" ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5 xfce4-notifyd-0.4.4.tar.bz2" +sha512sums="d48752cd4e02e515e4c5d147b7bce678a56f47f0bd336e3b9db4e14fc2b0355e0582816957fc43c313a5779b5495c836ee5da4f0cb83616a0164d692a169415f xfce4-notifyd-0.6.1.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index ef98510e3..35644eab4 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-taskmanager -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="670e8fd09bdaa85dc822dd5a7b055f898941e8079315843344e4dae12e2c0a14049b58241fb58f170461e7b8829bc479bea1a488b756210ef91ef8a4d7ff3348 xfce4-taskmanager-1.2.2.tar.bz2" +sha512sums="e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3 xfce4-taskmanager-1.2.3.tar.bz2" diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 7800f5703..5fea02e5a 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-whiskermenu-plugin -pkgver=2.4.3 +pkgver=2.4.4 _pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32 xfce4-whiskermenu-plugin-2.4.3.tar.bz2" +sha512sums="2fe27567d301f66de4648f1c3104a2ecb90c3b25672d5babcde69507559628a3a74b14d1526ff70dd75d64f7d056c8baae645f5a9291bf8c5e30a1a8258721ba xfce4-whiskermenu-plugin-2.4.4.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index c211fb629..f5b5b681b 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfconf -pkgver=4.14.1 +pkgver=4.14.3 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" @@ -39,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808 xfconf-4.14.1.tar.bz2" +sha512sums="e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713 xfconf-4.14.3.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index b6c907d50..2657ca4d6 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfwm4 -pkgver=4.14.0 +pkgver=4.14.2 pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939 xfwm4-4.14.0.tar.bz2" +sha512sums="9e28f7782ce6c1734f9a50efec75d4c03a193bf078fd29f42c11770cef134c4516c256cb9c4b92a71bbbbfca81f37ba0ce19477831bb1da858c839135005b8f2 xfwm4-4.14.2.tar.bz2" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 989c75152..2a3706253 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xterm -pkgver=353 +pkgver=356 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ea63858ec069a769f0a25a159d17099044686e20649233631244fed29440fa8beebbd0dd8ccaf4260fb3d26996a49013eeeea7e0c98860e00d2e657019e2611 xterm-353.tgz +sha512sums="181bec97c6290146e16af16fc9532961c3c9bc2343c7b9febe62091c59d2b50a1cd5ed6c4e8855cd656960295f3c644754741aa5eab28265ceb82a2004cb7fc8 xterm-356.tgz 6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index b57f1a969..99c437928 100644 --- a/user/yakuake/APKBUILD +++ b/user/yakuake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yakuake -pkgver=19.12.3 +pkgver=20.04.2 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7 yakuake-19.12.3.tar.xz" +sha512sums="b6a66ac0f228135bcf0dc2062e86e73f9873db21c02ef87882a3aa36c06822c98c0383dc965c567a92f41d330a94d39cf0272814b79782f4f3f87554ee6afedd yakuake-20.04.2.tar.xz" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index adac93a71..262a7f530 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 pkgver=4.8.7 -pkgrel=0 +pkgrel=1 pkgdesc="Mathematical theorem prover" url=" " arch="all" @@ -10,9 +10,15 @@ license="MIT" depends="" makedepends="gmp-dev python3-dev cmd:which" subpackages="$pkgname-dev py3-$pkgname:py3:noarch" -source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz + _trailing_zeros32.patch + " builddir="$srcdir/z3-z3-$pkgver" +case "$CARCH" in +pmmx) options="$options textrels";; +esac + build() { PYTHON=python3 ./configure \ --prefix=/usr \ @@ -37,4 +43,5 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz" +sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz +6cf6ee35b23f9ef9fe879369a1900c82d38836f245e927f0f80eb6361e3340c32c8b94f00b1cb69eb8cad1626675b8f7b9bdaecffa5072cd5e8b12ecf1e7e3c0 _trailing_zeros32.patch" diff --git a/user/z3/_trailing_zeros32.patch b/user/z3/_trailing_zeros32.patch new file mode 100644 index 000000000..05b977f51 --- /dev/null +++ b/user/z3/_trailing_zeros32.patch @@ -0,0 +1,23 @@ +From e212159f4e941c78fc03239e0884f2f0454f581f Mon Sep 17 00:00:00 2001 +From: Nikolaj Bjorner <nbjorner@microsoft.com> +Date: Wed, 20 Nov 2019 15:01:04 -0800 +Subject: [PATCH] fix #2727 + +Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> +--- + src/util/mpz.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp +index a8190df1b0..9c2d3d5ffb 100644 +--- a/src/util/mpz.cpp ++++ b/src/util/mpz.cpp +@@ -72,6 +72,8 @@ inline uint64_t _trailing_zeros64(uint64_t x) { + + #if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64) + // _trailing_zeros32 already defined using intrinsics ++#elif defined(__GNUC__) ++// _trailing_zeros32 already defined using intrinsics + #else + inline uint32_t _trailing_zeros32(uint32_t x) { + uint32_t r = 0; |