diff options
333 files changed, 1598 insertions, 7606 deletions
diff --git a/system/acl/APKBUILD b/system/acl/APKBUILD index 3ca79ebab..9c5b0e74b 100644 --- a/system/acl/APKBUILD +++ b/system/acl/APKBUILD @@ -1,38 +1,30 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=acl -pkgver=2.2.52 -pkgrel=5 +pkgver=2.2.53 +pkgrel=0 pkgdesc="Access control list utilities" url="https://savannah.nongnu.org/projects/acl" arch="all" +# depends on order of nftw, and requires test machine to have ACLs enabled on FS +options="!check" license="LGPL-2.1+ AND GPL-2.0+" depends="" makedepends_build="gzip gettext-tiny" makedepends_host="attr-dev gettext-tiny-dev" makedepends="$makedepends_build $makedepends_host" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libacl" -# depends on order of nftw, and requires test machine to have ACLs enabled on FS -options="!check" -source="http://download.savannah.nongnu.org/releases/acl/acl-$pkgver.src.tar.gz" +source="https://download.savannah.nongnu.org/releases/acl/acl-$pkgver.tar.gz" prepare() { cd "$builddir" default_prepare - update_config_sub sed -i \ -e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \ configure # hack PATH with AC_PATH_PROG - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:$pkgname:" \ - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in } build() { cd "$builddir" - unset PLATFORM - export OPTIMIZER="${CFLAGS}" - export DEBUG=-DNDEBUG CONFIG_SHELL=/bin/sh ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -44,8 +36,7 @@ build() { package() { cd "$builddir" - make DIST_ROOT="$pkgdir" install install-lib install-dev - chown -R root:root "$pkgdir"/* + make DESTDIR="$pkgdir" install } libacl() { @@ -54,4 +45,4 @@ libacl() { mv "$pkgdir"/lib/libacl.so.* "$subpkgdir"/lib/ } -sha512sums="59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7 acl-2.2.52.src.tar.gz" +sha512sums="176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716 acl-2.2.53.tar.gz" diff --git a/system/at/APKBUILD b/system/at/APKBUILD index 280156524..f876de3ca 100644 --- a/system/at/APKBUILD +++ b/system/at/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alexander Belkov <msun00@yandex.ru> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=at -pkgver=3.1.20 -pkgrel=3 +pkgver=3.1.23 +pkgrel=0 pkgdesc="Delayed job execution and batch processing daemon" url="https://packages.qa.debian.org/a/at.html" arch="all" @@ -55,7 +55,7 @@ package() { "$pkgdir"/etc/init.d/atd } -sha512sums="20a13512a86f988728f590712f5bf8a23f4dc44f4b42521a4dd4783dc1ba7ac2016ee87b4c2c14f2346a5839168a983d99c3195e947014aea3096a3db16d176f at_3.1.20.orig.tar.gz +sha512sums="ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd at_3.1.23.orig.tar.gz ec24581fd59de62a93a5914f57b811baaf00fcc8fe969a4c8d0eb0cb2fd939762871725fec406eb127763935ab95ea10e23f314144a5d08ede78ba3bcf231e4a 10-parsetime.l-1.patch 9c06a4e92f3820a85ba75be8c14cb02762f6a5d4f0182bb2faafe51f5de2e35b0ce91e7e81f6e5b3127732c36c8e23e276a103aa0419661a602df93df274f855 10-parsetime.y-1.patch ba57e93c9c90dc989e8ac299c12de13de0005b28fd934620a9a5b47af89db3c0dc63e39043ab3a50d313ed2bb4f4832b1f68db971b3f515c500a2b74ed18acbd 10-Makefile.in-1.patch diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD index 10fca7144..ac91b0e12 100644 --- a/system/attr/APKBUILD +++ b/system/attr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attr -pkgver=2.4.47 -pkgrel=9 +pkgver=2.4.48 +pkgrel=0 pkgdesc="Utilities for managing filesystem extended attributes" url="https://savannah.nongnu.org/projects/attr" arch="all" @@ -11,9 +11,7 @@ depends="" makedepends="libtool autoconf automake bash gettext-tiny gettext-tiny-dev" checkdepends="perl" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libattr" -source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.src.tar.gz - fix-decls.patch - fix-throw.patch +source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz test-runner-musl.patch test-runner-perl.patch " @@ -21,24 +19,18 @@ source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.src.tar.g prepare() { cd "$builddir" default_prepare - update_config_sub - - sed -i -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in } build() { cd "$builddir" - OPTIMIZER="${CFLAGS}" DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/ \ + --prefix=/usr \ --exec-prefix=/ \ - --sbindir=/bin \ - --bindir=/usr/bin \ + --sbindir=/sbin \ --libdir=/lib \ - --libexecdir=/usr/lib \ --includedir=/usr/include \ --mandir=/usr/share/man \ --datadir=/usr/share @@ -47,17 +39,12 @@ build() { check() { cd "$builddir" - make tests + make check } package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - install install-lib install-dev - - # provided by man-pages - rm -r "$pkgdir"/usr/share/man/man2 \ - "$pkgdir"/usr/share/man/man5/attr.5 + make -j1 DESTDIR="$pkgdir" install } libattr() { @@ -67,8 +54,6 @@ libattr() { mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/ } -sha512sums="2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 attr-2.4.47.src.tar.gz -fa7925f63c611e39b28adbf8fa3838bd91c245e4694957c1a8e212cb8f289eb62e04f50806227f6c1947d432ddf7633a471c13dd08d513d1e2b8a9ac1906cb33 fix-decls.patch -d758b864bac9bdbc3360df2e7a3bc7d04e06789975cf539b8e2b98b1d874744b55c80f0502e283f7233d6ec41f8a39624fe07b512a7fdc6af8d19dd3af5f9f5a fix-throw.patch +sha512sums="75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 attr-2.4.48.tar.gz da4b903ae0ba1c72bae60405745c1135d1c3c1cefd7525fca296f8dc7dac1e60e48eeba0ba80fddb035b24b847b00c5a9926d0d586c5d7989d0428e458d977d3 test-runner-musl.patch d10821cc73751171c6b9cc4172cf4c85be9b6e154782090a262a16fd69172a291c5d5c94587aebcf5b5d1e02c27769245d88f0aa86478193cf1a277ac7f4f18e test-runner-perl.patch" diff --git a/system/attr/fix-decls.patch b/system/attr/fix-decls.patch deleted file mode 100644 index 0de70a93d..000000000 --- a/system/attr/fix-decls.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 10 Jan 2014 13:56:37 +0000 -Subject: avoid glibc-specific DECLS defines - -This matches what we do in all the other headers. ---- -diff --git a/include/xattr.h b/include/xattr.h -index 70a84be..070d7c5 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -30,8 +30,9 @@ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - -- --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, - const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW; - extern int lremovexattr (const char *__path, const char *__name) __THROW; - extern int fremovexattr (int __filedes, const char *__name) __THROW; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ --- -cgit v0.9.0.2 diff --git a/system/attr/fix-throw.patch b/system/attr/fix-throw.patch deleted file mode 100644 index 220e3ad28..000000000 --- a/system/attr/fix-throw.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus <manu@netbsd.org> -Date: Mon, 30 Jun 2014 13:06:05 +0000 -Subject: Portability fixes - -- <features.h> is Linux specific -- Define __THROW for non glibc based systems ---- -diff --git a/include/xattr.h b/include/xattr.h -index 070d7c5..fd1f268 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -20,7 +20,18 @@ - #ifndef __XATTR_H__ - #define __XATTR_H__ - -+#if defined(linux) - #include <features.h> -+#endif -+ -+/* Portability non glibc c++ build systems */ -+#ifndef __THROW -+# if defined __cplusplus -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif - - #include <errno.h> - #ifndef ENOATTR --- -cgit v0.9.0.2 diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index f414e7542..921a1fdf3 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.0.5 +pkgver=3.1 pkgrel=0 pkgdesc="The GNU general-purpose parser generator" arch="all" @@ -38,4 +38,4 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2 bison-3.0.5.tar.xz" +sha512sums="2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152 bison-3.1.tar.xz" diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD index 2f73d6f45..2e1c8a628 100644 --- a/system/bubblewrap/APKBUILD +++ b/system/bubblewrap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=bubblewrap -pkgver=0.2.0 +pkgver=0.3.0 pkgrel=0 pkgdesc="Unprivileged sandboxing tool" url="https://github.com/projectatomic/bubblewrap" @@ -46,6 +46,6 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/ } -sha512sums="746f10cd9f9852ca4679d589357402ec10c352e02f77384844a4657fd9b2952189a3299319fbefedd35358d39fd16ded63cc3db95041ed2091548183786b8b63 bubblewrap-0.2.0.tar.gz +sha512sums="0dc033f83547112cedc706e4ef80e39ba0ee63f3750f93454a7b1a38aeb922ee660b3491a5a5d060fce9a7c4b326798a66814ad94f53f1e666c27a557fec17a4 bubblewrap-0.3.0.tar.gz 400a0446670ebf80f16739f1a7a2878aadc3099424f957ba09ec3df780506c23a11368f0578c9e352d7ca6473fa713df826fad7a20c50338aa5f9fa9ac6b84a4 realpath-workaround.patch f59cda3b09dd99db9ca6d97099a15bb2523e054063d677502317ae3165ba2e32105a0ae8f877afc3827bd28d093c9d9d413270f4c87d9fe5f26f3eee670d916e musl-fixes.patch" diff --git a/system/c-ares/APKBUILD b/system/c-ares/APKBUILD index 3effc2a1a..c2f577079 100644 --- a/system/c-ares/APKBUILD +++ b/system/c-ares/APKBUILD @@ -4,7 +4,7 @@ pkgname=c-ares pkgver=1.14.0 pkgrel=0 pkgdesc="Asynchronous DNS/name resolver library" -url="http://c-ares.haxx.se/" +url="https://c-ares.haxx.se/" arch="all" options="!checkroot" license="MIT" diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index f74bb7d76..9ea4e8c6f 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.11.4 +pkgver=3.12.1 pkgrel=0 pkgdesc="Cross-platform build system" -url="http://www.cmake.org" +url="https://cmake.org" arch="all" +options="!checkroot" license="CMake" makedepends="ncurses-dev curl-dev expat-dev zlib-dev bzip2-dev libarchive-dev libuv-dev xz-dev rhash-dev" -options="!checkroot" checkdepends="musl-utils file" subpackages="$pkgname-doc" @@ -18,7 +18,7 @@ case $pkgver in *.*.*) _v=v${pkgver%.*};; esac -source="http://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz" +source="https://cmake.org/files/$_v/cmake-${pkgver}.tar.gz" _parallel_opt() { local i n @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 cmake-3.11.4.tar.gz" +sha512sums="7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692 cmake-3.12.1.tar.gz" diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index f54e82463..840c55421 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=coreutils -pkgver=8.29 -pkgrel=2 +pkgver=8.30 +pkgrel=0 pkgdesc="Basic file, shell, and text manipulation utilities" url="http://www.gnu.org/software/coreutils/" arch="all" @@ -76,10 +76,10 @@ package() { ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot } -sha512sums="546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd coreutils-8.29.tar.xz +sha512sums="25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda coreutils-8.30.tar.xz bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b disable-csplit-io-err-test.patch 532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b disable-mbrtowc-test.patch -a6cbe77d2fd3655e59ead9ec5cfcc80ae8c1a688f779219910d9370a0e5f86195e2d3a1ca427a374d8457c5ca04ebb72f8bac0b7a7415337bac3545a85d22e3d localename-test-fix.patch" +86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf localename-test-fix.patch" [ ${CBUILD} != ${CHOST} ] && sha512sums="$sha512sums bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch diff --git a/system/coreutils/localename-test-fix.patch b/system/coreutils/localename-test-fix.patch index 9907eb67a..ff89319c7 100644 --- a/system/coreutils/localename-test-fix.patch +++ b/system/coreutils/localename-test-fix.patch @@ -1,14 +1,13 @@ +# if defined __APPLE__ && defined __MACH__ +# include <xlocale.h> +# endif +# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__ +# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__ +# include <langinfo.h> +# endif +# if !defined IN_LIBINTL --- coreutils-8.27/gnulib-tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000 +++ coreutils-8.27/gnulib-tests/localename.c 2017-07-30 16:40:47.098541270 +0000 -@@ -40,7 +40,7 @@ - # if defined __APPLE__ && defined __MACH__ - # include <xlocale.h> - # endif --# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__ -+# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__ - # include <langinfo.h> - # endif - # if !defined IN_LIBINTL @@ -2692,16 +2692,19 @@ locale_t thread_locale = uselocale (NULL); if (thread_locale != LC_GLOBAL_LOCALE) diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 08e8007a5..e82cd55bf 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -6,14 +6,14 @@ pkgname=curl pkgver=7.60.0 pkgrel=0 pkgdesc="An URL retrival utility and library" -url="http://curl.haxx.se" +url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" makedepends_build="groff perl" makedepends_host="zlib-dev openssl-dev libssh2-dev" makedepends="$makedepends_build $makedepends_host" -source="http://curl.haxx.se/download/$pkgname-$pkgver.tar.bz2 +source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.bz2 " subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl" diff --git a/system/expat/APKBUILD b/system/expat/APKBUILD index 8286b0db9..f57096314 100644 --- a/system/expat/APKBUILD +++ b/system/expat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=expat -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=0 pkgdesc="An XML Parser library written in C" url="https://libexpat.github.io/" @@ -12,6 +12,8 @@ subpackages="$pkgname-dev $pkgname-doc" builddir="$srcdir/$pkgname-$pkgver" # secfixes: +# 2.2.1-r0: +# - CVE-2016-9063 # 2.2.0-r1: # - CVE-2017-9233 @@ -35,4 +37,4 @@ package() { make DESTDIR="$pkgdir/" install } -sha512sums="8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637 expat-2.2.5.tar.bz2" +sha512sums="dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6 expat-2.2.6.tar.bz2" diff --git a/system/file/APKBUILD b/system/file/APKBUILD index b101f5b06..c870be1ef 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=file -pkgver=5.33 +pkgver=5.34 pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" @@ -38,4 +38,4 @@ libmagic() { mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr } -sha512sums="36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e file-5.33.tar.gz" +sha512sums="57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8 file-5.34.tar.gz" diff --git a/system/gdb/APKBUILD b/system/gdb/APKBUILD index 2bf45416d..b038ca23f 100644 --- a/system/gdb/APKBUILD +++ b/system/gdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdb -pkgver=8.1 +pkgver=8.2 pkgrel=0 pkgdesc="The GNU Debugger" url="https://www.sourceware.org/gdb/" @@ -56,7 +56,7 @@ package() { rm -rf "$pkgdir"/usr/lib } -sha512sums="ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357 gdb-8.1.tar.xz +sha512sums="11cc481bebc51eb6db73249ecb62b8c07455cf3db169f4860b3a83114849fbd2b5860a2db64488ba6c5909cf07b255c04770f1e36059eae6bee16d2a3581be90 gdb-8.2.tar.xz 986e68275f7692f39b5d8aedeb9f9e88f0e5bebb3f8c7f104933c525d35ca54fc90e18698c1e3e1009e8a188e5e70d6f252cb39e4c75e37db7bf479017e0da32 s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 7fdb90fff..d3b64080d 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.17.1 +pkgver=2.18.0 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -60,7 +60,7 @@ build() { check() { cd "$builddir" - make prefix=/usr DESTDIR="$pkgdir" test + make prefix=/usr DESTDIR="$pkgdir" -j1 test } package() { @@ -167,8 +167,8 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960 git-2.17.1.tar.xz +sha512sums="db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz 85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch -135645fa57c41c50bec6d09f7d3c92f26d30334b5f342d50942c24e0dd11106e40c36b11346c9e6cd69e98b7a9ebeec80e4e4f1506ef689f39d7ef4539727dae dont-test-other-encodings.patch +1e1cf54be8db0b7a63de2267f3cb0359070a50dcd940e5329a126f1d9f26b2596b93f2b836adc953e4d5b148bbba2eb8234dfeb2929ac3c1e3162507781141f6 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 98949bc1b..54a4012fe 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -191,3 +191,246 @@ We can't support Japanese people using musl cat >expected <<EOF author $UTF8_NAME summary $UTF8_MSG +--- git-2.18.0/t/t0028-working-tree-encoding.sh.old 2018-06-21 17:18:50.000000000 +0000 ++++ git-2.18.0/t/t0028-working-tree-encoding.sh 2018-09-05 17:42:14.650000000 +0000 +@@ -6,240 +6,4 @@ + + GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING + +-test_expect_success 'setup test files' ' +- git config core.eol lf && +- +- text="hallo there!\ncan you read me?" && +- echo "*.utf16 text working-tree-encoding=utf-16" >.gitattributes && +- printf "$text" >test.utf8.raw && +- printf "$text" | iconv -f UTF-8 -t UTF-16 >test.utf16.raw && +- printf "$text" | iconv -f UTF-8 -t UTF-32 >test.utf32.raw && +- +- # Line ending tests +- printf "one\ntwo\nthree\n" >lf.utf8.raw && +- printf "one\r\ntwo\r\nthree\r\n" >crlf.utf8.raw && +- +- # BOM tests +- printf "\0a\0b\0c" >nobom.utf16be.raw && +- printf "a\0b\0c\0" >nobom.utf16le.raw && +- printf "\376\777\0a\0b\0c" >bebom.utf16be.raw && +- printf "\777\376a\0b\0c\0" >lebom.utf16le.raw && +- printf "\0\0\0a\0\0\0b\0\0\0c" >nobom.utf32be.raw && +- printf "a\0\0\0b\0\0\0c\0\0\0" >nobom.utf32le.raw && +- printf "\0\0\376\777\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw && +- printf "\777\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw && +- +- # Add only UTF-16 file, we will add the UTF-32 file later +- cp test.utf16.raw test.utf16 && +- cp test.utf32.raw test.utf32 && +- git add .gitattributes test.utf16 && +- git commit -m initial +-' +- +-test_expect_success 'ensure UTF-8 is stored in Git' ' +- test_when_finished "rm -f test.utf16.git" && +- +- git cat-file -p :test.utf16 >test.utf16.git && +- test_cmp_bin test.utf8.raw test.utf16.git +-' +- +-test_expect_success 're-encode to UTF-16 on checkout' ' +- test_when_finished "rm -f test.utf16.raw" && +- +- rm test.utf16 && +- git checkout test.utf16 && +- test_cmp_bin test.utf16.raw test.utf16 +-' +- +-test_expect_success 'check $GIT_DIR/info/attributes support' ' +- test_when_finished "rm -f test.utf32.git" && +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.utf32 text working-tree-encoding=utf-32" >.git/info/attributes && +- git add test.utf32 && +- +- git cat-file -p :test.utf32 >test.utf32.git && +- test_cmp_bin test.utf8.raw test.utf32.git +-' +- +-for i in 16 32 +-do +- test_expect_success "check prohibited UTF-${i} BOM" ' +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes && +- echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes && +- +- # Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian) +- # but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32). +- # In these cases the BOM is prohibited. +- cp bebom.utf${i}be.raw bebom.utf${i}be && +- test_must_fail git add bebom.utf${i}be 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out && +- +- cp lebom.utf${i}le.raw lebom.utf${i}be && +- test_must_fail git add lebom.utf${i}be 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out && +- +- cp bebom.utf${i}be.raw bebom.utf${i}le && +- test_must_fail git add bebom.utf${i}le 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out && +- +- cp lebom.utf${i}le.raw lebom.utf${i}le && +- test_must_fail git add lebom.utf${i}le 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out +- ' +- +- test_expect_success "check required UTF-${i} BOM" ' +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes && +- +- cp nobom.utf${i}be.raw nobom.utf${i} && +- test_must_fail git add nobom.utf${i} 2>err.out && +- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && +- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out && +- +- cp nobom.utf${i}le.raw nobom.utf${i} && +- test_must_fail git add nobom.utf${i} 2>err.out && +- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && +- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out +- ' +- +- test_expect_success "eol conversion for UTF-${i} encoded files on checkout" ' +- test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" && +- test_when_finished "git reset --hard HEAD^" && +- +- cat lf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >lf.utf${i}.raw && +- cat crlf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >crlf.utf${i}.raw && +- cp crlf.utf${i}.raw eol.utf${i} && +- +- cat >expectIndexLF <<-EOF && +- i/lf w/-text attr/text eol.utf${i} +- EOF +- +- git add eol.utf${i} && +- git commit -m eol && +- +- # UTF-${i} with CRLF (Windows line endings) +- rm eol.utf${i} && +- git -c core.eol=crlf checkout eol.utf${i} && +- test_cmp_bin crlf.utf${i}.raw eol.utf${i} && +- +- # Although the file has CRLF in the working tree, +- # ensure LF in the index +- git ls-files --eol eol.utf${i} >actual && +- test_cmp expectIndexLF actual && +- +- # UTF-${i} with LF (Unix line endings) +- rm eol.utf${i} && +- git -c core.eol=lf checkout eol.utf${i} && +- test_cmp_bin lf.utf${i}.raw eol.utf${i} && +- +- # The file LF in the working tree, ensure LF in the index +- git ls-files --eol eol.utf${i} >actual && +- test_cmp expectIndexLF actual +- ' +-done +- +-test_expect_success 'check unsupported encodings' ' +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.set text working-tree-encoding" >.gitattributes && +- printf "set" >t.set && +- test_must_fail git add t.set 2>err.out && +- test_i18ngrep "true/false are no valid working-tree-encodings" err.out && +- +- echo "*.unset text -working-tree-encoding" >.gitattributes && +- printf "unset" >t.unset && +- git add t.unset && +- +- echo "*.empty text working-tree-encoding=" >.gitattributes && +- printf "empty" >t.empty && +- git add t.empty && +- +- echo "*.garbage text working-tree-encoding=garbage" >.gitattributes && +- printf "garbage" >t.garbage && +- test_must_fail git add t.garbage 2>err.out && +- test_i18ngrep "failed to encode" err.out +-' +- +-test_expect_success 'error if encoding round trip is not the same during refresh' ' +- BEFORE_STATE=$(git rev-parse HEAD) && +- test_when_finished "git reset --hard $BEFORE_STATE" && +- +- # Add and commit a UTF-16 file but skip the "working-tree-encoding" +- # filter. Consequently, the in-repo representation is UTF-16 and not +- # UTF-8. This simulates a Git version that has no working tree encoding +- # support. +- echo "*.utf16le text working-tree-encoding=utf-16le" >.gitattributes && +- echo "hallo" >nonsense.utf16le && +- TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) && +- git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le && +- COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) && +- git update-ref refs/heads/master $COMMIT && +- +- test_must_fail git checkout HEAD^ 2>err.out && +- test_i18ngrep "error: .* overwritten by checkout:" err.out +-' +- +-test_expect_success 'error if encoding garbage is already in Git' ' +- BEFORE_STATE=$(git rev-parse HEAD) && +- test_when_finished "git reset --hard $BEFORE_STATE" && +- +- # Skip the UTF-16 filter for the added file +- # This simulates a Git version that has no checkoutEncoding support +- cp nobom.utf16be.raw nonsense.utf16 && +- TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) && +- git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 && +- COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) && +- git update-ref refs/heads/master $COMMIT && +- +- git diff 2>err.out && +- test_i18ngrep "error: BOM is required" err.out +-' +- +-test_expect_success 'check roundtrip encoding' ' +- test_when_finished "rm -f roundtrip.shift roundtrip.utf16" && +- test_when_finished "git reset --hard HEAD" && +- +- text="hallo there!\nroundtrip test here!" && +- printf "$text" | iconv -f UTF-8 -t SHIFT-JIS >roundtrip.shift && +- printf "$text" | iconv -f UTF-8 -t UTF-16 >roundtrip.utf16 && +- echo "*.shift text working-tree-encoding=SHIFT-JIS" >>.gitattributes && +- +- # SHIFT-JIS encoded files are round-trip checked by default... +- GIT_TRACE=1 git add .gitattributes roundtrip.shift 2>&1 | +- grep "Checking roundtrip encoding for SHIFT-JIS" && +- git reset && +- +- # ... unless we overwrite the Git config! +- ! GIT_TRACE=1 git -c core.checkRoundtripEncoding=garbage \ +- add .gitattributes roundtrip.shift 2>&1 | +- grep "Checking roundtrip encoding for SHIFT-JIS" && +- git reset && +- +- # UTF-16 encoded files should not be round-trip checked by default... +- ! GIT_TRACE=1 git add roundtrip.utf16 2>&1 | +- grep "Checking roundtrip encoding for UTF-16" && +- git reset && +- +- # ... unless we tell Git to check it! +- GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-16, UTF-32" \ +- add roundtrip.utf16 2>&1 | +- grep "Checking roundtrip encoding for utf-16" && +- git reset && +- +- # ... unless we tell Git to check it! +- # (here we also check that the casing of the encoding is irrelevant) +- GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-32, utf-16" \ +- add roundtrip.utf16 2>&1 | +- grep "Checking roundtrip encoding for utf-16" && +- git reset +-' +- + test_done diff --git a/system/kmod/APKBUILD b/system/kmod/APKBUILD index b0aab15a3..2499dcdd6 100644 --- a/system/kmod/APKBUILD +++ b/system/kmod/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmod -pkgver=24 -pkgrel=1 +pkgver=25 +pkgrel=0 pkgdesc="Linux kernel module management utilities" url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary" arch="all" @@ -61,6 +61,6 @@ bashcomp() { } -sha512sums="58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779 kmod-24.tar.xz +sha512sums="d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 kmod-25.tar.xz f2ea3527bfba182c5e15557c224a5bba8c7e2ea3d21cf604e6eb2277226dcf983c3aeb9ac44a322c7f2b4942b35135da999d63a5b946b829d3f3b09c050a0f17 strndupa.patch 7f0f89fe98167f71b7924f341ba701d001158225463c2f5e39f706a0224b1e952ee901b441f28cb15787563e83bb6e54eb752bf8669ae7c0ffbb11984542f354 kmod-static-nodes.initd" diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index 6acf2a96a..c3f3ceef6 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libarchive -pkgver=3.3.2 -pkgrel=5 +pkgver=3.3.3 +pkgrel=0 pkgdesc="Library for creating and reading streaming archives" url="http://libarchive.org/" arch="all" +options="!check" # needs EUC-JP and KOI8R support in iconv license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain" makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev attr-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://www.libarchive.org/downloads/$pkgname-$pkgver.tar.gz - seek-error.patch - CVE-2017-14166.patch" -options="!check" # needs EUC-JP and KOI8R support in iconv + seek-error.patch" builddir="$srcdir/$pkgname-$pkgver" # secfixes: @@ -57,6 +56,5 @@ tools() { ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 libarchive-3.3.2.tar.gz -ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch -7cc9dbafd970c07fb4421b7a72a075cc0a000db77df4432222539c58625c93c45f01a144838b551980bc0c6dc5b4c3ab852eb1433006c3174581ba0897010dbe CVE-2017-14166.patch" +sha512sums="9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 libarchive-3.3.3.tar.gz +ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch" diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD index 899ee01ab..bd5362f82 100644 --- a/system/libedit/APKBUILD +++ b/system/libedit/APKBUILD @@ -1,7 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libedit -pkgver=3.1_p20180525 +pkgver=20180525.3.1 +_realver=${pkgver/.3.1/-3.1} pkgrel=0 pkgdesc="Library providing line editing, history, and tokenisation functions" url="http://thrysoee.dk/editline/" @@ -10,12 +11,11 @@ license="BSD-2-Clause" depends="" depends_dev="ncurses-dev" # XXX is this always unconditionally needed? makedepends="$depends_dev autoconf automake" -install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://thrysoee.dk/editline/libedit-20180525-3.1.tar.gz +source="http://thrysoee.dk/editline/libedit-$_realver.tar.gz tinfo.patch " -builddir="$srcdir/$pkgname-20180525-3.1" +builddir="$srcdir/$pkgname-$_realver" prepare() { cd "$builddir" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index 4f8222cb9..803410a29 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,22 +1,19 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.31 +pkgver=1.32 pkgrel=0 pkgdesc="GnuPG runtime library" -url="http://www.gnupg.org" +url="https://www.gnupg.org" arch="all" license="LGPL-2.1+" depends="" -depends_dev="" makedepends="" -install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-lisp:lisp:noarch" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 " -builddir="$srcdir"/$pkgname-$pkgver -build () { +build() { cd "$builddir" ./configure \ --build=$CBUILD \ @@ -43,4 +40,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="23983470be51035b2bc0cdbfa20f0915aec92c53c964c645eac51ba4e992b8436bd3a21f0b48d77d7c4ef178d2aacaf57ab33c7fad24b4f96f4ffb1d7116e67f libgpg-error-1.31.tar.bz2" +sha512sums="0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20 libgpg-error-1.32.tar.bz2" diff --git a/system/libuv/APKBUILD b/system/libuv/APKBUILD index 3ccba6e53..30dfc1ed6 100644 --- a/system/libuv/APKBUILD +++ b/system/libuv/APKBUILD @@ -2,7 +2,7 @@ # Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuv -pkgver=1.19.1 +pkgver=1.23.0 pkgrel=0 pkgdesc="Cross-platform asychronous I/O" url="http://libuv.org" @@ -11,6 +11,7 @@ license="MIT AND BSD-2-Clause AND BSD-3-Clause AND ISC" makedepends="automake autoconf libtool linux-headers" subpackages="$pkgname-dev" source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz + disable-process-priority.patch disable-setuid-test.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -46,5 +47,6 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="516b17afe5ea12f5c53abe68ea5fac9853f20c89fff754c054c041bb9d88a55e5a691842e509348617444f6080311c963707dd272c91c7ff7baf2c4d516b2d7f libuv-v1.19.1.tar.gz +sha512sums="1fe36cf285bdcfee485633e095e731999485ea156f07769c0ff277df5e4e1314c434021b4b697cef8e7e7e4299b24b7ee837f3f6348b27b300feb6e6c2781e4d libuv-v1.23.0.tar.gz +58bc259a0f703fa6b8dda14909f718e14dfb9ddc9039ae13378f7e32e0ff7096774cbfb2964a0abb06f8a64a71cf298cc77b7475927df0fb50ce3f0e414a7787 disable-process-priority.patch 478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch" diff --git a/system/libuv/disable-process-priority.patch b/system/libuv/disable-process-priority.patch new file mode 100644 index 000000000..f0f41fc95 --- /dev/null +++ b/system/libuv/disable-process-priority.patch @@ -0,0 +1,22 @@ +--- libuv-v1.23.0/test/test-list.h.old 2018-08-17 02:05:34.000000000 +0000 ++++ libuv-v1.23.0/test/test-list.h 2018-09-05 19:06:26.360000000 +0000 +@@ -214,7 +214,9 @@ + TEST_DECLARE (pipe_set_non_blocking) + TEST_DECLARE (pipe_set_chmod) + TEST_DECLARE (process_ref) ++#if 0 + TEST_DECLARE (process_priority) ++#endif + TEST_DECLARE (has_ref) + TEST_DECLARE (active) + TEST_DECLARE (embed) +@@ -690,7 +692,9 @@ + TEST_ENTRY (pipe_ref4) + TEST_HELPER (pipe_ref4, pipe_echo_server) + TEST_ENTRY (process_ref) ++#if 0 + TEST_ENTRY (process_priority) ++#endif + TEST_ENTRY (has_ref) + + TEST_ENTRY (loop_handles) diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD index 266a6fc93..e8b60b75f 100644 --- a/system/man-db/APKBUILD +++ b/system/man-db/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db -pkgver=2.8.3 -pkgrel=1 +pkgver=2.8.4 +pkgrel=0 pkgdesc="The man command and related utilities for examining on-line help files" url="http://www.nongnu.org/man-db/" arch="all" @@ -39,9 +39,8 @@ check() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/charset.alias rm -r "${pkgdir}"/usr/lib/tmpfiles.d # systemd } -sha512sums="35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745 man-db-2.8.3.tar.xz +sha512sums="3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66 man-db-2.8.4.tar.xz 4bc9efaafa30dedb6da9d2a62436cf570bef5603b98494ca3c565c3e338b57a481ed40af2312a20cd9f64f965fc0c45607403d829339700c57f9dc0022d7c6ed man-db-2.8.3-iconv.patch" diff --git a/system/mpfr3/APKBUILD b/system/mpfr3/APKBUILD index 5d8b4e012..b648abf1a 100644 --- a/system/mpfr3/APKBUILD +++ b/system/mpfr3/APKBUILD @@ -3,7 +3,7 @@ pkgname=mpfr3 pkgver=3.1.6 pkgrel=0 pkgdesc="multiple-precision floating-point library" -url="http://www.mpfr.org/" +url="https://www.mpfr.org/" arch="all" license="LGPL-3.0+" depends="" diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index adb527d8a..0505e9ebd 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.19 -pkgrel=13 +pkgver=1.1.20 +pkgrel=0 pkgdesc="System library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -72,6 +72,7 @@ package() { s390*) ARCH="s390x" ;; mips64*) ARCH="mips64" ;; mips*) ARCH="mips" ;; + m68k) ARCH="m68k" ;; esac make ARCH="$ARCH" prefix=/usr DESTDIR="$pkgdir" install-headers @@ -107,8 +108,8 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5 musl-1.1.19.tar.gz -b93eb56efadf4ac7e25be6cca22ef99553000e2c2d50f37cfa1430d2f5194cead34b4ca1afc394e97bda0b02eb916c2b85435e58bef686ce8b556546cf957880 amalgamation.patch +sha512sums="d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d musl-1.1.20.tar.gz +3162b778101a46d9fb3a38927e3c4969781ccdabb9bb72de10d48ea31691215ecba605faee945ed86144a7e31fc948c31c2fee2881dc07897be3e82b6c6ff1e6 amalgamation.patch 2c8e1dde1834238097b2ee8a7bfb53471a0d9cff4a5e38b55f048b567deff1cdd47c170d0578a67b1a039f95a6c5fbb8cff369c75b6a3e4d7ed171e8e86ebb8c 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch diff --git a/system/musl/amalgamation.patch b/system/musl/amalgamation.patch index 96dd545d9..d4d4465dc 100644 --- a/system/musl/amalgamation.patch +++ b/system/musl/amalgamation.patch @@ -1,2702 +1,3 @@ -diff --git a/Makefile b/Makefile -index 308ddaae..e23a8332 100644 ---- a/Makefile -+++ b/Makefile -@@ -116,17 +116,14 @@ obj/crt/Scrt1.o obj/crt/rcrt1.o: CFLAGS_ALL += -fPIC - OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=$(srcdir)/src/%)) - $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.o) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.lo): CFLAGS += -O3 - --MEMOPS_SRCS = src/string/memcpy.c src/string/memmove.c src/string/memcmp.c src/string/memset.c --$(MEMOPS_SRCS:%.c=obj/%.o) $(MEMOPS_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_MEMOPS) -- --NOSSP_SRCS = $(wildcard crt/*.c) \ -- src/env/__libc_start_main.c src/env/__init_tls.c \ -- src/env/__stack_chk_fail.c \ -- src/thread/__set_thread_area.c src/thread/$(ARCH)/__set_thread_area.c \ -- src/string/memset.c src/string/$(ARCH)/memset.c \ -- src/string/memcpy.c src/string/$(ARCH)/memcpy.c \ -- ldso/dlstart.c ldso/dynlink.c --$(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) -+MEMOPS_OBJS = $(filter %/memcpy.o %/memmove.o %/memcmp.o %/memset.o, $(LIBC_OBJS)) -+$(MEMOPS_OBJS) $(MEMOPS_OBJS:%.o=%.lo): CFLAGS_ALL += $(CFLAGS_MEMOPS) -+ -+NOSSP_OBJS = $(CRT_OBJS) $(LDSO_OBJS) $(filter \ -+ %/__libc_start_main.o %/__init_tls.o %/__stack_chk_fail.o \ -+ %/__set_thread_area.o %/memset.o %/memcpy.o \ -+ , $(LIBC_OBJS)) -+$(NOSSP_OBJS) $(NOSSP_OBJS:%.o=%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) - - $(CRT_OBJS): CFLAGS_ALL += -DCRT - -diff --git a/arch/aarch64/bits/hwcap.h b/arch/aarch64/bits/hwcap.h -index 11396d31..8541e329 100644 ---- a/arch/aarch64/bits/hwcap.h -+++ b/arch/aarch64/bits/hwcap.h -@@ -14,3 +14,15 @@ - #define HWCAP_JSCVT (1 << 13) - #define HWCAP_FCMA (1 << 14) - #define HWCAP_LRCPC (1 << 15) -+#define HWCAP_DCPOP (1 << 16) -+#define HWCAP_SHA3 (1 << 17) -+#define HWCAP_SM3 (1 << 18) -+#define HWCAP_SM4 (1 << 19) -+#define HWCAP_ASIMDDP (1 << 20) -+#define HWCAP_SHA512 (1 << 21) -+#define HWCAP_SVE (1 << 22) -+#define HWCAP_ASIMDFHM (1 << 23) -+#define HWCAP_DIT (1 << 24) -+#define HWCAP_USCAT (1 << 25) -+#define HWCAP_ILRCPC (1 << 26) -+#define HWCAP_FLAGM (1 << 27) -diff --git a/arch/aarch64/bits/signal.h b/arch/aarch64/bits/signal.h -index 1c67313d..b71261f5 100644 ---- a/arch/aarch64/bits/signal.h -+++ b/arch/aarch64/bits/signal.h -@@ -25,6 +25,7 @@ typedef struct sigcontext { - #define FPSIMD_MAGIC 0x46508001 - #define ESR_MAGIC 0x45535201 - #define EXTRA_MAGIC 0x45585401 -+#define SVE_MAGIC 0x53564501 - struct _aarch64_ctx { - unsigned int magic; - unsigned int size; -@@ -45,6 +46,44 @@ struct extra_context { - unsigned int size; - unsigned int __reserved[3]; - }; -+struct sve_context { -+ struct _aarch64_ctx head; -+ unsigned short vl; -+ unsigned short __reserved[3]; -+}; -+#define SVE_VQ_BYTES 16 -+#define SVE_VQ_MIN 1 -+#define SVE_VQ_MAX 512 -+#define SVE_VL_MIN (SVE_VQ_MIN * SVE_VQ_BYTES) -+#define SVE_VL_MAX (SVE_VQ_MAX * SVE_VQ_BYTES) -+#define SVE_NUM_ZREGS 32 -+#define SVE_NUM_PREGS 16 -+#define sve_vl_valid(vl) \ -+ ((vl) % SVE_VQ_BYTES == 0 && (vl) >= SVE_VL_MIN && (vl) <= SVE_VL_MAX) -+#define sve_vq_from_vl(vl) ((vl) / SVE_VQ_BYTES) -+#define sve_vl_from_vq(vq) ((vq) * SVE_VQ_BYTES) -+#define SVE_SIG_ZREG_SIZE(vq) ((unsigned)(vq) * SVE_VQ_BYTES) -+#define SVE_SIG_PREG_SIZE(vq) ((unsigned)(vq) * (SVE_VQ_BYTES / 8)) -+#define SVE_SIG_FFR_SIZE(vq) SVE_SIG_PREG_SIZE(vq) -+#define SVE_SIG_REGS_OFFSET \ -+ ((sizeof(struct sve_context) + (SVE_VQ_BYTES - 1)) \ -+ / SVE_VQ_BYTES * SVE_VQ_BYTES) -+#define SVE_SIG_ZREGS_OFFSET SVE_SIG_REGS_OFFSET -+#define SVE_SIG_ZREG_OFFSET(vq, n) \ -+ (SVE_SIG_ZREGS_OFFSET + SVE_SIG_ZREG_SIZE(vq) * (n)) -+#define SVE_SIG_ZREGS_SIZE(vq) \ -+ (SVE_SIG_ZREG_OFFSET(vq, SVE_NUM_ZREGS) - SVE_SIG_ZREGS_OFFSET) -+#define SVE_SIG_PREGS_OFFSET(vq) \ -+ (SVE_SIG_ZREGS_OFFSET + SVE_SIG_ZREGS_SIZE(vq)) -+#define SVE_SIG_PREG_OFFSET(vq, n) \ -+ (SVE_SIG_PREGS_OFFSET(vq) + SVE_SIG_PREG_SIZE(vq) * (n)) -+#define SVE_SIG_PREGS_SIZE(vq) \ -+ (SVE_SIG_PREG_OFFSET(vq, SVE_NUM_PREGS) - SVE_SIG_PREGS_OFFSET(vq)) -+#define SVE_SIG_FFR_OFFSET(vq) \ -+ (SVE_SIG_PREGS_OFFSET(vq) + SVE_SIG_PREGS_SIZE(vq)) -+#define SVE_SIG_REGS_SIZE(vq) \ -+ (SVE_SIG_FFR_OFFSET(vq) + SVE_SIG_FFR_SIZE(vq) - SVE_SIG_REGS_OFFSET) -+#define SVE_SIG_CONTEXT_SIZE(vq) (SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq)) - #else - typedef struct { - long double __regs[18+256]; -diff --git a/arch/aarch64/pthread_arch.h b/arch/aarch64/pthread_arch.h -index b2e2d8f1..e8499d8e 100644 ---- a/arch/aarch64/pthread_arch.h -+++ b/arch/aarch64/pthread_arch.h -@@ -2,10 +2,11 @@ static inline struct pthread *__pthread_self() - { - char *self; - __asm__ __volatile__ ("mrs %0,tpidr_el0" : "=r"(self)); -- return (void*)(self + 16 - sizeof(struct pthread)); -+ return (void*)(self - sizeof(struct pthread)); - } - - #define TLS_ABOVE_TP --#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 16) -+#define GAP_ABOVE_TP 16 -+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) - - #define MC_PC pc -diff --git a/arch/aarch64/reloc.h b/arch/aarch64/reloc.h -index 51b66e23..40cf0b28 100644 ---- a/arch/aarch64/reloc.h -+++ b/arch/aarch64/reloc.h -@@ -10,7 +10,7 @@ - - #define NO_LEGACY_INITFINI - --#define TPOFF_K 16 -+#define TPOFF_K 0 - - #define REL_SYMBOLIC R_AARCH64_ABS64 - #define REL_GOT R_AARCH64_GLOB_DAT -diff --git a/arch/arm/atomic_arch.h b/arch/arm/atomic_arch.h -index c5c56f81..62458b45 100644 ---- a/arch/arm/atomic_arch.h -+++ b/arch/arm/atomic_arch.h -@@ -7,8 +7,8 @@ - extern uintptr_t __attribute__((__visibility__("hidden"))) - __a_cas_ptr, __a_barrier_ptr; - --#if ((__ARM_ARCH_6__ || __ARM_ARCH_6K__ || __ARM_ARCH_6ZK__) && !__thumb__) \ -- || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7 -+#if ((__ARM_ARCH_6__ || __ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \ -+ || __ARM_ARCH_6T2__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7 - - #define a_ll a_ll - static inline int a_ll(volatile int *p) -@@ -91,4 +91,16 @@ static inline int a_clz_32(uint32_t x) - return x; - } - -+#if __ARM_ARCH_6T2__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7 -+ -+#define a_ctz_32 a_ctz_32 -+static inline int a_ctz_32(uint32_t x) -+{ -+ uint32_t xr; -+ __asm__ ("rbit %0, %1" : "=r"(xr) : "r"(x)); -+ return a_clz_32(xr); -+} -+ -+#endif -+ - #endif -diff --git a/arch/arm/bits/syscall.h.in b/arch/arm/bits/syscall.h.in -index c594152e..1920516a 100644 ---- a/arch/arm/bits/syscall.h.in -+++ b/arch/arm/bits/syscall.h.in -@@ -359,4 +359,5 @@ - #define __ARM_NR_usr26 0x0f0003 - #define __ARM_NR_usr32 0x0f0004 - #define __ARM_NR_set_tls 0x0f0005 -+#define __ARM_NR_get_tls 0x0f0006 - -diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h -index 197752ef..8f2ae8f8 100644 ---- a/arch/arm/pthread_arch.h -+++ b/arch/arm/pthread_arch.h -@@ -1,11 +1,11 @@ --#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6ZK__) && !__thumb__) \ -+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \ - || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7 - - static inline pthread_t __pthread_self() - { - char *p; - __asm__ __volatile__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(p) ); -- return (void *)(p+8-sizeof(struct pthread)); -+ return (void *)(p-sizeof(struct pthread)); - } - - #else -@@ -21,12 +21,13 @@ static inline pthread_t __pthread_self() - extern uintptr_t __attribute__((__visibility__("hidden"))) __a_gettp_ptr; - register uintptr_t p __asm__("r0"); - __asm__ __volatile__ ( BLX " %1" : "=r"(p) : "r"(__a_gettp_ptr) : "cc", "lr" ); -- return (void *)(p+8-sizeof(struct pthread)); -+ return (void *)(p-sizeof(struct pthread)); - } - - #endif - - #define TLS_ABOVE_TP --#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8) -+#define GAP_ABOVE_TP 8 -+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) - - #define MC_PC arm_pc -diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h -index b175711d..4b00bf64 100644 ---- a/arch/arm/reloc.h -+++ b/arch/arm/reloc.h -@@ -16,7 +16,7 @@ - - #define NO_LEGACY_INITFINI - --#define TPOFF_K 8 -+#define TPOFF_K 0 - - #define REL_SYMBOLIC R_ARM_ABS32 - #define REL_GOT R_ARM_GLOB_DAT -diff --git a/arch/arm/syscall_arch.h b/arch/arm/syscall_arch.h -index 6023303b..53fb155c 100644 ---- a/arch/arm/syscall_arch.h -+++ b/arch/arm/syscall_arch.h -@@ -3,74 +3,99 @@ - ((union { long long ll; long l[2]; }){ .ll = x }).l[1] - #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x)) - -+#ifdef __thumb__ -+ -+/* Avoid use of r7 in asm constraints when producing thumb code, -+ * since it's reserved as frame pointer and might not be supported. */ -+#define __ASM____R7__ -+#define __asm_syscall(...) do { \ -+ __asm__ __volatile__ ( "mov %1,r7 ; mov r7,%2 ; svc 0 ; mov r7,%1" \ -+ : "=r"(r0), "=&r"((int){0}) : __VA_ARGS__ : "memory"); \ -+ return r0; \ -+ } while (0) -+ -+#else -+ -+#define __ASM____R7__ __asm__("r7") - #define __asm_syscall(...) do { \ - __asm__ __volatile__ ( "svc 0" \ - : "=r"(r0) : __VA_ARGS__ : "memory"); \ - return r0; \ - } while (0) -+#endif -+ -+/* For thumb2, we can allow 8-bit immediate syscall numbers, saving a -+ * register in the above dance around r7. Does not work for thumb1 where -+ * only movs, not mov, supports immediates, and we can't use movs because -+ * it doesn't support high regs. */ -+#ifdef __thumb2__ -+#define R7_OPERAND "rI"(r7) -+#else -+#define R7_OPERAND "r"(r7) -+#endif - - static inline long __syscall0(long n) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0"); -- __asm_syscall("r"(r7)); -+ __asm_syscall(R7_OPERAND); - } - - static inline long __syscall1(long n, long a) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0") = a; -- __asm_syscall("r"(r7), "0"(r0)); -+ __asm_syscall(R7_OPERAND, "0"(r0)); - } - - static inline long __syscall2(long n, long a, long b) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0") = a; - register long r1 __asm__("r1") = b; -- __asm_syscall("r"(r7), "0"(r0), "r"(r1)); -+ __asm_syscall(R7_OPERAND, "0"(r0), "r"(r1)); - } - - static inline long __syscall3(long n, long a, long b, long c) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0") = a; - register long r1 __asm__("r1") = b; - register long r2 __asm__("r2") = c; -- __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2)); -+ __asm_syscall(R7_OPERAND, "0"(r0), "r"(r1), "r"(r2)); - } - - static inline long __syscall4(long n, long a, long b, long c, long d) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0") = a; - register long r1 __asm__("r1") = b; - register long r2 __asm__("r2") = c; - register long r3 __asm__("r3") = d; -- __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3)); -+ __asm_syscall(R7_OPERAND, "0"(r0), "r"(r1), "r"(r2), "r"(r3)); - } - - static inline long __syscall5(long n, long a, long b, long c, long d, long e) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0") = a; - register long r1 __asm__("r1") = b; - register long r2 __asm__("r2") = c; - register long r3 __asm__("r3") = d; - register long r4 __asm__("r4") = e; -- __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4)); -+ __asm_syscall(R7_OPERAND, "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4)); - } - - static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f) - { -- register long r7 __asm__("r7") = n; -+ register long r7 __ASM____R7__ = n; - register long r0 __asm__("r0") = a; - register long r1 __asm__("r1") = b; - register long r2 __asm__("r2") = c; - register long r3 __asm__("r3") = d; - register long r4 __asm__("r4") = e; - register long r5 __asm__("r5") = f; -- __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4), "r"(r5)); -+ __asm_syscall(R7_OPERAND, "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4), "r"(r5)); - } - - #define VDSO_USEFUL -@@ -78,3 +103,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo - #define VDSO_CGT_VER "LINUX_2.6" - - #define SYSCALL_FADVISE_6_ARG -+ -+#define SYSCALL_IPC_BROKEN_MODE -diff --git a/arch/generic/bits/kd.h b/arch/generic/bits/kd.h -new file mode 100644 -index 00000000..33b873f4 ---- /dev/null -+++ b/arch/generic/bits/kd.h -@@ -0,0 +1 @@ -+#include <linux/kd.h> -diff --git a/arch/generic/bits/ptrace.h b/arch/generic/bits/ptrace.h -new file mode 100644 -index 00000000..e69de29b -diff --git a/arch/generic/bits/soundcard.h b/arch/generic/bits/soundcard.h -new file mode 100644 -index 00000000..fade986f ---- /dev/null -+++ b/arch/generic/bits/soundcard.h -@@ -0,0 +1 @@ -+#include <linux/soundcard.h> -diff --git a/arch/generic/bits/termios.h b/arch/generic/bits/termios.h -index 434c02c8..124f71d2 100644 ---- a/arch/generic/bits/termios.h -+++ b/arch/generic/bits/termios.h -@@ -51,6 +51,7 @@ struct termios { - #define ONLRET 0000040 - #define OFILL 0000100 - #define OFDEL 0000200 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define NLDLY 0000400 - #define NL0 0000000 - #define NL1 0000400 -@@ -70,6 +71,7 @@ struct termios { - #define FFDLY 0100000 - #define FF0 0000000 - #define FF1 0100000 -+#endif - - #define VTDLY 0040000 - #define VT0 0000000 -diff --git a/arch/generic/bits/vt.h b/arch/generic/bits/vt.h -new file mode 100644 -index 00000000..834abfbc ---- /dev/null -+++ b/arch/generic/bits/vt.h -@@ -0,0 +1 @@ -+#include <linux/vt.h> -diff --git a/arch/i386/atomic_arch.h b/arch/i386/atomic_arch.h -index 7d2a48a5..047fb68d 100644 ---- a/arch/i386/atomic_arch.h -+++ b/arch/i386/atomic_arch.h -@@ -92,10 +92,10 @@ static inline int a_ctz_64(uint64_t x) - return r; - } - --#define a_ctz_l a_ctz_l --static inline int a_ctz_l(unsigned long x) -+#define a_ctz_32 a_ctz_32 -+static inline int a_ctz_32(uint32_t x) - { -- long r; -+ int r; - __asm__( "bsf %1,%0" : "=r"(r) : "r"(x) ); - return r; - } -diff --git a/arch/i386/bits/limits.h b/arch/i386/bits/limits.h -index 65a3dd64..c340ceb2 100644 ---- a/arch/i386/bits/limits.h -+++ b/arch/i386/bits/limits.h -@@ -1,6 +1,6 @@ - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define PAGE_SIZE 4096 -+#define PAGESIZE 4096 - #define LONG_BIT 32 - #endif - -diff --git a/arch/i386/bits/ptrace.h b/arch/i386/bits/ptrace.h -new file mode 100644 -index 00000000..7d0efbf3 ---- /dev/null -+++ b/arch/i386/bits/ptrace.h -@@ -0,0 +1,11 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SET_THREAD_AREA 26 -+#define PTRACE_SYSEMU 31 -+#define PTRACE_SYSEMU_SINGLESTEP 32 -+#define PTRACE_SINGLEBLOCK 33 -+ -+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA -+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA -+#define PT_SYSEMU PTRACE_SYSEMU -+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP -+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK -diff --git a/arch/i386/bits/user.h b/arch/i386/bits/user.h -index 0e343930..33fea986 100644 ---- a/arch/i386/bits/user.h -+++ b/arch/i386/bits/user.h -@@ -37,8 +37,8 @@ struct user { - int u_debugreg[8]; - }; - --#define PAGE_MASK (~(PAGE_SIZE-1)) --#define NBPG PAGE_SIZE -+#define PAGE_MASK (~(PAGESIZE-1)) -+#define NBPG PAGESIZE - #define UPAGES 1 - #define HOST_TEXT_START_ADDR (u.start_code) - #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -diff --git a/arch/m68k/atomic_arch.h b/arch/m68k/atomic_arch.h -new file mode 100644 -index 00000000..b369649a ---- /dev/null -+++ b/arch/m68k/atomic_arch.h -@@ -0,0 +1,8 @@ -+#define a_cas a_cas -+static inline int a_cas(volatile int *p, int t, int s) -+{ -+ __asm__ __volatile__ ( -+ "cas.l %0, %2, (%1)" -+ : "+d"(t) : "a"(p), "d"(s) : "memory", "cc"); -+ return t; -+} -diff --git a/arch/m68k/bits/alltypes.h.in b/arch/m68k/bits/alltypes.h.in -new file mode 100644 -index 00000000..a4a8141f ---- /dev/null -+++ b/arch/m68k/bits/alltypes.h.in -@@ -0,0 +1,31 @@ -+#define _Addr int -+#define _Int64 long long -+#define _Reg int -+ -+TYPEDEF __builtin_va_list va_list; -+TYPEDEF __builtin_va_list __isoc_va_list; -+ -+#ifndef __cplusplus -+TYPEDEF long wchar_t; -+#endif -+ -+#if __mcffpu__ -+TYPEDEF float float_t; -+TYPEDEF double double_t; -+#else -+TYPEDEF long double float_t; -+TYPEDEF long double double_t; -+#endif -+ -+TYPEDEF struct { long long __ll; long double __ld; } max_align_t; -+ -+TYPEDEF long time_t; -+TYPEDEF long suseconds_t; -+ -+TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t; -+TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t; -+TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t; -+TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t; -+TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t; -+TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t; -+TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t; -diff --git a/arch/m68k/bits/endian.h b/arch/m68k/bits/endian.h -new file mode 100644 -index 00000000..ef074b77 ---- /dev/null -+++ b/arch/m68k/bits/endian.h -@@ -0,0 +1 @@ -+#define __BYTE_ORDER __BIG_ENDIAN -diff --git a/arch/m68k/bits/fcntl.h b/arch/m68k/bits/fcntl.h -new file mode 100644 -index 00000000..f1c8400f ---- /dev/null -+++ b/arch/m68k/bits/fcntl.h -@@ -0,0 +1,40 @@ -+#define O_CREAT 0100 -+#define O_EXCL 0200 -+#define O_NOCTTY 0400 -+#define O_TRUNC 01000 -+#define O_APPEND 02000 -+#define O_NONBLOCK 04000 -+#define O_DSYNC 010000 -+#define O_SYNC 04010000 -+#define O_RSYNC 04010000 -+#define O_DIRECTORY 040000 -+#define O_NOFOLLOW 0100000 -+#define O_CLOEXEC 02000000 -+ -+#define O_ASYNC 020000 -+#define O_DIRECT 0200000 -+#define O_LARGEFILE 0400000 -+#define O_NOATIME 01000000 -+#define O_PATH 010000000 -+#define O_TMPFILE 020200000 -+#define O_NDELAY O_NONBLOCK -+ -+#define F_DUPFD 0 -+#define F_GETFD 1 -+#define F_SETFD 2 -+#define F_GETFL 3 -+#define F_SETFL 4 -+ -+#define F_SETOWN 8 -+#define F_GETOWN 9 -+#define F_SETSIG 10 -+#define F_GETSIG 11 -+ -+#define F_GETLK 12 -+#define F_SETLK 13 -+#define F_SETLKW 14 -+ -+#define F_SETOWN_EX 15 -+#define F_GETOWN_EX 16 -+ -+#define F_GETOWNER_UIDS 17 -diff --git a/arch/m68k/bits/fenv.h b/arch/m68k/bits/fenv.h -new file mode 100644 -index 00000000..c90a4a58 ---- /dev/null -+++ b/arch/m68k/bits/fenv.h -@@ -0,0 +1,29 @@ -+#if __HAVE_68881__ || __mcffpu__ -+ -+#define FE_INEXACT 8 -+#define FE_DIVBYZERO 16 -+#define FE_UNDERFLOW 32 -+#define FE_OVERFLOW 64 -+#define FE_INVALID 128 -+ -+#define FE_ALL_EXCEPT 0xf8 -+ -+#define FE_TONEAREST 0 -+#define FE_TOWARDZERO 16 -+#define FE_DOWNWARD 32 -+#define FE_UPWARD 48 -+ -+#else -+ -+#define FE_ALL_EXCEPT 0 -+#define FE_TONEAREST 0 -+ -+#endif -+ -+typedef unsigned fexcept_t; -+ -+typedef struct { -+ unsigned __control_register, __status_register, __instruction_address; -+} fenv_t; -+ -+#define FE_DFL_ENV ((const fenv_t *) -1) -diff --git a/arch/m68k/bits/float.h b/arch/m68k/bits/float.h -new file mode 100644 -index 00000000..0e6899d5 ---- /dev/null -+++ b/arch/m68k/bits/float.h -@@ -0,0 +1,39 @@ -+#if !__mcffpu__ -+ -+#define FLT_EVAL_METHOD 2 -+ -+#define LDBL_TRUE_MIN 3.6451995318824746025e-4951L -+#define LDBL_MIN 1.68105157155604675313e-4932L -+#define LDBL_MAX 1.1897314953572317650e+4932L -+#define LDBL_EPSILON 1.0842021724855044340e-19L -+ -+#define LDBL_MANT_DIG 64 -+#define LDBL_MIN_EXP (-16382) -+#define LDBL_MAX_EXP 16384 -+ -+#define LDBL_DIG 18 -+#define LDBL_MIN_10_EXP (-4931) -+#define LDBL_MAX_10_EXP 4932 -+ -+#define DECIMAL_DIG 21 -+ -+#else -+ -+#define FLT_EVAL_METHOD 0 -+ -+#define LDBL_TRUE_MIN 4.94065645841246544177e-324L -+#define LDBL_MIN 2.22507385850720138309e-308L -+#define LDBL_MAX 1.79769313486231570815e+308L -+#define LDBL_EPSILON 2.22044604925031308085e-16L -+ -+#define LDBL_MANT_DIG 53 -+#define LDBL_MIN_EXP (-1021) -+#define LDBL_MAX_EXP 1024 -+ -+#define LDBL_DIG 15 -+#define LDBL_MIN_10_EXP (-307) -+#define LDBL_MAX_10_EXP 308 -+ -+#define DECIMAL_DIG 17 -+ -+#endif -diff --git a/arch/m68k/bits/limits.h b/arch/m68k/bits/limits.h -new file mode 100644 -index 00000000..fbc6d238 ---- /dev/null -+++ b/arch/m68k/bits/limits.h -@@ -0,0 +1,7 @@ -+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ -+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -+#define LONG_BIT 32 -+#endif -+ -+#define LONG_MAX 0x7fffffffL -+#define LLONG_MAX 0x7fffffffffffffffLL -diff --git a/arch/m68k/bits/posix.h b/arch/m68k/bits/posix.h -new file mode 100644 -index 00000000..30a38714 ---- /dev/null -+++ b/arch/m68k/bits/posix.h -@@ -0,0 +1,2 @@ -+#define _POSIX_V6_ILP32_OFFBIG 1 -+#define _POSIX_V7_ILP32_OFFBIG 1 -diff --git a/arch/m68k/bits/ptrace.h b/arch/m68k/bits/ptrace.h -new file mode 100644 -index 00000000..da93e7a7 ---- /dev/null -+++ b/arch/m68k/bits/ptrace.h -@@ -0,0 +1,2 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SINGLEBLOCK 33 -diff --git a/arch/m68k/bits/reg.h b/arch/m68k/bits/reg.h -new file mode 100644 -index 00000000..99201f70 ---- /dev/null -+++ b/arch/m68k/bits/reg.h -@@ -0,0 +1,45 @@ -+#undef __WORDSIZE -+#define __WORDSIZE 32 -+#define PT_D1 0 -+#define PT_D2 1 -+#define PT_D3 2 -+#define PT_D4 3 -+#define PT_D5 4 -+#define PT_D6 5 -+#define PT_D7 6 -+#define PT_A0 7 -+#define PT_A1 8 -+#define PT_A2 9 -+#define PT_A3 10 -+#define PT_A4 11 -+#define PT_A5 12 -+#define PT_A6 13 -+#define PT_D0 14 -+#define PT_USP 15 -+#define PT_ORIG_D0 16 -+#define PT_SR 17 -+#define PT_PC 18 -+ -+#if __mcffpu__ -+#define PT_FP0 21 -+#define PT_FP1 23 -+#define PT_FP2 25 -+#define PT_FP3 27 -+#define PT_FP4 29 -+#define PT_FP5 31 -+#define PT_FP6 33 -+#define PT_FP7 35 -+#else -+#define PT_FP0 21 -+#define PT_FP1 24 -+#define PT_FP2 27 -+#define PT_FP3 30 -+#define PT_FP4 33 -+#define PT_FP5 36 -+#define PT_FP6 39 -+#define PT_FP7 42 -+#endif -+ -+#define PT_FPCR 45 -+#define PT_FPSR 46 -+#define PT_FPIAR 47 -diff --git a/arch/m68k/bits/setjmp.h b/arch/m68k/bits/setjmp.h -new file mode 100644 -index 00000000..5e091fb4 ---- /dev/null -+++ b/arch/m68k/bits/setjmp.h -@@ -0,0 +1 @@ -+typedef unsigned long __jmp_buf[39]; -diff --git a/arch/m68k/bits/signal.h b/arch/m68k/bits/signal.h -new file mode 100644 -index 00000000..2c369ca3 ---- /dev/null -+++ b/arch/m68k/bits/signal.h -@@ -0,0 +1,140 @@ -+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ -+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -+ -+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -+#define MINSIGSTKSZ 2048 -+#define SIGSTKSZ 8192 -+#endif -+ -+#ifdef _GNU_SOURCE -+enum { R_D0 = 0 }; -+#define R_D0 R_D0 -+enum { R_D1 = 1 }; -+#define R_D1 R_D1 -+enum { R_D2 = 2 }; -+#define R_D2 R_D2 -+enum { R_D3 = 3 }; -+#define R_D3 R_D3 -+enum { R_D4 = 4 }; -+#define R_D4 R_D4 -+enum { R_D5 = 5 }; -+#define R_D5 R_D5 -+enum { R_D6 = 6 }; -+#define R_D6 R_D6 -+enum { R_D7 = 7 }; -+#define R_D7 R_D7 -+enum { R_A0 = 8 }; -+#define R_A0 R_A0 -+enum { R_A1 = 9 }; -+#define R_A1 R_A1 -+enum { R_A2 = 10 }; -+#define R_A2 R_A2 -+enum { R_A3 = 11 }; -+#define R_A3 R_A3 -+enum { R_A4 = 12 }; -+#define R_A4 R_A4 -+enum { R_A5 = 13 }; -+#define R_A5 R_A5 -+enum { R_A6 = 14 }; -+#define R_A6 R_A6 -+enum { R_A7 = 15 }; -+#define R_A7 R_A7 -+enum { R_SP = 15 }; -+#define R_SP R_SP -+enum { R_PC = 16 }; -+#define R_PC R_PC -+enum { R_PS = 17 }; -+#define R_PS R_PS -+#endif -+ -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -+ -+struct sigcontext { -+ unsigned long sc_mask, sc_usp, sc_d0, sc_d1, sc_a0, sc_a1; -+ unsigned short sc_sr; -+ unsigned long sc_pc; -+ unsigned short sc_formatvec; -+ unsigned long sc_fpregs[6], sc_fpcntl[3]; -+ unsigned char sc_fpstate[216]; -+}; -+ -+typedef int greg_t, gregset_t[18]; -+typedef struct { -+ int f_pcr, f_psr, f_fpiaddr, f_fpregs[8][3]; -+} fpregset_t; -+ -+typedef struct { -+ int version; -+ gregset_t gregs; -+ fpregset_t fpregs; -+} mcontext_t; -+#else -+typedef struct { -+ int __version; -+ int __gregs[18]; -+ int __fpregs[27]; -+} mcontext_t; -+#endif -+ -+struct sigaltstack { -+ void *ss_sp; -+ int ss_flags; -+ size_t ss_size; -+}; -+ -+typedef struct __ucontext { -+ unsigned long uc_flags; -+ struct __ucontext *uc_link; -+ stack_t uc_stack; -+ mcontext_t uc_mcontext; -+ long __reserved[80]; -+ sigset_t uc_sigmask; -+} ucontext_t; -+ -+#define SA_NOCLDSTOP 1 -+#define SA_NOCLDWAIT 2 -+#define SA_SIGINFO 4 -+#define SA_ONSTACK 0x08000000 -+#define SA_RESTART 0x10000000 -+#define SA_NODEFER 0x40000000 -+#define SA_RESETHAND 0x80000000 -+#define SA_RESTORER 0x04000000 -+ -+#endif -+ -+#define SIGHUP 1 -+#define SIGINT 2 -+#define SIGQUIT 3 -+#define SIGILL 4 -+#define SIGTRAP 5 -+#define SIGABRT 6 -+#define SIGIOT SIGABRT -+#define SIGBUS 7 -+#define SIGFPE 8 -+#define SIGKILL 9 -+#define SIGUSR1 10 -+#define SIGSEGV 11 -+#define SIGUSR2 12 -+#define SIGPIPE 13 -+#define SIGALRM 14 -+#define SIGTERM 15 -+#define SIGSTKFLT 16 -+#define SIGCHLD 17 -+#define SIGCONT 18 -+#define SIGSTOP 19 -+#define SIGTSTP 20 -+#define SIGTTIN 21 -+#define SIGTTOU 22 -+#define SIGURG 23 -+#define SIGXCPU 24 -+#define SIGXFSZ 25 -+#define SIGVTALRM 26 -+#define SIGPROF 27 -+#define SIGWINCH 28 -+#define SIGIO 29 -+#define SIGPOLL 29 -+#define SIGPWR 30 -+#define SIGSYS 31 -+#define SIGUNUSED SIGSYS -+ -+#define _NSIG 65 -diff --git a/arch/m68k/bits/stat.h b/arch/m68k/bits/stat.h -new file mode 100644 -index 00000000..0f7b66a1 ---- /dev/null -+++ b/arch/m68k/bits/stat.h -@@ -0,0 +1,21 @@ -+/* copied from kernel definition, but with padding replaced -+ * by the corresponding correctly-sized userspace types. */ -+ -+struct stat { -+ dev_t st_dev; -+ short __st_dev_padding; -+ long __st_ino_truncated; -+ mode_t st_mode; -+ nlink_t st_nlink; -+ uid_t st_uid; -+ gid_t st_gid; -+ dev_t st_rdev; -+ short __st_rdev_padding; -+ off_t st_size; -+ blksize_t st_blksize; -+ blkcnt_t st_blocks; -+ struct timespec st_atim; -+ struct timespec st_mtim; -+ struct timespec st_ctim; -+ ino_t st_ino; -+}; -diff --git a/arch/m68k/bits/stdint.h b/arch/m68k/bits/stdint.h -new file mode 100644 -index 00000000..d1b27121 ---- /dev/null -+++ b/arch/m68k/bits/stdint.h -@@ -0,0 +1,20 @@ -+typedef int32_t int_fast16_t; -+typedef int32_t int_fast32_t; -+typedef uint32_t uint_fast16_t; -+typedef uint32_t uint_fast32_t; -+ -+#define INT_FAST16_MIN INT32_MIN -+#define INT_FAST32_MIN INT32_MIN -+ -+#define INT_FAST16_MAX INT32_MAX -+#define INT_FAST32_MAX INT32_MAX -+ -+#define UINT_FAST16_MAX UINT32_MAX -+#define UINT_FAST32_MAX UINT32_MAX -+ -+#define INTPTR_MIN INT32_MIN -+#define INTPTR_MAX INT32_MAX -+#define UINTPTR_MAX UINT32_MAX -+#define PTRDIFF_MIN INT32_MIN -+#define PTRDIFF_MAX INT32_MAX -+#define SIZE_MAX UINT32_MAX -diff --git a/arch/m68k/bits/syscall.h.in b/arch/m68k/bits/syscall.h.in -new file mode 100644 -index 00000000..89cf114c ---- /dev/null -+++ b/arch/m68k/bits/syscall.h.in -@@ -0,0 +1,361 @@ -+#define __NR_restart_syscall 0 -+#define __NR_exit 1 -+#define __NR_fork 2 -+#define __NR_read 3 -+#define __NR_write 4 -+#define __NR_open 5 -+#define __NR_close 6 -+#define __NR_waitpid 7 -+#define __NR_creat 8 -+#define __NR_link 9 -+#define __NR_unlink 10 -+#define __NR_execve 11 -+#define __NR_chdir 12 -+#define __NR_time 13 -+#define __NR_mknod 14 -+#define __NR_chmod 15 -+#define __NR_chown 16 -+#define __NR_oldstat 18 -+#define __NR_lseek 19 -+#define __NR_getpid 20 -+#define __NR_mount 21 -+#define __NR_umount 22 -+#define __NR_setuid 23 -+#define __NR_getuid 24 -+#define __NR_stime 25 -+#define __NR_ptrace 26 -+#define __NR_alarm 27 -+#define __NR_oldfstat 28 -+#define __NR_pause 29 -+#define __NR_utime 30 -+#define __NR_access 33 -+#define __NR_nice 34 -+#define __NR_sync 36 -+#define __NR_kill 37 -+#define __NR_rename 38 -+#define __NR_mkdir 39 -+#define __NR_rmdir 40 -+#define __NR_dup 41 -+#define __NR_pipe 42 -+#define __NR_times 43 -+#define __NR_brk 45 -+#define __NR_setgid 46 -+#define __NR_getgid 47 -+#define __NR_signal 48 -+#define __NR_geteuid 49 -+#define __NR_getegid 50 -+#define __NR_acct 51 -+#define __NR_umount2 52 -+#define __NR_ioctl 54 -+#define __NR_fcntl 55 -+#define __NR_setpgid 57 -+#define __NR_umask 60 -+#define __NR_chroot 61 -+#define __NR_ustat 62 -+#define __NR_dup2 63 -+#define __NR_getppid 64 -+#define __NR_getpgrp 65 -+#define __NR_setsid 66 -+#define __NR_sigaction 67 -+#define __NR_sgetmask 68 -+#define __NR_ssetmask 69 -+#define __NR_setreuid 70 -+#define __NR_setregid 71 -+#define __NR_sigsuspend 72 -+#define __NR_sigpending 73 -+#define __NR_sethostname 74 -+#define __NR_setrlimit 75 -+#define __NR_getrlimit 76 -+#define __NR_getrusage 77 -+#define __NR_gettimeofday 78 -+#define __NR_settimeofday 79 -+#define __NR_getgroups 80 -+#define __NR_setgroups 81 -+#define __NR_select 82 -+#define __NR_symlink 83 -+#define __NR_oldlstat 84 -+#define __NR_readlink 85 -+#define __NR_uselib 86 -+#define __NR_swapon 87 -+#define __NR_reboot 88 -+#define __NR_readdir 89 -+#define __NR_mmap 90 -+#define __NR_munmap 91 -+#define __NR_truncate 92 -+#define __NR_ftruncate 93 -+#define __NR_fchmod 94 -+#define __NR_fchown 95 -+#define __NR_getpriority 96 -+#define __NR_setpriority 97 -+#define __NR_statfs 99 -+#define __NR_fstatfs 100 -+#define __NR_socketcall 102 -+#define __NR_syslog 103 -+#define __NR_setitimer 104 -+#define __NR_getitimer 105 -+#define __NR_stat 106 -+#define __NR_lstat 107 -+#define __NR_fstat 108 -+#define __NR_vhangup 111 -+#define __NR_wait4 114 -+#define __NR_swapoff 115 -+#define __NR_sysinfo 116 -+#define __NR_ipc 117 -+#define __NR_fsync 118 -+#define __NR_sigreturn 119 -+#define __NR_clone 120 -+#define __NR_setdomainname 121 -+#define __NR_uname 122 -+#define __NR_cacheflush 123 -+#define __NR_adjtimex 124 -+#define __NR_mprotect 125 -+#define __NR_sigprocmask 126 -+#define __NR_create_module 127 -+#define __NR_init_module 128 -+#define __NR_delete_module 129 -+#define __NR_get_kernel_syms 130 -+#define __NR_quotactl 131 -+#define __NR_getpgid 132 -+#define __NR_fchdir 133 -+#define __NR_bdflush 134 -+#define __NR_sysfs 135 -+#define __NR_personality 136 -+#define __NR_setfsuid 138 -+#define __NR_setfsgid 139 -+#define __NR__llseek 140 -+#define __NR_getdents 141 -+#define __NR__newselect 142 -+#define __NR_flock 143 -+#define __NR_msync 144 -+#define __NR_readv 145 -+#define __NR_writev 146 -+#define __NR_getsid 147 -+#define __NR_fdatasync 148 -+#define __NR__sysctl 149 -+#define __NR_mlock 150 -+#define __NR_munlock 151 -+#define __NR_mlockall 152 -+#define __NR_munlockall 153 -+#define __NR_sched_setparam 154 -+#define __NR_sched_getparam 155 -+#define __NR_sched_setscheduler 156 -+#define __NR_sched_getscheduler 157 -+#define __NR_sched_yield 158 -+#define __NR_sched_get_priority_max 159 -+#define __NR_sched_get_priority_min 160 -+#define __NR_sched_rr_get_interval 161 -+#define __NR_nanosleep 162 -+#define __NR_mremap 163 -+#define __NR_setresuid 164 -+#define __NR_getresuid 165 -+#define __NR_getpagesize 166 -+#define __NR_query_module 167 -+#define __NR_poll 168 -+#define __NR_nfsservctl 169 -+#define __NR_setresgid 170 -+#define __NR_getresgid 171 -+#define __NR_prctl 172 -+#define __NR_rt_sigreturn 173 -+#define __NR_rt_sigaction 174 -+#define __NR_rt_sigprocmask 175 -+#define __NR_rt_sigpending 176 -+#define __NR_rt_sigtimedwait 177 -+#define __NR_rt_sigqueueinfo 178 -+#define __NR_rt_sigsuspend 179 -+#define __NR_pread64 180 -+#define __NR_pwrite64 181 -+#define __NR_lchown 182 -+#define __NR_getcwd 183 -+#define __NR_capget 184 -+#define __NR_capset 185 -+#define __NR_sigaltstack 186 -+#define __NR_sendfile 187 -+#define __NR_getpmsg 188 -+#define __NR_putpmsg 189 -+#define __NR_vfork 190 -+#define __NR_ugetrlimit 191 -+#define __NR_mmap2 192 -+#define __NR_truncate64 193 -+#define __NR_ftruncate64 194 -+#define __NR_stat64 195 -+#define __NR_lstat64 196 -+#define __NR_fstat64 197 -+#define __NR_chown32 198 -+#define __NR_getuid32 199 -+#define __NR_getgid32 200 -+#define __NR_geteuid32 201 -+#define __NR_getegid32 202 -+#define __NR_setreuid32 203 -+#define __NR_setregid32 204 -+#define __NR_getgroups32 205 -+#define __NR_setgroups32 206 -+#define __NR_fchown32 207 -+#define __NR_setresuid32 208 -+#define __NR_getresuid32 209 -+#define __NR_setresgid32 210 -+#define __NR_getresgid32 211 -+#define __NR_lchown32 212 -+#define __NR_setuid32 213 -+#define __NR_setgid32 214 -+#define __NR_setfsuid32 215 -+#define __NR_setfsgid32 216 -+#define __NR_pivot_root 217 -+#define __NR_getdents64 220 -+#define __NR_gettid 221 -+#define __NR_tkill 222 -+#define __NR_setxattr 223 -+#define __NR_lsetxattr 224 -+#define __NR_fsetxattr 225 -+#define __NR_getxattr 226 -+#define __NR_lgetxattr 227 -+#define __NR_fgetxattr 228 -+#define __NR_listxattr 229 -+#define __NR_llistxattr 230 -+#define __NR_flistxattr 231 -+#define __NR_removexattr 232 -+#define __NR_lremovexattr 233 -+#define __NR_fremovexattr 234 -+#define __NR_futex 235 -+#define __NR_sendfile64 236 -+#define __NR_mincore 237 -+#define __NR_madvise 238 -+#define __NR_fcntl64 239 -+#define __NR_readahead 240 -+#define __NR_io_setup 241 -+#define __NR_io_destroy 242 -+#define __NR_io_getevents 243 -+#define __NR_io_submit 244 -+#define __NR_io_cancel 245 -+#define __NR_fadvise64 246 -+#define __NR_exit_group 247 -+#define __NR_lookup_dcookie 248 -+#define __NR_epoll_create 249 -+#define __NR_epoll_ctl 250 -+#define __NR_epoll_wait 251 -+#define __NR_remap_file_pages 252 -+#define __NR_set_tid_address 253 -+#define __NR_timer_create 254 -+#define __NR_timer_settime 255 -+#define __NR_timer_gettime 256 -+#define __NR_timer_getoverrun 257 -+#define __NR_timer_delete 258 -+#define __NR_clock_settime 259 -+#define __NR_clock_gettime 260 -+#define __NR_clock_getres 261 -+#define __NR_clock_nanosleep 262 -+#define __NR_statfs64 263 -+#define __NR_fstatfs64 264 -+#define __NR_tgkill 265 -+#define __NR_utimes 266 -+#define __NR_fadvise64_64 267 -+#define __NR_mbind 268 -+#define __NR_get_mempolicy 269 -+#define __NR_set_mempolicy 270 -+#define __NR_mq_open 271 -+#define __NR_mq_unlink 272 -+#define __NR_mq_timedsend 273 -+#define __NR_mq_timedreceive 274 -+#define __NR_mq_notify 275 -+#define __NR_mq_getsetattr 276 -+#define __NR_waitid 277 -+#define __NR_add_key 279 -+#define __NR_request_key 280 -+#define __NR_keyctl 281 -+#define __NR_ioprio_set 282 -+#define __NR_ioprio_get 283 -+#define __NR_inotify_init 284 -+#define __NR_inotify_add_watch 285 -+#define __NR_inotify_rm_watch 286 -+#define __NR_migrate_pages 287 -+#define __NR_openat 288 -+#define __NR_mkdirat 289 -+#define __NR_mknodat 290 -+#define __NR_fchownat 291 -+#define __NR_futimesat 292 -+#define __NR_fstatat64 293 -+#define __NR_unlinkat 294 -+#define __NR_renameat 295 -+#define __NR_linkat 296 -+#define __NR_symlinkat 297 -+#define __NR_readlinkat 298 -+#define __NR_fchmodat 299 -+#define __NR_faccessat 300 -+#define __NR_pselect6 301 -+#define __NR_ppoll 302 -+#define __NR_unshare 303 -+#define __NR_set_robust_list 304 -+#define __NR_get_robust_list 305 -+#define __NR_splice 306 -+#define __NR_sync_file_range 307 -+#define __NR_tee 308 -+#define __NR_vmsplice 309 -+#define __NR_move_pages 310 -+#define __NR_sched_setaffinity 311 -+#define __NR_sched_getaffinity 312 -+#define __NR_kexec_load 313 -+#define __NR_getcpu 314 -+#define __NR_epoll_pwait 315 -+#define __NR_utimensat 316 -+#define __NR_signalfd 317 -+#define __NR_timerfd_create 318 -+#define __NR_eventfd 319 -+#define __NR_fallocate 320 -+#define __NR_timerfd_settime 321 -+#define __NR_timerfd_gettime 322 -+#define __NR_signalfd4 323 -+#define __NR_eventfd2 324 -+#define __NR_epoll_create1 325 -+#define __NR_dup3 326 -+#define __NR_pipe2 327 -+#define __NR_inotify_init1 328 -+#define __NR_preadv 329 -+#define __NR_pwritev 330 -+#define __NR_rt_tgsigqueueinfo 331 -+#define __NR_perf_event_open 332 -+#define __NR_get_thread_area 333 -+#define __NR_set_thread_area 334 -+#define __NR_atomic_cmpxchg_32 335 -+#define __NR_atomic_barrier 336 -+#define __NR_fanotify_init 337 -+#define __NR_fanotify_mark 338 -+#define __NR_prlimit64 339 -+#define __NR_name_to_handle_at 340 -+#define __NR_open_by_handle_at 341 -+#define __NR_clock_adjtime 342 -+#define __NR_syncfs 343 -+#define __NR_setns 344 -+#define __NR_process_vm_readv 345 -+#define __NR_process_vm_writev 346 -+#define __NR_kcmp 347 -+#define __NR_finit_module 348 -+#define __NR_sched_setattr 349 -+#define __NR_sched_getattr 350 -+#define __NR_renameat2 351 -+#define __NR_getrandom 352 -+#define __NR_memfd_create 353 -+#define __NR_bpf 354 -+#define __NR_execveat 355 -+#define __NR_socket 356 -+#define __NR_socketpair 357 -+#define __NR_bind 358 -+#define __NR_connect 359 -+#define __NR_listen 360 -+#define __NR_accept4 361 -+#define __NR_getsockopt 362 -+#define __NR_setsockopt 363 -+#define __NR_getsockname 364 -+#define __NR_getpeername 365 -+#define __NR_sendto 366 -+#define __NR_sendmsg 367 -+#define __NR_recvfrom 368 -+#define __NR_recvmsg 369 -+#define __NR_shutdown 370 -+#define __NR_recvmmsg 371 -+#define __NR_sendmmsg 372 -+#define __NR_userfaultfd 373 -+#define __NR_membarrier 374 -+#define __NR_mlock2 375 -+#define __NR_copy_file_range 376 -+#define __NR_preadv2 377 -+#define __NR_pwritev2 378 -+#define __NR_statx 379 -diff --git a/arch/m68k/bits/user.h b/arch/m68k/bits/user.h -new file mode 100644 -index 00000000..9a4ca128 ---- /dev/null -+++ b/arch/m68k/bits/user.h -@@ -0,0 +1,33 @@ -+#undef __WORDSIZE -+#define __WORDSIZE 32 -+ -+struct user_m68kfp_struct { -+ unsigned long fpregs[24], fpcntl[3]; -+}; -+ -+struct user_regs_struct { -+ long d1, d2, d3, d4, d5, d6, d7; -+ long a0, a1, a2, a3, a4, a5, a6; -+ long d0, usp, orig_d0; -+ short stkadj, sr; -+ long pc; -+ short fmtvec, __pad; -+}; -+ -+struct user { -+ struct user_regs_struct regs; -+ int u_fpvalid; -+ struct user_m68kfp_struct m68kfp; -+ unsigned long u_tsize, u_dsize, u_ssize, start_code, start_stack; -+ long signal; -+ int reserved; -+ unsigned long u_ar0; -+ struct user_m68kfp_struct *u_fpstate; -+ unsigned long magic; -+ char u_comm[32]; -+}; -+ -+#define NBPG 4096 -+#define UPAGES 1 -+#define HOST_TEXT_START_ADDR (u.start_code) -+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -diff --git a/arch/m68k/crt_arch.h b/arch/m68k/crt_arch.h -new file mode 100644 -index 00000000..48a42f29 ---- /dev/null -+++ b/arch/m68k/crt_arch.h -@@ -0,0 +1,14 @@ -+__asm__( -+".text\n" -+".weak _DYNAMIC \n" -+".hidden _DYNAMIC \n" -+".global " START "\n" -+START ":\n" -+" suba.l %fp,%fp \n" -+" movea.l %sp,%a0 \n" -+" lea _DYNAMIC-.-8,%a1 \n" -+" pea (%pc,%a1) \n" -+" pea (%a0) \n" -+" lea " START "_c-.-8,%a1 \n" -+" jsr (%pc,%a1) \n" -+); -diff --git a/arch/m68k/pthread_arch.h b/arch/m68k/pthread_arch.h -new file mode 100644 -index 00000000..02d5b8a0 ---- /dev/null -+++ b/arch/m68k/pthread_arch.h -@@ -0,0 +1,13 @@ -+static inline struct pthread *__pthread_self() -+{ -+ uintptr_t tp = __syscall(SYS_get_thread_area); -+ return (pthread_t)(tp - 0x7000 - sizeof(struct pthread)); -+} -+ -+#define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 -+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) -+ -+#define DTP_OFFSET 0x8000 -+ -+#define MC_PC gregs[R_PC] -diff --git a/arch/m68k/reloc.h b/arch/m68k/reloc.h -new file mode 100644 -index 00000000..f920b39e ---- /dev/null -+++ b/arch/m68k/reloc.h -@@ -0,0 +1,30 @@ -+#if __HAVE_68881__ -+#define FP_SUFFIX "" -+#elif __mcffpu__ -+#define FP_SUFFIX "-fp64" -+#else -+#define FP_SUFFIX "-sf" -+#endif -+ -+#define LDSO_ARCH "m68k" FP_SUFFIX -+ -+#define TPOFF_K (-0x7000) -+ -+#define REL_SYMBOLIC R_68K_32 -+#define REL_OFFSET R_68K_PC32 -+#define REL_GOT R_68K_GLOB_DAT -+#define REL_PLT R_68K_JMP_SLOT -+#define REL_RELATIVE R_68K_RELATIVE -+#define REL_COPY R_68K_COPY -+#define REL_DTPMOD R_68K_TLS_DTPMOD32 -+#define REL_DTPOFF R_68K_TLS_DTPREL32 -+#define REL_TPOFF R_68K_TLS_TPREL32 -+ -+#define CRTJMP(pc,sp) __asm__ __volatile__( \ -+ "move.l %1,%%sp ; jmp (%0)" : : "r"(pc), "r"(sp) : "memory" ) -+ -+#define GETFUNCSYM(fp, sym, got) __asm__ ( \ -+ ".hidden " #sym "\n" \ -+ "lea " #sym "-.-8,%0 \n" \ -+ "lea (%%pc,%0),%0 \n" \ -+ : "=a"(*fp) : : "memory" ) -diff --git a/arch/m68k/syscall_arch.h b/arch/m68k/syscall_arch.h -new file mode 100644 -index 00000000..af79c306 ---- /dev/null -+++ b/arch/m68k/syscall_arch.h -@@ -0,0 +1,91 @@ -+#define __SYSCALL_LL_E(x) \ -+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ -+((union { long long ll; long l[2]; }){ .ll = x }).l[1] -+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x)) -+ -+static __inline long __syscall0(long n) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : -+ : "memory"); -+ return d0; -+} -+ -+static inline long __syscall1(long n, long a) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ register unsigned long d1 __asm__("d1") = a; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : "r"(d1) -+ : "memory"); -+ return d0; -+} -+ -+static inline long __syscall2(long n, long a, long b) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ register unsigned long d1 __asm__("d1") = a; -+ register unsigned long d2 __asm__("d2") = b; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : "r"(d1), "r"(d2) -+ : "memory"); -+ return d0; -+} -+ -+static inline long __syscall3(long n, long a, long b, long c) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ register unsigned long d1 __asm__("d1") = a; -+ register unsigned long d2 __asm__("d2") = b; -+ register unsigned long d3 __asm__("d3") = c; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : "r"(d1), "r"(d2), "r"(d3) -+ : "memory"); -+ return d0; -+} -+ -+static inline long __syscall4(long n, long a, long b, long c, long d) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ register unsigned long d1 __asm__("d1") = a; -+ register unsigned long d2 __asm__("d2") = b; -+ register unsigned long d3 __asm__("d3") = c; -+ register unsigned long d4 __asm__("d4") = d; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : "r"(d1), "r"(d2), "r"(d3), "r"(d4) -+ : "memory"); -+ return d0; -+} -+ -+static inline long __syscall5(long n, long a, long b, long c, long d, long e) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ register unsigned long d1 __asm__("d1") = a; -+ register unsigned long d2 __asm__("d2") = b; -+ register unsigned long d3 __asm__("d3") = c; -+ register unsigned long d4 __asm__("d4") = d; -+ register unsigned long d5 __asm__("d5") = e; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : "r"(d1), "r"(d2), "r"(d3), "r"(d4), "r"(d5) -+ : "memory"); -+ return d0; -+} -+ -+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f) -+{ -+ register unsigned long d0 __asm__("d0") = n; -+ register unsigned long d1 __asm__("d1") = a; -+ register unsigned long d2 __asm__("d2") = b; -+ register unsigned long d3 __asm__("d3") = c; -+ register unsigned long d4 __asm__("d4") = d; -+ register unsigned long d5 __asm__("d5") = e; -+ register unsigned long a0 __asm__("a0") = f; -+ __asm__ __volatile__ ("trap #0" : "+r"(d0) -+ : "r"(d1), "r"(d2), "r"(d3), "r"(d4), "r"(d5), "r"(a0) -+ : "memory"); -+ return d0; -+} -+ -+#define SYSCALL_USE_SOCKETCALL -+#define SYSCALL_IPC_BROKEN_MODE -diff --git a/arch/microblaze/syscall_arch.h b/arch/microblaze/syscall_arch.h -index 8e2de7ea..6cf631ad 100644 ---- a/arch/microblaze/syscall_arch.h -+++ b/arch/microblaze/syscall_arch.h -@@ -102,3 +102,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo - #define SYSCALL_NO_INLINE - - #endif -+ -+#define SYSCALL_IPC_BROKEN_MODE -diff --git a/arch/mips/bits/hwcap.h b/arch/mips/bits/hwcap.h -index 05cffba4..13e86fe7 100644 ---- a/arch/mips/bits/hwcap.h -+++ b/arch/mips/bits/hwcap.h -@@ -1,2 +1,3 @@ - #define HWCAP_MIPS_R6 (1 << 0) - #define HWCAP_MIPS_MSA (1 << 1) -+#define HWCAP_MIPS_CRC32 (1 << 2) -diff --git a/arch/mips/bits/mman.h b/arch/mips/bits/mman.h -index c68aea88..9027bb63 100644 ---- a/arch/mips/bits/mman.h -+++ b/arch/mips/bits/mman.h -@@ -18,6 +18,7 @@ - #define MAP_STACK 0x40000 - #undef MAP_HUGETLB - #define MAP_HUGETLB 0x80000 -+#undef MAP_SYNC - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #undef MADV_SOFT_OFFLINE -diff --git a/arch/mips/bits/ptrace.h b/arch/mips/bits/ptrace.h -new file mode 100644 -index 00000000..77a01c06 ---- /dev/null -+++ b/arch/mips/bits/ptrace.h -@@ -0,0 +1,9 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SET_THREAD_AREA 26 -+#define PTRACE_PEEKTEXT_3264 0xc0 -+#define PTRACE_PEEKDATA_3264 0xc1 -+#define PTRACE_POKETEXT_3264 0xc2 -+#define PTRACE_POKEDATA_3264 0xc3 -+#define PTRACE_GET_THREAD_AREA_3264 0xc4 -+#define PTRACE_GET_WATCH_REGS 0xd0 -+#define PTRACE_SET_WATCH_REGS 0xd1 -diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h -index 191ebdb5..b82c7d34 100644 ---- a/arch/mips/bits/socket.h -+++ b/arch/mips/bits/socket.h -@@ -45,6 +45,7 @@ struct cmsghdr { - #define SO_BSDCOMPAT 14 - #define SO_PASSCRED 17 - #define SO_PEERCRED 18 -+#define SO_PEERSEC 30 - #define SO_SNDBUFFORCE 31 - #define SO_RCVBUFFORCE 33 - -diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h -index 6a1205d7..f7b9dd2e 100644 ---- a/arch/mips/bits/termios.h -+++ b/arch/mips/bits/termios.h -@@ -52,6 +52,7 @@ struct termios { - #define ONLRET 0000040 - #define OFILL 0000100 - #define OFDEL 0000200 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define NLDLY 0000400 - #define NL0 0000000 - #define NL1 0000400 -@@ -71,6 +72,7 @@ struct termios { - #define FFDLY 0100000 - #define FF0 0000000 - #define FF1 0100000 -+#endif - - #define VTDLY 0040000 - #define VT0 0000000 -@@ -163,5 +165,5 @@ struct termios { - #define EXTPROC 0200000 - - #define XTABS 0014000 --#define TIOCSER_TEMT 1 -+#define TIOCSER_TEMT 0x01 - #endif -diff --git a/arch/mips/pthread_arch.h b/arch/mips/pthread_arch.h -index e5812655..5fea15ad 100644 ---- a/arch/mips/pthread_arch.h -+++ b/arch/mips/pthread_arch.h -@@ -11,6 +11,7 @@ static inline struct pthread *__pthread_self() - } - - #define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 - #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) - - #define DTP_OFFSET 0x8000 -diff --git a/arch/mips64/bits/hwcap.h b/arch/mips64/bits/hwcap.h -index 05cffba4..13e86fe7 100644 ---- a/arch/mips64/bits/hwcap.h -+++ b/arch/mips64/bits/hwcap.h -@@ -1,2 +1,3 @@ - #define HWCAP_MIPS_R6 (1 << 0) - #define HWCAP_MIPS_MSA (1 << 1) -+#define HWCAP_MIPS_CRC32 (1 << 2) -diff --git a/arch/mips64/bits/mman.h b/arch/mips64/bits/mman.h -index c68aea88..9027bb63 100644 ---- a/arch/mips64/bits/mman.h -+++ b/arch/mips64/bits/mman.h -@@ -18,6 +18,7 @@ - #define MAP_STACK 0x40000 - #undef MAP_HUGETLB - #define MAP_HUGETLB 0x80000 -+#undef MAP_SYNC - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #undef MADV_SOFT_OFFLINE -diff --git a/arch/mips64/bits/ptrace.h b/arch/mips64/bits/ptrace.h -new file mode 100644 -index 00000000..77a01c06 ---- /dev/null -+++ b/arch/mips64/bits/ptrace.h -@@ -0,0 +1,9 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SET_THREAD_AREA 26 -+#define PTRACE_PEEKTEXT_3264 0xc0 -+#define PTRACE_PEEKDATA_3264 0xc1 -+#define PTRACE_POKETEXT_3264 0xc2 -+#define PTRACE_POKEDATA_3264 0xc3 -+#define PTRACE_GET_THREAD_AREA_3264 0xc4 -+#define PTRACE_GET_WATCH_REGS 0xd0 -+#define PTRACE_SET_WATCH_REGS 0xd1 -diff --git a/arch/mips64/bits/socket.h b/arch/mips64/bits/socket.h -index cf801797..5aff0d91 100644 ---- a/arch/mips64/bits/socket.h -+++ b/arch/mips64/bits/socket.h -@@ -61,6 +61,7 @@ struct cmsghdr { - #define SO_BSDCOMPAT 14 - #define SO_PASSCRED 17 - #define SO_PEERCRED 18 -+#define SO_PEERSEC 30 - #define SO_SNDBUFFORCE 31 - #define SO_RCVBUFFORCE 33 - -diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h -index 6a1205d7..f7b9dd2e 100644 ---- a/arch/mips64/bits/termios.h -+++ b/arch/mips64/bits/termios.h -@@ -52,6 +52,7 @@ struct termios { - #define ONLRET 0000040 - #define OFILL 0000100 - #define OFDEL 0000200 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define NLDLY 0000400 - #define NL0 0000000 - #define NL1 0000400 -@@ -71,6 +72,7 @@ struct termios { - #define FFDLY 0100000 - #define FF0 0000000 - #define FF1 0100000 -+#endif - - #define VTDLY 0040000 - #define VT0 0000000 -@@ -163,5 +165,5 @@ struct termios { - #define EXTPROC 0200000 - - #define XTABS 0014000 --#define TIOCSER_TEMT 1 -+#define TIOCSER_TEMT 0x01 - #endif -diff --git a/arch/mips64/pthread_arch.h b/arch/mips64/pthread_arch.h -index e5812655..5fea15ad 100644 ---- a/arch/mips64/pthread_arch.h -+++ b/arch/mips64/pthread_arch.h -@@ -11,6 +11,7 @@ static inline struct pthread *__pthread_self() - } - - #define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 - #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) - - #define DTP_OFFSET 0x8000 -diff --git a/arch/mipsn32/bits/hwcap.h b/arch/mipsn32/bits/hwcap.h -index 05cffba4..13e86fe7 100644 ---- a/arch/mipsn32/bits/hwcap.h -+++ b/arch/mipsn32/bits/hwcap.h -@@ -1,2 +1,3 @@ - #define HWCAP_MIPS_R6 (1 << 0) - #define HWCAP_MIPS_MSA (1 << 1) -+#define HWCAP_MIPS_CRC32 (1 << 2) -diff --git a/arch/mipsn32/bits/mman.h b/arch/mipsn32/bits/mman.h -index c68aea88..9027bb63 100644 ---- a/arch/mipsn32/bits/mman.h -+++ b/arch/mipsn32/bits/mman.h -@@ -18,6 +18,7 @@ - #define MAP_STACK 0x40000 - #undef MAP_HUGETLB - #define MAP_HUGETLB 0x80000 -+#undef MAP_SYNC - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #undef MADV_SOFT_OFFLINE -diff --git a/arch/mipsn32/bits/ptrace.h b/arch/mipsn32/bits/ptrace.h -new file mode 100644 -index 00000000..77a01c06 ---- /dev/null -+++ b/arch/mipsn32/bits/ptrace.h -@@ -0,0 +1,9 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SET_THREAD_AREA 26 -+#define PTRACE_PEEKTEXT_3264 0xc0 -+#define PTRACE_PEEKDATA_3264 0xc1 -+#define PTRACE_POKETEXT_3264 0xc2 -+#define PTRACE_POKEDATA_3264 0xc3 -+#define PTRACE_GET_THREAD_AREA_3264 0xc4 -+#define PTRACE_GET_WATCH_REGS 0xd0 -+#define PTRACE_SET_WATCH_REGS 0xd1 -diff --git a/arch/mipsn32/bits/socket.h b/arch/mipsn32/bits/socket.h -index 191ebdb5..b82c7d34 100644 ---- a/arch/mipsn32/bits/socket.h -+++ b/arch/mipsn32/bits/socket.h -@@ -45,6 +45,7 @@ struct cmsghdr { - #define SO_BSDCOMPAT 14 - #define SO_PASSCRED 17 - #define SO_PEERCRED 18 -+#define SO_PEERSEC 30 - #define SO_SNDBUFFORCE 31 - #define SO_RCVBUFFORCE 33 - -diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h -index 6a1205d7..f7b9dd2e 100644 ---- a/arch/mipsn32/bits/termios.h -+++ b/arch/mipsn32/bits/termios.h -@@ -52,6 +52,7 @@ struct termios { - #define ONLRET 0000040 - #define OFILL 0000100 - #define OFDEL 0000200 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define NLDLY 0000400 - #define NL0 0000000 - #define NL1 0000400 -@@ -71,6 +72,7 @@ struct termios { - #define FFDLY 0100000 - #define FF0 0000000 - #define FF1 0100000 -+#endif - - #define VTDLY 0040000 - #define VT0 0000000 -@@ -163,5 +165,5 @@ struct termios { - #define EXTPROC 0200000 - - #define XTABS 0014000 --#define TIOCSER_TEMT 1 -+#define TIOCSER_TEMT 0x01 - #endif -diff --git a/arch/mipsn32/pthread_arch.h b/arch/mipsn32/pthread_arch.h -index e5812655..5fea15ad 100644 ---- a/arch/mipsn32/pthread_arch.h -+++ b/arch/mipsn32/pthread_arch.h -@@ -11,6 +11,7 @@ static inline struct pthread *__pthread_self() - } - - #define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 - #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) - - #define DTP_OFFSET 0x8000 -diff --git a/arch/or1k/bits/limits.h b/arch/or1k/bits/limits.h -index 483b6749..3a811c99 100644 ---- a/arch/or1k/bits/limits.h -+++ b/arch/or1k/bits/limits.h -@@ -1,6 +1,6 @@ - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define PAGE_SIZE 8192 -+#define PAGESIZE 8192 - #define LONG_BIT 32 - #endif - -diff --git a/arch/or1k/pthread_arch.h b/arch/or1k/pthread_arch.h -index 7decd769..521b9c53 100644 ---- a/arch/or1k/pthread_arch.h -+++ b/arch/or1k/pthread_arch.h -@@ -12,6 +12,7 @@ static inline struct pthread *__pthread_self() - } - - #define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 - #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) - - #define MC_PC regs.pc -diff --git a/arch/powerpc/bits/hwcap.h b/arch/powerpc/bits/hwcap.h -index 82c92a93..803de9b5 100644 ---- a/arch/powerpc/bits/hwcap.h -+++ b/arch/powerpc/bits/hwcap.h -@@ -38,3 +38,6 @@ - #define PPC_FEATURE2_HTM_NOSC 0x01000000 - #define PPC_FEATURE2_ARCH_3_00 0x00800000 - #define PPC_FEATURE2_HAS_IEEE128 0x00400000 -+#define PPC_FEATURE2_DARN 0x00200000 -+#define PPC_FEATURE2_SCV 0x00100000 -+#define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000 -diff --git a/arch/powerpc/bits/mman.h b/arch/powerpc/bits/mman.h -index 95ec4358..b3a675a8 100644 ---- a/arch/powerpc/bits/mman.h -+++ b/arch/powerpc/bits/mman.h -@@ -4,6 +4,7 @@ - #define MAP_NORESERVE 0x40 - #undef MAP_LOCKED - #define MAP_LOCKED 0x80 -+#undef MAP_SYNC - - #undef MCL_CURRENT - #define MCL_CURRENT 0x2000 -diff --git a/arch/powerpc/bits/ptrace.h b/arch/powerpc/bits/ptrace.h -new file mode 100644 -index 00000000..75086ca0 ---- /dev/null -+++ b/arch/powerpc/bits/ptrace.h -@@ -0,0 +1,23 @@ -+#define PTRACE_GETVRREGS 0x12 -+#define PTRACE_SETVRREGS 0x13 -+#define PTRACE_GETEVRREGS 0x14 -+#define PTRACE_SETEVRREGS 0x15 -+#define PTRACE_GETREGS64 0x16 -+#define PTRACE_SETREGS64 0x17 -+#define PTRACE_GET_DEBUGREG 0x19 -+#define PTRACE_SET_DEBUGREG 0x1a -+#define PTRACE_GETVSRREGS 0x1b -+#define PTRACE_SETVSRREGS 0x1c -+#define PTRACE_SINGLEBLOCK 0x100 -+ -+#define PT_GETVRREGS PTRACE_GETVRREGS -+#define PT_SETVRREGS PTRACE_SETVRREGS -+#define PT_GETEVRREGS PTRACE_GETEVRREGS -+#define PT_SETEVRREGS PTRACE_SETEVRREGS -+#define PT_GETREGS64 PTRACE_GETREGS64 -+#define PT_SETREGS64 PTRACE_SETREGS64 -+#define PT_GET_DEBUGREG PTRACE_GET_DEBUGREG -+#define PT_SET_DEBUGREG PTRACE_SET_DEBUGREG -+#define PT_GETVSRREGS PTRACE_GETVSRREGS -+#define PT_SETVSRREGS PTRACE_SETVSRREGS -+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK -diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h -index 2fee8777..a94b8bdb 100644 ---- a/arch/powerpc/bits/socket.h -+++ b/arch/powerpc/bits/socket.h -@@ -36,6 +36,7 @@ struct cmsghdr { - #define SO_PASSCRED 20 - #define SO_PEERCRED 21 - #define SO_ACCEPTCONN 30 -+#define SO_PEERSEC 31 - #define SO_SNDBUFFORCE 32 - #define SO_RCVBUFFORCE 33 - #define SO_PROTOCOL 38 -diff --git a/arch/powerpc/bits/syscall.h.in b/arch/powerpc/bits/syscall.h.in -index 20833915..7ce94bbd 100644 ---- a/arch/powerpc/bits/syscall.h.in -+++ b/arch/powerpc/bits/syscall.h.in -@@ -368,4 +368,7 @@ - #define __NR_pwritev2 381 - #define __NR_kexec_file_load 382 - #define __NR_statx 383 -+#define __NR_pkey_alloc 384 -+#define __NR_pkey_free 385 -+#define __NR_pkey_mprotect 386 - -diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h -index 0b09630c..e3f22e86 100644 ---- a/arch/powerpc/bits/termios.h -+++ b/arch/powerpc/bits/termios.h -@@ -53,6 +53,7 @@ struct termios { - #define ONLRET 0000040 - #define OFILL 0000100 - #define OFDEL 0000200 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define NLDLY 0001400 - #define NL0 0000000 - #define NL1 0000400 -@@ -74,6 +75,7 @@ struct termios { - #define BSDLY 0100000 - #define BS0 0000000 - #define BS1 0100000 -+#endif - - #define VTDLY 0200000 - #define VT0 0000000 -@@ -165,5 +167,5 @@ struct termios { - #define EXTPROC 0x10000000 - - #define XTABS 00006000 --#define TIOCSER_TEMT 1 -+#define TIOCSER_TEMT 0x01 - #endif -diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h -index 7c5c4fad..79e5a09f 100644 ---- a/arch/powerpc/pthread_arch.h -+++ b/arch/powerpc/pthread_arch.h -@@ -11,6 +11,7 @@ static inline struct pthread *__pthread_self() - } - - #define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 - #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) - - #define DTP_OFFSET 0x8000 -diff --git a/arch/powerpc64/bits/hwcap.h b/arch/powerpc64/bits/hwcap.h -index 82c92a93..803de9b5 100644 ---- a/arch/powerpc64/bits/hwcap.h -+++ b/arch/powerpc64/bits/hwcap.h -@@ -38,3 +38,6 @@ - #define PPC_FEATURE2_HTM_NOSC 0x01000000 - #define PPC_FEATURE2_ARCH_3_00 0x00800000 - #define PPC_FEATURE2_HAS_IEEE128 0x00400000 -+#define PPC_FEATURE2_DARN 0x00200000 -+#define PPC_FEATURE2_SCV 0x00100000 -+#define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000 -diff --git a/arch/powerpc64/bits/mman.h b/arch/powerpc64/bits/mman.h -index 95ec4358..b3a675a8 100644 ---- a/arch/powerpc64/bits/mman.h -+++ b/arch/powerpc64/bits/mman.h -@@ -4,6 +4,7 @@ - #define MAP_NORESERVE 0x40 - #undef MAP_LOCKED - #define MAP_LOCKED 0x80 -+#undef MAP_SYNC - - #undef MCL_CURRENT - #define MCL_CURRENT 0x2000 -diff --git a/arch/powerpc64/bits/ptrace.h b/arch/powerpc64/bits/ptrace.h -new file mode 100644 -index 00000000..75086ca0 ---- /dev/null -+++ b/arch/powerpc64/bits/ptrace.h -@@ -0,0 +1,23 @@ -+#define PTRACE_GETVRREGS 0x12 -+#define PTRACE_SETVRREGS 0x13 -+#define PTRACE_GETEVRREGS 0x14 -+#define PTRACE_SETEVRREGS 0x15 -+#define PTRACE_GETREGS64 0x16 -+#define PTRACE_SETREGS64 0x17 -+#define PTRACE_GET_DEBUGREG 0x19 -+#define PTRACE_SET_DEBUGREG 0x1a -+#define PTRACE_GETVSRREGS 0x1b -+#define PTRACE_SETVSRREGS 0x1c -+#define PTRACE_SINGLEBLOCK 0x100 -+ -+#define PT_GETVRREGS PTRACE_GETVRREGS -+#define PT_SETVRREGS PTRACE_SETVRREGS -+#define PT_GETEVRREGS PTRACE_GETEVRREGS -+#define PT_SETEVRREGS PTRACE_SETEVRREGS -+#define PT_GETREGS64 PTRACE_GETREGS64 -+#define PT_SETREGS64 PTRACE_SETREGS64 -+#define PT_GET_DEBUGREG PTRACE_GET_DEBUGREG -+#define PT_SET_DEBUGREG PTRACE_SET_DEBUGREG -+#define PT_GETVSRREGS PTRACE_GETVSRREGS -+#define PT_SETVSRREGS PTRACE_SETVSRREGS -+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK -diff --git a/arch/powerpc64/bits/socket.h b/arch/powerpc64/bits/socket.h -index 2f748ae8..0f3c9aac 100644 ---- a/arch/powerpc64/bits/socket.h -+++ b/arch/powerpc64/bits/socket.h -@@ -54,6 +54,7 @@ struct cmsghdr { - #define SO_PASSCRED 20 - #define SO_PEERCRED 21 - #define SO_ACCEPTCONN 30 -+#define SO_PEERSEC 31 - #define SO_SNDBUFFORCE 32 - #define SO_RCVBUFFORCE 33 - #define SO_PROTOCOL 38 -diff --git a/arch/powerpc64/bits/syscall.h.in b/arch/powerpc64/bits/syscall.h.in -index 936f43c0..1da1ecc0 100644 ---- a/arch/powerpc64/bits/syscall.h.in -+++ b/arch/powerpc64/bits/syscall.h.in -@@ -359,4 +359,7 @@ - #define __NR_pwritev2 381 - #define __NR_kexec_file_load 382 - #define __NR_statx 383 -+#define __NR_pkey_alloc 384 -+#define __NR_pkey_free 385 -+#define __NR_pkey_mprotect 386 - -diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h -index 0b09630c..e3f22e86 100644 ---- a/arch/powerpc64/bits/termios.h -+++ b/arch/powerpc64/bits/termios.h -@@ -53,6 +53,7 @@ struct termios { - #define ONLRET 0000040 - #define OFILL 0000100 - #define OFDEL 0000200 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define NLDLY 0001400 - #define NL0 0000000 - #define NL1 0000400 -@@ -74,6 +75,7 @@ struct termios { - #define BSDLY 0100000 - #define BS0 0000000 - #define BS1 0100000 -+#endif - - #define VTDLY 0200000 - #define VT0 0000000 -@@ -165,5 +167,5 @@ struct termios { - #define EXTPROC 0x10000000 - - #define XTABS 00006000 --#define TIOCSER_TEMT 1 -+#define TIOCSER_TEMT 0x01 - #endif -diff --git a/arch/powerpc64/pthread_arch.h b/arch/powerpc64/pthread_arch.h -index 2f976fe2..37b75e29 100644 ---- a/arch/powerpc64/pthread_arch.h -+++ b/arch/powerpc64/pthread_arch.h -@@ -6,6 +6,7 @@ static inline struct pthread *__pthread_self() - } - - #define TLS_ABOVE_TP -+#define GAP_ABOVE_TP 0 - #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000) - - #define DTP_OFFSET 0x8000 -diff --git a/arch/s390x/bits/limits.h b/arch/s390x/bits/limits.h -index 792a30b9..86ef7663 100644 ---- a/arch/s390x/bits/limits.h -+++ b/arch/s390x/bits/limits.h -@@ -1,6 +1,6 @@ - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define PAGE_SIZE 4096 -+#define PAGESIZE 4096 - #define LONG_BIT 64 - #endif - -diff --git a/arch/s390x/bits/ptrace.h b/arch/s390x/bits/ptrace.h -new file mode 100644 -index 00000000..d50e3262 ---- /dev/null -+++ b/arch/s390x/bits/ptrace.h -@@ -0,0 +1,9 @@ -+#define PTRACE_SINGLEBLOCK 12 -+#define PTRACE_PEEKUSR_AREA 0x5000 -+#define PTRACE_POKEUSR_AREA 0x5001 -+#define PTRACE_GET_LAST_BREAK 0x5006 -+#define PTRACE_ENABLE_TE 0x5009 -+#define PTRACE_DISABLE_TE 0x5010 -+#define PTRACE_TE_ABORT_RAND 0x5011 -+ -+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK -diff --git a/arch/s390x/bits/syscall.h.in b/arch/s390x/bits/syscall.h.in -index 4fe1a64f..409e9155 100644 ---- a/arch/s390x/bits/syscall.h.in -+++ b/arch/s390x/bits/syscall.h.in -@@ -322,4 +322,6 @@ - #define __NR_pwritev2 377 - #define __NR_s390_guarded_storage 378 - #define __NR_statx 379 -+#define __NR_s390_sthyi 380 -+#define __NR_kexec_file_load 381 - -diff --git a/arch/s390x/bits/user.h b/arch/s390x/bits/user.h -index 17bce16f..ff3f0483 100644 ---- a/arch/s390x/bits/user.h -+++ b/arch/s390x/bits/user.h -@@ -54,8 +54,8 @@ struct user { - char u_comm[32]; - }; - --#define PAGE_MASK (~(PAGE_SIZE-1)) --#define NBPG PAGE_SIZE -+#define PAGE_MASK (~(PAGESIZE-1)) -+#define NBPG PAGESIZE - #define UPAGES 1 - #define HOST_TEXT_START_ADDR (u.start_code) - #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -diff --git a/arch/sh/bits/limits.h b/arch/sh/bits/limits.h -index 65a3dd64..c340ceb2 100644 ---- a/arch/sh/bits/limits.h -+++ b/arch/sh/bits/limits.h -@@ -1,6 +1,6 @@ - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define PAGE_SIZE 4096 -+#define PAGESIZE 4096 - #define LONG_BIT 32 - #endif - -diff --git a/arch/sh/pthread_arch.h b/arch/sh/pthread_arch.h -index 2756e7ec..a7dd27a6 100644 ---- a/arch/sh/pthread_arch.h -+++ b/arch/sh/pthread_arch.h -@@ -2,10 +2,16 @@ static inline struct pthread *__pthread_self() - { - char *self; - __asm__ __volatile__ ("stc gbr,%0" : "=r" (self) ); -- return (struct pthread *) (self + 8 - sizeof(struct pthread)); -+ return (struct pthread *) (self - sizeof(struct pthread)); - } - - #define TLS_ABOVE_TP --#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8) -+#define GAP_ABOVE_TP 8 -+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread)) - - #define MC_PC sc_pc -+ -+#ifdef __FDPIC__ -+#define MC_GOT sc_regs[12] -+#define CANCEL_GOT (*(uintptr_t *)((char *)__syscall_cp_asm+sizeof(uintptr_t))) -+#endif -diff --git a/arch/sh/reloc.h b/arch/sh/reloc.h -index 0238ce07..a1f16cb1 100644 ---- a/arch/sh/reloc.h -+++ b/arch/sh/reloc.h -@@ -20,7 +20,7 @@ - - #define LDSO_ARCH "sh" ENDIAN_SUFFIX FP_SUFFIX ABI_SUFFIX - --#define TPOFF_K 8 -+#define TPOFF_K 0 - - #define REL_SYMBOLIC R_SH_DIR32 - #define REL_OFFSET R_SH_REL32 -diff --git a/arch/sh/syscall_arch.h b/arch/sh/syscall_arch.h -index 84758fe0..48f61d94 100644 ---- a/arch/sh/syscall_arch.h -+++ b/arch/sh/syscall_arch.h -@@ -86,3 +86,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo - register long r1 __asm__("r1") = f; - __asm_syscall(22, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "0"(r0), "r"(r1)); - } -+ -+#define SYSCALL_IPC_BROKEN_MODE -diff --git a/arch/x32/atomic_arch.h b/arch/x32/atomic_arch.h -index a744c299..918c2d4e 100644 ---- a/arch/x32/atomic_arch.h -+++ b/arch/x32/atomic_arch.h -@@ -106,8 +106,8 @@ static inline int a_ctz_64(uint64_t x) - return x; - } - --#define a_ctz_l a_ctz_l --static inline int a_ctz_l(unsigned long x) -+#define a_ctz_32 a_ctz_32 -+static inline int a_ctz_32(uint32_t x) - { - __asm__( "bsf %1,%0" : "=r"(x) : "r"(x) ); - return x; -diff --git a/arch/x32/bits/limits.h b/arch/x32/bits/limits.h -index 65a3dd64..c340ceb2 100644 ---- a/arch/x32/bits/limits.h -+++ b/arch/x32/bits/limits.h -@@ -1,6 +1,6 @@ - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define PAGE_SIZE 4096 -+#define PAGESIZE 4096 - #define LONG_BIT 32 - #endif - -diff --git a/arch/x32/bits/ptrace.h b/arch/x32/bits/ptrace.h -new file mode 100644 -index 00000000..7f8a09b5 ---- /dev/null -+++ b/arch/x32/bits/ptrace.h -@@ -0,0 +1,13 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SET_THREAD_AREA 26 -+#define PTRACE_ARCH_PRCTL 30 -+#define PTRACE_SYSEMU 31 -+#define PTRACE_SYSEMU_SINGLESTEP 32 -+#define PTRACE_SINGLEBLOCK 33 -+ -+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA -+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA -+#define PT_ARCH_PRCTL PTRACE_ARCH_PRCTL -+#define PT_SYSEMU PTRACE_SYSEMU -+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP -+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK -diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h -index 471bb19d..4073cc06 100644 ---- a/arch/x32/bits/user.h -+++ b/arch/x32/bits/user.h -@@ -34,8 +34,8 @@ struct user { - unsigned long u_debugreg[8]; - }; - --#define PAGE_MASK (~(PAGE_SIZE-1)) --#define NBPG PAGE_SIZE -+#define PAGE_MASK (~(PAGESIZE-1)) -+#define NBPG PAGESIZE - #define UPAGES 1 - #define HOST_TEXT_START_ADDR (u.start_code) - #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -diff --git a/arch/x86_64/bits/limits.h b/arch/x86_64/bits/limits.h -index 792a30b9..86ef7663 100644 ---- a/arch/x86_64/bits/limits.h -+++ b/arch/x86_64/bits/limits.h -@@ -1,6 +1,6 @@ - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define PAGE_SIZE 4096 -+#define PAGESIZE 4096 - #define LONG_BIT 64 - #endif - -diff --git a/arch/x86_64/bits/ptrace.h b/arch/x86_64/bits/ptrace.h -new file mode 100644 -index 00000000..7f8a09b5 ---- /dev/null -+++ b/arch/x86_64/bits/ptrace.h -@@ -0,0 +1,13 @@ -+#define PTRACE_GET_THREAD_AREA 25 -+#define PTRACE_SET_THREAD_AREA 26 -+#define PTRACE_ARCH_PRCTL 30 -+#define PTRACE_SYSEMU 31 -+#define PTRACE_SYSEMU_SINGLESTEP 32 -+#define PTRACE_SINGLEBLOCK 33 -+ -+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA -+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA -+#define PT_ARCH_PRCTL PTRACE_ARCH_PRCTL -+#define PT_SYSEMU PTRACE_SYSEMU -+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP -+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK -diff --git a/arch/x86_64/bits/user.h b/arch/x86_64/bits/user.h -index 471bb19d..4073cc06 100644 ---- a/arch/x86_64/bits/user.h -+++ b/arch/x86_64/bits/user.h -@@ -34,8 +34,8 @@ struct user { - unsigned long u_debugreg[8]; - }; - --#define PAGE_MASK (~(PAGE_SIZE-1)) --#define NBPG PAGE_SIZE -+#define PAGE_MASK (~(PAGESIZE-1)) -+#define NBPG PAGESIZE - #define UPAGES 1 - #define HOST_TEXT_START_ADDR (u.start_code) - #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -diff --git a/configure b/configure -index 1e59c461..f940af9a 100755 ---- a/configure -+++ b/configure -@@ -320,6 +320,7 @@ i?86*) ARCH=i386 ;; - x86_64-x32*|x32*|x86_64*x32) ARCH=x32 ;; - x86_64-nt64*) ARCH=nt64 ;; - x86_64*) ARCH=x86_64 ;; -+m68k*) ARCH=m68k ;; - mips64*|mipsisa64*) ARCH=mips64 ;; - mips*) ARCH=mips ;; - microblaze*) ARCH=microblaze ;; -@@ -590,10 +591,12 @@ tryldflag LDFLAGS_AUTO -Wl,--no-undefined - # versions built without shared library support and pcc are broken. - tryldflag LDFLAGS_AUTO -Wl,--exclude-libs=ALL - --# Linking with -Bsymbolic-functions is no longer mandatory for --# the dynamic linker to work, but enable it if it works as --# a linking optimization. --tryldflag LDFLAGS_AUTO -Wl,-Bsymbolic-functions -+# Public data symbols must be interposable to allow for copy -+# relocations, but otherwise we want to bind symbols at libc link -+# time to eliminate startup relocations and PLT overhead. Use -+# --dynamic-list rather than -Bsymbolic-functions for greater -+# control over what symbols are left unbound. -+tryldflag LDFLAGS_AUTO -Wl,--dynamic-list="$srcdir/dynamic.list" - - # Find compiler runtime library - test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh -@@ -639,6 +642,13 @@ if test "$ARCH" = "aarch64" ; then - trycppif __AARCH64EB__ "$t" && SUBARCH=${SUBARCH}_be - fi - -+if test "$ARCH" = "m68k" ; then -+if trycppif "__HAVE_68881__" ; then : ; -+elif trycppif "__mcffpu__" ; then SUBARCH="-fp64" -+else SUBARCH="-sf" -+fi -+fi -+ - if test "$ARCH" = "mips" ; then - trycppif "__mips_isa_rev >= 6" "$t" && SUBARCH=${SUBARCH}r6 - trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" && SUBARCH=${SUBARCH}el -diff --git a/dynamic.list b/dynamic.list -new file mode 100644 -index 00000000..686f8eb4 ---- /dev/null -+++ b/dynamic.list -@@ -0,0 +1,44 @@ -+{ -+environ; -+__environ; -+ -+stdin; -+stdout; -+stderr; -+ -+malloc; -+calloc; -+realloc; -+free; -+memalign; -+posix_memalign; -+aligned_alloc; -+malloc_usable_size; -+ -+timezone; -+daylight; -+tzname; -+__timezone; -+__daylight; -+__tzname; -+ -+signgam; -+__signgam; -+ -+optarg; -+optind; -+opterr; -+optreset; -+__optreset; -+ -+getdate_err; -+ -+h_errno; -+ -+program_invocation_name; -+program_invocation_short_name; -+__progname; -+__progname_full; -+ -+__stack_chk_guard; -+}; -diff --git a/include/alltypes.h.in b/include/alltypes.h.in -index 6a9c105f..622ca01d 100644 ---- a/include/alltypes.h.in -+++ b/include/alltypes.h.in -@@ -7,10 +7,10 @@ TYPEDEF _Addr regoff_t; - TYPEDEF _Reg register_t; - - TYPEDEF signed char int8_t; --TYPEDEF short int16_t; --TYPEDEF int int32_t; --TYPEDEF _Int64 int64_t; --TYPEDEF _Int64 intmax_t; -+TYPEDEF signed short int16_t; -+TYPEDEF signed int int32_t; -+TYPEDEF signed _Int64 int64_t; -+TYPEDEF signed _Int64 intmax_t; - TYPEDEF unsigned char uint8_t; - TYPEDEF unsigned short uint16_t; - TYPEDEF unsigned int uint32_t; -diff --git a/include/elf.h b/include/elf.h -index e79915fe..c2297353 100644 ---- a/include/elf.h -+++ b/include/elf.h -@@ -623,6 +623,7 @@ typedef struct { - - - #define NT_PRSTATUS 1 -+#define NT_PRFPREG 2 - #define NT_FPREGSET 2 - #define NT_PRPSINFO 3 - #define NT_PRXREG 4 -@@ -644,6 +645,19 @@ typedef struct { - #define NT_PPC_VMX 0x100 - #define NT_PPC_SPE 0x101 - #define NT_PPC_VSX 0x102 -+#define NT_PPC_TAR 0x103 -+#define NT_PPC_PPR 0x104 -+#define NT_PPC_DSCR 0x105 -+#define NT_PPC_EBB 0x106 -+#define NT_PPC_PMU 0x107 -+#define NT_PPC_TM_CGPR 0x108 -+#define NT_PPC_TM_CFPR 0x109 -+#define NT_PPC_TM_CVMX 0x10a -+#define NT_PPC_TM_CVSX 0x10b -+#define NT_PPC_TM_SPR 0x10c -+#define NT_PPC_TM_CTAR 0x10d -+#define NT_PPC_TM_CPPR 0x10e -+#define NT_PPC_TM_CDSCR 0x10f - #define NT_386_TLS 0x200 - #define NT_386_IOPERM 0x201 - #define NT_X86_XSTATE 0x202 -@@ -656,14 +670,21 @@ typedef struct { - #define NT_S390_LAST_BREAK 0x306 - #define NT_S390_SYSTEM_CALL 0x307 - #define NT_S390_TDB 0x308 -+#define NT_S390_VXRS_LOW 0x309 -+#define NT_S390_VXRS_HIGH 0x30a -+#define NT_S390_GS_CB 0x30b -+#define NT_S390_GS_BC 0x30c -+#define NT_S390_RI_CB 0x30d - #define NT_ARM_VFP 0x400 - #define NT_ARM_TLS 0x401 - #define NT_ARM_HW_BREAK 0x402 - #define NT_ARM_HW_WATCH 0x403 - #define NT_ARM_SYSTEM_CALL 0x404 -+#define NT_ARM_SVE 0x405 - #define NT_METAG_CBUF 0x500 - #define NT_METAG_RPIPE 0x501 - #define NT_METAG_TLS 0x502 -+#define NT_ARC_V2 0x600 - #define NT_VERSION 1 - - -@@ -721,7 +742,8 @@ typedef struct { - #define DT_ENCODING 32 - #define DT_PREINIT_ARRAY 32 - #define DT_PREINIT_ARRAYSZ 33 --#define DT_NUM 34 -+#define DT_SYMTAB_SHNDX 34 -+#define DT_NUM 35 - #define DT_LOOS 0x6000000d - #define DT_HIOS 0x6ffff000 - #define DT_LOPROC 0x70000000 -@@ -821,6 +843,8 @@ typedef struct { - #define DF_1_SYMINTPOSE 0x00800000 - #define DF_1_GLOBAUDIT 0x01000000 - #define DF_1_SINGLETON 0x02000000 -+#define DF_1_STUB 0x04000000 -+#define DF_1_PIE 0x08000000 - - #define DTF_1_PARINIT 0x00000001 - #define DTF_1_CONFEXP 0x00000002 -@@ -1002,6 +1026,14 @@ typedef struct { - #define AT_L2_CACHESHAPE 36 - #define AT_L3_CACHESHAPE 37 - -+#define AT_L1I_CACHESIZE 40 -+#define AT_L1I_CACHEGEOMETRY 41 -+#define AT_L1D_CACHESIZE 42 -+#define AT_L1D_CACHEGEOMETRY 43 -+#define AT_L2_CACHESIZE 44 -+#define AT_L2_CACHEGEOMETRY 45 -+#define AT_L3_CACHESIZE 46 -+#define AT_L3_CACHEGEOMETRY 47 - - - -@@ -1097,7 +1129,25 @@ typedef struct { - #define R_68K_GLOB_DAT 20 - #define R_68K_JMP_SLOT 21 - #define R_68K_RELATIVE 22 --#define R_68K_NUM 23 -+#define R_68K_TLS_GD32 25 -+#define R_68K_TLS_GD16 26 -+#define R_68K_TLS_GD8 27 -+#define R_68K_TLS_LDM32 28 -+#define R_68K_TLS_LDM16 29 -+#define R_68K_TLS_LDM8 30 -+#define R_68K_TLS_LDO32 31 -+#define R_68K_TLS_LDO16 32 -+#define R_68K_TLS_LDO8 33 -+#define R_68K_TLS_IE32 34 -+#define R_68K_TLS_IE16 35 -+#define R_68K_TLS_IE8 36 -+#define R_68K_TLS_LE32 37 -+#define R_68K_TLS_LE16 38 -+#define R_68K_TLS_LE8 39 -+#define R_68K_TLS_DTPMOD32 40 -+#define R_68K_TLS_DTPREL32 41 -+#define R_68K_TLS_TPREL32 42 -+#define R_68K_NUM 43 - - #define R_386_NONE 0 - #define R_386_32 1 -@@ -2233,6 +2283,7 @@ enum - - #define PPC64_OPT_TLS 1 - #define PPC64_OPT_MULTI_TOC 2 -+#define PPC64_OPT_LOCALENTRY 4 - - #define STO_PPC64_LOCAL_BIT 5 - #define STO_PPC64_LOCAL_MASK 0xe0 -diff --git a/include/limits.h b/include/limits.h -index f9805a1e..02c2139d 100644 ---- a/include/limits.h -+++ b/include/limits.h -@@ -9,7 +9,7 @@ - - /* Support signed or unsigned plain-char */ - --#if '\0'-1 > 0 -+#if '\xff' > 0 - #define CHAR_MIN 0 - #define CHAR_MAX 255 - #else -@@ -40,14 +40,9 @@ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - - #define PIPE_BUF 4096 --#ifdef PAGE_SIZE --#define PAGESIZE PAGE_SIZE --#endif - #define FILESIZEBITS 64 - #define NAME_MAX 255 --#define SYMLINK_MAX 255 - #define PATH_MAX 4096 --#define NZERO 20 - #define NGROUPS_MAX 32 - #define ARG_MAX 131072 - #define IOV_MAX 1024 -@@ -82,13 +77,22 @@ - #define RE_DUP_MAX 255 - - #define NL_ARGMAX 9 --#define NL_LANGMAX 32 - #define NL_MSGMAX 32767 - #define NL_SETMAX 255 - #define NL_TEXTMAX 2048 - - #endif - -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) -+ -+#ifdef PAGESIZE -+#define PAGE_SIZE PAGESIZE -+#endif -+#define NZERO 20 -+#define NL_LANGMAX 32 -+ -+#endif -+ - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \ - || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) - -diff --git a/include/math.h b/include/math.h -index 6ac91da2..fea34686 100644 ---- a/include/math.h -+++ b/include/math.h -@@ -27,7 +27,7 @@ extern "C" { - #define MATH_ERREXCEPT 2 - #define math_errhandling 2 - --#define FP_ILOGBNAN (-1-(int)(((unsigned)-1)>>1)) -+#define FP_ILOGBNAN (-1-0x7fffffff) - #define FP_ILOGB0 FP_ILOGBNAN - - #define FP_NAN 0 -diff --git a/include/net/if_arp.h b/include/net/if_arp.h -index c832ff95..27becc83 100644 ---- a/include/net/if_arp.h -+++ b/include/net/if_arp.h -@@ -59,6 +59,7 @@ struct arphdr { - #define ARPHRD_LAPB 516 - #define ARPHRD_DDCMP 517 - #define ARPHRD_RAWHDLC 518 -+#define ARPHRD_RAWIP 519 - - #define ARPHRD_TUNNEL 768 - #define ARPHRD_TUNNEL6 769 -diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h -index 97134d75..ecd6c73c 100644 ---- a/include/netinet/if_ether.h -+++ b/include/netinet/if_ether.h -@@ -5,6 +5,7 @@ - #include <sys/types.h> - - #define ETH_ALEN 6 -+#define ETH_TLEN 2 - #define ETH_HLEN 14 - #define ETH_ZLEN 60 - #define ETH_DATA_LEN 1500 -@@ -17,6 +18,7 @@ - #define ETH_P_PUP 0x0200 - #define ETH_P_PUPAT 0x0201 - #define ETH_P_TSN 0x22F0 -+#define ETH_P_ERSPAN2 0x22EB - #define ETH_P_IP 0x0800 - #define ETH_P_X25 0x0805 - #define ETH_P_ARP 0x0806 -@@ -53,6 +55,8 @@ - #define ETH_P_AOE 0x88A2 - #define ETH_P_8021AD 0x88A8 - #define ETH_P_802_EX1 0x88B5 -+#define ETH_P_ERSPAN 0x88BE -+#define ETH_P_PREAUTH 0x88C7 - #define ETH_P_TIPC 0x88CA - #define ETH_P_MACSEC 0x88E5 - #define ETH_P_8021AH 0x88E7 -@@ -66,11 +70,13 @@ - #define ETH_P_IBOE 0x8915 - #define ETH_P_80221 0x8917 - #define ETH_P_HSR 0x892F -+#define ETH_P_NSH 0x894F - #define ETH_P_LOOPBACK 0x9000 - #define ETH_P_QINQ1 0x9100 - #define ETH_P_QINQ2 0x9200 - #define ETH_P_QINQ3 0x9300 - #define ETH_P_EDSA 0xDADA -+#define ETH_P_IFE 0xED3E - #define ETH_P_AF_IUCV 0xFBFB - - #define ETH_P_802_3_MIN 0x0600 -@@ -100,6 +106,7 @@ - #define ETH_P_IEEE802154 0x00F6 - #define ETH_P_CAIF 0x00F7 - #define ETH_P_XDSA 0x00F8 -+#define ETH_P_MAP 0x00F9 - - struct ethhdr { - uint8_t h_dest[ETH_ALEN]; -diff --git a/include/netinet/in.h b/include/netinet/in.h -index f18b478d..192679a6 100644 ---- a/include/netinet/in.h -+++ b/include/netinet/in.h -@@ -363,6 +363,7 @@ struct ip6_mtuinfo { - #define IPV6_TRANSPARENT 75 - #define IPV6_UNICAST_IF 76 - #define IPV6_RECVFRAGSIZE 77 -+#define IPV6_FREEBIND 78 - - #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP - #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP -diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h -index 4d20936a..1e2acfbf 100644 ---- a/include/netinet/tcp.h -+++ b/include/netinet/tcp.h -@@ -34,6 +34,8 @@ - #define TCP_FASTOPEN_CONNECT 30 - #define TCP_ULP 31 - #define TCP_MD5SIG_EXT 32 -+#define TCP_FASTOPEN_KEY 33 -+#define TCP_FASTOPEN_NO_COOKIE 34 - - #define TCP_ESTABLISHED 1 - #define TCP_SYN_SENT 2 -@@ -54,6 +56,16 @@ enum { - TCP_NLA_SNDBUF_LIMITED, - TCP_NLA_DATA_SEGS_OUT, - TCP_NLA_TOTAL_RETRANS, -+ TCP_NLA_PACING_RATE, -+ TCP_NLA_DELIVERY_RATE, -+ TCP_NLA_SND_CWND, -+ TCP_NLA_REORDERING, -+ TCP_NLA_MIN_RTT, -+ TCP_NLA_RECUR_RETRANS, -+ TCP_NLA_DELIVERY_RATE_APP_LMT, -+ TCP_NLA_SNDQ_SIZE, -+ TCP_NLA_CA_STATE, -+ TCP_NLA_SND_SSTHRESH, - }; - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -@@ -220,6 +232,14 @@ struct tcp_md5sig { - uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; - }; - -+struct tcp_diag_md5sig { -+ uint8_t tcpm_family; -+ uint8_t tcpm_prefixlen; -+ uint16_t tcpm_keylen; -+ uint32_t tcpm_addr[4]; -+ uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; -+}; -+ - struct tcp_repair_window { - uint32_t snd_wl1; - uint32_t snd_wnd; -diff --git a/include/signal.h b/include/signal.h -index 2c8b3d55..a4f85cca 100644 ---- a/include/signal.h -+++ b/include/signal.h -@@ -210,7 +210,7 @@ int sigpending(sigset_t *); - int sigwait(const sigset_t *__restrict, int *__restrict); - int sigwaitinfo(const sigset_t *__restrict, siginfo_t *__restrict); - int sigtimedwait(const sigset_t *__restrict, siginfo_t *__restrict, const struct timespec *__restrict); --int sigqueue(pid_t, int, const union sigval); -+int sigqueue(pid_t, int, union sigval); - - int pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict); - int pthread_kill(pthread_t, int); -@@ -231,6 +231,8 @@ int sigrelse(int); - void (*sigset(int, void (*)(int)))(int); - #define TRAP_BRKPT 1 - #define TRAP_TRACE 2 -+#define TRAP_BRANCH 3 -+#define TRAP_HWBKPT 4 - #define POLL_IN 1 - #define POLL_OUT 2 - #define POLL_MSG 3 -diff --git a/include/stdio.h b/include/stdio.h -index 7c4f9ee4..afadd912 100644 ---- a/include/stdio.h -+++ b/include/stdio.h -@@ -49,6 +49,7 @@ extern "C" { - - typedef union _G_fpos64_t { - char __opaque[16]; -+ long long __lldata; - double __align; - } fpos_t; - diff --git a/include/stdlib.h b/include/stdlib.h index 42ca8336..4bbaded0 100644 --- a/include/stdlib.h @@ -2736,369 +37,6 @@ index 42ca8336..4bbaded0 100644 int mkostemps (char *, int, int); void *valloc (size_t); void *memalign(size_t, size_t); -diff --git a/include/string.h b/include/string.h -index ce1dc300..795a2abc 100644 ---- a/include/string.h -+++ b/include/string.h -@@ -82,6 +82,7 @@ void *memccpy (void *__restrict, const void *__restrict, int, size_t); - char *strsep(char **, const char *); - size_t strlcat (char *, const char *, size_t); - size_t strlcpy (char *, const char *, size_t); -+void explicit_bzero (void *, size_t); - #endif - - #ifdef _GNU_SOURCE -diff --git a/include/sys/epoll.h b/include/sys/epoll.h -index ffe2311f..ac81a841 100644 ---- a/include/sys/epoll.h -+++ b/include/sys/epoll.h -@@ -21,6 +21,7 @@ enum EPOLL_EVENTS { __EPOLL_DUMMY }; - #define EPOLLPRI 0x002 - #define EPOLLOUT 0x004 - #define EPOLLRDNORM 0x040 -+#define EPOLLNVAL 0x020 - #define EPOLLRDBAND 0x080 - #define EPOLLWRNORM 0x100 - #define EPOLLWRBAND 0x200 -diff --git a/include/sys/kd.h b/include/sys/kd.h -index 793fd59f..42122b9c 100644 ---- a/include/sys/kd.h -+++ b/include/sys/kd.h -@@ -1,8 +1 @@ --#ifndef _SYS_KD_H --#define _SYS_KD_H -- --#define _LINUX_TYPES_H --#include <linux/kd.h> --#undef _LINUX_TYPES_H -- --#endif -+#include <bits/kd.h> -diff --git a/include/sys/mman.h b/include/sys/mman.h -index 8a5149c9..99d02a2e 100644 ---- a/include/sys/mman.h -+++ b/include/sys/mman.h -@@ -20,6 +20,7 @@ extern "C" { - - #define MAP_SHARED 0x01 - #define MAP_PRIVATE 0x02 -+#define MAP_SHARED_VALIDATE 0x03 - #define MAP_TYPE 0x0f - #define MAP_FIXED 0x10 - #define MAP_ANON 0x20 -@@ -33,8 +34,23 @@ extern "C" { - #define MAP_NONBLOCK 0x10000 - #define MAP_STACK 0x20000 - #define MAP_HUGETLB 0x40000 -+#define MAP_SYNC 0x80000 -+#define MAP_FIXED_NOREPLACE 0x100000 - #define MAP_FILE 0 - -+#define MAP_HUGE_SHIFT 26 -+#define MAP_HUGE_MASK 0x3f -+#define MAP_HUGE_64KB (16 << 26) -+#define MAP_HUGE_512KB (19 << 26) -+#define MAP_HUGE_1MB (20 << 26) -+#define MAP_HUGE_2MB (21 << 26) -+#define MAP_HUGE_8MB (23 << 26) -+#define MAP_HUGE_16MB (24 << 26) -+#define MAP_HUGE_256MB (28 << 26) -+#define MAP_HUGE_1GB (30 << 26) -+#define MAP_HUGE_2GB (31 << 26) -+#define MAP_HUGE_16GB (34U << 26) -+ - #define PROT_NONE 0 - #define PROT_READ 1 - #define PROT_WRITE 2 -@@ -72,10 +88,23 @@ extern "C" { - #define MADV_NOHUGEPAGE 15 - #define MADV_DONTDUMP 16 - #define MADV_DODUMP 17 -+#define MADV_WIPEONFORK 18 -+#define MADV_KEEPONFORK 19 - #define MADV_HWPOISON 100 - #define MADV_SOFT_OFFLINE 101 - #endif - -+#ifdef _GNU_SOURCE -+#define MREMAP_MAYMOVE 1 -+#define MREMAP_FIXED 2 -+ -+#define MLOCK_ONFAULT 0x01 -+ -+#define MFD_CLOEXEC 0x0001U -+#define MFD_ALLOW_SEALING 0x0002U -+#define MFD_HUGETLB 0x0004U -+#endif -+ - #include <bits/mman.h> - - void *mmap (void *, size_t, int, int, int, off_t); -@@ -92,14 +121,13 @@ int mlockall (int); - int munlockall (void); - - #ifdef _GNU_SOURCE --#define MREMAP_MAYMOVE 1 --#define MREMAP_FIXED 2 - void *mremap (void *, size_t, size_t, int, ...); - int remap_file_pages (void *, size_t, int, size_t, int); -+int memfd_create (const char *, unsigned); -+int mlock2 (const void *, size_t, unsigned); - #endif - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) --#define MLOCK_ONFAULT 0x01 - int madvise (void *, size_t, int); - int mincore (void *, size_t, unsigned char *); - #endif -diff --git a/include/sys/msg.h b/include/sys/msg.h -index 139f22b7..be6afc34 100644 ---- a/include/sys/msg.h -+++ b/include/sys/msg.h -@@ -27,6 +27,7 @@ typedef unsigned long msglen_t; - - #define MSG_STAT 11 - #define MSG_INFO 12 -+#define MSG_STAT_ANY 13 - - struct msginfo { - int msgpool, msgmap, msgmax, msgmnb, msgmni, msgssz, msgtql; -diff --git a/include/sys/prctl.h b/include/sys/prctl.h -index 24f4f8bd..af76408c 100644 ---- a/include/sys/prctl.h -+++ b/include/sys/prctl.h -@@ -130,6 +130,21 @@ struct prctl_mm_map { - #define PR_CAP_AMBIENT_LOWER 3 - #define PR_CAP_AMBIENT_CLEAR_ALL 4 - -+#define PR_SVE_SET_VL 50 -+#define PR_SVE_SET_VL_ONEXEC (1 << 18) -+#define PR_SVE_GET_VL 51 -+#define PR_SVE_VL_LEN_MASK 0xffff -+#define PR_SVE_VL_INHERIT (1 << 17) -+ -+#define PR_GET_SPECULATION_CTRL 52 -+#define PR_SET_SPECULATION_CTRL 53 -+#define PR_SPEC_STORE_BYPASS 0 -+#define PR_SPEC_NOT_AFFECTED 0 -+#define PR_SPEC_PRCTL (1UL << 0) -+#define PR_SPEC_ENABLE (1UL << 1) -+#define PR_SPEC_DISABLE (1UL << 2) -+#define PR_SPEC_FORCE_DISABLE (1UL << 3) -+ - int prctl (int, ...); - - #ifdef __cplusplus -diff --git a/include/sys/ptrace.h b/include/sys/ptrace.h -index d9d45408..229e1f3d 100644 ---- a/include/sys/ptrace.h -+++ b/include/sys/ptrace.h -@@ -40,6 +40,7 @@ extern "C" { - #define PTRACE_GETSIGMASK 0x420a - #define PTRACE_SETSIGMASK 0x420b - #define PTRACE_SECCOMP_GET_FILTER 0x420c -+#define PTRACE_SECCOMP_GET_METADATA 0x420d - - #define PT_READ_I PTRACE_PEEKTEXT - #define PT_READ_D PTRACE_PEEKDATA -@@ -83,15 +84,23 @@ extern "C" { - #define PTRACE_EVENT_VFORK_DONE 5 - #define PTRACE_EVENT_EXIT 6 - #define PTRACE_EVENT_SECCOMP 7 -+#define PTRACE_EVENT_STOP 128 - - #define PTRACE_PEEKSIGINFO_SHARED 1 - --struct ptrace_peeksiginfo_args { -+#include <bits/ptrace.h> -+ -+struct __ptrace_peeksiginfo_args { - uint64_t off; - uint32_t flags; - int32_t nr; - }; - -+struct __ptrace_seccomp_metadata { -+ uint64_t filter_off; -+ uint64_t flags; -+}; -+ - long ptrace(int, ...); - - #ifdef __cplusplus -diff --git a/include/sys/random.h b/include/sys/random.h -new file mode 100644 -index 00000000..4ee7bf2c ---- /dev/null -+++ b/include/sys/random.h -@@ -0,0 +1,19 @@ -+#ifndef _SYS_RANDOM_H -+#define _SYS_RANDOM_H -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define __NEED_size_t -+#define __NEED_ssize_t -+#include <bits/alltypes.h> -+ -+#define GRND_NONBLOCK 0x0001 -+#define GRND_RANDOM 0x0002 -+ -+ssize_t getrandom(void *, size_t, unsigned); -+ -+#ifdef __cplusplus -+} -+#endif -+#endif -diff --git a/include/sys/sem.h b/include/sys/sem.h -index e7c36980..61cdb83d 100644 ---- a/include/sys/sem.h -+++ b/include/sys/sem.h -@@ -33,6 +33,7 @@ extern "C" { - - #define SEM_STAT 18 - #define SEM_INFO 19 -+#define SEM_STAT_ANY 20 - - struct seminfo { - int semmap; -diff --git a/include/sys/shm.h b/include/sys/shm.h -index 67be822b..662fde59 100644 ---- a/include/sys/shm.h -+++ b/include/sys/shm.h -@@ -35,11 +35,25 @@ extern "C" { - #define SHM_UNLOCK 12 - #define SHM_STAT 13 - #define SHM_INFO 14 -+#define SHM_STAT_ANY 15 - #define SHM_DEST 01000 - #define SHM_LOCKED 02000 - #define SHM_HUGETLB 04000 - #define SHM_NORESERVE 010000 - -+#define SHM_HUGE_SHIFT 26 -+#define SHM_HUGE_MASK 0x3f -+#define SHM_HUGE_64KB (16 << 26) -+#define SHM_HUGE_512KB (19 << 26) -+#define SHM_HUGE_1MB (20 << 26) -+#define SHM_HUGE_2MB (21 << 26) -+#define SHM_HUGE_8MB (23 << 26) -+#define SHM_HUGE_16MB (24 << 26) -+#define SHM_HUGE_256MB (28 << 26) -+#define SHM_HUGE_1GB (30 << 26) -+#define SHM_HUGE_2GB (31 << 26) -+#define SHM_HUGE_16GB (34U << 26) -+ - typedef unsigned long shmatt_t; - - void *shmat(int, const void *, int); -diff --git a/include/sys/socket.h b/include/sys/socket.h -index 051d20e0..14be6e99 100644 ---- a/include/sys/socket.h -+++ b/include/sys/socket.h -@@ -108,7 +108,8 @@ struct linger { - #define PF_VSOCK 40 - #define PF_KCM 41 - #define PF_QIPCRTR 42 --#define PF_MAX 43 -+#define PF_SMC 43 -+#define PF_MAX 44 - - #define AF_UNSPEC PF_UNSPEC - #define AF_LOCAL PF_LOCAL -@@ -156,6 +157,7 @@ struct linger { - #define AF_VSOCK PF_VSOCK - #define AF_KCM PF_KCM - #define AF_QIPCRTR PF_QIPCRTR -+#define AF_SMC PF_SMC - #define AF_MAX PF_MAX - - #ifndef SO_DEBUG -@@ -181,6 +183,7 @@ struct linger { - #define SO_RCVTIMEO 20 - #define SO_SNDTIMEO 21 - #define SO_ACCEPTCONN 30 -+#define SO_PEERSEC 31 - #define SO_SNDBUFFORCE 32 - #define SO_RCVBUFFORCE 33 - #define SO_PROTOCOL 38 -@@ -201,7 +204,6 @@ struct linger { - #define SO_TIMESTAMP 29 - #define SCM_TIMESTAMP SO_TIMESTAMP - --#define SO_PEERSEC 31 - #define SO_PASSSEC 34 - #define SO_TIMESTAMPNS 35 - #define SCM_TIMESTAMPNS SO_TIMESTAMPNS -@@ -230,6 +232,7 @@ struct linger { - #define SO_COOKIE 57 - #define SCM_TIMESTAMPING_PKTINFO 58 - #define SO_PEERGROUPS 59 -+#define SO_ZEROCOPY 60 - - #ifndef SOL_SOCKET - #define SOL_SOCKET 1 -@@ -261,6 +264,7 @@ struct linger { - #define SOL_ALG 279 - #define SOL_NFC 280 - #define SOL_KCM 281 -+#define SOL_TLS 282 - - #define SOMAXCONN 128 - -@@ -282,6 +286,7 @@ struct linger { - #define MSG_MORE 0x8000 - #define MSG_WAITFORONE 0x10000 - #define MSG_BATCH 0x40000 -+#define MSG_ZEROCOPY 0x4000000 - #define MSG_FASTOPEN 0x20000000 - #define MSG_CMSG_CLOEXEC 0x40000000 - -diff --git a/include/sys/soundcard.h b/include/sys/soundcard.h -index fade986f..5ca77646 100644 ---- a/include/sys/soundcard.h -+++ b/include/sys/soundcard.h -@@ -1 +1 @@ --#include <linux/soundcard.h> -+#include <bits/soundcard.h> -diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h -index e0839eca..ef07d684 100644 ---- a/include/sys/statvfs.h -+++ b/include/sys/statvfs.h -@@ -42,6 +42,7 @@ int fstatvfs (int, struct statvfs *); - #define ST_IMMUTABLE 512 - #define ST_NOATIME 1024 - #define ST_NODIRATIME 2048 -+#define ST_RELATIME 4096 - - #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) - #define statvfs64 statvfs -diff --git a/include/sys/vt.h b/include/sys/vt.h -index 834abfbc..5000de49 100644 ---- a/include/sys/vt.h -+++ b/include/sys/vt.h -@@ -1 +1 @@ --#include <linux/vt.h> -+#include <bits/vt.h> -diff --git a/include/tar.h b/include/tar.h -index be589842..2eba66ec 100644 ---- a/include/tar.h -+++ b/include/tar.h -@@ -1,9 +1,13 @@ - #ifndef _TAR_H - #define _TAR_H - -+#include <features.h> -+ - #define TSUID 04000 - #define TSGID 02000 -+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) - #define TSVTX 01000 -+#endif - #define TUREAD 00400 - #define TUWRITE 00200 - #define TUEXEC 00100 diff --git a/include/time.h b/include/time.h index 672b3fc3..c5946dd0 100644 --- a/include/time.h @@ -3120,47 +58,10 @@ index 672b3fc3..c5946dd0 100644 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ -diff --git a/include/uchar.h b/include/uchar.h -index 8dabf1ed..7e5c4d40 100644 ---- a/include/uchar.h -+++ b/include/uchar.h -@@ -3,7 +3,9 @@ - - #ifdef __cplusplus - extern "C" { --#else -+#endif -+ -+#if __cplusplus < 201103L - typedef unsigned short char16_t; - typedef unsigned char32_t; - #endif diff --git a/include/unistd.h b/include/unistd.h -index 09190af4..1bdd3292 100644 +index 9485da7a..1bdd3292 100644 --- a/include/unistd.h +++ b/include/unistd.h -@@ -128,12 +128,11 @@ long fpathconf(int, int); - long sysconf(int); - size_t confstr(int, char *, size_t); - -+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #define F_ULOCK 0 - #define F_LOCK 1 - #define F_TLOCK 2 - #define F_TEST 3 -- --#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - int setreuid(uid_t, uid_t); - int setregid(gid_t, gid_t); - int lockf(int, int, off_t); -@@ -176,6 +175,7 @@ int acct(const char *); - long syscall(long, ...); - int execvpe(const char *, char *const [], char *const []); - int issetugid(void); -+int getentropy(void *, size_t); - #endif - - #ifdef _GNU_SOURCE @@ -274,6 +274,7 @@ int eaccess(const char *, int); #define _PC_ALLOC_SIZE_MIN 18 #define _PC_SYMLINK_MAX 19 @@ -3186,328 +87,6 @@ index 09190af4..1bdd3292 100644 #ifdef __cplusplus } -diff --git a/ldso/dynlink.c b/ldso/dynlink.c -index 9bf6924b..87281ddb 100644 ---- a/ldso/dynlink.c -+++ b/ldso/dynlink.c -@@ -133,6 +133,9 @@ static struct dso *const nodeps_dummy; - - struct debug *_dl_debug_addr = &debug; - -+__attribute__((__visibility__("hidden"))) -+extern int __malloc_replaced; -+ - __attribute__((__visibility__("hidden"))) - void (*const __init_array_start)(void)=0, (*const __fini_array_start)(void)=0; - -@@ -158,10 +161,26 @@ static void *laddr(const struct dso *p, size_t v) - for (j=0; v-p->loadmap->segs[j].p_vaddr >= p->loadmap->segs[j].p_memsz; j++); - return (void *)(v - p->loadmap->segs[j].p_vaddr + p->loadmap->segs[j].addr); - } -+static void *laddr_pg(const struct dso *p, size_t v) -+{ -+ size_t j=0; -+ size_t pgsz = PAGE_SIZE; -+ if (!p->loadmap) return p->base + v; -+ for (j=0; ; j++) { -+ size_t a = p->loadmap->segs[j].p_vaddr; -+ size_t b = a + p->loadmap->segs[j].p_memsz; -+ a &= -pgsz; -+ b += pgsz-1; -+ b &= -pgsz; -+ if (v-a<b-a) break; -+ } -+ return (void *)(v - p->loadmap->segs[j].p_vaddr + p->loadmap->segs[j].addr); -+} - #define fpaddr(p, v) ((void (*)())&(struct funcdesc){ \ - laddr(p, v), (p)->got }) - #else - #define laddr(p, v) (void *)((p)->base + (v)) -+#define laddr_pg(p, v) laddr(p, v) - #define fpaddr(p, v) ((void (*)())laddr(p, v)) - #endif - -@@ -366,6 +385,14 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri - sym_val = def.sym ? (size_t)laddr(def.dso, def.sym->st_value) : 0; - tls_val = def.sym ? def.sym->st_value : 0; - -+ if ((type == REL_TPOFF || type == REL_TPOFF_NEG) -+ && runtime && def.dso->tls_id > static_tls_cnt) { -+ error("Error relocating %s: %s: initial-exec TLS " -+ "resolves to dynamic definition in %s", -+ dso->name, name, def.dso->name); -+ longjmp(*rtld_fail, 1); -+ } -+ - switch(type) { - case REL_NONE: - break; -@@ -419,7 +446,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri - #endif - case REL_TLSDESC: - if (stride<3) addend = reloc_addr[1]; -- if (runtime && def.dso->tls_id >= static_tls_cnt) { -+ if (runtime && def.dso->tls_id > static_tls_cnt) { - struct td_index *new = malloc(sizeof *new); - if (!new) { - error( -@@ -476,23 +503,16 @@ static void redo_lazy_relocs() - /* A huge hack: to make up for the wastefulness of shared libraries - * needing at least a page of dirty memory even if they have no global - * data, we reclaim the gaps at the beginning and end of writable maps -- * and "donate" them to the heap by setting up minimal malloc -- * structures and then freeing them. */ -+ * and "donate" them to the heap. */ - - static void reclaim(struct dso *dso, size_t start, size_t end) - { -- size_t *a, *z; -+ void __malloc_donate(char *, char *); - if (start >= dso->relro_start && start < dso->relro_end) start = dso->relro_end; - if (end >= dso->relro_start && end < dso->relro_end) end = dso->relro_start; -- start = start + 6*sizeof(size_t)-1 & -4*sizeof(size_t); -- end = (end & -4*sizeof(size_t)) - 2*sizeof(size_t); -- if (start>end || end-start < 4*sizeof(size_t)) return; -- a = laddr(dso, start); -- z = laddr(dso, end); -- a[-2] = 1; -- a[-1] = z[0] = end-start + 2*sizeof(size_t) | 1; -- z[1] = 1; -- free(a); -+ if (start >= end) return; -+ char *base = laddr_pg(dso, start); -+ __malloc_donate(base, base+(end-start)); - } - - static void reclaim_gaps(struct dso *dso) -@@ -500,7 +520,6 @@ static void reclaim_gaps(struct dso *dso) - Phdr *ph = dso->phdr; - size_t phcnt = dso->phnum; - -- if (DL_FDPIC) return; // FIXME - for (; phcnt--; ph=(void *)((char *)ph+dso->phentsize)) { - if (ph->p_type!=PT_LOAD) continue; - if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue; -@@ -695,18 +714,17 @@ static void *map_library(int fd, struct dso *dso) - dso->phnum = eh->e_phnum; - dso->phentsize = eh->e_phentsize; - } -- /* Reuse the existing mapping for the lowest-address LOAD */ -- if ((ph->p_vaddr & -PAGE_SIZE) == addr_min && !DL_NOMMU_SUPPORT) -- continue; - this_min = ph->p_vaddr & -PAGE_SIZE; - this_max = ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE; - off_start = ph->p_offset & -PAGE_SIZE; - prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) | - ((ph->p_flags&PF_W) ? PROT_WRITE: 0) | - ((ph->p_flags&PF_X) ? PROT_EXEC : 0)); -- if (mmap_fixed(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED) -- goto error; -- if (ph->p_memsz > ph->p_filesz) { -+ /* Reuse the existing mapping for the lowest-address LOAD */ -+ if ((ph->p_vaddr & -PAGE_SIZE) != addr_min || DL_NOMMU_SUPPORT) -+ if (mmap_fixed(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED) -+ goto error; -+ if (ph->p_memsz > ph->p_filesz && (ph->p_flags&PF_W)) { - size_t brk = (size_t)base+ph->p_vaddr+ph->p_filesz; - size_t pgbrk = brk+PAGE_SIZE-1 & -PAGE_SIZE; - memset((void *)brk, 0, pgbrk-brk & PAGE_SIZE-1); -@@ -1583,8 +1601,9 @@ _Noreturn void __dls3(size_t *sp) - libc.tls_head = tls_tail = &app.tls; - app.tls_id = tls_cnt = 1; - #ifdef TLS_ABOVE_TP -- app.tls.offset = 0; -- tls_offset = app.tls.size -+ app.tls.offset = GAP_ABOVE_TP; -+ app.tls.offset += -GAP_ABOVE_TP & (app.tls.align-1); -+ tls_offset = app.tls.offset + app.tls.size - + ( -((uintptr_t)app.tls.image + app.tls.size) - & (app.tls.align-1) ); - #else -@@ -1683,6 +1702,12 @@ _Noreturn void __dls3(size_t *sp) - if (ldso_fail) _exit(127); - if (ldd_mode) _exit(0); - -+ /* Determine if malloc was interposed by a replacement implementation -+ * so that calloc and the memalign family can harden against the -+ * possibility of incomplete replacement. */ -+ if (find_sym(head, "malloc", 1).dso != &ldso) -+ __malloc_replaced = 1; -+ - /* Switch to runtime mode: any further failures in the dynamic - * linker are a reportable failure rather than a fatal startup - * error. */ -@@ -1861,8 +1886,17 @@ static void *addr2dso(size_t a) - return p; - } - } else { -+ Phdr *ph = p->phdr; -+ size_t phcnt = p->phnum; -+ size_t entsz = p->phentsize; -+ size_t base = (size_t)p->base; -+ for (; phcnt--; ph=(void *)((char *)ph+entsz)) { -+ if (ph->p_type != PT_LOAD) continue; -+ if (a-base-ph->p_vaddr < ph->p_memsz) -+ return p; -+ } - if (a-(size_t)p->map < p->map_len) -- return p; -+ return 0; - } - } - return 0; -@@ -1926,16 +1960,18 @@ failed: - return 0; - } - --int dladdr(const void *addr, Dl_info *info) -+int dladdr(const void *addr_arg, Dl_info *info) - { -+ size_t addr = (size_t)addr_arg; - struct dso *p; - Sym *sym, *bestsym; - uint32_t nsym; - char *strings; -- void *best = 0; -+ size_t best = 0; -+ size_t besterr = -1; - - pthread_rwlock_rdlock(&lock); -- p = addr2dso((size_t)addr); -+ p = addr2dso(addr); - pthread_rwlock_unlock(&lock); - - if (!p) return 0; -@@ -1945,11 +1981,12 @@ int dladdr(const void *addr, Dl_info *info) - nsym = count_syms(p); - - if (DL_FDPIC) { -- size_t idx = ((size_t)addr-(size_t)p->funcdescs) -+ size_t idx = (addr-(size_t)p->funcdescs) - / sizeof(*p->funcdescs); - if (idx < nsym && (sym[idx].st_info&0xf) == STT_FUNC) { -- best = p->funcdescs + idx; -+ best = (size_t)(p->funcdescs + idx); - bestsym = sym + idx; -+ besterr = 0; - } - } - -@@ -1957,25 +1994,35 @@ int dladdr(const void *addr, Dl_info *info) - if (sym->st_value - && (1<<(sym->st_info&0xf) & OK_TYPES) - && (1<<(sym->st_info>>4) & OK_BINDS)) { -- void *symaddr = laddr(p, sym->st_value); -- if (symaddr > addr || symaddr < best) -+ size_t symaddr = (size_t)laddr(p, sym->st_value); -+ if (symaddr > addr || symaddr <= best) - continue; - best = symaddr; - bestsym = sym; -+ besterr = addr - symaddr; - if (addr == symaddr) - break; - } - } - -- if (!best) return 0; -- -- if (DL_FDPIC && (bestsym->st_info&0xf) == STT_FUNC) -- best = p->funcdescs + (bestsym - p->syms); -+ if (bestsym && besterr > bestsym->st_size-1) { -+ best = 0; -+ bestsym = 0; -+ } - - info->dli_fname = p->name; - info->dli_fbase = p->map; -+ -+ if (!best) { -+ info->dli_sname = 0; -+ info->dli_saddr = 0; -+ return 1; -+ } -+ -+ if (DL_FDPIC && (bestsym->st_info&0xf) == STT_FUNC) -+ best = (size_t)(p->funcdescs + (bestsym - p->syms)); - info->dli_sname = strings + bestsym->st_name; -- info->dli_saddr = best; -+ info->dli_saddr = (void *)best; - - return 1; - } -diff --git a/src/complex/casin.c b/src/complex/casin.c -index dfdda988..01ed6184 100644 ---- a/src/complex/casin.c -+++ b/src/complex/casin.c -@@ -12,5 +12,6 @@ double complex casin(double complex z) - x = creal(z); - y = cimag(z); - w = CMPLX(1.0 - (x - y)*(x + y), -2.0*x*y); -- return clog(CMPLX(-y, x) + csqrt(w)); -+ double complex r = clog(CMPLX(-y, x) + csqrt(w)); -+ return CMPLX(cimag(r), -creal(r)); - } -diff --git a/src/complex/casinf.c b/src/complex/casinf.c -index 93f0e335..4fcb76fc 100644 ---- a/src/complex/casinf.c -+++ b/src/complex/casinf.c -@@ -10,5 +10,6 @@ float complex casinf(float complex z) - x = crealf(z); - y = cimagf(z); - w = CMPLXF(1.0 - (x - y)*(x + y), -2.0*x*y); -- return clogf(CMPLXF(-y, x) + csqrtf(w)); -+ float complex r = clogf(CMPLXF(-y, x) + csqrtf(w)); -+ return CMPLXF(cimagf(r), -crealf(r)); - } -diff --git a/src/complex/casinl.c b/src/complex/casinl.c -index 0916c60f..3b7ceba7 100644 ---- a/src/complex/casinl.c -+++ b/src/complex/casinl.c -@@ -15,6 +15,7 @@ long double complex casinl(long double complex z) - x = creall(z); - y = cimagl(z); - w = CMPLXL(1.0 - (x - y)*(x + y), -2.0*x*y); -- return clogl(CMPLXL(-y, x) + csqrtl(w)); -+ long double complex r = clogl(CMPLXL(-y, x) + csqrtl(w)); -+ return CMPLXL(cimagl(r), -creall(r)); - } - #endif -diff --git a/src/complex/catan.c b/src/complex/catan.c -index 39ce6cf2..7dc2afeb 100644 ---- a/src/complex/catan.c -+++ b/src/complex/catan.c -@@ -91,29 +91,17 @@ double complex catan(double complex z) - x = creal(z); - y = cimag(z); - -- if (x == 0.0 && y > 1.0) -- goto ovrf; -- - x2 = x * x; - a = 1.0 - x2 - (y * y); -- if (a == 0.0) -- goto ovrf; - - t = 0.5 * atan2(2.0 * x, a); - w = _redupi(t); - - t = y - 1.0; - a = x2 + (t * t); -- if (a == 0.0) -- goto ovrf; - - t = y + 1.0; - a = (x2 + t * t)/a; -- w = w + (0.25 * log(a)) * I; -- return w; -- --ovrf: -- // FIXME -- w = MAXNUM + MAXNUM * I; -+ w = CMPLX(w, 0.25 * log(a)); - return w; - } diff --git a/src/conf/confstr.c b/src/conf/confstr.c index 02cb1aa2..8f870a69 100644 --- a/src/conf/confstr.c @@ -3524,7 +103,7 @@ index 02cb1aa2..8f870a69 100644 return 0; } diff --git a/src/conf/fpathconf.c b/src/conf/fpathconf.c -index 8eb037e6..b6a9d63e 100644 +index e6aca5cf..b6a9d63e 100644 --- a/src/conf/fpathconf.c +++ b/src/conf/fpathconf.c @@ -4,7 +4,7 @@ @@ -3536,82 +115,21 @@ index 8eb037e6..b6a9d63e 100644 [_PC_LINK_MAX] = _POSIX_LINK_MAX, [_PC_MAX_CANON] = _POSIX_MAX_CANON, [_PC_MAX_INPUT] = _POSIX_MAX_INPUT, -@@ -24,8 +24,9 @@ long fpathconf(int fd, int name) - [_PC_REC_MIN_XFER_SIZE] = 4096, +@@ -25,7 +25,8 @@ long fpathconf(int fd, int name) [_PC_REC_XFER_ALIGN] = 4096, [_PC_ALLOC_SIZE_MIN] = 4096, -- [_PC_SYMLINK_MAX] = SYMLINK_MAX, + [_PC_SYMLINK_MAX] = -1, - [_PC_2_SYMLINKS] = 1 -+ [_PC_SYMLINK_MAX] = -1, + [_PC_2_SYMLINKS] = 1, + [_PC_TIMESTAMP_RESOLUTION] = 100000000, }; if (name >= sizeof(values)/sizeof(values[0])) { errno = EINVAL; diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c -index 9ce330a5..483e1635 100644 +index 45ef1c16..483e1635 100644 --- a/src/conf/sysconf.c +++ b/src/conf/sysconf.c -@@ -18,6 +18,7 @@ - #define JT_PHYS_PAGES JT(8) - #define JT_AVPHYS_PAGES JT(9) - #define JT_ZERO JT(10) -+#define JT_DELAYTIMER_MAX JT(11) - - #define RLIM(x) (-32768|(RLIMIT_ ## x)) - -@@ -33,7 +34,7 @@ long sysconf(int name) - [_SC_TZNAME_MAX] = TZNAME_MAX, - [_SC_JOB_CONTROL] = 1, - [_SC_SAVED_IDS] = 1, -- [_SC_REALTIME_SIGNALS] = 1, -+ [_SC_REALTIME_SIGNALS] = VER, - [_SC_PRIORITY_SCHEDULING] = -1, - [_SC_TIMERS] = VER, - [_SC_ASYNCHRONOUS_IO] = VER, -@@ -50,7 +51,7 @@ long sysconf(int name) - [_SC_AIO_LISTIO_MAX] = -1, - [_SC_AIO_MAX] = -1, - [_SC_AIO_PRIO_DELTA_MAX] = JT_ZERO, /* ?? */ -- [_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX, -+ [_SC_DELAYTIMER_MAX] = JT_DELAYTIMER_MAX, - [_SC_MQ_OPEN_MAX] = -1, - [_SC_MQ_PRIO_MAX] = JT_MQ_PRIO_MAX, - [_SC_VERSION] = VER, -@@ -111,8 +112,8 @@ long sysconf(int name) - [_SC_XOPEN_XPG4] = -1, - [_SC_NZERO] = NZERO, - [_SC_XBS5_ILP32_OFF32] = -1, -- [_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO, -- [_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO, -+ [_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1, -+ [_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : -1, - [_SC_XBS5_LPBIG_OFFBIG] = -1, - [_SC_XOPEN_LEGACY] = -1, - [_SC_XOPEN_REALTIME] = -1, -@@ -141,8 +142,8 @@ long sysconf(int name) - [_SC_STREAMS] = JT_ZERO, - [_SC_2_PBS_CHECKPOINT] = -1, - [_SC_V6_ILP32_OFF32] = -1, -- [_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO, -- [_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO, -+ [_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1, -+ [_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : -1, - [_SC_V6_LPBIG_OFFBIG] = -1, - [_SC_HOST_NAME_MAX] = HOST_NAME_MAX, - [_SC_TRACE] = -1, -@@ -153,8 +154,8 @@ long sysconf(int name) - [_SC_IPV6] = VER, - [_SC_RAW_SOCKETS] = VER, - [_SC_V7_ILP32_OFF32] = -1, -- [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO, -- [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO, -+ [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1, -+ [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : -1, - [_SC_V7_LPBIG_OFFBIG] = -1, - [_SC_SS_REPL_MAX] = -1, - [_SC_TRACE_EVENT_NAME_MAX] = -1, -@@ -164,6 +165,7 @@ long sysconf(int name) +@@ -165,6 +165,7 @@ long sysconf(int name) [_SC_XOPEN_STREAMS] = JT_ZERO, [_SC_THREAD_ROBUST_PRIO_INHERIT] = -1, [_SC_THREAD_ROBUST_PRIO_PROTECT] = -1, @@ -3619,789 +137,6 @@ index 9ce330a5..483e1635 100644 }; if (name >= sizeof(values)/sizeof(values[0]) || !values[name]) { -@@ -190,6 +192,8 @@ long sysconf(int name) - return PAGE_SIZE; - case JT_SEM_VALUE_MAX & 255: - return SEM_VALUE_MAX; -+ case JT_DELAYTIMER_MAX & 255: -+ return DELAYTIMER_MAX; - case JT_NPROCESSORS_CONF & 255: - case JT_NPROCESSORS_ONLN & 255: ; - unsigned char set[128] = {1}; -diff --git a/src/dirent/__dirent.h b/src/dirent/__dirent.h -index 101b0368..828a5f17 100644 ---- a/src/dirent/__dirent.h -+++ b/src/dirent/__dirent.h -@@ -1,9 +1,11 @@ - struct __dirstream - { -- int fd; - off_t tell; -+ int fd; - int buf_pos; - int buf_end; - volatile int lock[1]; -+ /* Any changes to this struct must preserve the property: -+ * offsetof(struct __dirent, buf) % sizeof(off_t) == 0 */ - char buf[2048]; - }; -diff --git a/src/dirent/readdir.c b/src/dirent/readdir.c -index 2cf0632c..eef92f79 100644 ---- a/src/dirent/readdir.c -+++ b/src/dirent/readdir.c -@@ -1,10 +1,12 @@ - #include <dirent.h> - #include <errno.h> -+#include <stddef.h> - #include "__dirent.h" - #include "syscall.h" - #include "libc.h" - --int __getdents(int, struct dirent *, size_t); -+typedef char dirstream_buf_alignment_check[1-2*(int)( -+ offsetof(struct __dirstream, buf) % sizeof(off_t))]; - - struct dirent *readdir(DIR *dir) - { -diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c -index b125eb1f..31d324a8 100644 ---- a/src/env/__init_tls.c -+++ b/src/env/__init_tls.c -@@ -15,7 +15,8 @@ int __init_tp(void *p) - int r = __set_thread_area(TP_ADJ(p)); - if (r < 0) return -1; - if (!r) libc.can_do_threads = 1; -- td->tid = __syscall(SYS_set_tid_address, &td->tid); -+ td->detach_state = DT_JOINABLE; -+ td->tid = __syscall(SYS_set_tid_address, &td->detach_state); - td->locale = &libc.global_locale; - td->robust_list.head = &td->robust_list.head; - return 0; -@@ -103,13 +104,19 @@ static void static_init_tls(size_t *aux) - - main_tls.size += (-main_tls.size - (uintptr_t)main_tls.image) - & (main_tls.align-1); -- if (main_tls.align < MIN_TLS_ALIGN) main_tls.align = MIN_TLS_ALIGN; --#ifndef TLS_ABOVE_TP -+#ifdef TLS_ABOVE_TP -+ main_tls.offset = GAP_ABOVE_TP; -+ main_tls.offset += -GAP_ABOVE_TP & (main_tls.align-1); -+#else - main_tls.offset = main_tls.size; - #endif -+ if (main_tls.align < MIN_TLS_ALIGN) main_tls.align = MIN_TLS_ALIGN; - - libc.tls_align = main_tls.align; - libc.tls_size = 2*sizeof(void *) + sizeof(struct pthread) -+#ifdef TLS_ABOVE_TP -+ + main_tls.offset -+#endif - + main_tls.size + main_tls.align - + MIN_TLS_ALIGN-1 & -MIN_TLS_ALIGN; - -diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c -index 2d758af7..0583f686 100644 ---- a/src/env/__libc_start_main.c -+++ b/src/env/__libc_start_main.c -@@ -42,11 +42,13 @@ void __init_libc(char **envp, char *pn) - && !aux[AT_SECURE]) return; - - struct pollfd pfd[3] = { {.fd=0}, {.fd=1}, {.fd=2} }; -+ int r = - #ifdef SYS_poll - __syscall(SYS_poll, pfd, 3, 0); - #else - __syscall(SYS_ppoll, pfd, 3, &(struct timespec){0}, 0, _NSIG/8); - #endif -+ if (r<0) a_crash(); - for (i=0; i<3; i++) if (pfd[i].revents&POLLNVAL) - if (__sys_open("/dev/null", O_RDWR)<0) - a_crash(); -diff --git a/src/errno/__errno_location.c b/src/errno/__errno_location.c -index 7172a1be..ad9f9241 100644 ---- a/src/errno/__errno_location.c -+++ b/src/errno/__errno_location.c -@@ -1,3 +1,4 @@ -+#include <errno.h> - #include "pthread_impl.h" - - int *__errno_location(void) -diff --git a/src/errno/__strerror.h b/src/errno/__strerror.h -index 915044b5..2f04d400 100644 ---- a/src/errno/__strerror.h -+++ b/src/errno/__strerror.h -@@ -100,5 +100,6 @@ E(EREMOTEIO, "Remote I/O error") - E(EDQUOT, "Quota exceeded") - E(ENOMEDIUM, "No medium found") - E(EMEDIUMTYPE, "Wrong medium type") -+E(EMULTIHOP, "Multihop attempted") - - E(0, "No error information") -diff --git a/src/exit/abort.c b/src/exit/abort.c -index ecc0f735..5e5a87c3 100644 ---- a/src/exit/abort.c -+++ b/src/exit/abort.c -@@ -1,13 +1,31 @@ - #include <stdlib.h> - #include <signal.h> -+#include <string.h> - #include "syscall.h" - #include "pthread_impl.h" - #include "atomic.h" - - _Noreturn void abort(void) - { -+ struct sigaction abrtaction; -+ sigset_t abrtset; -+ - raise(SIGABRT); - __block_all_sigs(0); -+ -+ /* Unblock just SIGABRT, and set default handler */ -+ sigemptyset(&abrtset); -+ sigaddset(&abrtset, SIGABRT); -+ sigprocmask(SIG_UNBLOCK, &abrtset, 0); -+ -+ memset(&abrtaction, 0, sizeof(struct sigaction)); -+ abrtaction.sa_handler = SIG_DFL; -+ -+ sigaction(SIGABRT, &abrtaction, NULL); -+ -+ raise(SIGABRT); -+ -+ /* Ok, give up. */ - a_crash(); - raise(SIGKILL); - _Exit(127); -diff --git a/src/fenv/m68k/fenv.c b/src/fenv/m68k/fenv.c -new file mode 100644 -index 00000000..e60949d1 ---- /dev/null -+++ b/src/fenv/m68k/fenv.c -@@ -0,0 +1,84 @@ -+#include <fenv.h> -+ -+#if __HAVE_68881__ || __mcffpu__ -+ -+static unsigned getsr() -+{ -+ unsigned v; -+ __asm__ __volatile__ ("fmove.l %%fpsr,%0" : "=dm"(v)); -+ return v; -+} -+ -+static void setsr(unsigned v) -+{ -+ __asm__ __volatile__ ("fmove.l %0,%%fpsr" : : "dm"(v)); -+} -+ -+static unsigned getcr() -+{ -+ unsigned v; -+ __asm__ __volatile__ ("fmove.l %%fpcr,%0" : "=dm"(v)); -+ return v; -+} -+ -+static void setcr(unsigned v) -+{ -+ __asm__ __volatile__ ("fmove.l %0,%%fpcr" : : "dm"(v)); -+} -+ -+int feclearexcept(int mask) -+{ -+ if (mask & ~FE_ALL_EXCEPT) return -1; -+ setsr(getsr() & ~mask); -+ return 0; -+} -+ -+int feraiseexcept(int mask) -+{ -+ if (mask & ~FE_ALL_EXCEPT) return -1; -+ setsr(getsr() | mask); -+ return 0; -+} -+ -+int fetestexcept(int mask) -+{ -+ return getsr() & mask; -+} -+ -+int fegetround(void) -+{ -+ return getcr() & FE_UPWARD; -+} -+ -+int __fesetround(int r) -+{ -+ setcr((getcr() & ~FE_UPWARD) | r); -+ return 0; -+} -+ -+int fegetenv(fenv_t *envp) -+{ -+ envp->__control_register = getcr(); -+ envp->__status_register = getsr(); -+ __asm__ __volatile__ ("fmove.l %%fpiar,%0" -+ : "=dm"(envp->__instruction_address)); -+ return 0; -+} -+ -+int fesetenv(const fenv_t *envp) -+{ -+ static const fenv_t default_env = { 0 }; -+ if (envp == FE_DFL_ENV) -+ envp = &default_env; -+ setcr(envp->__control_register); -+ setsr(envp->__status_register); -+ __asm__ __volatile__ ("fmove.l %0,%%fpiar" -+ : : "dm"(envp->__instruction_address)); -+ return 0; -+} -+ -+#else -+ -+#include "../fenv.c" -+ -+#endif -diff --git a/src/internal/atomic.h b/src/internal/atomic.h -index ab473dd7..f938879b 100644 ---- a/src/internal/atomic.h -+++ b/src/internal/atomic.h -@@ -251,6 +251,22 @@ static inline void a_crash() - } - #endif - -+#ifndef a_ctz_32 -+#define a_ctz_32 a_ctz_32 -+static inline int a_ctz_32(uint32_t x) -+{ -+#ifdef a_clz_32 -+ return 31-a_clz_32(x&-x); -+#else -+ static const char debruijn32[32] = { -+ 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, -+ 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 -+ }; -+ return debruijn32[(x&-x)*0x076be629 >> 27]; -+#endif -+} -+#endif -+ - #ifndef a_ctz_64 - #define a_ctz_64 a_ctz_64 - static inline int a_ctz_64(uint64_t x) -@@ -261,22 +277,23 @@ static inline int a_ctz_64(uint64_t x) - 63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, - 51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 - }; -- static const char debruijn32[32] = { -- 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, -- 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 -- }; - if (sizeof(long) < 8) { - uint32_t y = x; - if (!y) { - y = x>>32; -- return 32 + debruijn32[(y&-y)*0x076be629 >> 27]; -+ return 32 + a_ctz_32(y); - } -- return debruijn32[(y&-y)*0x076be629 >> 27]; -+ return a_ctz_32(y); - } - return debruijn64[(x&-x)*0x022fdd63cc95386dull >> 58]; - } - #endif - -+static inline int a_ctz_l(unsigned long x) -+{ -+ return (sizeof(long) < 8) ? a_ctz_32(x) : a_ctz_64(x); -+} -+ - #ifndef a_clz_64 - #define a_clz_64 a_clz_64 - static inline int a_clz_64(uint64_t x) -@@ -298,17 +315,4 @@ static inline int a_clz_64(uint64_t x) - } - #endif - --#ifndef a_ctz_l --#define a_ctz_l a_ctz_l --static inline int a_ctz_l(unsigned long x) --{ -- static const char debruijn32[32] = { -- 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, -- 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 -- }; -- if (sizeof(long) == 8) return a_ctz_64(x); -- return debruijn32[(x&-x)*0x076be629 >> 27]; --} --#endif -- - #endif -diff --git a/src/internal/libm.h b/src/internal/libm.h -index df864111..a2505f7e 100644 ---- a/src/internal/libm.h -+++ b/src/internal/libm.h -@@ -28,6 +28,17 @@ union ldshape { - uint16_t se; - } i; - }; -+#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __BIG_ENDIAN -+/* This is the m68k variant of 80-bit long double, and this definition only works -+ * on archs where the alignment requirement of uint64_t is <= 4. */ -+union ldshape { -+ long double f; -+ struct { -+ uint16_t se; -+ uint16_t pad; -+ uint64_t m; -+ } i; -+}; - #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN - union ldshape { - long double f; -diff --git a/src/internal/m68k/syscall.s b/src/internal/m68k/syscall.s -new file mode 100644 -index 00000000..9972a34d ---- /dev/null -+++ b/src/internal/m68k/syscall.s -@@ -0,0 +1,9 @@ -+.global __syscall -+.hidden __syscall -+.type __syscall,%function -+__syscall: -+ movem.l %d2-%d5,-(%sp) -+ movem.l 20(%sp),%d0-%d5/%a0 -+ trap #0 -+ movem.l (%sp)+,%d2-%d5 -+ rts -diff --git a/src/internal/malloc_impl.h b/src/internal/malloc_impl.h -new file mode 100644 -index 00000000..5d025b06 ---- /dev/null -+++ b/src/internal/malloc_impl.h -@@ -0,0 +1,45 @@ -+#ifndef MALLOC_IMPL_H -+#define MALLOC_IMPL_H -+ -+void *__mmap(void *, size_t, int, int, int, off_t); -+int __munmap(void *, size_t); -+void *__mremap(void *, size_t, size_t, int, ...); -+int __madvise(void *, size_t, int); -+ -+struct chunk { -+ size_t psize, csize; -+ struct chunk *next, *prev; -+}; -+ -+struct bin { -+ volatile int lock[2]; -+ struct chunk *head; -+ struct chunk *tail; -+}; -+ -+#define SIZE_ALIGN (4*sizeof(size_t)) -+#define SIZE_MASK (-SIZE_ALIGN) -+#define OVERHEAD (2*sizeof(size_t)) -+#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN) -+#define DONTCARE 16 -+#define RECLAIM 163840 -+ -+#define CHUNK_SIZE(c) ((c)->csize & -2) -+#define CHUNK_PSIZE(c) ((c)->psize & -2) -+#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c))) -+#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c))) -+#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD) -+#define CHUNK_TO_MEM(c) (void *)((char *)(c) + OVERHEAD) -+#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head)) -+ -+#define C_INUSE ((size_t)1) -+ -+#define IS_MMAPPED(c) !((c)->csize & (C_INUSE)) -+ -+__attribute__((__visibility__("hidden"))) -+void __bin_chunk(struct chunk *); -+ -+__attribute__((__visibility__("hidden"))) -+extern int __malloc_replaced; -+ -+#endif -diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h -index f6a4f2c2..3826bd8e 100644 ---- a/src/internal/pthread_impl.h -+++ b/src/internal/pthread_impl.h -@@ -19,38 +19,36 @@ struct pthread { - void **dtv, *unused1, *unused2; - uintptr_t sysinfo; - uintptr_t canary, canary2; -- pid_t tid, pid; - - /* Part 2 -- implementation details, non-ABI. */ -- int tsd_used, errno_val; -- volatile int cancel, canceldisable, cancelasync; -- int detached; -+ int tid; -+ int errno_val; -+ volatile int detach_state; -+ volatile int cancel; -+ volatile unsigned char canceldisable, cancelasync; -+ unsigned char tsd_used:1; -+ unsigned char unblock_cancel:1; -+ unsigned char dlerror_flag:1; - unsigned char *map_base; - size_t map_size; - void *stack; - size_t stack_size; -+ size_t guard_size; - void *start_arg; - void *(*start)(void *); - void *result; - struct __ptcb *cancelbuf; - void **tsd; -- volatile int dead; - struct { - volatile void *volatile head; - long off; - volatile void *volatile pending; - } robust_list; -- int unblock_cancel; - volatile int timer_id; - locale_t locale; - volatile int killlock[1]; -- volatile int exitlock[1]; -- volatile int startlock[2]; -- unsigned long sigmask[_NSIG/8/sizeof(long)]; - char *dlerror_buf; -- int dlerror_flag; - void *stdio_locks; -- size_t guard_size; - - /* Part 3 -- the positions of these fields relative to - * the end of the structure is external and internal ABI. */ -@@ -58,6 +56,22 @@ struct pthread { - void **dtv_copy; - }; - -+struct start_sched_args { -+ void *start_arg; -+ void *(*start_fn)(void *); -+ sigset_t mask; -+ pthread_attr_t *attr; -+ volatile int futex; -+}; -+ -+enum { -+ DT_EXITED = 0, -+ DT_EXITING, -+ DT_JOINABLE, -+ DT_DETACHED, -+ DT_DYNAMIC, -+}; -+ - struct __timer { - int timerid; - pthread_t thread; -@@ -147,8 +161,8 @@ static inline void __wake(volatile void *addr, int cnt, int priv) - static inline void __futexwait(volatile void *addr, int val, int priv) - { - if (priv) priv = FUTEX_PRIVATE; -- __syscall(SYS_futex, addr, FUTEX_WAIT|priv, val) != -ENOSYS || -- __syscall(SYS_futex, addr, FUTEX_WAIT, val); -+ __syscall(SYS_futex, addr, FUTEX_WAIT|priv, val, 0) != -ENOSYS || -+ __syscall(SYS_futex, addr, FUTEX_WAIT, val, 0); - } - - void __acquire_ptc(void); -diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h -index 7cdf729d..1127a492 100644 ---- a/src/internal/stdio_impl.h -+++ b/src/internal/stdio_impl.h -@@ -9,7 +9,7 @@ - - #define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 0) - #define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0) --#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else -+#define FUNLOCK(f) do { if (__need_unlock) __unlockfile((f)); } while (0) - - #define F_PERM 1 - #define F_NORD 4 -diff --git a/src/ipc/msgctl.c b/src/ipc/msgctl.c -index 4372c719..ea9b2337 100644 ---- a/src/ipc/msgctl.c -+++ b/src/ipc/msgctl.c -@@ -1,12 +1,34 @@ - #include <sys/msg.h> -+#include <endian.h> - #include "syscall.h" - #include "ipc.h" - -+#if __BYTE_ORDER != __BIG_ENDIAN -+#undef SYSCALL_IPC_BROKEN_MODE -+#endif -+ - int msgctl(int q, int cmd, struct msqid_ds *buf) - { -+#ifdef SYSCALL_IPC_BROKEN_MODE -+ struct msqid_ds tmp; -+ if (cmd == IPC_SET) { -+ tmp = *buf; -+ tmp.msg_perm.mode *= 0x10000U; -+ buf = &tmp; -+ } -+#endif - #ifdef SYS_msgctl -- return syscall(SYS_msgctl, q, cmd | IPC_64, buf); -+ int r = __syscall(SYS_msgctl, q, cmd | IPC_64, buf); - #else -- return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0); -+ int r = __syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0); -+#endif -+#ifdef SYSCALL_IPC_BROKEN_MODE -+ if (r >= 0) switch (cmd) { -+ case IPC_STAT: -+ case MSG_STAT: -+ case MSG_STAT_ANY: -+ buf->msg_perm.mode >>= 16; -+ } - #endif -+ return __syscall_ret(r); - } -diff --git a/src/ipc/semctl.c b/src/ipc/semctl.c -index 673a9a8c..941e2813 100644 ---- a/src/ipc/semctl.c -+++ b/src/ipc/semctl.c -@@ -1,8 +1,13 @@ - #include <sys/sem.h> - #include <stdarg.h> -+#include <endian.h> - #include "syscall.h" - #include "ipc.h" - -+#if __BYTE_ORDER != __BIG_ENDIAN -+#undef SYSCALL_IPC_BROKEN_MODE -+#endif -+ - union semun { - int val; - struct semid_ds *buf; -@@ -20,9 +25,26 @@ int semctl(int id, int num, int cmd, ...) - arg = va_arg(ap, union semun); - va_end(ap); - } -+#ifdef SYSCALL_IPC_BROKEN_MODE -+ struct semid_ds tmp; -+ if (cmd == IPC_SET) { -+ tmp = *arg.buf; -+ tmp.sem_perm.mode *= 0x10000U; -+ arg.buf = &tmp; -+ } -+#endif - #ifdef SYS_semctl -- return syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf); -+ int r = __syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf); - #else -- return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf); -+ int r = __syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf); -+#endif -+#ifdef SYSCALL_IPC_BROKEN_MODE -+ if (r >= 0) switch (cmd) { -+ case IPC_STAT: -+ case SEM_STAT: -+ case SEM_STAT_ANY: -+ arg.buf->sem_perm.mode >>= 16; -+ } - #endif -+ return __syscall_ret(r); - } -diff --git a/src/ipc/shmctl.c b/src/ipc/shmctl.c -index e2879f20..c951a581 100644 ---- a/src/ipc/shmctl.c -+++ b/src/ipc/shmctl.c -@@ -1,12 +1,34 @@ - #include <sys/shm.h> -+#include <endian.h> - #include "syscall.h" - #include "ipc.h" - -+#if __BYTE_ORDER != __BIG_ENDIAN -+#undef SYSCALL_IPC_BROKEN_MODE -+#endif -+ - int shmctl(int id, int cmd, struct shmid_ds *buf) - { -+#ifdef SYSCALL_IPC_BROKEN_MODE -+ struct shmid_ds tmp; -+ if (cmd == IPC_SET) { -+ tmp = *buf; -+ tmp.shm_perm.mode *= 0x10000U; -+ buf = &tmp; -+ } -+#endif - #ifdef SYS_shmctl -- return syscall(SYS_shmctl, id, cmd | IPC_64, buf); -+ int r = __syscall(SYS_shmctl, id, cmd | IPC_64, buf); - #else -- return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0); -+ int r = __syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0); -+#endif -+#ifdef SYSCALL_IPC_BROKEN_MODE -+ if (r >= 0) switch (cmd) { -+ case IPC_STAT: -+ case SHM_STAT: -+ case SHM_STAT_ANY: -+ buf->shm_perm.mode >>= 16; -+ } - #endif -+ return __syscall_ret(r); - } -diff --git a/src/ldso/aarch64/tlsdesc.s b/src/ldso/aarch64/tlsdesc.s -index 8ed5c267..8e4004d7 100644 ---- a/src/ldso/aarch64/tlsdesc.s -+++ b/src/ldso/aarch64/tlsdesc.s -@@ -14,7 +14,7 @@ __tlsdesc_static: - // size_t __tlsdesc_dynamic(size_t *a) - // { - // struct {size_t modidx,off;} *p = (void*)a[1]; --// size_t *dtv = *(size_t**)(tp + 16 - 8); -+// size_t *dtv = *(size_t**)(tp - 8); - // if (p->modidx <= dtv[0]) - // return dtv[p->modidx] + p->off - tp; - // return __tls_get_new(p) - tp; -@@ -28,8 +28,7 @@ __tlsdesc_dynamic: - mrs x1,tpidr_el0 // tp - ldr x0,[x0,#8] // p - ldr x2,[x0] // p->modidx -- add x3,x1,#8 -- ldr x3,[x3] // dtv -+ ldr x3,[x1,#-8] // dtv - ldr x4,[x3] // dtv[0] - cmp x2,x4 - b.hi 1f -diff --git a/src/ldso/m68k/dlsym.s b/src/ldso/m68k/dlsym.s -new file mode 100644 -index 00000000..5209ae1b ---- /dev/null -+++ b/src/ldso/m68k/dlsym.s -@@ -0,0 +1,12 @@ -+.text -+.global dlsym -+.hidden __dlsym -+.type dlsym,@function -+dlsym: -+ move.l (%sp),-(%sp) -+ move.l 12(%sp),-(%sp) -+ move.l 12(%sp),-(%sp) -+ lea __dlsym-.-8,%a1 -+ jsr (%pc,%a1) -+ add.l #12,%sp -+ rts -diff --git a/src/linux/getrandom.c b/src/linux/getrandom.c -new file mode 100644 -index 00000000..6cc6f6b0 ---- /dev/null -+++ b/src/linux/getrandom.c -@@ -0,0 +1,7 @@ -+#include <sys/random.h> -+#include "syscall.h" -+ -+ssize_t getrandom(void *buf, size_t buflen, unsigned flags) -+{ -+ return syscall_cp(SYS_getrandom, buf, buflen, flags); -+} -diff --git a/src/linux/memfd_create.c b/src/linux/memfd_create.c -new file mode 100644 -index 00000000..1649fe55 ---- /dev/null -+++ b/src/linux/memfd_create.c -@@ -0,0 +1,8 @@ -+#define _GNU_SOURCE 1 -+#include <sys/mman.h> -+#include "syscall.h" -+ -+int memfd_create(const char *name, unsigned flags) -+{ -+ return syscall(SYS_memfd_create, name, flags); -+} -diff --git a/src/linux/mlock2.c b/src/linux/mlock2.c -new file mode 100644 -index 00000000..10132742 ---- /dev/null -+++ b/src/linux/mlock2.c -@@ -0,0 +1,10 @@ -+#define _GNU_SOURCE 1 -+#include <sys/mman.h> -+#include "syscall.h" -+ -+int mlock2(const void *addr, size_t len, unsigned flags) -+{ -+ if (flags == 0) -+ return mlock(addr, len); -+ return syscall(SYS_mlock2, addr, len, flags); -+} -diff --git a/src/locale/iconv.c b/src/locale/iconv.c -index d469856c..3047c27b 100644 ---- a/src/locale/iconv.c -+++ b/src/locale/iconv.c -@@ -458,16 +458,24 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri - * range in the hkscs table then hard-coded - * here. Ugly, yes. */ - if (c/256 == 0xdc) { -- if (totype-0300U > 8) k = 2; -- else k = "\10\4\4\10\4\4\10\2\4"[totype-0300]; -- if (k > *outb) goto toobig; -- x += iconv(combine_to_from(to, 0), -+ union { -+ char c[8]; -+ wchar_t wc[2]; -+ } tmp; -+ char *ptmp = tmp.c; -+ size_t tmpx = iconv(combine_to_from(to, find_charmap("utf8")), - &(char *){"\303\212\314\204" - "\303\212\314\214" - "\303\252\314\204" - "\303\252\314\214" - +c%256}, &(size_t){4}, -- out, outb); -+ &ptmp, &(size_t){sizeof tmp}); -+ size_t tmplen = ptmp - tmp.c; -+ if (tmplen > *outb) goto toobig; -+ if (tmpx) x++; -+ memcpy(*out, &tmp, tmplen); -+ *out += tmplen; -+ *outb -= tmplen; - continue; - } - if (!c) goto ilseq; -@@ -539,6 +547,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri - if (*outb < 1) goto toobig; - if (c<256 && c==legacy_map(tomap, c)) { - revout: -+ if (*outb < 1) goto toobig; - *(*out)++ = c; - *outb -= 1; - break; -@@ -645,6 +654,8 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri - *out += 4; - *outb -= 4; - break; -+ case UTF_32: -+ totype = UTF_32BE; - case UTF_32BE: - case UTF_32LE: - if (*outb < 4) goto toobig; -diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c -index b16caf44..83be6433 100644 ---- a/src/locale/langinfo.c -+++ b/src/locale/langinfo.c -@@ -33,7 +33,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc) - int idx = item & 65535; - const char *str; - -- if (item == CODESET) return MB_CUR_MAX==1 ? "ASCII" : "UTF-8"; -+ if (item == CODESET) return loc->cat[LC_CTYPE] ? "UTF-8" : "ASCII"; - - /* _NL_LOCALE_NAME extension */ - if (idx == 65535 && cat < LC_ALL) diff --git a/src/locale/setlocale.c b/src/locale/setlocale.c index 40bc7ece..4d51cdfe 100644 --- a/src/locale/setlocale.c @@ -4415,675 +150,6 @@ index 40bc7ece..4d51cdfe 100644 LOCK(lock); /* For LC_ALL, setlocale is required to return a string which -diff --git a/src/malloc/__brk.c b/src/malloc/__brk.c -deleted file mode 100644 -index 4c9119b4..00000000 ---- a/src/malloc/__brk.c -+++ /dev/null -@@ -1,7 +0,0 @@ --#include <stdint.h> --#include "syscall.h" -- --uintptr_t __brk(uintptr_t newbrk) --{ -- return __syscall(SYS_brk, newbrk); --} -diff --git a/src/malloc/calloc.c b/src/malloc/calloc.c -deleted file mode 100644 -index 436c0b03..00000000 ---- a/src/malloc/calloc.c -+++ /dev/null -@@ -1,13 +0,0 @@ --#include <stdlib.h> --#include <errno.h> -- --void *__malloc0(size_t); -- --void *calloc(size_t m, size_t n) --{ -- if (n && m > (size_t)-1/n) { -- errno = ENOMEM; -- return 0; -- } -- return __malloc0(n * m); --} -diff --git a/src/malloc/lite_malloc.c b/src/malloc/lite_malloc.c -index 701f60b4..96c4feac 100644 ---- a/src/malloc/lite_malloc.c -+++ b/src/malloc/lite_malloc.c -@@ -47,4 +47,14 @@ static void *__simple_malloc(size_t n) - } - - weak_alias(__simple_malloc, malloc); --weak_alias(__simple_malloc, __malloc0); -+ -+static void *__simple_calloc(size_t m, size_t n) -+{ -+ if (n && m > (size_t)-1/n) { -+ errno = ENOMEM; -+ return 0; -+ } -+ return __simple_malloc(n * m); -+} -+ -+weak_alias(__simple_calloc, calloc); -diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c -index 9e05e1d6..d72883e1 100644 ---- a/src/malloc/malloc.c -+++ b/src/malloc/malloc.c -@@ -8,53 +8,19 @@ - #include "libc.h" - #include "atomic.h" - #include "pthread_impl.h" -+#include "malloc_impl.h" - - #if defined(__GNUC__) && defined(__PIC__) - #define inline inline __attribute__((always_inline)) - #endif - --void *__mmap(void *, size_t, int, int, int, off_t); --int __munmap(void *, size_t); --void *__mremap(void *, size_t, size_t, int, ...); --int __madvise(void *, size_t, int); -- --struct chunk { -- size_t psize, csize; -- struct chunk *next, *prev; --}; -- --struct bin { -- volatile int lock[2]; -- struct chunk *head; -- struct chunk *tail; --}; -- - static struct { - volatile uint64_t binmap; - struct bin bins[64]; - volatile int free_lock[2]; - } mal; - -- --#define SIZE_ALIGN (4*sizeof(size_t)) --#define SIZE_MASK (-SIZE_ALIGN) --#define OVERHEAD (2*sizeof(size_t)) --#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN) --#define DONTCARE 16 --#define RECLAIM 163840 -- --#define CHUNK_SIZE(c) ((c)->csize & -2) --#define CHUNK_PSIZE(c) ((c)->psize & -2) --#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c))) --#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c))) --#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD) --#define CHUNK_TO_MEM(c) (void *)((char *)(c) + OVERHEAD) --#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head)) -- --#define C_INUSE ((size_t)1) -- --#define IS_MMAPPED(c) !((c)->csize & (C_INUSE)) -- -+int __malloc_replaced; - - /* Synchronization tools */ - -@@ -314,7 +280,7 @@ static void trim(struct chunk *self, size_t n) - next->psize = n1-n | C_INUSE; - self->csize = n | C_INUSE; - -- free(CHUNK_TO_MEM(split)); -+ __bin_chunk(split); - } - - void *malloc(size_t n) -@@ -366,15 +332,40 @@ void *malloc(size_t n) - return CHUNK_TO_MEM(c); - } - --void *__malloc0(size_t n) -+static size_t mal0_clear(char *p, size_t pagesz, size_t n) - { -+#ifdef __GNUC__ -+ typedef uint64_t __attribute__((__may_alias__)) T; -+#else -+ typedef unsigned char T; -+#endif -+ char *pp = p + n; -+ size_t i = (uintptr_t)pp & (pagesz - 1); -+ for (;;) { -+ pp = memset(pp - i, 0, i); -+ if (pp - p < pagesz) return pp - p; -+ for (i = pagesz; i; i -= 2*sizeof(T), pp -= 2*sizeof(T)) -+ if (((T *)pp)[-1] | ((T *)pp)[-2]) -+ break; -+ } -+} -+ -+void *calloc(size_t m, size_t n) -+{ -+ if (n && m > (size_t)-1/n) { -+ errno = ENOMEM; -+ return 0; -+ } -+ n *= m; - void *p = malloc(n); -- if (p && !IS_MMAPPED(MEM_TO_CHUNK(p))) { -- size_t *z; -- n = (n + sizeof *z - 1)/sizeof *z; -- for (z=p; n; n--, z++) if (*z) *z=0; -+ if (!p) return p; -+ if (!__malloc_replaced) { -+ if (IS_MMAPPED(MEM_TO_CHUNK(p))) -+ return p; -+ if (n >= PAGE_SIZE) -+ n = mal0_clear(p, PAGE_SIZE, n); - } -- return p; -+ return memset(p, 0, n); - } - - void *realloc(void *p, size_t n) -@@ -397,10 +388,9 @@ void *realloc(void *p, size_t n) - size_t newlen = n + extra; - /* Crash on realloc of freed chunk */ - if (extra & 1) a_crash(); -- if (newlen < PAGE_SIZE && (new = malloc(n))) { -- memcpy(new, p, n-OVERHEAD); -- free(p); -- return new; -+ if (newlen < PAGE_SIZE && (new = malloc(n-OVERHEAD))) { -+ n0 = n; -+ goto copy_free_ret; - } - newlen = (newlen + PAGE_SIZE-1) & -PAGE_SIZE; - if (oldlen == newlen) return p; -@@ -443,34 +433,20 @@ copy_realloc: - /* As a last resort, allocate a new chunk and copy to it. */ - new = malloc(n-OVERHEAD); - if (!new) return 0; -+copy_free_ret: - memcpy(new, p, n0-OVERHEAD); - free(CHUNK_TO_MEM(self)); - return new; - } - --void free(void *p) -+void __bin_chunk(struct chunk *self) - { -- struct chunk *self, *next; -+ struct chunk *next = NEXT_CHUNK(self); - size_t final_size, new_size, size; - int reclaim=0; - int i; - -- if (!p) return; -- -- self = MEM_TO_CHUNK(p); -- -- if (IS_MMAPPED(self)) { -- size_t extra = self->psize; -- char *base = (char *)self - extra; -- size_t len = CHUNK_SIZE(self) + extra; -- /* Crash on double free */ -- if (extra & 1) a_crash(); -- __munmap(base, len); -- return; -- } -- - final_size = new_size = CHUNK_SIZE(self); -- next = NEXT_CHUNK(self); - - /* Crash on corrupted footer (likely from buffer overflow) */ - if (next->psize != self->csize) a_crash(); -@@ -531,3 +507,44 @@ void free(void *p) - - unlock_bin(i); - } -+ -+static void unmap_chunk(struct chunk *self) -+{ -+ size_t extra = self->psize; -+ char *base = (char *)self - extra; -+ size_t len = CHUNK_SIZE(self) + extra; -+ /* Crash on double free */ -+ if (extra & 1) a_crash(); -+ __munmap(base, len); -+} -+ -+void free(void *p) -+{ -+ if (!p) return; -+ -+ struct chunk *self = MEM_TO_CHUNK(p); -+ -+ if (IS_MMAPPED(self)) -+ unmap_chunk(self); -+ else -+ __bin_chunk(self); -+} -+ -+void __malloc_donate(char *start, char *end) -+{ -+ size_t align_start_up = (SIZE_ALIGN-1) & (-(uintptr_t)start - OVERHEAD); -+ size_t align_end_down = (SIZE_ALIGN-1) & (uintptr_t)end; -+ -+ /* Getting past this condition ensures that the padding for alignment -+ * and header overhead will not overflow and will leave a nonzero -+ * multiple of SIZE_ALIGN bytes between start and end. */ -+ if (end - start <= OVERHEAD + align_start_up + align_end_down) -+ return; -+ start += align_start_up + OVERHEAD; -+ end -= align_end_down; -+ -+ struct chunk *c = MEM_TO_CHUNK(start), *n = MEM_TO_CHUNK(end); -+ c->psize = n->csize = C_INUSE; -+ c->csize = n->psize = C_INUSE | (end-start); -+ __bin_chunk(c); -+} -diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c -index 006bd21c..8a6152f4 100644 ---- a/src/malloc/memalign.c -+++ b/src/malloc/memalign.c -@@ -2,55 +2,53 @@ - #include <stdint.h> - #include <errno.h> - #include "libc.h" -- --/* This function should work with most dlmalloc-like chunk bookkeeping -- * systems, but it's only guaranteed to work with the native implementation -- * used in this library. */ -+#include "malloc_impl.h" - - void *__memalign(size_t align, size_t len) - { -- unsigned char *mem, *new, *end; -- size_t header, footer; -+ unsigned char *mem, *new; - - if ((align & -align) != align) { - errno = EINVAL; -- return NULL; -+ return 0; - } - -- if (len > SIZE_MAX - align) { -+ if (len > SIZE_MAX - align || __malloc_replaced) { - errno = ENOMEM; -- return NULL; -+ return 0; - } - -- if (align <= 4*sizeof(size_t)) { -- if (!(mem = malloc(len))) -- return NULL; -- return mem; -- } -+ if (align <= SIZE_ALIGN) -+ return malloc(len); - - if (!(mem = malloc(len + align-1))) -- return NULL; -+ return 0; - - new = (void *)((uintptr_t)mem + align-1 & -align); - if (new == mem) return mem; - -- header = ((size_t *)mem)[-1]; -+ struct chunk *c = MEM_TO_CHUNK(mem); -+ struct chunk *n = MEM_TO_CHUNK(new); - -- if (!(header & 7)) { -- ((size_t *)new)[-2] = ((size_t *)mem)[-2] + (new-mem); -- ((size_t *)new)[-1] = ((size_t *)mem)[-1] - (new-mem); -+ if (IS_MMAPPED(c)) { -+ /* Apply difference between aligned and original -+ * address to the "extra" field of mmapped chunk. */ -+ n->psize = c->psize + (new-mem); -+ n->csize = c->csize - (new-mem); - return new; - } - -- end = mem + (header & -8); -- footer = ((size_t *)end)[-2]; -+ struct chunk *t = NEXT_CHUNK(c); - -- ((size_t *)mem)[-1] = header&7 | new-mem; -- ((size_t *)new)[-2] = footer&7 | new-mem; -- ((size_t *)new)[-1] = header&7 | end-new; -- ((size_t *)end)[-2] = footer&7 | end-new; -+ /* Split the allocated chunk into two chunks. The aligned part -+ * that will be used has the size in its footer reduced by the -+ * difference between the aligned and original addresses, and -+ * the resulting size copied to its header. A new header and -+ * footer are written for the split-off part to be freed. */ -+ n->psize = c->csize = C_INUSE | (new-mem); -+ n->csize = t->psize -= new-mem; - -- free(mem); -+ __bin_chunk(c); - return new; - } - -diff --git a/src/math/__fpclassifyl.c b/src/math/__fpclassifyl.c -index 481c0b94..e41781b6 100644 ---- a/src/math/__fpclassifyl.c -+++ b/src/math/__fpclassifyl.c -@@ -13,10 +13,18 @@ int __fpclassifyl(long double x) - int msb = u.i.m>>63; - if (!e && !msb) - return u.i.m ? FP_SUBNORMAL : FP_ZERO; -+ if (e == 0x7fff) { -+ /* The x86 variant of 80-bit extended precision only admits -+ * one representation of each infinity, with the mantissa msb -+ * necessarily set. The version with it clear is invalid/nan. -+ * The m68k variant, however, allows either, and tooling uses -+ * the version with it clear. */ -+ if (__BYTE_ORDER == __LITTLE_ENDIAN && !msb) -+ return FP_NAN; -+ return u.i.m << 1 ? FP_NAN : FP_INFINITE; -+ } - if (!msb) - return FP_NAN; -- if (e == 0x7fff) -- return u.i.m << 1 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; - } - #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 -diff --git a/src/math/fmaf.c b/src/math/fmaf.c -index aa57feb6..80f5cd8a 100644 ---- a/src/math/fmaf.c -+++ b/src/math/fmaf.c -@@ -50,7 +50,7 @@ float fmaf(float x, float y, float z) - /* Common case: The double precision result is fine. */ - if ((u.i & 0x1fffffff) != 0x10000000 || /* not a halfway case */ - e == 0x7ff || /* NaN */ -- result - xy == z || /* exact */ -+ (result - xy == z && result - z == xy) || /* exact */ - fegetround() != FE_TONEAREST) /* not round-to-nearest */ - { - /* -diff --git a/src/misc/getentropy.c b/src/misc/getentropy.c -new file mode 100644 -index 00000000..4c61ae26 ---- /dev/null -+++ b/src/misc/getentropy.c -@@ -0,0 +1,31 @@ -+#include <sys/random.h> -+#include <pthread.h> -+#include <errno.h> -+ -+int getentropy(void *buffer, size_t len) -+{ -+ int cs, ret; -+ char *pos = buffer; -+ -+ if (len > 256) { -+ errno = EIO; -+ return -1; -+ } -+ -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); -+ -+ while (len) { -+ ret = getrandom(pos, len, 0); -+ if (ret < 0) { -+ if (errno == EINTR) continue; -+ else break; -+ } -+ pos += ret; -+ len -= ret; -+ ret = 0; -+ } -+ -+ pthread_setcancelstate(cs, 0); -+ -+ return ret; -+} -diff --git a/src/misc/gethostid.c b/src/misc/gethostid.c -index ea65611a..25bb35db 100644 ---- a/src/misc/gethostid.c -+++ b/src/misc/gethostid.c -@@ -1,3 +1,5 @@ -+#include <unistd.h> -+ - long gethostid() - { - return 0; -diff --git a/src/misc/getopt.c b/src/misc/getopt.c -index e9bab41c..cd1f292f 100644 ---- a/src/misc/getopt.c -+++ b/src/misc/getopt.c -@@ -77,15 +77,19 @@ int getopt(int argc, char * const argv[], const char *optstring) - if (l>0) i+=l; else i++; - } while (l && d != c); - -- if (d != c) { -+ if (d != c || c == ':') { - optopt = c; - if (optstring[0] != ':' && opterr) - __getopt_msg(argv[0], ": unrecognized option: ", optchar, k); - return '?'; - } - if (optstring[i] == ':') { -- if (optstring[i+1] == ':') optarg = 0; -- else if (optind >= argc) { -+ optarg = 0; -+ if (optstring[i+1] != ':' || optpos) { -+ optarg = argv[optind++] + optpos; -+ optpos = 0; -+ } -+ if (optind > argc) { - optopt = c; - if (optstring[0] == ':') return ':'; - if (opterr) __getopt_msg(argv[0], -@@ -93,10 +97,6 @@ int getopt(int argc, char * const argv[], const char *optstring) - optchar, k); - return '?'; - } -- if (optstring[i+1] != ':' || optpos) { -- optarg = argv[optind++] + optpos; -- optpos = 0; -- } - } - return c; - } -diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c -index 008b747c..ddcef949 100644 ---- a/src/misc/getopt_long.c -+++ b/src/misc/getopt_long.c -@@ -1,5 +1,7 @@ - #define _GNU_SOURCE - #include <stddef.h> -+#include <stdlib.h> -+#include <limits.h> - #include <getopt.h> - #include <stdio.h> - #include <string.h> -@@ -58,10 +60,10 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring - { - int colon = optstring[optstring[0]=='+'||optstring[0]=='-']==':'; - int i, cnt, match; -- char *arg, *opt; -+ char *arg, *opt, *start = argv[optind]+1; - for (cnt=i=0; longopts[i].name; i++) { - const char *name = longopts[i].name; -- opt = argv[optind]+1; -+ opt = start; - if (*opt == '-') opt++; - while (*opt && *opt != '=' && *opt == *name) - name++, opt++; -@@ -74,6 +76,17 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring - } - cnt++; - } -+ if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) { -+ int l = arg-start; -+ for (i=0; optstring[i]; i++) { -+ int j; -+ for (j=0; j<l && start[j]==optstring[i+j]; j++); -+ if (j==l) { -+ cnt++; -+ break; -+ } -+ } -+ } - if (cnt==1) { - i = match; - opt = arg; -diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c -index b9439f77..ba26847a 100644 ---- a/src/network/getaddrinfo.c -+++ b/src/network/getaddrinfo.c -@@ -3,6 +3,10 @@ - #include <netinet/in.h> - #include <netdb.h> - #include <string.h> -+#include <pthread.h> -+#include <unistd.h> -+#include <endian.h> -+#include <errno.h> - #include "lookup.h" - - int getaddrinfo(const char *restrict host, const char *restrict serv, const struct addrinfo *restrict hint, struct addrinfo **restrict res) -@@ -43,6 +47,41 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru - } - } - -+ if (flags & AI_ADDRCONFIG) { -+ /* Define the "an address is configured" condition for address -+ * families via ability to create a socket for the family plus -+ * routability of the loopback address for the family. */ -+ static const struct sockaddr_in lo4 = { -+ .sin_family = AF_INET, .sin_port = 65535, -+ .sin_addr.s_addr = __BYTE_ORDER == __BIG_ENDIAN -+ ? 0x7f000001 : 0x0100007f -+ }; -+ static const struct sockaddr_in6 lo6 = { -+ .sin6_family = AF_INET6, .sin6_port = 65535, -+ .sin6_addr = IN6ADDR_LOOPBACK_INIT -+ }; -+ int tf[2] = { AF_INET, AF_INET6 }; -+ const void *ta[2] = { &lo4, &lo6 }; -+ socklen_t tl[2] = { sizeof lo4, sizeof lo6 }; -+ for (i=0; i<2; i++) { -+ if (family==tf[1-i]) continue; -+ int s = socket(tf[i], SOCK_CLOEXEC|SOCK_DGRAM, -+ IPPROTO_UDP); -+ if (s>=0) { -+ int cs; -+ pthread_setcancelstate( -+ PTHREAD_CANCEL_DISABLE, &cs); -+ int r = connect(s, ta[i], tl[i]); -+ pthread_setcancelstate(cs, 0); -+ close(s); -+ if (!r) continue; -+ } -+ if (errno != EAFNOSUPPORT) return EAI_SYSTEM; -+ if (family == tf[i]) return EAI_NONAME; -+ family = tf[1-i]; -+ } -+ } -+ - nservs = __lookup_serv(ports, serv, proto, socktype, flags); - if (nservs < 0) return nservs; - -diff --git a/src/network/inet_ntop.c b/src/network/inet_ntop.c -index 14f9f4c4..4bfef2c5 100644 ---- a/src/network/inet_ntop.c -+++ b/src/network/inet_ntop.c -@@ -36,7 +36,7 @@ const char *inet_ntop(int af, const void *restrict a0, char *restrict s, socklen - j = strspn(buf+i, ":0"); - if (j>max) best=i, max=j; - } -- if (max>2) { -+ if (max>3) { - buf[best] = buf[best+1] = ':'; - memmove(buf+best+2, buf+best+max, i-best-max+1); - } -diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c -index 209c20f0..0e6db9ef 100644 ---- a/src/network/lookup_name.c -+++ b/src/network/lookup_name.c -@@ -184,6 +184,10 @@ static int name_from_dns_search(struct address buf[static MAXADDRS], char canon[ - for (dots=l=0; name[l]; l++) if (name[l]=='.') dots++; - if (dots >= conf.ndots || name[l-1]=='.') *search = 0; - -+ /* Strip final dot for canon, fail if multiple trailing dots. */ -+ if (name[l-1]=='.') l--; -+ if (!l || name[l-1]=='.') return EAI_NONAME; -+ - /* This can never happen; the caller already checked length. */ - if (l >= 256) return EAI_NONAME; - -@@ -351,36 +355,53 @@ int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], c - * excessive runtime and code size cost and dubious benefit. - * So far the label/precedence table cannot be customized. */ - for (i=0; i<cnt; i++) { -+ int family = buf[i].family; - int key = 0; -- struct sockaddr_in6 sa, da = { -+ struct sockaddr_in6 sa6 = { 0 }, da6 = { - .sin6_family = AF_INET6, - .sin6_scope_id = buf[i].scopeid, - .sin6_port = 65535 - }; -- if (buf[i].family == AF_INET6) { -- memcpy(da.sin6_addr.s6_addr, buf[i].addr, 16); -+ struct sockaddr_in sa4 = { 0 }, da4 = { -+ .sin_family = AF_INET, -+ .sin_port = 65535 -+ }; -+ void *sa, *da; -+ socklen_t salen, dalen; -+ if (family == AF_INET6) { -+ memcpy(da6.sin6_addr.s6_addr, buf[i].addr, 16); -+ da = &da6; dalen = sizeof da6; -+ sa = &sa6; salen = sizeof sa6; - } else { -- memcpy(da.sin6_addr.s6_addr, -+ memcpy(sa6.sin6_addr.s6_addr, -+ "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12); -+ memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4); -+ memcpy(da6.sin6_addr.s6_addr, - "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12); -- memcpy(da.sin6_addr.s6_addr+12, buf[i].addr, 4); -+ memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4); -+ memcpy(&da4.sin_addr, buf[i].addr, 4); -+ da = &da4; dalen = sizeof da4; -+ sa = &sa4; salen = sizeof sa4; - } -- const struct policy *dpolicy = policyof(&da.sin6_addr); -- int dscope = scopeof(&da.sin6_addr); -+ const struct policy *dpolicy = policyof(&da6.sin6_addr); -+ int dscope = scopeof(&da6.sin6_addr); - int dlabel = dpolicy->label; - int dprec = dpolicy->prec; - int prefixlen = 0; -- int fd = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP); -+ int fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP); - if (fd >= 0) { -- if (!connect(fd, (void *)&da, sizeof da)) { -+ if (!connect(fd, da, dalen)) { - key |= DAS_USABLE; -- if (!getsockname(fd, (void *)&sa, -- &(socklen_t){sizeof sa})) { -- if (dscope == scopeof(&sa.sin6_addr)) -+ if (!getsockname(fd, sa, &salen)) { -+ if (family == AF_INET) memcpy( -+ &sa6.sin6_addr.s6_addr+12, -+ &sa4.sin_addr, 4); -+ if (dscope == scopeof(&sa6.sin6_addr)) - key |= DAS_MATCHINGSCOPE; -- if (dlabel == labelof(&sa.sin6_addr)) -+ if (dlabel == labelof(&sa6.sin6_addr)) - key |= DAS_MATCHINGLABEL; -- prefixlen = prefixmatch(&sa.sin6_addr, -- &da.sin6_addr); -+ prefixlen = prefixmatch(&sa6.sin6_addr, -+ &da6.sin6_addr); - } - } - close(fd); diff --git a/src/process/execlp.c b/src/process/execlp.c index 5eed886e..f6da398b 100644 --- a/src/process/execlp.c @@ -5162,16 +228,10 @@ index 2dddeddb..fdd0ca48 100644 weak_alias(__execvpe, execvpe); diff --git a/src/process/system.c b/src/process/system.c -index 8cbdda06..aa01e13b 100644 +index 9135b815..aa01e13b 100644 --- a/src/process/system.c +++ b/src/process/system.c -@@ -14,12 +14,14 @@ int system(const char *cmd) - pid_t pid; - sigset_t old, reset; - struct sigaction sa = { .sa_handler = SIG_IGN }, oldint, oldquit; -- int status = 0x7f00, ret; -+ int status = -1, ret; - posix_spawnattr_t attr; +@@ -19,7 +19,9 @@ int system(const char *cmd) pthread_testcancel(); @@ -5182,1098 +242,11 @@ index 8cbdda06..aa01e13b 100644 sigaction(SIGINT, &sa, &oldint); sigaction(SIGQUIT, &sa, &oldquit); -diff --git a/src/setjmp/m68k/longjmp.s b/src/setjmp/m68k/longjmp.s -new file mode 100644 -index 00000000..cdb05fb5 ---- /dev/null -+++ b/src/setjmp/m68k/longjmp.s -@@ -0,0 +1,14 @@ -+.global _longjmp -+.global longjmp -+.type _longjmp,@function -+.type longjmp,@function -+_longjmp: -+longjmp: -+ movea.l 4(%sp),%a0 -+ move.l 8(%sp),%d0 -+ bne 1f -+ move.l #1,%d0 -+1: movem.l (%a0),%d2-%d7/%a2-%a7 -+ fmovem.x 52(%a0),%fp2-%fp7 -+ move.l 48(%a0),(%sp) -+ rts -diff --git a/src/setjmp/m68k/setjmp.s b/src/setjmp/m68k/setjmp.s -new file mode 100644 -index 00000000..15e549b0 ---- /dev/null -+++ b/src/setjmp/m68k/setjmp.s -@@ -0,0 +1,18 @@ -+.global ___setjmp -+.hidden ___setjmp -+.global __setjmp -+.global _setjmp -+.global setjmp -+.type __setjmp,@function -+.type _setjmp,@function -+.type setjmp,@function -+___setjmp: -+__setjmp: -+_setjmp: -+setjmp: -+ movea.l 4(%sp),%a0 -+ movem.l %d2-%d7/%a2-%a7,(%a0) -+ move.l (%sp),48(%a0) -+ fmovem.x %fp2-%fp7,52(%a0) -+ clr.l %d0 -+ rts -diff --git a/src/signal/m68k/sigsetjmp.s b/src/signal/m68k/sigsetjmp.s -new file mode 100644 -index 00000000..09bfa646 ---- /dev/null -+++ b/src/signal/m68k/sigsetjmp.s -@@ -0,0 +1,29 @@ -+.global sigsetjmp -+.global __sigsetjmp -+.type sigsetjmp,@function -+.type __sigsetjmp,@function -+sigsetjmp: -+__sigsetjmp: -+ move.l 8(%sp),%d0 -+ beq 1f -+ -+ movea.l 4(%sp),%a1 -+ move.l (%sp)+,156(%a1) -+ move.l %a2,156+4+8(%a1) -+ movea.l %a1,%a2 -+ -+.hidden ___setjmp -+ lea ___setjmp-.-8,%a1 -+ jsr (%pc,%a1) -+ -+ move.l 156(%a2),-(%sp) -+ move.l %a2,4(%sp) -+ move.l %d0,8(%sp) -+ movea.l 156+4+8(%a2),%a2 -+ -+.hidden __sigsetjmp_tail -+ lea __sigsetjmp_tail-.-8,%a1 -+ jmp (%pc,%a1) -+ -+1: lea ___setjmp-.-8,%a1 -+ jmp (%pc,%a1) -diff --git a/src/signal/psiginfo.c b/src/signal/psiginfo.c -index 57be34cd..2b15982b 100644 ---- a/src/signal/psiginfo.c -+++ b/src/signal/psiginfo.c -@@ -1,10 +1,6 @@ --#include <stdio.h> --#include <string.h> - #include <signal.h> - - void psiginfo(const siginfo_t *si, const char *msg) - { -- char *s = strsignal(si->si_signo); -- if (msg) fprintf(stderr, "%s: %s\n", msg, s); -- else fprintf(stderr, "%s\n", s); -+ psignal(si->si_signo, msg); - } -diff --git a/src/signal/psignal.c b/src/signal/psignal.c -index 02f1c760..138dbe00 100644 ---- a/src/signal/psignal.c -+++ b/src/signal/psignal.c -@@ -1,10 +1,27 @@ --#include <stdio.h> -+#include "stdio_impl.h" - #include <string.h> - #include <signal.h> -+#include <errno.h> - - void psignal(int sig, const char *msg) - { -+ FILE *f = stderr; - char *s = strsignal(sig); -- if (msg) fprintf(stderr, "%s: %s\n", msg, s); -- else fprintf(stderr, "%s\n", s); -+ -+ FLOCK(f); -+ -+ /* Save stderr's orientation and encoding rule, since psignal is not -+ * permitted to change them. Save errno and restore it if there is no -+ * error since fprintf might change it even on success but psignal is -+ * not permitted to do so. */ -+ void *old_locale = f->locale; -+ int old_mode = f->mode; -+ int old_errno = errno; -+ -+ if (fprintf(f, "%s%s%s\n", msg?msg:"", msg?": ":"", s)>=0) -+ errno = old_errno; -+ f->mode = old_mode; -+ f->locale = old_locale; -+ -+ FUNLOCK(f); - } -diff --git a/src/signal/sigisemptyset.c b/src/signal/sigisemptyset.c -index 312c66cf..68b86624 100644 ---- a/src/signal/sigisemptyset.c -+++ b/src/signal/sigisemptyset.c -@@ -4,6 +4,7 @@ - - int sigisemptyset(const sigset_t *set) - { -- static const unsigned long zeroset[_NSIG/8/sizeof(long)]; -- return !memcmp(set, &zeroset, _NSIG/8); -+ for (size_t i=0; i<_NSIG/8/sizeof *set->__bits; i++) -+ if (set->__bits[i]) return 0; -+ return 1; - } -diff --git a/src/signal/sigrtmin.c b/src/signal/sigrtmin.c -index d0e769bb..c5a1fd92 100644 ---- a/src/signal/sigrtmin.c -+++ b/src/signal/sigrtmin.c -@@ -1,3 +1,5 @@ -+#include <signal.h> -+ - int __libc_current_sigrtmin() - { - return 35; -diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c -index 9d967d6e..2ff75d8a 100644 ---- a/src/stdio/__lockfile.c -+++ b/src/stdio/__lockfile.c -@@ -1,28 +1,25 @@ - #include "stdio_impl.h" - #include "pthread_impl.h" - -+#define MAYBE_WAITERS 0x40000000 -+ - int __lockfile(FILE *f) - { -- int owner, tid = __pthread_self()->tid; -- if (f->lock == tid) -+ int owner = f->lock, tid = __pthread_self()->tid; -+ if ((owner & ~MAYBE_WAITERS) == tid) - return 0; -- while ((owner = a_cas(&f->lock, 0, tid))) -- __wait(&f->lock, &f->waiters, owner, 1); -+ for (;;) { -+ owner = a_cas(&f->lock, 0, tid); -+ if (!owner) return 1; -+ if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break; -+ } -+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) -+ __futexwait(&f->lock, owner, 1); - return 1; - } - - void __unlockfile(FILE *f) - { -- a_store(&f->lock, 0); -- -- /* The following read is technically invalid under situations -- * of self-synchronized destruction. Another thread may have -- * called fclose as soon as the above store has completed. -- * Nonetheless, since FILE objects always live in memory -- * obtained by malloc from the heap, it's safe to assume -- * the dereferences below will not fault. In the worst case, -- * a spurious syscall will be made. If the implementation of -- * malloc changes, this assumption needs revisiting. */ -- -- if (f->waiters) __wake(&f->lock, 1, 1); -+ if (a_swap(&f->lock, 0) & MAYBE_WAITERS) -+ __wake(&f->lock, 1, 1); - } -diff --git a/src/stdio/__stdio_exit.c b/src/stdio/__stdio_exit.c -index 191b4454..5741070f 100644 ---- a/src/stdio/__stdio_exit.c -+++ b/src/stdio/__stdio_exit.c -@@ -19,6 +19,7 @@ void __stdio_exit(void) - for (f=*__ofl_lock(); f; f=f->next) close_file(f); - close_file(__stdin_used); - close_file(__stdout_used); -+ close_file(__stderr_used); - } - - weak_alias(__stdio_exit, __stdio_exit_needed); -diff --git a/src/stdio/__stdio_read.c b/src/stdio/__stdio_read.c -index f8fa6d3b..ea675da3 100644 ---- a/src/stdio/__stdio_read.c -+++ b/src/stdio/__stdio_read.c -@@ -9,10 +9,11 @@ size_t __stdio_read(FILE *f, unsigned char *buf, size_t len) - }; - ssize_t cnt; - -- cnt = syscall(SYS_readv, f->fd, iov, 2); -+ cnt = iov[0].iov_len ? syscall(SYS_readv, f->fd, iov, 2) -+ : syscall(SYS_read, f->fd, iov[1].iov_base, iov[1].iov_len); - if (cnt <= 0) { -- f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt); -- return cnt; -+ f->flags |= cnt ? F_ERR : F_EOF; -+ return 0; - } - if (cnt <= iov[0].iov_len) return cnt; - cnt -= iov[0].iov_len; -diff --git a/src/stdio/__towrite.c b/src/stdio/__towrite.c -index 0a69d926..b022cbca 100644 ---- a/src/stdio/__towrite.c -+++ b/src/stdio/__towrite.c -@@ -3,7 +3,7 @@ - int __towrite(FILE *f) - { - f->mode |= f->mode-1; -- if (f->flags & (F_NOWR)) { -+ if (f->flags & F_NOWR) { - f->flags |= F_ERR; - return EOF; - } -diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c -index d687a877..c675413d 100644 ---- a/src/stdio/fclose.c -+++ b/src/stdio/fclose.c -@@ -24,7 +24,7 @@ int fclose(FILE *f) - r = fflush(f); - r |= f->close(f); - -- if (f->getln_buf) free(f->getln_buf); -+ free(f->getln_buf); - if (!perm) free(f); - else FUNLOCK(f); - -diff --git a/src/stdio/fgetpos.c b/src/stdio/fgetpos.c -index c3fa0eb0..6eb361e1 100644 ---- a/src/stdio/fgetpos.c -+++ b/src/stdio/fgetpos.c -@@ -4,7 +4,7 @@ int fgetpos(FILE *restrict f, fpos_t *restrict pos) - { - off_t off = __ftello(f); - if (off < 0) return -1; -- *(off_t *)pos = off; -+ *(long long *)pos = off; - return 0; - } - -diff --git a/src/stdio/fileno.c b/src/stdio/fileno.c -index ba7f9391..0bd0e988 100644 ---- a/src/stdio/fileno.c -+++ b/src/stdio/fileno.c -@@ -1,13 +1,16 @@ - #include "stdio_impl.h" -+#include <errno.h> - - int fileno(FILE *f) - { -- /* f->fd never changes, but the lock must be obtained and released -- * anyway since this function cannot return while another thread -- * holds the lock. */ - FLOCK(f); -+ int fd = f->fd; - FUNLOCK(f); -- return f->fd; -+ if (fd < 0) { -+ errno = EBADF; -+ return -1; -+ } -+ return fd; - } - - weak_alias(fileno, fileno_unlocked); -diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c -index a196c1ef..6806cf8b 100644 ---- a/src/stdio/flockfile.c -+++ b/src/stdio/flockfile.c -@@ -1,10 +1,11 @@ - #include "stdio_impl.h" - #include "pthread_impl.h" - -+void __register_locked_file(FILE *, pthread_t); -+ - void flockfile(FILE *f) - { -- while (ftrylockfile(f)) { -- int owner = f->lock; -- if (owner) __wait(&f->lock, &f->waiters, owner, 1); -- } -+ if (!ftrylockfile(f)) return; -+ __lockfile(f); -+ __register_locked_file(f, __pthread_self()); - } -diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c -index 2ce43d32..5e0eeb50 100644 ---- a/src/stdio/fmemopen.c -+++ b/src/stdio/fmemopen.c -@@ -9,6 +9,12 @@ struct cookie { - int mode; - }; - -+struct mem_FILE { -+ FILE f; -+ struct cookie c; -+ unsigned char buf[UNGET+BUFSIZ], buf2[]; -+}; -+ - static off_t mseek(FILE *f, off_t off, int whence) - { - ssize_t base; -@@ -72,8 +78,7 @@ static int mclose(FILE *m) - - FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode) - { -- FILE *f; -- struct cookie *c; -+ struct mem_FILE *f; - int plus = !!strchr(mode, '+'); - - if (!size || !strchr("rwa", *mode)) { -@@ -86,29 +91,35 @@ FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode) - return 0; - } - -- f = calloc(sizeof *f + sizeof *c + UNGET + BUFSIZ + (buf?0:size), 1); -+ f = malloc(sizeof *f + (buf?0:size)); - if (!f) return 0; -- f->cookie = c = (void *)(f+1); -- f->fd = -1; -- f->lbf = EOF; -- f->buf = (unsigned char *)(c+1) + UNGET; -- f->buf_size = BUFSIZ; -- if (!buf) buf = f->buf + BUFSIZ; -+ memset(&f->f, 0, sizeof f->f); -+ f->f.cookie = &f->c; -+ f->f.fd = -1; -+ f->f.lbf = EOF; -+ f->f.buf = f->buf + UNGET; -+ f->f.buf_size = sizeof f->buf - UNGET; -+ if (!buf) { -+ buf = f->buf2;; -+ memset(buf, 0, size); -+ } - -- c->buf = buf; -- c->size = size; -- c->mode = *mode; -+ memset(&f->c, 0, sizeof f->c); -+ f->c.buf = buf; -+ f->c.size = size; -+ f->c.mode = *mode; - -- if (!plus) f->flags = (*mode == 'r') ? F_NOWR : F_NORD; -- if (*mode == 'r') c->len = size; -- else if (*mode == 'a') c->len = c->pos = strnlen(buf, size); -+ if (!plus) f->f.flags = (*mode == 'r') ? F_NOWR : F_NORD; -+ if (*mode == 'r') f->c.len = size; -+ else if (*mode == 'a') f->c.len = f->c.pos = strnlen(buf, size); -+ else if (plus) *f->c.buf = 0; - -- f->read = mread; -- f->write = mwrite; -- f->seek = mseek; -- f->close = mclose; -+ f->f.read = mread; -+ f->f.write = mwrite; -+ f->f.seek = mseek; -+ f->f.close = mclose; - -- if (!libc.threaded) f->lock = -1; -+ if (!libc.threaded) f->f.lock = -1; - -- return __ofl_add(f); -+ return __ofl_add(&f->f); - } -diff --git a/src/stdio/fopencookie.c b/src/stdio/fopencookie.c -index 2f46dd53..da042fe8 100644 ---- a/src/stdio/fopencookie.c -+++ b/src/stdio/fopencookie.c -@@ -116,15 +116,12 @@ FILE *fopencookie(void *cookie, const char *mode, cookie_io_functions_t iofuncs) - - /* Set up our fcookie */ - f->fc.cookie = cookie; -- f->fc.iofuncs.read = iofuncs.read; -- f->fc.iofuncs.write = iofuncs.write; -- f->fc.iofuncs.seek = iofuncs.seek; -- f->fc.iofuncs.close = iofuncs.close; -+ f->fc.iofuncs = iofuncs; - - f->f.fd = -1; - f->f.cookie = &f->fc; - f->f.buf = f->buf + UNGET; -- f->f.buf_size = BUFSIZ; -+ f->f.buf_size = sizeof f->buf - UNGET; - f->f.lbf = EOF; - - /* Initialize op ptrs. No problem if some are unneeded. */ -diff --git a/src/stdio/fread.c b/src/stdio/fread.c -index aef75f73..733d3716 100644 ---- a/src/stdio/fread.c -+++ b/src/stdio/fread.c -@@ -25,7 +25,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f) - /* Read the remainder directly */ - for (; l; l-=k, dest+=k) { - k = __toread(f) ? 0 : f->read(f, dest, l); -- if (k+1<=1) { -+ if (!k) { - FUNLOCK(f); - return (len-l)/size; - } -diff --git a/src/stdio/fsetpos.c b/src/stdio/fsetpos.c -index 5d76c8cd..6310424e 100644 ---- a/src/stdio/fsetpos.c -+++ b/src/stdio/fsetpos.c -@@ -2,7 +2,7 @@ - - int fsetpos(FILE *f, const fpos_t *pos) - { -- return __fseeko(f, *(const off_t *)pos, SEEK_SET); -+ return __fseeko(f, *(const long long *)pos, SEEK_SET); - } - - LFS64(fsetpos); -diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c -index eb13c839..3b97807a 100644 ---- a/src/stdio/ftrylockfile.c -+++ b/src/stdio/ftrylockfile.c -@@ -2,6 +2,8 @@ - #include "pthread_impl.h" - #include <limits.h> - -+#define MAYBE_WAITERS 0x40000000 -+ - void __do_orphaned_stdio_locks() - { - FILE *f; -@@ -18,23 +20,29 @@ void __unlist_locked_file(FILE *f) - } - } - -+void __register_locked_file(FILE *f, pthread_t self) -+{ -+ f->lockcount = 1; -+ f->prev_locked = 0; -+ f->next_locked = self->stdio_locks; -+ if (f->next_locked) f->next_locked->prev_locked = f; -+ self->stdio_locks = f; -+} -+ - int ftrylockfile(FILE *f) - { - pthread_t self = __pthread_self(); - int tid = self->tid; -- if (f->lock == tid) { -+ int owner = f->lock; -+ if ((owner & ~MAYBE_WAITERS) == tid) { - if (f->lockcount == LONG_MAX) - return -1; - f->lockcount++; - return 0; - } -- if (f->lock < 0) f->lock = 0; -- if (f->lock || a_cas(&f->lock, 0, tid)) -+ if (owner < 0) f->lock = owner = 0; -+ if (owner || a_cas(&f->lock, 0, tid)) - return -1; -- f->lockcount = 1; -- f->prev_locked = 0; -- f->next_locked = self->stdio_locks; -- if (f->next_locked) f->next_locked->prev_locked = f; -- self->stdio_locks = f; -+ __register_locked_file(f, self); - return 0; - } -diff --git a/src/stdio/getdelim.c b/src/stdio/getdelim.c -index 1ccd8029..d4b23882 100644 ---- a/src/stdio/getdelim.c -+++ b/src/stdio/getdelim.c -@@ -3,8 +3,6 @@ - #include <inttypes.h> - #include <errno.h> - --#define MIN(a,b) ((a)<(b) ? (a) : (b)) -- - ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restrict f) - { - char *tmp; -diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c -index eab024da..40f5ad60 100644 ---- a/src/stdio/open_memstream.c -+++ b/src/stdio/open_memstream.c -@@ -12,6 +12,12 @@ struct cookie { - size_t space; - }; - -+struct ms_FILE { -+ FILE f; -+ struct cookie c; -+ unsigned char buf[BUFSIZ]; -+}; -+ - static off_t ms_seek(FILE *f, off_t off, int whence) - { - ssize_t base; -@@ -57,34 +63,35 @@ static int ms_close(FILE *f) - - FILE *open_memstream(char **bufp, size_t *sizep) - { -- FILE *f; -- struct cookie *c; -+ struct ms_FILE *f; - char *buf; - -- if (!(f=malloc(sizeof *f + sizeof *c + BUFSIZ))) return 0; -+ if (!(f=malloc(sizeof *f))) return 0; - if (!(buf=malloc(sizeof *buf))) { - free(f); - return 0; - } -- memset(f, 0, sizeof *f + sizeof *c); -- f->cookie = c = (void *)(f+1); -+ memset(&f->f, 0, sizeof f->f); -+ memset(&f->c, 0, sizeof f->c); -+ f->f.cookie = &f->c; - -- c->bufp = bufp; -- c->sizep = sizep; -- c->pos = c->len = c->space = *sizep = 0; -- c->buf = *bufp = buf; -+ f->c.bufp = bufp; -+ f->c.sizep = sizep; -+ f->c.pos = f->c.len = f->c.space = *sizep = 0; -+ f->c.buf = *bufp = buf; - *buf = 0; - -- f->flags = F_NORD; -- f->fd = -1; -- f->buf = (void *)(c+1); -- f->buf_size = BUFSIZ; -- f->lbf = EOF; -- f->write = ms_write; -- f->seek = ms_seek; -- f->close = ms_close; -+ f->f.flags = F_NORD; -+ f->f.fd = -1; -+ f->f.buf = f->buf; -+ f->f.buf_size = sizeof f->buf; -+ f->f.lbf = EOF; -+ f->f.write = ms_write; -+ f->f.seek = ms_seek; -+ f->f.close = ms_close; -+ f->f.mode = -1; - -- if (!libc.threaded) f->lock = -1; -+ if (!libc.threaded) f->f.lock = -1; - -- return __ofl_add(f); -+ return __ofl_add(&f->f); - } -diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c -index 4d90cd97..a7c3a645 100644 ---- a/src/stdio/open_wmemstream.c -+++ b/src/stdio/open_wmemstream.c -@@ -14,6 +14,12 @@ struct cookie { - mbstate_t mbs; - }; - -+struct wms_FILE { -+ FILE f; -+ struct cookie c; -+ unsigned char buf[1]; -+}; -+ - static off_t wms_seek(FILE *f, off_t off, int whence) - { - ssize_t base; -@@ -59,34 +65,36 @@ static int wms_close(FILE *f) - - FILE *open_wmemstream(wchar_t **bufp, size_t *sizep) - { -- FILE *f; -- struct cookie *c; -+ struct wms_FILE *f; - wchar_t *buf; - -- if (!(f=malloc(sizeof *f + sizeof *c))) return 0; -+ if (!(f=malloc(sizeof *f))) return 0; - if (!(buf=malloc(sizeof *buf))) { - free(f); - return 0; - } -- memset(f, 0, sizeof *f + sizeof *c); -- f->cookie = c = (void *)(f+1); -+ memset(&f->f, 0, sizeof f->f); -+ memset(&f->c, 0, sizeof f->c); -+ f->f.cookie = &f->c; - -- c->bufp = bufp; -- c->sizep = sizep; -- c->pos = c->len = c->space = *sizep = 0; -- c->buf = *bufp = buf; -+ f->c.bufp = bufp; -+ f->c.sizep = sizep; -+ f->c.pos = f->c.len = f->c.space = *sizep = 0; -+ f->c.buf = *bufp = buf; - *buf = 0; - -- f->flags = F_NORD; -- f->fd = -1; -- f->buf = (void *)(c+1); -- f->buf_size = 0; -- f->lbf = EOF; -- f->write = wms_write; -- f->seek = wms_seek; -- f->close = wms_close; -+ f->f.flags = F_NORD; -+ f->f.fd = -1; -+ f->f.buf = f->buf; -+ f->f.buf_size = 0; -+ f->f.lbf = EOF; -+ f->f.write = wms_write; -+ f->f.seek = wms_seek; -+ f->f.close = wms_close; -+ -+ if (!libc.threaded) f->f.lock = -1; - -- if (!libc.threaded) f->lock = -1; -+ fwide(&f->f, 1); - -- return __ofl_add(f); -+ return __ofl_add(&f->f); - } -diff --git a/src/stdio/perror.c b/src/stdio/perror.c -index fdcb4d71..d0943f26 100644 ---- a/src/stdio/perror.c -+++ b/src/stdio/perror.c -@@ -9,6 +9,11 @@ void perror(const char *msg) - char *errstr = strerror(errno); - - FLOCK(f); -+ -+ /* Save stderr's orientation and encoding rule, since perror is not -+ * permitted to change them. */ -+ void *old_locale = f->locale; -+ int old_mode = f->mode; - - if (msg && *msg) { - fwrite(msg, strlen(msg), 1, f); -@@ -18,5 +23,8 @@ void perror(const char *msg) - fwrite(errstr, strlen(errstr), 1, f); - fputc('\n', f); - -+ f->mode = old_mode; -+ f->locale = old_locale; -+ - FUNLOCK(f); - } -diff --git a/src/stdio/setvbuf.c b/src/stdio/setvbuf.c -index 541a125f..06ea296c 100644 ---- a/src/stdio/setvbuf.c -+++ b/src/stdio/setvbuf.c -@@ -1,22 +1,25 @@ - #include "stdio_impl.h" - --/* This function makes no attempt to protect the user from his/her own -- * stupidity. If called any time but when then ISO C standard specifically -- * allows it, all hell can and will break loose, especially with threads! -- * -- * This implementation ignores all arguments except the buffering type, -- * and uses the existing buffer allocated alongside the FILE object. -- * In the case of stderr where the preexisting buffer is length 1, it -- * is not possible to set line buffering or full buffering. */ -+/* The behavior of this function is undefined except when it is the first -+ * operation on the stream, so the presence or absence of locking is not -+ * observable in a program whose behavior is defined. Thus no locking is -+ * performed here. No allocation of buffers is performed, but a buffer -+ * provided by the caller is used as long as it is suitably sized. */ - - int setvbuf(FILE *restrict f, char *restrict buf, int type, size_t size) - { - f->lbf = EOF; - -- if (type == _IONBF) -+ if (type == _IONBF) { - f->buf_size = 0; -- else if (type == _IOLBF) -- f->lbf = '\n'; -+ } else { -+ if (buf && size >= UNGET) { -+ f->buf = (void *)(buf + UNGET); -+ f->buf_size = size - UNGET; -+ } -+ if (type == _IOLBF && f->buf_size) -+ f->lbf = '\n'; -+ } - - f->flags |= F_SVB; - -diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c -index 50fb55c1..2100eb5e 100644 ---- a/src/stdio/vfprintf.c -+++ b/src/stdio/vfprintf.c -@@ -220,6 +220,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t) - else re=LDBL_MANT_DIG/4-1-p; - - if (re) { -+ round *= 1<<(LDBL_MANT_DIG%4); - while (re--) round*=16; - if (*prefix=='-') { - y=-y; -@@ -673,11 +674,12 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap) - if (f->mode < 1) f->flags &= ~F_ERR; - if (!f->buf_size) { - saved_buf = f->buf; -- f->wpos = f->wbase = f->buf = internal_buf; -+ f->buf = internal_buf; - f->buf_size = sizeof internal_buf; -- f->wend = internal_buf + sizeof internal_buf; -+ f->wpos = f->wbase = f->wend = 0; - } -- ret = printf_core(f, fmt, &ap2, nl_arg, nl_type); -+ if (!f->wend && __towrite(f)) ret = -1; -+ else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type); - if (saved_buf) { - f->write(f, 0, 0); - if (!f->wpos) ret = -1; -diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c -index e87ad42a..9d774fcc 100644 ---- a/src/stdio/vfwprintf.c -+++ b/src/stdio/vfwprintf.c -@@ -255,8 +255,11 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ - } - continue; - case 'c': -+ if (w<1) w=1; -+ if (w>1 && !(fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, ""); - fputwc(btowc(arg.i), f); -- l = 1; -+ if (w>1 && (fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, ""); -+ l = w; - continue; - case 'C': - fputwc(arg.i, f); -diff --git a/src/stdio/vswprintf.c b/src/stdio/vswprintf.c -index 6eb2f6ac..38efed65 100644 ---- a/src/stdio/vswprintf.c -+++ b/src/stdio/vswprintf.c -@@ -1,6 +1,5 @@ - #include "stdio_impl.h" - #include <limits.h> --#include <string.h> - #include <errno.h> - #include <stdint.h> - #include <wchar.h> -@@ -37,17 +36,17 @@ static size_t sw_write(FILE *f, const unsigned char *s, size_t l) - int vswprintf(wchar_t *restrict s, size_t n, const wchar_t *restrict fmt, va_list ap) - { - int r; -- FILE f; - unsigned char buf[256]; - struct cookie c = { s, n-1 }; -+ FILE f = { -+ .lbf = EOF, -+ .write = sw_write, -+ .lock = -1, -+ .buf = buf, -+ .buf_size = sizeof buf, -+ .cookie = &c, -+ }; - -- memset(&f, 0, sizeof(FILE)); -- f.lbf = EOF; -- f.write = sw_write; -- f.buf_size = sizeof buf; -- f.buf = buf; -- f.lock = -1; -- f.cookie = &c; - if (!n) { - return -1; - } else if (n > INT_MAX) { -diff --git a/src/stdlib/abs.c b/src/stdlib/abs.c -index 4806d629..e721fdc2 100644 ---- a/src/stdlib/abs.c -+++ b/src/stdlib/abs.c -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+ - int abs(int a) - { - return a>0 ? a : -a; -diff --git a/src/stdlib/bsearch.c b/src/stdlib/bsearch.c -index 61d89367..fe050ea3 100644 ---- a/src/stdlib/bsearch.c -+++ b/src/stdlib/bsearch.c -@@ -7,13 +7,13 @@ void *bsearch(const void *key, const void *base, size_t nel, size_t width, int ( - while (nel > 0) { - try = (char *)base + width*(nel/2); - sign = cmp(key, try); -- if (!sign) return try; -- else if (nel == 1) break; -- else if (sign < 0) -+ if (sign < 0) { - nel /= 2; -- else { -- base = try; -- nel -= nel/2; -+ } else if (sign > 0) { -+ base = (char *)try + width; -+ nel -= nel/2+1; -+ } else { -+ return try; - } - } - return NULL; -diff --git a/src/stdlib/labs.c b/src/stdlib/labs.c -index 675b95b8..83ddb147 100644 ---- a/src/stdlib/labs.c -+++ b/src/stdlib/labs.c -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+ - long labs(long a) - { - return a>0 ? a : -a; -diff --git a/src/stdlib/llabs.c b/src/stdlib/llabs.c -index bec4a03d..9dfaf5cf 100644 ---- a/src/stdlib/llabs.c -+++ b/src/stdlib/llabs.c -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+ - long long llabs(long long a) - { - return a>0 ? a : -a; -diff --git a/src/string/explicit_bzero.c b/src/string/explicit_bzero.c -new file mode 100644 -index 00000000..f2e12f23 ---- /dev/null -+++ b/src/string/explicit_bzero.c -@@ -0,0 +1,8 @@ -+#define _BSD_SOURCE -+#include <string.h> -+ -+void explicit_bzero(void *d, size_t n) -+{ -+ d = memset(d, 0, n); -+ __asm__ __volatile__ ("" : : "r"(d) : "memory"); -+} -diff --git a/src/thread/arm/__aeabi_read_tp.s b/src/thread/arm/__aeabi_read_tp.s -index 9d0cd311..2585620c 100644 ---- a/src/thread/arm/__aeabi_read_tp.s -+++ b/src/thread/arm/__aeabi_read_tp.s -@@ -2,7 +2,9 @@ - .global __aeabi_read_tp - .type __aeabi_read_tp,%function - __aeabi_read_tp: -- push {r1,r2,r3,lr} -- bl __aeabi_read_tp_c -- pop {r1,r2,r3,lr} -- bx lr -+ ldr r0,1f -+ add r0,r0,pc -+ ldr r0,[r0] -+2: bx r0 -+ .align 2 -+1: .word __a_gettp_ptr - 2b -diff --git a/src/thread/arm/__aeabi_read_tp_c.c b/src/thread/arm/__aeabi_read_tp_c.c -deleted file mode 100644 -index 654bdc57..00000000 ---- a/src/thread/arm/__aeabi_read_tp_c.c -+++ /dev/null -@@ -1,8 +0,0 @@ --#include "pthread_impl.h" --#include <stdint.h> -- --__attribute__((__visibility__("hidden"))) --void *__aeabi_read_tp_c(void) --{ -- return (void *)((uintptr_t)__pthread_self()-8+sizeof(struct pthread)); --} -diff --git a/src/thread/default_attr.c b/src/thread/default_attr.c -new file mode 100644 -index 00000000..46fe98ee ---- /dev/null -+++ b/src/thread/default_attr.c -@@ -0,0 +1,4 @@ -+#include "pthread_impl.h" -+ -+size_t __default_stacksize = DEFAULT_STACK_SIZE; -+size_t __default_guardsize = DEFAULT_GUARD_SIZE; -diff --git a/src/thread/m68k/__m68k_read_tp.s b/src/thread/m68k/__m68k_read_tp.s -new file mode 100644 -index 00000000..86886da8 ---- /dev/null -+++ b/src/thread/m68k/__m68k_read_tp.s -@@ -0,0 +1,8 @@ -+.text -+.global __m68k_read_tp -+.type __m68k_read_tp,@function -+__m68k_read_tp: -+ move.l #333,%d0 -+ trap #0 -+ move.l %d0,%a0 -+ rts -diff --git a/src/thread/m68k/clone.s b/src/thread/m68k/clone.s -new file mode 100644 -index 00000000..5b61b6fa ---- /dev/null -+++ b/src/thread/m68k/clone.s -@@ -0,0 +1,24 @@ -+.text -+.global __clone -+.type __clone,@function -+__clone: -+ movem.l %d2-%d5,-(%sp) -+ move.l #120,%d0 -+ move.l 28(%sp),%d1 -+ move.l 24(%sp),%d2 -+ and.l #-16,%d2 -+ move.l 36(%sp),%d3 -+ move.l 44(%sp),%d4 -+ move.l 40(%sp),%d5 -+ move.l 20(%sp),%a0 -+ move.l 32(%sp),%a1 -+ trap #0 -+ tst.l %d0 -+ beq 1f -+ movem.l (%sp)+,%d2-%d5 -+ rts -+1: move.l %a1,-(%sp) -+ jsr (%a0) -+ move.l #1,%d0 -+ trap #0 -+ clr.b 0 -diff --git a/src/thread/m68k/syscall_cp.s b/src/thread/m68k/syscall_cp.s -new file mode 100644 -index 00000000..5628a896 ---- /dev/null -+++ b/src/thread/m68k/syscall_cp.s -@@ -0,0 +1,26 @@ -+.text -+.global __cp_begin -+.hidden __cp_begin -+.global __cp_end -+.hidden __cp_end -+.global __cp_cancel -+.hidden __cp_cancel -+.hidden __cancel -+.global __syscall_cp_asm -+.hidden __syscall_cp_asm -+.type __syscall_cp_asm,@function -+__syscall_cp_asm: -+ movem.l %d2-%d5,-(%sp) -+ movea.l 20(%sp),%a0 -+__cp_begin: -+ move.l (%a0),%d0 -+ bne __cp_cancel -+ movem.l 24(%sp),%d0-%d5/%a0 -+ trap #0 -+__cp_end: -+ movem.l (%sp)+,%d2-%d5 -+ rts -+__cp_cancel: -+ movem.l (%sp)+,%d2-%d5 -+ move.l __cancel-.-8,%a1 -+ jmp (%pc,%a1) -diff --git a/src/thread/mips/clone.s b/src/thread/mips/clone.s -index 37dddf57..30a0146b 100644 ---- a/src/thread/mips/clone.s -+++ b/src/thread/mips/clone.s -@@ -28,5 +28,8 @@ __clone: - nop - 1: lw $25, 0($sp) - lw $4, 4($sp) -- jr $25 -+ jalr $25 - nop -+ move $4, $2 -+ li $2, 4001 -+ syscall -diff --git a/src/thread/mips64/clone.s b/src/thread/mips64/clone.s -index 229d2677..1b71e07c 100644 ---- a/src/thread/mips64/clone.s -+++ b/src/thread/mips64/clone.s -@@ -26,5 +26,8 @@ __clone: - nop - 1: ld $25, 0($sp) # function pointer - ld $4, 8($sp) # argument pointer -- jr $25 # call the user's function -+ jalr $25 # call the user's function - nop -+ move $4, $2 -+ li $2, 5058 -+ syscall -diff --git a/src/thread/mipsn32/clone.s b/src/thread/mipsn32/clone.s -index 51035852..ebf5dbea 100644 ---- a/src/thread/mipsn32/clone.s -+++ b/src/thread/mipsn32/clone.s -@@ -26,5 +26,8 @@ __clone: - nop - 1: lw $25, 0($sp) # function pointer - lw $4, 4($sp) # argument pointer -- jr $25 # call the user's function -+ jalr $25 # call the user's function - nop -+ move $4, $2 -+ li $2, 6058 -+ syscall -diff --git a/src/thread/powerpc64/syscall_cp.s b/src/thread/powerpc64/syscall_cp.s -index d420dbde..ef50ed00 100644 ---- a/src/thread/powerpc64/syscall_cp.s -+++ b/src/thread/powerpc64/syscall_cp.s -@@ -34,4 +34,11 @@ __cp_end: - blr - - __cp_cancel: -+ mflr 0 -+ bl 1f -+ .long .TOC.-. -+1: mflr 3 -+ lwa 2, 0(3) -+ add 2, 2, 3 -+ mtlr 0 - b __cancel -diff --git a/src/thread/pthread_attr_init.c b/src/thread/pthread_attr_init.c -index 8f6e3374..a962b460 100644 ---- a/src/thread/pthread_attr_init.c -+++ b/src/thread/pthread_attr_init.c -@@ -1,9 +1,12 @@ - #include "pthread_impl.h" - -+extern size_t __default_stacksize; -+extern size_t __default_guardsize; -+ - int pthread_attr_init(pthread_attr_t *a) - { - *a = (pthread_attr_t){0}; -- a->_a_stacksize = DEFAULT_STACK_SIZE; -- a->_a_guardsize = DEFAULT_GUARD_SIZE; -+ a->_a_stacksize = __default_stacksize; -+ a->_a_guardsize = __default_guardsize; - return 0; - } diff --git a/src/thread/pthread_attr_setinheritsched.c b/src/thread/pthread_attr_setinheritsched.c -index c91d8f83..4115e2fe 100644 +index e540e846..4115e2fe 100644 --- a/src/thread/pthread_attr_setinheritsched.c +++ b/src/thread/pthread_attr_setinheritsched.c -@@ -1,8 +1,29 @@ - #include "pthread_impl.h" -+#include "syscall.h" -+ -+__attribute__((__visibility__("hidden"))) -+void *__start_sched(void *p) -+{ -+ struct start_sched_args *ssa = p; -+ void *start_arg = ssa->start_arg; -+ void *(*start_fn)(void *) = ssa->start_fn; -+ pthread_t self = __pthread_self(); -+ -+ int ret = -__syscall(SYS_sched_setscheduler, self->tid, -+ ssa->attr->_a_policy, &ssa->attr->_a_prio); -+ if (!ret) __restore_sigs(&ssa->mask); -+ a_store(&ssa->futex, ret); -+ __wake(&ssa->futex, 1, 1); -+ if (ret) { -+ self->detach_state = DT_DYNAMIC; -+ return 0; -+ } -+ return start_fn(start_arg); -+} +@@ -23,7 +23,7 @@ void *__start_sched(void *p) int pthread_attr_setinheritsched(pthread_attr_t *a, int inherit) { @@ -6294,375 +267,6 @@ index 46b520c0..933bdb38 100644 + return ENOTSUP; } } -diff --git a/src/thread/pthread_barrierattr_setpshared.c b/src/thread/pthread_barrierattr_setpshared.c -index b391461e..c2d2929d 100644 ---- a/src/thread/pthread_barrierattr_setpshared.c -+++ b/src/thread/pthread_barrierattr_setpshared.c -@@ -2,6 +2,7 @@ - - int pthread_barrierattr_setpshared(pthread_barrierattr_t *a, int pshared) - { -+ if (pshared > 1U) return EINVAL; - a->__attr = pshared ? INT_MIN : 0; - return 0; - } -diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c -index 3d229223..5d458af2 100644 ---- a/src/thread/pthread_cancel.c -+++ b/src/thread/pthread_cancel.c -@@ -61,6 +61,9 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx) - - if (self->cancelasync || pc >= (uintptr_t)__cp_begin && pc < (uintptr_t)__cp_end) { - uc->uc_mcontext.MC_PC = (uintptr_t)__cp_cancel; -+#ifdef CANCEL_GOT -+ uc->uc_mcontext.MC_GOT = CANCEL_GOT; -+#endif - return; - } - -@@ -92,6 +95,10 @@ int pthread_cancel(pthread_t t) - init = 1; - } - a_store(&t->cancel, 1); -- if (t == pthread_self() && !t->cancelasync) return 0; -+ if (t == pthread_self()) { -+ if (t->canceldisable == PTHREAD_CANCEL_ENABLE && t->cancelasync) -+ pthread_exit(PTHREAD_CANCELED); -+ return 0; -+ } - return pthread_kill(t, SIGCANCEL); - } -diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c -index 439ee363..27ace2c6 100644 ---- a/src/thread/pthread_create.c -+++ b/src/thread/pthread_create.c -@@ -19,6 +19,12 @@ weak_alias(dummy_0, __pthread_tsd_run_dtors); - weak_alias(dummy_0, __do_orphaned_stdio_locks); - weak_alias(dummy_0, __dl_thread_cleanup); - -+static void *dummy_1(void *p) -+{ -+ return 0; -+} -+weak_alias(dummy_1, __start_sched); -+ - _Noreturn void __pthread_exit(void *result) - { - pthread_t self = __pthread_self(); -@@ -37,11 +43,11 @@ _Noreturn void __pthread_exit(void *result) - - __pthread_tsd_run_dtors(); - -- LOCK(self->exitlock); -- -- /* Mark this thread dead before decrementing count */ -+ /* Access to target the exiting thread with syscalls that use -+ * its kernel tid is controlled by killlock. For detached threads, -+ * any use past this point would have undefined behavior, but for -+ * joinable threads it's a valid usage that must be handled. */ - LOCK(self->killlock); -- self->dead = 1; - - /* Block all signals before decrementing the live thread count. - * This is important to ensure that dynamically allocated TLS -@@ -49,20 +55,14 @@ _Noreturn void __pthread_exit(void *result) - * reasons as well. */ - __block_all_sigs(&set); - -- /* Wait to unlock the kill lock, which governs functions like -- * pthread_kill which target a thread id, until signals have -- * been blocked. This precludes observation of the thread id -- * as a live thread (with application code running in it) after -- * the thread was reported dead by ESRCH being returned. */ -- UNLOCK(self->killlock); -- - /* It's impossible to determine whether this is "the last thread" - * until performing the atomic decrement, since multiple threads - * could exit at the same time. For the last thread, revert the -- * decrement and unblock signals to give the atexit handlers and -- * stdio cleanup code a consistent state. */ -+ * decrement, restore the tid, and unblock signals to give the -+ * atexit handlers and stdio cleanup code a consistent state. */ - if (a_fetch_add(&libc.threads_minus_1, -1)==0) { - libc.threads_minus_1 = 0; -+ UNLOCK(self->killlock); - __restore_sigs(&set); - exit(0); - } -@@ -89,15 +89,19 @@ _Noreturn void __pthread_exit(void *result) - __do_orphaned_stdio_locks(); - __dl_thread_cleanup(); - -- if (self->detached && self->map_base) { -+ /* 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); -+ -+ if (state>=DT_DETACHED && self->map_base) { - /* Detached threads must avoid the kernel clear_child_tid - * feature, since the virtual address will have been - * unmapped and possibly already reused by a new mapping - * at the time the kernel would perform the write. In - * the case of threads that started out detached, the - * initial clone flags are correct, but if the thread was -- * detached later (== 2), we need to clear it here. */ -- if (self->detached == 2) __syscall(SYS_set_tid_address, 0); -+ * detached later, we need to clear it here. */ -+ if (state == DT_DYNAMIC) __syscall(SYS_set_tid_address, 0); - - /* Robust list will no longer be valid, and was already - * processed above, so unregister it with the kernel. */ -@@ -113,6 +117,12 @@ _Noreturn void __pthread_exit(void *result) - __unmapself(self->map_base, self->map_size); - } - -+ /* After the kernel thread exits, its tid may be reused. Clear it -+ * to prevent inadvertent use and inform functions that would use -+ * it that it's no longer available. */ -+ self->tid = 0; -+ UNLOCK(self->killlock); -+ - for (;;) __syscall(SYS_exit, 0); - } - -@@ -131,19 +141,6 @@ void __do_cleanup_pop(struct __ptcb *cb) - static int start(void *p) - { - pthread_t self = p; -- /* States for startlock: -- * 0 = no need for start sync -- * 1 = waiting for parent to do work -- * 2 = failure in parent, child must abort -- * 3 = success in parent, child must restore sigmask */ -- if (self->startlock[0]) { -- __wait(self->startlock, 0, 1, 1); -- if (self->startlock[0] == 2) { -- self->detached = 2; -- pthread_exit(0); -- } -- __restore_sigs(self->sigmask); -- } - if (self->unblock_cancel) - __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, - SIGPT_SET, 0, _NSIG/8); -@@ -168,8 +165,8 @@ static void *dummy_tsd[1] = { 0 }; - weak_alias(dummy_tsd, __pthread_tsd_main); - - volatile int __block_new_threads = 0; --size_t __default_stacksize = DEFAULT_STACK_SIZE; --size_t __default_guardsize = DEFAULT_GUARD_SIZE; -+extern size_t __default_stacksize; -+extern size_t __default_guardsize; - - static FILE *volatile dummy_file = 0; - weak_alias(dummy_file, __stdin_used); -@@ -194,6 +191,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att - | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED; - int do_sched = 0; - pthread_attr_t attr = { 0 }; -+ struct start_sched_args ssa; - - if (!libc.can_do_threads) return ENOSYS; - self = __pthread_self(); -@@ -272,24 +270,32 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att - new->tsd = (void *)tsd; - new->locale = &libc.global_locale; - if (attr._a_detach) { -- new->detached = 1; -+ new->detach_state = DT_DETACHED; - flags -= CLONE_CHILD_CLEARTID; -+ } else { -+ new->detach_state = DT_JOINABLE; - } - if (attr._a_sched) { -- do_sched = new->startlock[0] = 1; -- __block_app_sigs(new->sigmask); -+ do_sched = 1; -+ ssa.futex = -1; -+ ssa.start_fn = new->start; -+ ssa.start_arg = new->start_arg; -+ ssa.attr = &attr; -+ new->start = __start_sched; -+ new->start_arg = &ssa; -+ __block_app_sigs(&ssa.mask); - } - new->robust_list.head = &new->robust_list.head; - new->unblock_cancel = self->cancel; - new->CANARY = self->CANARY; - - a_inc(&libc.threads_minus_1); -- ret = __clone((c11 ? start_c11 : start), stack, flags, new, &new->tid, TP_ADJ(new), &new->tid); -+ ret = __clone((c11 ? start_c11 : start), stack, flags, new, &new->tid, TP_ADJ(new), &new->detach_state); - - __release_ptc(); - - if (do_sched) { -- __restore_sigs(new->sigmask); -+ __restore_sigs(&ssa.mask); - } - - if (ret < 0) { -@@ -299,11 +305,9 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att - } - - if (do_sched) { -- ret = __syscall(SYS_sched_setscheduler, new->tid, -- attr._a_policy, &attr._a_prio); -- a_store(new->startlock, ret<0 ? 2 : 3); -- __wake(new->startlock, 1, 1); -- if (ret < 0) return -ret; -+ __futexwait(&ssa.futex, -1, 1); -+ ret = ssa.futex; -+ if (ret) return ret; - } - - *res = new; -diff --git a/src/thread/pthread_detach.c b/src/thread/pthread_detach.c -index 692bbaf9..9cee7a89 100644 ---- a/src/thread/pthread_detach.c -+++ b/src/thread/pthread_detach.c -@@ -5,11 +5,10 @@ int __pthread_join(pthread_t, void **); - - static int __pthread_detach(pthread_t t) - { -- /* Cannot detach a thread that's already exiting */ -- if (a_cas(t->exitlock, 0, INT_MIN + 1)) -+ /* If the cas fails, detach state is either already-detached -+ * or exiting/exited, and pthread_join will trap or cleanup. */ -+ if (a_cas(&t->detach_state, DT_JOINABLE, DT_DYNAMIC) != DT_JOINABLE) - return __pthread_join(t, 0); -- t->detached = 2; -- UNLOCK(t->exitlock); - return 0; - } - -diff --git a/src/thread/pthread_getattr_np.c b/src/thread/pthread_getattr_np.c -index 29a209bd..2881831f 100644 ---- a/src/thread/pthread_getattr_np.c -+++ b/src/thread/pthread_getattr_np.c -@@ -6,7 +6,7 @@ - int pthread_getattr_np(pthread_t t, pthread_attr_t *a) - { - *a = (pthread_attr_t){0}; -- a->_a_detach = !!t->detached; -+ a->_a_detach = t->detach_state>=DT_DETACHED; - a->_a_guardsize = t->guard_size; - if (t->stack) { - a->_a_stackaddr = (uintptr_t)t->stack; -diff --git a/src/thread/pthread_getschedparam.c b/src/thread/pthread_getschedparam.c -index a994b637..05be4242 100644 ---- a/src/thread/pthread_getschedparam.c -+++ b/src/thread/pthread_getschedparam.c -@@ -4,7 +4,7 @@ int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param - { - int r; - LOCK(t->killlock); -- if (t->dead) { -+ if (!t->tid) { - r = ESRCH; - } else { - r = -__syscall(SYS_sched_getparam, t->tid, param); -diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c -index b7175c09..18264da6 100644 ---- a/src/thread/pthread_join.c -+++ b/src/thread/pthread_join.c -@@ -7,13 +7,14 @@ int __pthread_setcancelstate(int, int *); - - int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at) - { -- int tmp, cs, r = 0; -+ int state, cs, r = 0; - __pthread_testcancel(); - __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); - if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0); -- if (t->detached) a_crash(); -- while ((tmp = t->tid) && r != ETIMEDOUT && r != EINVAL) -- r = __timedwait_cp(&t->tid, tmp, CLOCK_REALTIME, at, 0); -+ while ((state = t->detach_state) && r != ETIMEDOUT && r != EINVAL) { -+ if (state >= DT_DETACHED) a_crash(); -+ r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 0); -+ } - __pthread_setcancelstate(cs, 0); - if (r == ETIMEDOUT || r == EINVAL) return r; - a_barrier(); -@@ -29,7 +30,7 @@ int __pthread_join(pthread_t t, void **res) - - int __pthread_tryjoin_np(pthread_t t, void **res) - { -- return t->tid ? EBUSY : __pthread_join(t, res); -+ return t->detach_state==DT_JOINABLE ? EBUSY : __pthread_join(t, res); - } - - weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np); -diff --git a/src/thread/pthread_kill.c b/src/thread/pthread_kill.c -index f0903420..6d70e626 100644 ---- a/src/thread/pthread_kill.c -+++ b/src/thread/pthread_kill.c -@@ -4,7 +4,8 @@ int pthread_kill(pthread_t t, int sig) - { - int r; - LOCK(t->killlock); -- r = t->dead ? ESRCH : -__syscall(SYS_tkill, t->tid, sig); -+ r = t->tid ? -__syscall(SYS_tkill, t->tid, sig) -+ : (sig+0U >= _NSIG ? EINVAL : 0); - UNLOCK(t->killlock); - return r; - } -diff --git a/src/thread/pthread_setschedparam.c b/src/thread/pthread_setschedparam.c -index 9e2fa456..ab45f2ff 100644 ---- a/src/thread/pthread_setschedparam.c -+++ b/src/thread/pthread_setschedparam.c -@@ -4,7 +4,7 @@ int pthread_setschedparam(pthread_t t, int policy, const struct sched_param *par - { - int r; - LOCK(t->killlock); -- r = t->dead ? ESRCH : -__syscall(SYS_sched_setscheduler, t->tid, policy, param); -+ r = !t->tid ? ESRCH : -__syscall(SYS_sched_setscheduler, t->tid, policy, param); - UNLOCK(t->killlock); - return r; - } -diff --git a/src/thread/pthread_setschedprio.c b/src/thread/pthread_setschedprio.c -index dc745b42..c353f6b5 100644 ---- a/src/thread/pthread_setschedprio.c -+++ b/src/thread/pthread_setschedprio.c -@@ -4,7 +4,7 @@ int pthread_setschedprio(pthread_t t, int prio) - { - int r; - LOCK(t->killlock); -- r = t->dead ? ESRCH : -__syscall(SYS_sched_setparam, t->tid, &prio); -+ r = !t->tid ? ESRCH : -__syscall(SYS_sched_setparam, t->tid, &prio); - UNLOCK(t->killlock); - return r; - } -diff --git a/src/time/__tz.c b/src/time/__tz.c -index 1dbb0b8f..814edcdf 100644 ---- a/src/time/__tz.c -+++ b/src/time/__tz.c -@@ -230,7 +230,7 @@ static void do_tzset() - dst_off = __timezone - 3600; - } else { - __daylight = 0; -- dst_off = 0; -+ dst_off = __timezone; - } - - if (*s == ',') s++, getrule(&s, r0); -diff --git a/src/time/strftime.c b/src/time/strftime.c -index 708875ee..d3f2add9 100644 ---- a/src/time/strftime.c -+++ b/src/time/strftime.c -@@ -181,9 +181,8 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * - *l = 0; - return ""; - } -- *l = snprintf(*s, sizeof *s, "%+.2d%.2d", -- (tm->__tm_gmtoff)/3600, -- abs(tm->__tm_gmtoff%3600)/60); -+ *l = snprintf(*s, sizeof *s, "%+.4ld", -+ tm->__tm_gmtoff/3600*100 + tm->__tm_gmtoff%3600/60); - return *s; - case 'Z': - if (tm->tm_isdst < 0) { diff --git a/src/time/timespec_get.c b/src/time/timespec_get.c index 03c5a77b..c423b825 100644 --- a/src/time/timespec_get.c @@ -6676,115 +280,3 @@ index 03c5a77b..c423b825 100644 int ret = __clock_gettime(CLOCK_REALTIME, ts); return ret < 0 ? 0 : base; } -diff --git a/src/time/wcsftime.c b/src/time/wcsftime.c -index 638e64f6..23500cc8 100644 ---- a/src/time/wcsftime.c -+++ b/src/time/wcsftime.c -@@ -4,7 +4,7 @@ - #include "locale_impl.h" - #include "libc.h" - --const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc); -+const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc, int pad); - - size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, const struct tm *restrict tm, locale_t loc) - { -@@ -14,7 +14,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co - wchar_t *p; - const char *t_mb; - const wchar_t *t; -- int plus; -+ int pad, plus; - unsigned long width; - for (l=0; l<n; f++) { - if (!*f) { -@@ -26,6 +26,8 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co - continue; - } - f++; -+ pad = 0; -+ if (*f == '-' || *f == '_' || *f == '0') pad = *f++; - if ((plus = (*f == '+'))) f++; - width = wcstoul(f, &p, 10); - if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') { -@@ -35,7 +37,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co - } - f = p; - if (*f == 'E' || *f == 'O') f++; -- t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc); -+ t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc, pad); - if (!t_mb) break; - k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf); - if (k == (size_t)-1) return 0; -diff --git a/src/unistd/getcwd.c b/src/unistd/getcwd.c -index 103fbbb5..f407ffe0 100644 ---- a/src/unistd/getcwd.c -+++ b/src/unistd/getcwd.c -@@ -6,10 +6,10 @@ - - char *getcwd(char *buf, size_t size) - { -- char tmp[PATH_MAX]; -+ char tmp[buf ? 1 : PATH_MAX]; - if (!buf) { - buf = tmp; -- size = PATH_MAX; -+ size = sizeof tmp; - } else if (!size) { - errno = EINVAL; - return 0; -diff --git a/src/unistd/gethostname.c b/src/unistd/gethostname.c -index f984b7dd..633ef571 100644 ---- a/src/unistd/gethostname.c -+++ b/src/unistd/gethostname.c -@@ -8,6 +8,6 @@ int gethostname(char *name, size_t len) - if (uname(&uts)) return -1; - if (len > sizeof uts.nodename) len = sizeof uts.nodename; - for (i=0; i<len && (name[i] = uts.nodename[i]); i++); -- if (i==len) name[i-1] = 0; -+ if (i && i==len) name[i-1] = 0; - return 0; - } -diff --git a/src/unistd/nice.c b/src/unistd/nice.c -index da569967..6c25c8c3 100644 ---- a/src/unistd/nice.c -+++ b/src/unistd/nice.c -@@ -1,12 +1,16 @@ - #include <unistd.h> - #include <sys/resource.h> -+#include <limits.h> - #include "syscall.h" - - int nice(int inc) - { --#ifdef SYS_nice -- return syscall(SYS_nice, inc); --#else -- return setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0)+inc); --#endif -+ int prio = inc; -+ // Only query old priority if it can affect the result. -+ // This also avoids issues with integer overflow. -+ if (inc > -2*NZERO && inc < 2*NZERO) -+ prio += getpriority(PRIO_PROCESS, 0); -+ if (prio > NZERO-1) prio = NZERO-1; -+ if (prio < -NZERO) prio = -NZERO; -+ return setpriority(PRIO_PROCESS, 0, prio) ? -1 : prio; - } -diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh -index 294e24f7..30492574 100644 ---- a/tools/musl-gcc.specs.sh -+++ b/tools/musl-gcc.specs.sh -@@ -17,10 +17,10 @@ cat <<EOF - libgcc.a%s %:if-exists(libgcc_eh.a%s) - - *startfile: --%{!shared: $libdir/%{pie:S}crt1.o} $libdir/crti.o %{shared|pie:crtbeginS.o%s;:crtbegin.o%s} -+%{!shared: $libdir/Scrt1.o} $libdir/crti.o crtbeginS.o%s - - *endfile: --%{shared|pie:crtendS.o%s;:crtend.o%s} $libdir/crtn.o -+crtendS.o%s $libdir/crtn.o - - *link: - -dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} %{rdynamic:-export-dynamic} diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index eaa4508bf..d3905f3fc 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ncurses -pkgver=6.1_p20180609 +pkgver=6.1_p20180901 _ver=${pkgver%_p*}-${pkgver#*_p} -pkgrel=5 +pkgrel=0 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/ncurses.html" arch="all" @@ -106,4 +106,4 @@ static() { mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ } -sha512sums="616975a1ef61ca6efb68c9411fb4d310f5472f4f58c277afaecacc42e2186358dbda1831f8d2f9fe5ef98ecabd8c3ea0e618762450e9cf99b92230277bca480c ncurses-6.1-20180609.tgz" +sha512sums="3c7983a80aba1cc69ad9ac2f43cd60bfe714c8e83b8eb6755ca6c5cf14d26d1e98c7407de34af74e58d52ca1d9446e04f2a76fd31a37377782aa4e515b35ba7e ncurses-6.1-20180901.tgz" diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 46284cae3..a6da52de1 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr -pkgver=4.19 +pkgver=4.20 pkgrel=0 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" arch="all" options="!check" # No test suite. license="MPL-1.1 AND GPL-2.0-only AND LGPL-2.1-only" -depends= +depends="" # -dev package does not ship any symlinks so dependency cannot be autodetected depends_dev="nspr" makedepends="autoconf automake" @@ -60,5 +60,5 @@ package() { "$pkgdir"/usr/include/nspr/md } -sha512sums="45a48111d0f89db0649a5e1356719868ff81881f9cf48c22c1d13b0831978b103f19e9840d6a5359fcdc90d763c0a60f0a29f7840d756a5efbd53ce1afd36844 nspr-4.19.tar.gz +sha512sums="22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949 nspr-4.20.tar.gz ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch" diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index b6c1f5992..806441d20 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.38 +pkgver=3.39 _ver=${pkgver//./_} pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -9,7 +9,7 @@ url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" arch="all" options="!check" license="MPL-2.0" -depends= +depends="" depends_dev="nspr-dev" makedepends="nspr-dev sqlite-dev zlib-dev perl bsd-compat-headers" subpackages="$pkgname-static $pkgname-dev $pkgname-tools" @@ -147,7 +147,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab nss-3.38.tar.gz +sha512sums="16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f nss-3.39.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/openssl/3001-CVE-2018-0737.patch b/system/openssl/3001-CVE-2018-0737.patch deleted file mode 100644 index 162dc3d7f..000000000 --- a/system/openssl/3001-CVE-2018-0737.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001 -From: Billy Brumley <bbrumley@gmail.com> -Date: Wed, 11 Apr 2018 10:10:58 +0300 -Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont - both get called with BN_FLG_CONSTTIME flag set. - -CVE-2018-0737 - -Reviewed-by: Rich Salz <rsalz@openssl.org> -Reviewed-by: Matt Caswell <matt@openssl.org> -(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787) ---- - crypto/rsa/rsa_gen.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c -index 9ca5dfefb70..42b89a8dfaa 100644 ---- a/crypto/rsa/rsa_gen.c -+++ b/crypto/rsa/rsa_gen.c -@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, - if (BN_copy(rsa->e, e_value) == NULL) - goto err; - -+ BN_set_flags(rsa->p, BN_FLG_CONSTTIME); -+ BN_set_flags(rsa->q, BN_FLG_CONSTTIME); - BN_set_flags(r2, BN_FLG_CONSTTIME); - /* generate p and q */ - for (;;) { diff --git a/system/openssl/3002-CVE-2018-0732.patch b/system/openssl/3002-CVE-2018-0732.patch deleted file mode 100644 index 148e7c3bc..000000000 --- a/system/openssl/3002-CVE-2018-0732.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001 -From: Guido Vranken <guidovranken@gmail.com> -Date: Mon, 11 Jun 2018 19:38:54 +0200 -Subject: [PATCH] Reject excessively large primes in DH key generation. - -CVE-2018-0732 - -Signed-off-by: Guido Vranken <guidovranken@gmail.com> - -(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) - -Reviewed-by: Tim Hudson <tjh@openssl.org> -Reviewed-by: Matt Caswell <matt@openssl.org> -(Merged from https://github.com/openssl/openssl/pull/6457) ---- - crypto/dh/dh_key.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c -index 387558f1467..f235e0d682b 100644 ---- a/crypto/dh/dh_key.c -+++ b/crypto/dh/dh_key.c -@@ -130,10 +130,15 @@ static int generate_key(DH *dh) - int ok = 0; - int generate_new_key = 0; - unsigned l; -- BN_CTX *ctx; -+ BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; - BIGNUM *pub_key = NULL, *priv_key = NULL; - -+ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { -+ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); -+ return 0; -+ } -+ - ctx = BN_CTX_new(); - if (ctx == NULL) - goto err; diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD index 684f41bf1..7aeb36b7b 100644 --- a/system/openssl/APKBUILD +++ b/system/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openssl -pkgver=1.0.2o +pkgver=1.0.2p pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="https://www.openssl.org/" @@ -28,8 +28,6 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch 1002-backport-changes-from-upstream-padlock-module.patch 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch - 3001-CVE-2018-0737.patch - 3002-CVE-2018-0732.patch " # secfixes: @@ -143,7 +141,7 @@ dev() { default_dev } -sha512sums="8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd openssl-1.0.2o.tar.gz +sha512sums="958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 openssl-1.0.2p.tar.gz 2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c 0002-busybox-basename.patch 58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch @@ -154,6 +152,4 @@ c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723e 5febe20948e3f12d981e378e1f4ea538711657aacb6865a1aa91339d4a04277e250f490a1f2abc2c6f290bdc2b1bffdba1d00983b4c09f7ea983eef8163f9420 0010-ssl-env-zlib.patch 8c181760d7a149aa18d246d50f1c0438ffb63c98677b05306dfc00400ad0429b47d31e7c8d85126005c67f743d23e7a8a81174ffe98556f4caf9cf6b04d9ff17 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch a3555440b5f544bfd6b9ad97557d8f4c1d673f6a35219f65056a72035d186be5f354717ddf9784899b602464d48657b090ade24379552d43af97609c0f48c389 1002-backport-changes-from-upstream-padlock-module.patch -6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch -70be7fb9abad901fd84e8028e328c5b2fb7feff18547cfb749c5f59faf06eceab9052f9979d721670f6f3e099ba59761e8394e986565d349dd25e9718eaa99f0 3001-CVE-2018-0737.patch -ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4 3002-CVE-2018-0732.patch" +6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch" diff --git a/system/perl-authen-sasl/APKBUILD b/system/perl-authen-sasl/APKBUILD index 611d30fa7..ad6f196ca 100644 --- a/system/perl-authen-sasl/APKBUILD +++ b/system/perl-authen-sasl/APKBUILD @@ -4,7 +4,7 @@ _realname=Authen-SASL pkgver=2.16 pkgrel=2 pkgdesc="SASL authentication framework for Perl" -url="http://search.cpan.org/dist/Authen-SASL/" +url="https://metacpan.org/release/Authen-SASL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-digest-hmac" diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index 801c2e226..aed5f54d1 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.04 +pkgver=4.06 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" -url="http://search.cpan.org/dist/Cpanel-JSON-XS/" +url="https://metacpan.org/release/Cpanel-JSON-XS" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6b2479ee89f2b8c79ef979cecbdb6f29c28ee37ab530eabc9070728ba37063be3c5836571bea84d537dc93f8586cca71fd3bdca5e420c1d6a2eabf2547ca1db7 Cpanel-JSON-XS-4.04.tar.gz" +sha512sums="df765265c23982a6c5eb80d16d9c9e3b3ab9f0b34aa130df8da084936aa2b7e9f4b362466948925df7be9c448892eef93017cf1fa7be7f640b62c83493829cec Cpanel-JSON-XS-4.06.tar.gz" diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD index f551079de..e0febf493 100644 --- a/system/perl-dbd-sqlite/APKBUILD +++ b/system/perl-dbd-sqlite/APKBUILD @@ -5,7 +5,7 @@ _pkgname=DBD-SQLite pkgver=1.58 pkgrel=0 pkgdesc="Perl DBI SQLite module" -url="http://search.cpan.org/dist/$_pkgname" +url="https://metacpan.org/release/DBD-SQLite" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl-dbi" diff --git a/system/perl-dbi/APKBUILD b/system/perl-dbi/APKBUILD index c8d0efda4..007506a47 100644 --- a/system/perl-dbi/APKBUILD +++ b/system/perl-dbi/APKBUILD @@ -5,7 +5,7 @@ _realpkgname=DBI pkgver=1.641 pkgrel=0 pkgdesc="Database independent interface for Perl" -url="http://search.cpan.org/dist/${_realpkgname}" +url="https://metacpan.org/release/DBI" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends= diff --git a/system/perl-digest-hmac/APKBUILD b/system/perl-digest-hmac/APKBUILD index ccf09a834..3bca43d37 100644 --- a/system/perl-digest-hmac/APKBUILD +++ b/system/perl-digest-hmac/APKBUILD @@ -4,7 +4,7 @@ _realname=Digest-HMAC pkgver=1.03 pkgrel=1 pkgdesc="Keyed-Hashing for Message Authentication Perl module" -url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/" +url="https://metacpan.org/release/Digest-HMAC" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-digest-sha1" diff --git a/system/perl-digest-sha1/APKBUILD b/system/perl-digest-sha1/APKBUILD index 60205b85b..a9f19e206 100644 --- a/system/perl-digest-sha1/APKBUILD +++ b/system/perl-digest-sha1/APKBUILD @@ -5,7 +5,7 @@ _realname=Digest-SHA1 pkgver=2.13 pkgrel=11 pkgdesc="Perl interface to the SHA-1 algorithm" -url="http://search.cpan.org/dist/Digest-SHA1/" +url="https://metacpan.org/release/Digest-SHA1" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-encode-locale/APKBUILD b/system/perl-encode-locale/APKBUILD index 6f79efa94..a4dccf27c 100644 --- a/system/perl-encode-locale/APKBUILD +++ b/system/perl-encode-locale/APKBUILD @@ -5,7 +5,7 @@ _realname=Encode-Locale pkgver=1.05 pkgrel=2 pkgdesc="Perl module - Determine locale encoding" -url="http://search.cpan.org/~gaas" +url="https://metacpan.org/release/Encode-Locale" arch="noarch" license="GPL-2.0-only Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-error/APKBUILD b/system/perl-error/APKBUILD index 6c3a1235a..542627640 100644 --- a/system/perl-error/APKBUILD +++ b/system/perl-error/APKBUILD @@ -4,7 +4,7 @@ _realname=Error pkgver=0.17026 pkgrel=0 pkgdesc="Perl module error/exception handling in an OO-ish way" -url="http://search.cpan.org/dist/Error/" +url="https://metacpan.org/release/Error" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-extutils-config/APKBUILD b/system/perl-extutils-config/APKBUILD index c4eab6a9f..2c42337c2 100644 --- a/system/perl-extutils-config/APKBUILD +++ b/system/perl-extutils-config/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=ExtUtils-Config pkgver=0.008 pkgrel=0 pkgdesc="A wrapper library for Perl configuration" -url="http://search.cpan.org/dist/ExtUtils-Config/" +url="https://metacpan.org/release/ExtUtils-Config" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-extutils-helpers/APKBUILD b/system/perl-extutils-helpers/APKBUILD index d125cdb7f..310875cf2 100644 --- a/system/perl-extutils-helpers/APKBUILD +++ b/system/perl-extutils-helpers/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=ExtUtils-Helpers pkgver=0.026 pkgrel=0 pkgdesc="Various portability utilities for Perl module builders" -url="http://search.cpan.org/dist/ExtUtils-Helpers/" +url="https://metacpan.org/release/ExtUtils-Helpers" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-extutils-installpaths/APKBUILD b/system/perl-extutils-installpaths/APKBUILD index 459c61276..57d3ba2e5 100644 --- a/system/perl-extutils-installpaths/APKBUILD +++ b/system/perl-extutils-installpaths/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=ExtUtils-InstallPaths pkgver=0.012 pkgrel=0 pkgdesc="Build.PL install path logic made easy" -url="http://search.cpan.org/dist/ExtUtils-InstallPaths/" +url="https://metacpan.org/release/ExtUtils-InstallPaths" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-extutils-config" diff --git a/system/perl-file-listing/APKBUILD b/system/perl-file-listing/APKBUILD index 4e36cd844..89464b395 100644 --- a/system/perl-file-listing/APKBUILD +++ b/system/perl-file-listing/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-file-listing pkgver=6.04 pkgrel=2 pkgdesc="File::Listing perl module" -url="http://search.cpan.org/dist/File-Listing/" +url="https://metacpan.org/release/File-Listing" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-http-date" diff --git a/system/perl-file-remove/APKBUILD b/system/perl-file-remove/APKBUILD index bed356f5e..568b40155 100644 --- a/system/perl-file-remove/APKBUILD +++ b/system/perl-file-remove/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=File-Remove pkgver=1.57 pkgrel=1 pkgdesc="Remove files and directories" -url="http://search.cpan.org/dist/File-Remove/" +url="https://metacpan.org/release/File-Remove" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-html-parser/APKBUILD b/system/perl-html-parser/APKBUILD index f810d3748..60aede3a0 100644 --- a/system/perl-html-parser/APKBUILD +++ b/system/perl-html-parser/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=HTML-Parser pkgver=3.72 pkgrel=3 pkgdesc="Perl HTML parser" -url="http://search.cpan.org/dist/HTML-Parser/" +url="https://metacpan.org/release/HTML-Parser" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-html-tagset" diff --git a/system/perl-html-tagset/APKBUILD b/system/perl-html-tagset/APKBUILD index 607b5cc68..0427a8a5e 100644 --- a/system/perl-html-tagset/APKBUILD +++ b/system/perl-html-tagset/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=HTML-Tagset pkgver=3.20 pkgrel=2 pkgdesc="Useful data tables for parsing HTML" -url="http://search.cpan.org/dist/HTML-Tagset/" +url="https://metacpan.org/release/HTML-Tagset" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-http-cookies/APKBUILD b/system/perl-http-cookies/APKBUILD index dd2031356..f6b751771 100644 --- a/system/perl-http-cookies/APKBUILD +++ b/system/perl-http-cookies/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=HTTP-Cookies pkgver=6.04 pkgrel=1 pkgdesc="Perl HTTP cookie jars" -url="http://search.cpan.org/dist/HTTP-Cookies/" +url="https://metacpan.org/release/HTTP-Cookies" arch="noarch" license="GPL-2.0-only or Artistic-1.0-Perl" depends="perl perl-http-date perl-http-message" diff --git a/system/perl-http-daemon/APKBUILD b/system/perl-http-daemon/APKBUILD index f8f330398..b85717256 100644 --- a/system/perl-http-daemon/APKBUILD +++ b/system/perl-http-daemon/APKBUILD @@ -4,12 +4,11 @@ pkgname=perl-http-daemon pkgver=6.01 pkgrel=2 pkgdesc="HTTP::Daemon perl module" -url="http://search.cpan.org/dist/HTTP-Daemon/" +url="https://metacpan.org/release/HTTP-Daemon" arch="noarch" license="GPL-2.0-only or Artistic-1.0-Perl" depends="perl perl-http-date perl-http-message" makedepends="perl-dev" -install="" replaces="perl-libwww" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-$pkgver.tar.gz" diff --git a/system/perl-http-date/APKBUILD b/system/perl-http-date/APKBUILD index 2d4b83da4..b4a3f7829 100644 --- a/system/perl-http-date/APKBUILD +++ b/system/perl-http-date/APKBUILD @@ -5,7 +5,7 @@ _realname=HTTP-Date pkgver=6.02 pkgrel=2 pkgdesc="Perl module date conversion routines" -url="http://search.cpan.org/~gaas" +url="https://metacpan.org/release/HTTP-Date" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD index d5b178f38..26fae9ff0 100644 --- a/system/perl-http-message/APKBUILD +++ b/system/perl-http-message/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=HTTP-Message pkgver=6.18 pkgrel=0 pkgdesc="Perl class encapsulating HTTP-style messages" -url="http://search.cpan.org/dist/HTTP-Message/" +url="https://metacpan.org/release/HTTP-Message" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-lwp-mediatypes perl-encode-locale perl-http-date perl-uri perl-io-html" diff --git a/system/perl-http-negotiate/APKBUILD b/system/perl-http-negotiate/APKBUILD index 1efada759..98ebfb1da 100644 --- a/system/perl-http-negotiate/APKBUILD +++ b/system/perl-http-negotiate/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-http-negotiate pkgver=6.01 pkgrel=2 pkgdesc="HTTP::Negotiate perl module" -url="http://search.cpan.org/dist/HTTP-Negotiate/" +url="https://metacpan.org/release/HTTP-Negotiate" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-http-message" diff --git a/system/perl-io-html/APKBUILD b/system/perl-io-html/APKBUILD index c6c49d10f..b5e2c6c6e 100644 --- a/system/perl-io-html/APKBUILD +++ b/system/perl-io-html/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=IO-HTML pkgver=1.001 pkgrel=2 pkgdesc="Open an HTML file with automatic charset detection" -url="http://search.cpan.org/dist/IO-HTML/" +url="https://metacpan.org/release/IO-HTML" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-io-socket-ssl/APKBUILD b/system/perl-io-socket-ssl/APKBUILD index c5c982c33..fabe57860 100644 --- a/system/perl-io-socket-ssl/APKBUILD +++ b/system/perl-io-socket-ssl/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-io-socket-ssl _pkgreal=IO-Socket-SSL -pkgver=2.056 +pkgver=2.059 pkgrel=0 pkgdesc="Perl module implementing SSL/TLS with IO::Socket interface" -url="http://search.cpan.org/dist/IO-Socket-SSL/" +url="https://metacpan.org/release/IO-Socket-SSL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="ca-certificates perl-net-libidn perl-net-ssleay" @@ -37,4 +37,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="a3d580f977f8fd99f196a710f6eb5bc649d46e22d17f4e02660b2bab130629b34d1aff037974f320ce52121b13c1d77aa2f504278ec50530667e67413442b70b IO-Socket-SSL-2.056.tar.gz" +sha512sums="af3800d171036b026bcb502692f70d88c4a9f2546e465181ef9037467b942c94303840cc479403f5f0e6f0ad6b06918cbaf78f0b1447e5416594c819ed94a39b IO-Socket-SSL-2.059.tar.gz" diff --git a/system/perl-json-maybexs/APKBUILD b/system/perl-json-maybexs/APKBUILD index 5fe5367f3..cbea4a6d2 100644 --- a/system/perl-json-maybexs/APKBUILD +++ b/system/perl-json-maybexs/APKBUILD @@ -5,8 +5,8 @@ pkgname=perl-json-maybexs _pkgreal=JSON-MaybeXS pkgver=1.004000 pkgrel=0 -pkgdesc="Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>" -url="http://search.cpan.org/dist/JSON-MaybeXS/" +pkgdesc="Use <Cpanel::JSON::XS> with a fallback to <JSON::XS> and <JSON::PP>" +url="https://metacpan.org/release/JSON-MaybeXS" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-cpanel-json-xs" diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD index 946a515d9..1c6b4fdea 100644 --- a/system/perl-json/APKBUILD +++ b/system/perl-json/APKBUILD @@ -4,7 +4,7 @@ _pkgreal=JSON pkgver=2.97001 pkgrel=0 pkgdesc="Perl module implementing a JSON encoder/decoder" -url="http://search.cpan.org/dist/JSON/" +url="https://metacpan.org/release/JSON" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" makedepends="perl-dev" diff --git a/system/perl-libwww/APKBUILD b/system/perl-libwww/APKBUILD index ee7012f8a..c31dc6cfe 100644 --- a/system/perl-libwww/APKBUILD +++ b/system/perl-libwww/APKBUILD @@ -2,20 +2,20 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-libwww _realname=libwww-perl -pkgver=6.31 +pkgver=6.35 pkgrel=0 pkgdesc="Perl module - World Wide Web library" -url="http://search.cpan.org/~mschilli" +url="https://metacpan.org/release/libwww-perl" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl-http-date perl-http-cookies perl-net-http perl-http-daemon perl-html-parser perl-file-listing perl-www-robotrules - perl-http-negotiate perl-uri perl-http-message + perl-http-negotiate perl-uri perl-http-message perl-test-needs perl-lwp-mediatypes perl-encode-locale perl-try-tiny" makedepends="perl-dev perl-test-fatal perl-test-requiresinternet" install= subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/libwww-perl/libwww-perl/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-6.35.tar.gz" builddir="$srcdir/$_realname-$pkgver" build() { @@ -36,4 +36,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -sha512sums="884612d01d0d5dd47f74c7e9fd44ec17f6f08069521710c84912cd11643097a5456e91c9339b888307c629199721aa20c449cf8f7e4ef6fd7be719ab637b3cf2 perl-libwww-6.31.tar.gz" +sha512sums="db7eea57fc85f80f351c3556f0747cf94100b5cd75a6fdd76006f6ada5c7087143660f724db70f3e5fe45f53cabce2dcbaece985551e74f546f71cd7d6d27e7a perl-libwww-6.35.tar.gz" diff --git a/system/perl-lwp-mediatypes/APKBUILD b/system/perl-lwp-mediatypes/APKBUILD index c2fdb7f43..51778d258 100644 --- a/system/perl-lwp-mediatypes/APKBUILD +++ b/system/perl-lwp-mediatypes/APKBUILD @@ -5,7 +5,7 @@ _realname=LWP-MediaTypes pkgver=6.02 pkgrel=2 pkgdesc="Perl module - guess media type for a file or a URL" -url="http://search.cpan.org/~gaas" +url="https://metacpan.org/release/LWP-MediaTypes" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-module-build-tiny/APKBUILD b/system/perl-module-build-tiny/APKBUILD index 646c6be04..05d2e73da 100644 --- a/system/perl-module-build-tiny/APKBUILD +++ b/system/perl-module-build-tiny/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Module-Build-Tiny pkgver=0.039 pkgrel=0 pkgdesc="A tiny replacement for Module::Build" -url="http://search.cpan.org/dist/Module-Build-Tiny/" +url="https://metacpan.org/release/Module-Build-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-extutils-installpaths perl-extutils-config perl-extutils-helpers perl-test-harness" diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD index 83ba709ca..dffb1853d 100644 --- a/system/perl-module-build/APKBUILD +++ b/system/perl-module-build/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Module-Build pkgver=0.4224 pkgrel=0 pkgdesc="Build and install Perl modules" -url="http://search.cpan.org/dist/Module-Build/" +url="https://metacpan.org/release/Module-Build" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-module-install/APKBUILD b/system/perl-module-install/APKBUILD index df5e2fc71..38b38df74 100644 --- a/system/perl-module-install/APKBUILD +++ b/system/perl-module-install/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Module-Install pkgver=1.19 pkgrel=1 pkgdesc="Standalone, extensible Perl module installer" -url="http://search.cpan.org/dist/Module-Install/" +url="https://metacpan.org/release/Module-Install" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpanmakedepends="perl-file-remove perl-module-build perl-module-scandeps perl-yaml-tiny" diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD index 20d41f61b..e8a1cdc73 100644 --- a/system/perl-module-scandeps/APKBUILD +++ b/system/perl-module-scandeps/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-scandeps _pkgreal=Module-ScanDeps -pkgver=1.24 +pkgver=1.25 pkgrel=0 pkgdesc="Recursively scan Perl code for dependencies" -url="http://search.cpan.org/dist/Module-ScanDeps/" +url="https://metacpan.org/release/Module-ScanDeps" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpanmakedepends="perl-test-requires" @@ -42,4 +42,4 @@ check() { make test } -sha512sums="7f3d9821aa863d8ebc78fb5fb3c7172ce133169ec54ed91b90e05ba50654b4bd0282b3a760adfc8b6bd553dda4116dbf51972bb2af94b59f6f04daeba996e889 Module-ScanDeps-1.24.tar.gz" +sha512sums="1d1d10b55147e68238465fc1e5e9248d926151394034f0bde32c0030ff9bbd685ebb1ed0c6c924769a2e38c2dc15621990b454438db5ef5699aeed378f02aec7 Module-ScanDeps-1.25.tar.gz" diff --git a/system/perl-net-http/APKBUILD b/system/perl-net-http/APKBUILD index 4197f33f5..879c5f966 100644 --- a/system/perl-net-http/APKBUILD +++ b/system/perl-net-http/APKBUILD @@ -4,12 +4,11 @@ pkgname=perl-net-http pkgver=6.18 pkgrel=0 pkgdesc="Low-level HTTP connection client library for Perl" -url="http://search.cpan.org/dist/Net-HTTP/" +url="https://metacpan.org/release/Net-HTTP" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-uri" makedepends="perl-dev" -install="" replaces="perl-libwww" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz" diff --git a/system/perl-net-libidn/APKBUILD b/system/perl-net-libidn/APKBUILD index 290e9b600..d8bac5b15 100644 --- a/system/perl-net-libidn/APKBUILD +++ b/system/perl-net-libidn/APKBUILD @@ -10,7 +10,6 @@ arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" makedepends="libidn-dev perl-dev" -install="" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/T/TH/THOR/$_realname-$pkgver.tar.gz" builddir="$srcdir/$_realname-$pkgver" diff --git a/system/perl-net-smtp-ssl/APKBUILD b/system/perl-net-smtp-ssl/APKBUILD index 67e08e266..05e7f7a05 100644 --- a/system/perl-net-smtp-ssl/APKBUILD +++ b/system/perl-net-smtp-ssl/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Net-SMTP-SSL pkgver=1.04 pkgrel=0 pkgdesc="SSL/TLS support for Net::SMTP" -url="http://search.cpan.org/dist/Net-SMTP-SSL/" +url="https://metacpan.org/release/Net-SMTP-SSL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-io-socket-ssl perl-net-ssleay" diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD index 6e0256315..f39c464b7 100644 --- a/system/perl-net-ssleay/APKBUILD +++ b/system/perl-net-ssleay/APKBUILD @@ -5,7 +5,7 @@ _realname=Net-SSLeay pkgver=1.85 pkgrel=0 pkgdesc="Perl extension for using OpenSSL" -url="http://search.cpan.org/dist/Net-SSLeay/" +url="https://metacpan.org/release/Net-SSLeay" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-sub-uplevel/APKBUILD b/system/perl-sub-uplevel/APKBUILD index 6eb77aff4..035f67670 100644 --- a/system/perl-sub-uplevel/APKBUILD +++ b/system/perl-sub-uplevel/APKBUILD @@ -5,7 +5,7 @@ _realname=Sub-Uplevel pkgver=0.2800 pkgrel=0 pkgdesc="Perl module to apparently run a function in a higher stack frame" -url="http://search.cpan.org/~dagolden/$_realname-$pkgver/" +url="https://metacpan.org/release/Sub-Uplevel" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-test-exception/APKBUILD b/system/perl-test-exception/APKBUILD index 25a978be2..4c1acf79c 100644 --- a/system/perl-test-exception/APKBUILD +++ b/system/perl-test-exception/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Exception pkgver=0.43 pkgrel=0 pkgdesc="Perl module for testing exception-based code" -url="http://search.cpan.org/dist/Test-Exception/" +url="https://metacpan.org/release/Test-Exception" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-sub-uplevel" diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD index 3cb20afdd..f9c0bbfd5 100644 --- a/system/perl-test-fatal/APKBUILD +++ b/system/perl-test-fatal/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Fatal pkgver=0.014 pkgrel=1 pkgdesc="incredibly simple helpers for testing code with exceptions" -url="http://search.cpan.org/dist/Test-Fatal/" +url="https://metacpan.org/release/Test-Fatal" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-try-tiny" diff --git a/system/perl-test-harness/APKBUILD b/system/perl-test-harness/APKBUILD index bca0490e7..082ee0e68 100644 --- a/system/perl-test-harness/APKBUILD +++ b/system/perl-test-harness/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Harness pkgver=3.42 pkgrel=0 pkgdesc="Run Perl standard test scripts with statistics" -url="http://search.cpan.org/dist/Test-Harness/" +url="https://metacpan.org/release/Test-Harness" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-test-leaktrace/APKBUILD b/system/perl-test-leaktrace/APKBUILD index 6e63eafa7..5ba02bf89 100644 --- a/system/perl-test-leaktrace/APKBUILD +++ b/system/perl-test-leaktrace/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-LeakTrace pkgver=0.16 pkgrel=0 pkgdesc="Traces memory leaks" -url="http://search.cpan.org/dist/Test-LeakTrace/" +url="https://metacpan.org/release/Test-LeakTrace" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD index c40abbe62..1c2e096c3 100644 --- a/system/perl-test-needs/APKBUILD +++ b/system/perl-test-needs/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-test-needs pkgver=0.002005 pkgrel=0 pkgdesc="Perl module for skipping tests when modules aren't found" -url="https://metacpan.org/pod/Test::Needs" +url="https://metacpan.org/release/Test-Needs" arch="noarch" license="Artistic-2.0" depends="perl" diff --git a/system/perl-test-nowarnings/APKBUILD b/system/perl-test-nowarnings/APKBUILD index 42adbdfb4..f8ab7e3d2 100644 --- a/system/perl-test-nowarnings/APKBUILD +++ b/system/perl-test-nowarnings/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-test-nowarnings pkgver=1.04 pkgrel=2 pkgdesc="Perl module to ensure no warnings occur during testing" -url="http://search.cpan.org/dist/Test-NoWarnings/" +url="https://metacpan.org/release/Test-NoWarnings" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-test-simple" diff --git a/system/perl-test-pod/APKBUILD b/system/perl-test-pod/APKBUILD index a2ce5e98b..639ccdbd3 100644 --- a/system/perl-test-pod/APKBUILD +++ b/system/perl-test-pod/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=perl-test-pod _pkgreal=Test-Pod -pkgver=1.51 -pkgrel=2 +pkgver=1.52 +pkgrel=0 pkgdesc="Check for POD errors in files" -url="http://search.cpan.org/dist/Test-Pod/" +url="https://metacpan.org/release/Test-Pod" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" cpandepends="" @@ -41,4 +41,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="bf4e8b2a71a79a5edec86991c7cbbcc929fa4f2eb403b411cd678fbdf89fe30c198e00a29db80ca9c98fe6655167c0a77e7f166f073a18711db3b1f3e5cd3c15 Test-Pod-1.51.tar.gz" +sha512sums="9b078488e1da8b907f5f3a46452aa9bfd49db61f1539d076dccebf9a8b476eaf0f539f00badc9c500b1e732a8827331b2286375924986efb990367767eeb8365 Test-Pod-1.52.tar.gz" diff --git a/system/perl-test-requires/APKBUILD b/system/perl-test-requires/APKBUILD index cc9459d38..a849fab33 100644 --- a/system/perl-test-requires/APKBUILD +++ b/system/perl-test-requires/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Requires pkgver=0.10 pkgrel=0 pkgdesc="Checks to see if a Perl module can be loaded" -url="http://search.cpan.org/dist/Test-Requires/" +url="https://metacpan.org/release/Test-Requires" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-test-requiresinternet/APKBUILD b/system/perl-test-requiresinternet/APKBUILD index db7b419a5..6a7dea85e 100644 --- a/system/perl-test-requiresinternet/APKBUILD +++ b/system/perl-test-requiresinternet/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-RequiresInternet pkgver=0.05 pkgrel=1 pkgdesc="Easily test network connectivity" -url="http://search.cpan.org/dist/Test-RequiresInternet/" +url="https://metacpan.org/release/Test-RequiresInternet" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" makedepends="perl-dev" diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index f47194d67..078869136 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple -pkgver=1.302136 +pkgver=1.302140 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" -url="http://search.cpan.org/dist/Test-Simple/" +url="https://metacpan.org/release/Test-Simple" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" provides="perl-test-tester" @@ -47,4 +47,4 @@ doc() { replaces="perl-doc" } -sha512sums="80bc252a7d796ba6f43c61b50ea47ed12f391995d80a254a565627dc3d3728a4d8fa5395ca657c29630e19b3f22518c1c50774ce4e52abc52797c0adfdeac9aa Test-Simple-1.302136.tar.gz" +sha512sums="fb823470165e321f68bf761cb9fd31d9e2b3efb42a7ac25602f4a33624e3b8287f6210d502c6afe7723b5ad50c4b1fed2a1db166f151f9b9155d2bca4600766f Test-Simple-1.302140.tar.gz" diff --git a/system/perl-test-warn/APKBUILD b/system/perl-test-warn/APKBUILD index 0be6991fb..0ae630515 100644 --- a/system/perl-test-warn/APKBUILD +++ b/system/perl-test-warn/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Warn pkgver=0.36 pkgrel=0 pkgdesc="Perl extension to test methods for warnings" -url="http://search.cpan.org/dist/Test-Warn/" +url="https://metacpan.org/release/Test-Warn" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-sub-uplevel" diff --git a/system/perl-test-without-module/APKBUILD b/system/perl-test-without-module/APKBUILD index 48eb1162f..ce250cbbe 100644 --- a/system/perl-test-without-module/APKBUILD +++ b/system/perl-test-without-module/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Without-Module pkgver=0.20 pkgrel=0 pkgdesc="Test fallback behaviour in absence of Perl modules" -url="https://metacpan.org/pod/Test::Without::Module" +url="https://metacpan.org/release/Test-Without-Module" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" makedepends="perl-dev" diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD index fb93a3117..957139162 100644 --- a/system/perl-try-tiny/APKBUILD +++ b/system/perl-try-tiny/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Try-Tiny pkgver=0.30 pkgrel=0 pkgdesc="Minimal Perl try/catch with proper environment preservation" -url="http://search.cpan.org/dist/Try-Tiny/" +url="https://metacpan.org/release/Try-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD index 6624a4621..5909ad364 100644 --- a/system/perl-uri/APKBUILD +++ b/system/perl-uri/APKBUILD @@ -4,13 +4,12 @@ pkgname=perl-uri pkgver=1.74 pkgrel=0 pkgdesc="Perl library for URI manipulation" -url="https://metacpan.org/pod/URI" +url="https://metacpan.org/release/URI" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl" makedepends="$depends" checkdepends="perl-test-needs" -install="" subpackages="$pkgname-doc" provides="perl-uri-escape" source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-$pkgver.tar.gz" diff --git a/system/perl-www-robotrules/APKBUILD b/system/perl-www-robotrules/APKBUILD index f2add4a41..dba5d1b34 100644 --- a/system/perl-www-robotrules/APKBUILD +++ b/system/perl-www-robotrules/APKBUILD @@ -4,12 +4,11 @@ pkgname=perl-www-robotrules pkgver=6.02 pkgrel=2 pkgdesc="Perl module for parsing /robots.txt files on HTTP servers" -url="http://search.cpan.org/dist/WWW-RobotRules/" +url="https://metacpan.org/release/WWW-RobotRules" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-uri" makedepends="perl-dev" -install="" replaces="perl-libwww" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz" diff --git a/system/perl-yaml-syck/APKBUILD b/system/perl-yaml-syck/APKBUILD index e912ec396..c2eeac2f2 100644 --- a/system/perl-yaml-syck/APKBUILD +++ b/system/perl-yaml-syck/APKBUILD @@ -6,15 +6,11 @@ _pkgreal=YAML-Syck pkgver=1.30 pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" -url="http://search.cpan.org/dist/YAML-Syck/" +url="https://metacpan.org/release/YAML-Syck" arch="all" license="MIT" -cpandepends="" -cpanmakedepends="" -cpancheckdepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -checkdepends="$cpancheckdepends" +depends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/system/perl-yaml-tiny/APKBUILD b/system/perl-yaml-tiny/APKBUILD index db3151174..466fcbe98 100644 --- a/system/perl-yaml-tiny/APKBUILD +++ b/system/perl-yaml-tiny/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=YAML-Tiny pkgver=1.73 pkgrel=1 pkgdesc="YAML manipulation library for Perl" -url="http://search.cpan.org/dist/YAML-Tiny/" +url="https://metacpan.org/release/YAML-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/sqlite/APKBUILD b/system/sqlite/APKBUILD index 54e79ccc4..77eac113e 100644 --- a/system/sqlite/APKBUILD +++ b/system/sqlite/APKBUILD @@ -17,7 +17,7 @@ esac [ $_d -lt 10 ] && _d=0$_d _ver=${_a}${_b}${_c}${_d} -pkgrel=1 +pkgrel=2 pkgdesc="C library that implements an SQL database engine" url="https://sqlite.org/" arch="all" @@ -29,6 +29,7 @@ source="http://www.sqlite.org/2018/$pkgname-autoconf-$_ver.tar.gz subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" _amalgamation="-DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS3 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_COLUMN_METADATA \ diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 7ac11deaf..4c0e5bd0f 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=4.23 +pkgver=4.24 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -59,7 +59,7 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="f7694c18a32fcdcfee8f54f866ff8102b6b1797c89d97daf91e62d8c8f642b937ffcbb5ee4c027b1eb3163125e2b65ab063e856657aff056c70b0dbfc46f0aea strace-4.23.tar.gz +sha512sums="14d5bb8722a3aeb9d1173e6ee040fbad6fd8a66182fd417f5ec699afcd3fc2f03a636a45a529ed1400881db5e766acdd37fd0f3d07da6e651a15abbc5c394c28 strace-4.24.tar.gz 273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch 44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 0d8ac292c..3e3fdc7b5 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -11,7 +11,7 @@ else fi pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" -url="http://www.sudo.ws/sudo/" +url="https://www.sudo.ws/sudo/" arch="all" options="suid" license="ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause AND Zlib" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 0bad1ac68..a9b40bf35 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.0204 -pkgrel=2 +pkgver=8.1.0346 +pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" arch="all" @@ -80,5 +80,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="e2629dc44a9cf6c73b589508c35a7f068fb22ae9f0802dbe7b6efa2b104598e1c1a9c0a8abacc256fee9f72b64a68ab984c443f27c57c8129c2754d49e099587 vim-8.1.0204.tar.gz +sha512sums="ce27d6d9215e80d84661aec4062f4730e4ed95cfbcedfdd46e73b5a5a1599ea709664c967c5e17ad3515341f79b59fb5c3ddc851cc84cd5717c0e68c6c82961c vim-8.1.0346.tar.gz 3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc" diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD index 5499c5e51..323ac3b40 100644 --- a/system/yaml/APKBUILD +++ b/system/yaml/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yaml -pkgver=0.1.7 +pkgver=0.2.1 pkgrel=0 pkgdesc="YAML 1.1 parser and emitter written in C" -url="http://pyyaml.org/wiki/LibYAML" +url="https://pyyaml.org/wiki/LibYAML" arch="all" license="MIT" depends="" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975 yaml-0.1.7.tar.gz" +sha512sums="97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 yaml-0.2.1.tar.gz" diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index a1b503f1f..c9d32132a 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cc93dc25faa9d4dcb107b0b75fb3c1b0cc0a36a90cc06d281396b22f4353f3e7b665bcda07a97ce74341676ead88e88e3935667291fc39202d0afddfe27e2284 akonadi-contacts-18.08.0.tar.xz" +sha512sums="d27e2acafc5b1395f670683730d6dba59481807dca8c773fcf5ab3de70982b5eff1bd3802a38853bda60331466ecc7aac77eb916effad1e871b24b456533517a akonadi-contacts-18.08.1.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index f635821a9..8f0c83a06 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="323bce4d2529ee458ee967f5c3173173b88683205e66bec2b8e795783a5e7ee5fb4b185732876d34eba660b66035d9b1f8cdc4589abc0a8e1f570eec17ffb0d0 akonadi-mime-18.08.0.tar.xz" +sha512sums="67abb50167b2c8e98126346bcacbd55943d2b199603853125578154c39a390cd6cb8be169e4acb356669730a86a65c2e3fb7d7610d466c2b1dce7f689b39fec1 akonadi-mime-18.08.1.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index f436e936c..c9532814c 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -49,5 +49,5 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="1b7252d75b8fac82f89ccb53a8dfff26e856baf461dded97b673e7c0d52ce8864c25c2910c94e965bf401f79becd64fce688212130adb47c559a366f8d5a166b akonadi-18.08.0.tar.xz +sha512sums="50d5711e2b78ed512efa771c4852885c5464dc7cea3563cabd79bcbff7847906f300c453f863b1f1b6d3d3508a060eb2a69e3e94f75d2079eca66a0ff15c581c akonadi-18.08.1.tar.xz b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index 908b7105c..0555f6dcb 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3c8ca18e1872f7d5b3e8b79f880c9b30157e2bbbf1c74a975fbd8ac2820f710f6aa82768c08038b04f6ffba623c9097725f47541a96928cfe66e003c8ed992f analitza-18.08.0.tar.xz" +sha512sums="b04415ad46919a6c5e53a86218597d25648092058f8029947bf09cb9f0bd174314b76951d998bedf0ecc6e543ead91e14ec752c4a673c567a02ae7badc1450fc analitza-18.08.1.tar.xz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index ff19c38dd..cd9c11879 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="405052d2d8a86b91b67b94b59c8f69df0091308acca1fe316695c4ce3dfc49272226b873baee2fc1dac2e5fd60ec1a1d2acf706dcfd60e43ac40e39e60e64992 ark-18.08.0.tar.xz" +sha512sums="b4daf4f438a084df452063556a1754856a56a9a97db2c8379775d9803bc262447f7fed983c4a04e046f2a5e673ae43e4f3a902854912f79da14b9080c9970eaf ark-18.08.1.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index a26b36c1b..21e2974fc 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="70b36651c56ab682f49e11ba91fc08d8596e08c2574567b313b20f01fcdcdc3be364fe2c453bd11db12485a54bdd3980bd76d7c1659f406a2f51742c7eff56c0 artikulate-18.08.0.tar.xz" +sha512sums="1f81e5ff112d0424550a7af09fc5bbbb4bc2eb926b7fc791493c34c2fa82f1e27e51d92467eed186ba4bcfa3e0f0bf65ad93b0c4c061067052eaa04a5c0bcc29 artikulate-18.08.1.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index c024b4e31..e66239fc5 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e56a0236793d6028160cca56bf799f6042095e16853a9413795f1f123e7c09114b1bf688ea4534712f5db13554d91d7f5c1c991b8fc379efe9977bc453ae4f6 attica-5.48.0.tar.xz" +sha512sums="026fcb7d5de01840dfaa8f28f007cd1fba142af0e1b471b5c4f5ef479e4d5b169108703ddf30998ba3e33c054bd8a833ee3f8bc4ebac25fafdba196f93166b07 attica-5.50.0.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 407888b3e..50cc78724 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -56,5 +56,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ceebe025cb922836254831947005ed5b294e232395252054f316d7cc796bebf09ebdc2d8980c71b8959f9f7f89bd1f9f16418c67328b0224afd3bc1367ee3cd0 baloo-5.48.0.tar.xz +sha512sums="e516ef4361ed24ec4f524bb46e1fd6e62edf2d497a56538c920d07090fe295ca8dd2fb5661a99879cdd47ee2c3037c727026838681525a6f3596ba70669b901d baloo-5.50.0.tar.xz 5622f1eb7a692c0ebd5d904b421612292375d3ea3f4ffdc4624fa8e2dc4a5fe56e5636f11a388224642be03c8fc28a678cffb9b167eb3de48ff4ae2979e6435e initialise-variable.patch" diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 7272fd226..ebc355658 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="19bc27d3e430d017c32ad8556c9c9abd6339fbb25e431b6ec96fd4a22b51ae62141e1a36a03beea8e93d7c8d1978a56b48d97ad6ef1d13044db39472dacb3e36 blinken-18.08.0.tar.xz" +sha512sums="d5bc40e2a2aa9f0d0d350d6aef57456bebb5e91e9f1f512b90eba720bd4d4a58762a3e04378296b06374125c93820f201752939d4ca75cf81cffb023fa8591a7 blinken-18.08.1.tar.xz" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index f344724dd..a31ebc6a5 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="610d2c316bb2536b157cfcc7620a835f71111fe0458db333a43ba3d6f9c09558b2f0055ba4f6ec5d3530a5c4966c108da5b454850692b57f21320ff5497aa8ca bomber-18.08.0.tar.xz" +sha512sums="17d09475097ed84a36da0eb769f1b77e2248ab253c4ce774e73b97146a08fbf7864e088af4e63cbafbdb3dd3aba5bb197af9451f9e767643faa5fe35d5cdd22f bomber-18.08.1.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 610de9d26..5d2346ded 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93e683d954f7eb61114a7bc777047927b3ec220d4392d53e9c0601d86955dd0a69914a345338b5d8087b5643de35983e373eda856f0850854ec0764b303c2a93 bovo-18.08.0.tar.xz" +sha512sums="fbd38aa34144aa2a7417b751cdc2b9c95aa8ddd1714b5d83e3fac0282f27d99dca32fcbafe493d5e8571268ebcb74142755fdaa56246fbe87eaadfbaa469d1d3 bovo-18.08.1.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 835b2d1ad..10cd74567 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -46,4 +46,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="f1095293307080628e43aa452b22e897f22a4ba3b7654f19390ce0cb3ee7a0507eef7a394986c4b8d032fbadd716c79aa77487b44445ca056f4b03b12cd39d83 breeze-icons-5.48.0.tar.xz" +sha512sums="b47061154606f60973a2232393aa36bf76d67936883bba6d55bb303450156cd07710c9436d91523cbcf347886e05975fcbb5cd3d7b6f6a30ae18dc89c2eb377c breeze-icons-5.50.0.tar.xz" diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index 2c1353095..f5d8e5009 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -3,7 +3,7 @@ pkgname=cups pkgver=2.2.8 pkgrel=1 pkgdesc="The CUPS Printing System" -url="http://www.cups.org/" +url="https://www.cups.org/" arch="all" license="GPL-2.0-only AND LGPL-2.0-only" # cupsUTF8ToCharset(CUPS_EUC_JP) of utfdemo.txt: FAIL (UTF-8 to EUC-JP on line 1) diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index 6dd420194..c3f98b3b3 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2f68af2a996edbe532c06770ac246c027ef5539bae3766364cfcd92c5ac3c8eb9996fcb727796c41cab566b779045af0761406fbf531f240115ca8ada5683f9 dolphin-18.08.0.tar.xz" +sha512sums="1ad302f332bbae523db78db5048b910b182ef396a4222da0718d5b280be1adb54eba6abeeaa9facc3ecc49353b91e1aa67bb6f7429446589d6b51d0458a726ae dolphin-18.08.1.tar.xz" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 1ca9cbbfc..8bc3d7880 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e4bd2e09e1fe705f62f567c8157fd596e231bb3198780f2b53ae36941853f2a3ae3ae6813fece218e4b1949cfd7865810841a9e27f6a8f1e899f8d98f8d4543 dragon-18.08.0.tar.xz" +sha512sums="db226628077572d78622fc891cb201cad1983c4940c0f82f20ec4a578a58cc711ec84e6c31d6372ac8e1da14d43e7501f1eb09416f6f0530f6e4addadfeaf309 dragon-18.08.1.tar.xz" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index c8dbf7062..a7a22b7bc 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="52e52ef6b35f4ae34b7ef35270a05c1fec856b253007376e3c7707fd98ecdd228b1b305ecdff1863a735780bea27a5aa14dfb32f0fca4992f7f4edcff359f47b extra-cmake-modules-5.48.0.tar.xz +sha512sums="0e56b1137a9cd8ff6a25b7790986713fb2358d8ffa1a175ca87054790440e528a37f56e2785190b40a469fd4d32bc731d4d24f55d6557515c8edb311abf3a56c extra-cmake-modules-5.50.0.tar.xz 0af703a9d4696080bc52032d1d341e86fd142bef91f3c1afa9cf180e1cf2ff3bba2ea47fd36b8f52135f056a202c58a08e7c7525f671d6993839865ce6aef0f6 posix.patch" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index 5a557d0ee..afe43f57c 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="81029ec6e5536c12566cd36a344747461588de08ef45388ad67b57a8b6ac8a461bfc7f7cbaa162e1369763a0f89b57787f69a68b997285ec2c2d17027d9c1adf frameworkintegration-5.48.0.tar.xz" +sha512sums="e4efed63fc3fade085e68dd3dcef7c61d68a4fa2945ad4289c96acb1ce369a2fb763242a7d1ee205314560c5f6383018bceb0f7771da7fd2979cc375af22d61f frameworkintegration-5.50.0.tar.xz" diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index c90663bc4..e857bc2c5 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.00.89 +pkgver=1.00.97 pkgrel=0 pkgdesc="Tabular Datastream Library" url="http://www.freetds.org/" @@ -40,5 +40,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="44d9257cf3b2e80f192c3ff7f7356d06b1995ccfc738273e2474ecb154fb4cd7502cc37f7894cc4ec91ef9871c41e718dd12b612bbe2d6d2d80b9024279ac3eb freetds-1.00.89.tar.gz +sha512sums="4e185f96e77735675cf5a3d49d85da27f6813a34cd82fdc6ac534dd67d2d5f624855c5c1dc0d60dcd022bcd1a226fe19148bfca09ff83a322ebd24a70d064cb2 freetds-1.00.97.tar.gz d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD index 08c89d29a..96cb7d5ff 100644 --- a/user/gc/APKBUILD +++ b/user/gc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gc -pkgver=7.6.6 +pkgver=7.6.8 pkgrel=0 pkgdesc="A garbage collector for C and C++" url="http://hboehm.info/gc/" @@ -48,5 +48,5 @@ libgccpp() { mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ } -sha512sums="85be341132fa460fcad7ca323cf1c594f37e19430269d639ca796b9e3502b0d496822cdccb2b7ca77859f3d19a43165b963142b60fce6b1271ed9a3cccb6620b gc-7.6.6.tar.gz +sha512sums="525e84e3de0575a76dc994f746fb60f829c850442b6e4dbec5482000a478bb63b9e8d5ac6ddf677a341312207e228eb64442fd7b177223b86efbb9cef3e74aec gc-7.6.8.tar.gz 6439505931f0d023bf27d6ce0af90d09dc23bb9dd49b561566ec54b2cddc20642be9bd7b41203f643cb6efed3db2f54aef410b436f3acc2351fe4bb0a8791ea4 fix-boehm-gc.patch" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index cee333160..862e0a22e 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7c2bf3574e45673e001cd3e77ac29be3b416e7a5e1cb752af4aaf94efe19150925b79210f917a8a8a8b5299f9e8d127d96bf1480ec5a0de18c4925f85c357174 granatier-18.08.0.tar.xz" +sha512sums="94375800f3817158a81de3caf290cd6f0fedca920f42e65f10b573ba1f590ff16870219aafba95233f6862b434b0472e74699dca40b6486134840cf84d1555c6 granatier-18.08.1.tar.xz" diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index ef995b168..3e7d8cca0 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.14.1 +pkgver=1.14.2 pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" license="GPL LGPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -depends= +depends="" replaces="gst-plugins-base1" makedepends=" alsa-lib-dev @@ -66,4 +66,4 @@ doc() { replaces="${pkgname}1-doc" } -sha512sums="bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e gst-plugins-base-1.14.1.tar.xz" +sha512sums="35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f gst-plugins-base-1.14.2.tar.xz" diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index 7b8ff566a..c60def265 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.14.1 +pkgver=1.14.2 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" @@ -47,4 +47,4 @@ doc() { default_doc replaces="${pkgname}1-doc" } -sha512sums="9cf16d79774293dd7fa10c08f6628b83f4e77f0386bebbfd47ded0498e4abd48eee1aee164af53d59fbea2d395e42eb5a12ef4b8f631bc4fd5d4f69545191f9b gstreamer-1.14.1.tar.xz" +sha512sums="270dba318d15b54fff6e09d09d77dea13be55bbf82a5bb510efb43f954e234230505366cc6f19f5431e2dd24f5a7734daf5a89d9bd94de8302ed722df0e1eb84 gstreamer-1.14.2.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 91e8e1d45..020b5a3b6 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.0204 +pkgver=8.1.0346 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="e2629dc44a9cf6c73b589508c35a7f068fb22ae9f0802dbe7b6efa2b104598e1c1a9c0a8abacc256fee9f72b64a68ab984c443f27c57c8129c2754d49e099587 vim-8.1.0204.tar.gz" +sha512sums="ce27d6d9215e80d84661aec4062f4730e4ed95cfbcedfdd46e73b5a5a1599ea709664c967c5e17ad3515341f79b59fb5c3ddc851cc84cd5717c0e68c6c82961c vim-8.1.0346.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 86ba88567..daf6e20ec 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1c3f26d4b95c3d09074a8658909a1c70a4efe29a416ea3bed321efe555b8eebc2b8a8358090417864024fd11f293b1f0a0b83a6214aae8ce7620ea931978a7a gwenview-18.08.0.tar.xz" +sha512sums="6fb57a1c872198fd8c7afdfc1df49be7b01a086d2e890479ded3ac0e0fe48748055c30e2678a9e7ad0141c5b7435db01aa03f8d4f11193a65eff42960474a732 gwenview-18.08.1.tar.xz" diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index f18681cae..87f8ac126 100644 --- a/user/irssi/APKBUILD +++ b/user/irssi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=irssi pkgver=1.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Text-based IRC client" url="https://irssi.org" arch="all" @@ -22,7 +22,8 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --enable-true-color \ - --with-perl=module + --with-perl=module \ + --with-perl-lib=vendor make } diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 64ceee132..599845de4 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=3.79 +pkgver=4.1 pkgrel=0 pkgdesc="Lists of country, language, and currency names" url=" " @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="286d4f328142cdc7ace409d2aaa811e3732df49d78b1875ce71f76f1bb683ce0c4d3f9d2bba752bf6cd25ee8f4c53bdc84568e2eaf85f49650452df19800b345 iso-codes-3.79.tar.xz" +sha512sums="cf02be0cfc43a1fb28334ccae552cac9a7dee70ca3969b6263eca4bd7fee8ddcc437bd23d290643ba2cd7e99b207661d7330daaf452dc59cde36fdd5919b5616 iso-codes-4.1.tar.xz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 7e5623e85..a0430d44a 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="feff2ee1b2c15872623ab831983aac0e5ad03343f6d64b6db603b64a91fc27e020e16837ecc602c86aa276bd52ed090911d500ca2a4ec3581063528d615a162d juk-18.08.0.tar.xz" +sha512sums="4b5cffc92545242543b5184d0b3ddf0858ff8ddfe49e7ca65ee95e02a7a3add3395f0f084cbea44a0493c0535a8ea70b98ab5326d621ccb849501ffa3ee01a18 juk-18.08.1.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 5a2d1b072..a458d957d 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3e0d69135ffcc49c71dd9f18e69ff2dd03d49b42284cec1c2dd2bae0e88c17fa60bb46dca049eb438ec573436f4c4034599d444d66ef94454b45ecf38a09a18 kactivities-stats-5.48.0.tar.xz" +sha512sums="0a8e76797333ac0ca29bd734c4c6acb4d2dc07deac0ebe7cfb5e32a2a61ea9537fc9b011dc6aad5c7ad70a6e3cf853d6ce847c612d56559a715b8c8a1378d714 kactivities-stats-5.50.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index 6a525999c..399d8dc61 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0009b382c71d606aff567374465b93fa0fba95b47310b2b538b547fb4af791a44af683c9d4e9662c3bec99a8fb9e7e435156c97fa17d940ae05ef5bbb36da8a kactivities-5.48.0.tar.xz" +sha512sums="dde9466f632768664114b791aaea1315dc7535545b66cd874109b83896d29fcb692f9598adefd601687540de5f960d5e238cce4110d484b71b1cc9021fa984c4 kactivities-5.50.0.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index c374c07af..12fe2048a 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99fdcb2e2ee06d4b2971d95e24aa5d65dd652a3feb8d8d13015cd28375337b44fb27b9ce66e9368e63347e0f5eb61cd3d4a1e9ebb7f93b5f624138bf47efe422 kalgebra-18.08.0.tar.xz" +sha512sums="ecad3a4b56cca0e017d4a168863a03b464955633b36ba76286ff825ddd6779816d9f5e9d4100fedf8b7d079cd7e75c5e37528eda2ca7715f0f1e2a4026d7614f kalgebra-18.08.1.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 5131db9d3..37fe3cc57 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ef95bdeefac2f34ff92a66c072bba46c80fd84f879e53fc9380c37ad611e49be8f8b12f1cfc773ceeedda8300f02a232174c5cd8fc3256bb947fc33d40c548b0 kalzium-18.08.0.tar.xz" +sha512sums="9d7caa714c3f8b345852539559d143009df7a334a4298fe2ef0d191277d55d8912c2487436cb815bb6e79eb3ac093f943002e09c0e25eb7644ef5d0904b57901 kalzium-18.08.1.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index b95019b1e..faaa5ef64 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d6e9297cc1466205d594defd4f12c5bed223be7a0400fa1bb2a97f654292626d499d19946509c2d8c5ff2ca9ecfadf7e9548228d575d34b1562df05d0e4db01b kanagram-18.08.0.tar.xz" +sha512sums="6595fff9c3ebf8a795e9e57ce74f53b00cc3b15a0d0a1ceb823a969c211ade9348bdecaea7ccd65f504449057c859cdce57c43f580950afbbd84cccef4d614c1 kanagram-18.08.1.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 4373d52ec..884546ee4 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2410a5d6c35010f77216bffce8827595416b0bdedd08c07d10b57e0d185c269216c1245c7a4b73d1d5ad60c16c3387068d78d94b1c3f0b106aa409b93c5f2ce0 kapman-18.08.0.tar.xz" +sha512sums="bfd3772f86d3a5d3b00aae9a6e5ba423d50ad86765a6bcd7bc7192740c7e341daf869156e65829cd9231c10139d93f5fb357174bdd792a2cce66ba3853e9439f kapman-18.08.1.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index fee9c5893..b39098951 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c48654c6946a2678d3bfdb8826df341124a81074940d2e7d9b939a83157b9e482241a21923fc9dd768d89933345350a6ec777ba30a785430b593ac14cb8fb5b5 karchive-5.48.0.tar.xz" +sha512sums="8042ef931c8d2c6eeb84f6ea33858fb111f7e08bbc012b333eed33c278eff9269ae263b50110201fb448d5e213598a2afebf542e7d0f6c3fdcdc944ed2ddfaba karchive-5.50.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index c4e4b60a3..dd8e29ea2 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -92,4 +92,4 @@ kwrite_lang() { done } -sha512sums="e288a69dd3823962632cec5829f3d118e44acc6179d2b709fc251b9de1ab31ff2cc51a25d87eecf93e51a665b8f5aed336077d551076a67bdc4232107809ce51 kate-18.08.0.tar.xz" +sha512sums="cd76272aa540aac13da8fd078ee0d5b020645c51fd16ed341e91383570d3e30d0005bdd7702c2b145538df7252443bee8c927281f93a8473b42166bf964a1b41 kate-18.08.1.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index b7faa2edc..37ead7ff1 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8141acea4d9b9e2862719c996f02a8c8964a04399b4f3b490799f72b5b5a7b17ec947a748874a64bf11e1a31b3cc09eda92a8f8d6c8450479d4631094700990b katomic-18.08.0.tar.xz" +sha512sums="669e9b77689853270983e290df6a8ae8690544e589b11d14125a4696c12f34d4197d364d0c03d45407d6a1e69af1a1fbea94e61f16e6b6c9933131df751de32d katomic-18.08.1.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index 3881ebc7a..84fce7ccc 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34023dc452ebc0297c2a866b848109d4e34dcd4afccc541e76d98f07b2817b9928bc4ab100eded4f326aa6fa18f6c76cef6723fcd09cd8b56649b7175c1812bb kauth-5.48.0.tar.xz" +sha512sums="c31614178529262188ae83815b88cbe4553480e81b9d98ddab0bd6dd1656504930b8df211ab12c3b1510dd616cc0b681697eaf214b426b347b4377311f6d0c00 kauth-5.50.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 34ee8f044..162169663 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7a08cecd11a9cc4fc7ad285d90c111d1f983faeacc2488d53826e717bc2fa560ee958da2c21466dad57c966f53b69834b6378ef68f6f6a597ccacc32b8796a1e kblackbox-18.08.0.tar.xz" +sha512sums="ca9092b71a45dddde78da793d6ba4981ba86f909df4aae1a4db8a3517ea433ae2a48046de36d50d921209ded6680ff03a42270723ea8ddf3fdd19c51797824f2 kblackbox-18.08.1.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index c8b881ff7..8ffa597e5 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="660200bdcdf6c1e0da026df6fd8ad772fd40a1a53d73d9441e948cac1ab58369e6f7111ed836ce8d76dbba41e649ef3219aacb57e5573a856dd692f93c11f68f kblocks-18.08.0.tar.xz" +sha512sums="1c30f91d854de088cbd1fd3b68604d1778e26284fa06f693af599934a9308f0903185369a712143d3f1b3d799a720f54e622caf8af07c08e790d1544157fd6d9 kblocks-18.08.1.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index e74ad4939..74714a704 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="635f05a1cf0a49e27ad77382ffa4dd3778eb63e3dd9c37c7c96230456d26bd55c1f36d1d0e2b5d1219858872443ac7b61db2dd63e9985dc28942d410c4ce22e9 kbookmarks-5.48.0.tar.xz" +sha512sums="03340e18b6c4774e4aa16af9bdadccf102fdda9caae930e92f9afed833ec3f70eae818b9dd5f51c071b52019d7b7566195d2d552cc725af575548a75d7e7575a kbookmarks-5.50.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index fc9e71628..ee8ede952 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a7f459e67bf4c70ac97e82810848b66b603cf1e5a9c864388ae1e8b820815bf1a84ab66948d99c38408e97967f907461a17a5067a57495d07037f5c78e2cab3b kbounce-18.08.0.tar.xz" +sha512sums="f7c97c133f69a8a8db2cff91eba30d9aad3c4e340145b7e57db9fbe8a85c429896936fd258622158f283cb36b3d670bbd52056b9a249f6db79a27abf83cd293a kbounce-18.08.1.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index b51153536..b72d8629c 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aac831053583ebcc384e5ab9943df1f81dcd4a44de362eeab745172a7a0ced68e630f7d69110f786d65a71b85234b8eb35bb50b830c8183b59abcad34f62bbf1 kbreakout-18.08.0.tar.xz" +sha512sums="0a069711dcaf47cdeb91ac07b714bf2fa3400877656a94188e72e25131f4c44462f27cebb0860304b6ab29aaaeba909bde931547c7b431cb95ef4cfd33a559b6 kbreakout-18.08.1.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index c3237cc6f..83704799f 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eeca73a52ee2977f6d0e8bad3a207845be13896cfcc4f4ddccf7401531f7d7449a66eb276e07cd916091f985425e6af3a480ba3ef39102ba8c0b60d7ed7d36e8 kbruch-18.08.0.tar.xz" +sha512sums="8b2ef8a7137a2fa92fe76c3c653f11f641b963e051c6a6d772b9b6285e9d7e6060f6004e80fb5d460471f67db859650cbc2c959ff6db90114b4d82360cee9d8d kbruch-18.08.1.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 421ca9999..7b5b9efd4 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="80484968995fc7df6e2a2e41c52608e6be38cdb196eb09259e50d4d31270d5f131b737decc745fb634c856f580e76b7e56391469f3af7601e913479f9351eedd kcalc-18.08.0.tar.xz" +sha512sums="5d738132b06c9a866a6001007afa7c90d7df7ffade11464ff7378beb656cdc826d7b79e174c1f942f7b9e61edc32348b313dbd4e824dd34de1858b3363540f6f kcalc-18.08.1.tar.xz" diff --git a/user/kcalcore/APKBUILD b/user/kcalcore/APKBUILD index 4eb6fdf5a..a248e8c50 100644 --- a/user/kcalcore/APKBUILD +++ b/user/kcalcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalcore -pkgver=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -33,7 +33,7 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(RecursOn-RFC2445_RRULETest39.ics|Compat-Mozilla|Compat-Evolution|Compat-libical3)' + TZ=UTC CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'Compat-libical3' } package() { @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="08ee305f9607ac66a1887651817fe7b48f47692c18486771b1f3dd01293dfba92bed7ad2e7b2694b4d556b8808e14fb69b33203bc1c2846df5784ce05067422a kcalcore-18.08.0.tar.xz" +sha512sums="3573b9b5314085855c7a06c87423474d5e83a3ef4b7200fab2532345774a8984c927940c3e5e26b3c1123cf1e8c944c480ea510b3577da8d7820acfa691915c8 kcalcore-18.08.1.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 0d185475a..614037e92 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34b44ef59be4857e96619564189a87d3e5ab3873cdba71885a08d42165cd6f82a5a76d619a2fe520d529d19198a8153f8d635f4db1117669e56e2605bb6887fd kcharselect-18.08.0.tar.xz" +sha512sums="5b6c5b384747461434f37f870fab85d7cccc33e11505b1b2cf80391378ce9eff051f468875e2a1c3453c2cc5e8ee85b1c622523f1db95f59ce490fe57ec91ffb kcharselect-18.08.1.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index 9ead39272..e7cf772aa 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4b9dca72c705b2395dc16f205c7e215e76fa7bcf205b8081ee94f40f4ae1fe6abfd14cf94989df1898b664160f67458f532f194a847c0ecdc9cf2b39223dc86c kcmutils-5.48.0.tar.xz" +sha512sums="306c7c76c08d1ddfdec6ec0dae8367c531f174f3c1ccece3ea0d32d8650a1106be3c10741bd97d2ddff4d81f05c720e8b98d43b290bdd787a0b1269dd6d71bbb kcmutils-5.50.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index 0ac5bea78..36ad184d1 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc48ca509a397721aeef9af174b073a17895758fb595370ce6103640f53c20ddb9d375bbd81d7417a65342247c5a0cf4e52a9457d027dbe7e85431095cee739b kcodecs-5.48.0.tar.xz" +sha512sums="94b8027989f317ae0f4e4563c670c8c91534ae353ca5d8e00d742c6e285d99043fd1cf0197f08408f8f66e64ab7a3c8f21055364ac8e152130c04a21c7d1f221 kcodecs-5.50.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 830ef4c95..66dbf928d 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7760f1adc836ac0c73c7438de1883f6b13ba2a7c271a9255b3d3d5731735f17faa48304676ad2823937f43e29ab5f658abcda91b3d597b1efb1737dd8c0da9aa kcolorchooser-18.08.0.tar.xz" +sha512sums="a2a514297dc9930d96f23f153f11b0b0a87d0bae1ecf41940665b89c2bfd3ea6c30bfdb622c47cf108e92f21bf7ac7f428f4c9414b72863b76955f18acb0f7bf kcolorchooser-18.08.1.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index 3c2d61d9d..820273f90 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efd00a2ec90acc14bd717a1fca375da9741386e346aebb47eb41d65552675d2a7834763d5362190c0c8b8918b0e9a1eea25c37f72b2bc7c3734aa1e28ae44a99 kcompletion-5.48.0.tar.xz" +sha512sums="27db7af56d4cafada863ae8f30a87c4d1974717ee2b3f537b235a6f1353c3976932c27308b4f9fe1a6386b0d395c22ffefb2f4c273a496a0785a34a494451c4c kcompletion-5.50.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index e5dbc3623..e1cb1880e 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c1d11fae67114976937d9f30aa3fb8ad3d53e756b792c1b4dcf89f660b77d8150310a06b2e1365bb7f78f46ef6a37280d20657ca8f460d6fc088c9f75efd8ca4 kconfig-5.48.0.tar.xz" +sha512sums="282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746 kconfig-5.50.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index 59bb9b1d3..0a3db8409 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ac9575b1ca64d73150f7cd8a24b7aa6d511198c724cf61b90f055fd6eb19aab0172c4480eb4f80ac21b22aa6fbb91657aa0cdd74f4c5bce110c5effa04f4def kconfigwidgets-5.48.0.tar.xz" +sha512sums="7129f42ae1e6c80bde763ae0c44ee7913358243b49b2337d42d4aa580ff4135229c5146105a548bbff0e3234ae9990f09827218a7109d932396da2e5a82f5763 kconfigwidgets-5.50.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 977316ff9..6ea3ca92b 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0ffebcc27266bb8cbd1d28b950a646ae43d034c69c661583558b2aa3b23d21213b21581732d1f99abe4c89c1523af19d181fa47124d9ed8ac8483adff9a2d4b kcontacts-18.08.0.tar.xz" +sha512sums="a28f004bb7c87206a3d063f66fae54c0147a1489bae94e7b5e5b7756f88518ddf86bd425a590483bcde6f339fbba2f76ee44e2138f595b19b1944718537c5fb2 kcontacts-18.08.1.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index fe5d26b59..f8d1988d2 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f828d9e4f011c10479611a6556ff04a6843a0473286188bc0f696a41ded466407d451691ce278f6acc0610a884339dd9caf9432d92e104a0d140493c38256263 kcoreaddons-5.48.0.tar.xz" +sha512sums="3b8f50b2775425363b83048ab78bb7999dcdfa522a4d8d002292cbaf6975747b5159687c2ce4737b17404b999ec2d6894a3acd23873480ae7376e9134f1ea887 kcoreaddons-5.50.0.tar.xz" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 1602deed5..ac76418fd 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3c0abab1e52d51c6f92ff3f5a808a73a82f2ecb7a64d00ec652521c1fe29ad3f4273f34c73c958481e339d7000bd03927d4bb2536e99cbde5e050d26028ca2cb kcrash-5.48.0.tar.xz" +sha512sums="79cec88f7e37901e9758dcc8f69883369dba8db536a563cfa66245038ca46240a5c0c70c4fb4b48c0c1e4b7772ec90d341707add99124b02408fc567a7e64648 kcrash-5.50.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index c5d8d8218..3c92c23b6 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="78b184a0e89dbb04a9f281a64f571476d41bd8104534f5a456df1007bad31fc9211497272c91b9c9875c6eaf6ec7024067c213ef9848441d6b6edd4a6ecaf7dd kdbusaddons-5.48.0.tar.xz" +sha512sums="26176685e8aebcdb1c249de9e95d88ba1faf9e0e2ffe67338237df2cfdf8b1a1fabc79c6febabc4a80a774a2e838085e273640d66fbacdbbaf49e00bcbd6d9dd kdbusaddons-5.50.0.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 9750103db..67b1cf614 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=18.08.0 +pkgver=18.08.1 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 b3846452c..ab5dd711d 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=18.08.0 +pkgver=18.08.1 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 4bae5873a..ec45f7d58 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=18.08.0 +pkgver=18.08.1 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 c1c0c6c35..08d30bbb3 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=18.08.0 +pkgver=18.08.1 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 eb0d76d75..f2267818b 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=18.08.0 +pkgver=18.08.1 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 00e015942..5f53975ec 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=18.08.0 +pkgver=18.08.1 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 2f2c05017..3d72ee926 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab1cad3c84e9b64521a9387ca448abad2606088da215c55944415363a9e1e66ee17b02499dbb516cfc7f0bba7755aaba8f0f1ffc8ccd9cb57d9ac4ce44d4dcf1 kdeclarative-5.48.0.tar.xz" +sha512sums="ebe13f08a292cd3c1cf92cd242433160f1a2e9a5ea329379dab1d3b26d7c2a026261d77b8dc7b4abd1980a1a3d769b021bee6c2730ad2d4910b758c5b0e135dc kdeclarative-5.50.0.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index 76b5b5892..91fb19b38 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a5bcc7e5a1206f6bf36ee43af2f2a25c70a02643bf44e43d50f37a873bfd4e160c2fb6e6df763275955d1e8ee5061bcd4cbcb8397c1e81032c00d1a159e9a42 kded-5.48.0.tar.xz" +sha512sums="f5751df6c7b142038e67ca0cd1d59d5afa0b48268e09cd4e691750603258484ae264821cbc400cd4db348083377325d2213ac515aaa6c1aca7bf8a5843a5fc50 kded-5.50.0.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index b0014c6dc..b0a51e451 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="76903eb30429cab5130859ac8bfa6e4b79ea0c4b7ada8b990e63c3cb5e35051213752a69df98b17283f2e713eabee469294175aae596d777df3dd3e3d9d3e306 kdelibs4support-5.48.0.tar.xz" +sha512sums="1fa3a9bcd2b0af1cd4ec66d6538bfd25bb33a2a5ba6c74bbc4b6709ee71b681d5fea9672245c8a060dcfa493fcaf590af49c6c34a4ec535499a3db9d7007166a kdelibs4support-5.50.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index d0cd23746..67adf9300 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94a101dc5665b8e130afdd3ee70f23eb48e7df3a259ffc7c636276b48415dabadb4b8999718f6d19e3b52a92af369e59128d3ef91a5ab3267a9a5876f4bfe6a2 kdenlive-18.08.0.tar.xz" +sha512sums="737ebbb877c93a064472c82bda2ab6915833bb49442b9f36f3e3833d395dfa8608c7dff7dcea2816b25f7569025fbe810e8dd3c29ba96ee0c872d25ce9314bc6 kdenlive-18.08.1.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index afcae95b1..7dc9aa5ce 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="12a4c174bb85acbb66574103571aef2af1d2c080ce18ac69c9d05612cc0cb5a2b2106a8e70f0f77addbf951e4bc41115226c6ae17f64f510bc30c56926d41e2e kdesignerplugin-5.48.0.tar.xz" +sha512sums="6e4b58096559a0568da9618a6644440f1cca7f569118ecadaf5b5fdb07d5a28c6845e075c4745e61812365ccf96ec7e1cea0edfa70afaacf2df4b0ef4ee92b08 kdesignerplugin-5.50.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index d64e8fc45..9f0712103 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26ac4fca0408cf72eafb60eb147a3c7b25300cb97fe5889fb149637d91a77211e056550cba5cb1b68262aa2f547a09052c589aa2888662681fd54a1c7a24c2f1 kdesu-5.48.0.tar.xz" +sha512sums="b8104fc48e36db124f735aad13edde0c6cedde33ad20ec0eaff68e5ea1eaa1a664444b30e6a20b5d20f2c75792c94d0f77a06ad1d7852388a7d987da8298d95b kdesu-5.50.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 010807e33..d81c45377 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d2690c22e21ebb1033dc0a768d0a6dca79e49b3c4f06b588233ca6e0f573a8f84cc982e8dc9112d59d929f21ff8a3bb00eee21f79f8c175bfcfd11a511a19005 kdf-18.08.0.tar.xz" +sha512sums="49f91e8d502c624029639ea19ccbd470d6e48da1b5e41e76a95e16ec69a710f448a997916de5496aad01c9039e96374d473c65d410dc2cb31b60d5638a2f913b kdf-18.08.1.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 6fd9b1042..52a6b0df8 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da8e27d6c63e95ebc8fb98303211b4a542e2b4d79c87b463623112162f539171745d337d22d039f572fcc8050bc933a8e766563a749eda7c94533397a443aafb kdiamond-18.08.0.tar.xz" +sha512sums="ebb91009e6dee64e8e7cc8a3188a3386640398fb55d59b93cb37e029626afe71caf0b29d1e7b8fa1b6936140d07567db7843ca5bf7605105bc2240959b8c9e7e kdiamond-18.08.1.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index db08e9681..23f522646 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb0e8bbf418d9e3b32580895850d1973beed24987593fd776a4fc73d6a20c672a29fd032e86514411dfb234c4fbcd3a4593e23503479bc7c207445d2ff16261b kdnssd-5.48.0.tar.xz" +sha512sums="cd49247c02c2cc568d4942e3c08d4bb9b40180a8e096ee978b2d5884e40ba69266ea78b319301cf5106e135f3b648f1adbefd5288fccbf5779dff1e2d1c0d1d4 kdnssd-5.50.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index bd349d9ca..a819c32e0 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -32,7 +32,8 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Requires catalogue files to be already installed + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'kdoctools_install' } package() { @@ -40,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="40b50dfbd2f1590bdfa75dd276e9060d84988608398d0567dad3f798fcaa8782c23974256cf0ef7cb529c5b93bc54107d6219551458b608b576c922e83529729 kdoctools-5.48.0.tar.xz" +sha512sums="cb09a6c0a990b074e66161171e947f18b0036621da075a4f66452fb2a8f5985bee45b371e1e3303cc4afa73d376b89a839ac42e8b479c71911f7f89845422e86 kdoctools-5.50.0.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index c482d5f6a..c4b38c990 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="24889212ca03736caca6ad591237961a53409205b7e03a1599bff6fe7b88f78a1088f857d896e2f60a1432d8b35921487ca710b2091af855d553aa0ac68922c7 kemoticons-5.48.0.tar.xz" +sha512sums="04c132340be0159514cf46b60f2a9f9ce35c6cd35ad64820463d9d8f929fccbb7d4082337c1920b778e35875b222e4caae4d98c4133b4c9ea365b4e69ab79223 kemoticons-5.50.0.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index b57a32e50..3697cbaec 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3738e1184ddf34582aaa0ebcc75dd881bf4fc8e68253ccd597b70db71a093a9ccee6c726f034324521556471a3ae7f73dd4b1c8384922c95272d9c28c5cc8d0 kfilemetadata-5.48.0.tar.xz" +sha512sums="9e6d86da7e50e4dc432fc29af366572cc3504301686a38f8f46d44be0041bcd72fc0c8515906995d8ba4a6fb7217767efb9eb151d2578e1104c5a1cb8db9cc4a kfilemetadata-5.50.0.tar.xz" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 5702256a0..8b00aab74 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d665a487d6eb62d4c97ff6ea0692e1d7db9347d6c989fab487c7d12ff287b77f88d817544679ef45cc8cfd05ddd8bf9dc884c4aabb8f1e57608f4b84b16e60d1 kfind-18.08.0.tar.xz" +sha512sums="53c1a34776a6b5b56363d2f40a29252cc5dd7828c97f40917032132883a4b1f50d1972a241a287f7ef086c1bac137d8628ad08e3c21a879fa444c6d7247731a1 kfind-18.08.1.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index fbdda12d5..1b4562594 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bf5de870e4546bfee82e49889f9e85790e8239ab7d5f857d657ca5be1e78fc43583815a67588b8a2f72c883c8e47ef6dc592ca897781a388eb66ce0675fc49df kfloppy-18.08.0.tar.xz" +sha512sums="e33857c5ff4988a6675461302b53125f54a678f7c4286a8416dc8f569fe1c9d7560567d2884788b912a08cedc66430149747a1d2e5fadd23c3c2c1b8590d586a kfloppy-18.08.1.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 639e072ab..2e19ec8ba 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ba8658f08d79239b47bb854d02c4d50de505cb0803f7fe327435adb659368e5f3bfced377b4ad30b009e049c1a32bf15d283dcaf40264f70f86bbcdea7c9bd28 kfourinline-18.08.0.tar.xz" +sha512sums="b1540e2c3cb1eb3e41dc78836c1341b8afabbf0faa00da596233ecf5768dfffdb6cb20274fb383f8bfe7a35c92eb345873decdf3fe502df374632246f84f4959 kfourinline-18.08.1.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 54974dbfc..46aeab4e8 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84cbbd9228d2458aee56b72814df05a6d05d1e6c1d70a74141c1dc419563b951edc1173fb15f688ea4999bb03337da41883bb2c75be384651b53dc230baa6374 kgeography-18.08.0.tar.xz" +sha512sums="a2f3573cb281f165fc222304c981b4d88eadd0707b227e5e28580c8dc1ad1b8c9490505a17611b0bcb028e36ec68e473b9947eacd7a8a0834b4ea5b9c60b4abb kgeography-18.08.1.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index bde7de026..2ed329914 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="423673df6008146c2aab64cd8ac503ad322fa12c4aa2169699e3c9e1cc81a8e8f1aba3340b5f9c0367c87cd6cf6196fc32f90dfb764f66dad75da9c61a0529c6 kget-18.08.0.tar.xz" +sha512sums="c6fb54e4b91952372aaa038c1e3a6ec6fdb82ff0f320dd1f6059fa41118a8399a9369bfd93e7b1db1123c893174469a1479fc7c000c555709d8d6aa80334502d kget-18.08.1.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 07f092dbc..bd10da079 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c62e1766eae97d658477e0cea100f354be58f176eb8a843699af728ca0ee296ea3a8762107ca5e3290dbb7500d699cd11265f68d5848d765f586eb093db60817 kglobalaccel-5.48.0.tar.xz" +sha512sums="3cb9530c392c5eeb126a56b6efd81a9f6daa072fd860b79362bfb6ae47c9af3f259a0d3258bbe04a7af34fb1c0ad6000c1e70b7f8075e6cbd10444acee9222eb kglobalaccel-5.50.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index 73c3c79a1..eb1879c9c 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f676e8c70b2c68f8c901b2b373b9cff4d55f24e63a4a029eb416e08ac22b22840d4ff9d3c73dcd5e410937c03ad768312e3a5dd13b97f6ccff36d9b66c7408aa kgoldrunner-18.08.0.tar.xz" +sha512sums="d55d67438f2906cd161f3957d50d35ce9ea7578c0381af39825d65de4701d96230400f41e998be3d2eff65f95bbcddbf8af45769fe5280aafa1d77eff9a9d529 kgoldrunner-18.08.1.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index e218a99f9..b713d4a5b 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" arch="all" +options="!check" # Tests require X11 now. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kcodecs-dev @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abdb8356bf4aaf0c2aa54bd0b3c45a71fbbb659f256c826f1ca963cb5055d073db19245dcc3a77eb624251c8918756d4080b981e8da880e6fa45358877eb0d72 kgpg-18.08.0.tar.xz" +sha512sums="339f64bc9be2a644f0c3b4f901c14c19bbe7891996d7a3ba840d9368260e87d75a3860d6bdc78d0ceb2d966f04223a2350a0d86e46b06f7e4a3e665713bafb5e kgpg-18.08.1.tar.xz" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index 3b4b74727..45dcca573 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b0d48ab61da46b703b06d246b1deb5e41a0e80221ae563c0bfaff5b7639133963c35fce5d3503bf0d6748893eeb8442c9c78f85567072130304323dadb3bad25 kguiaddons-5.48.0.tar.xz" +sha512sums="6a7ac22a60a0811aa7f2ce9f2ccb3f16f17e53dcb2352092b10b5d5384251d7e46c575b12549a4733416de88c5bd724670d52d5b96fa47005fb6b8ab847594cd kguiaddons-5.50.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index c434d99b9..038173711 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="41c31a32b4715ff7170d863ab51f642a24539167ccdb15019043b5cfe3d67b568e505b08f22cae05135916fded8402754f7fa37c3d8930b430d89e7d23c35166 khangman-18.08.0.tar.xz" +sha512sums="72603208e513a1e7e47b639892f07c57434eaf15d31d3c793efdd7969f365c150f4f05d40652009c5e84e58d92408aa2373f8b70c854d6e3a762bc90aa44f35f khangman-18.08.1.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index 117752099..b2a4c831d 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e74dae402a2cae2f3d1d0f2b0172fc04405954d327408e761176e41c051bbe98d8ec49f74b4e9df870e68c13cdce20a562b0ea5e4827240bddbe92b63c986cb khelpcenter-18.08.0.tar.xz" +sha512sums="243ebc119a2e6190a645b9bf0a14a47e14f0bd6ff4dd768ef994b344dbbdbd8242501fa01d28f71453bd34002fff1e119505cfa4f6f7c0ea76e363c84e3be25f khelpcenter-18.08.1.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index 2cbab91b9..824b0d0e8 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="70bf5b48e08d5a250205b30e62108944aa01a9df497e653765d3225166239395c9b88ec8a2622309e19b644f256727331723ffa96dc7a1ea55e36568f933536f kholidays-5.48.0.tar.xz" +sha512sums="019c22a2806d73fd726157854a70206c7e91cdfc8ac23a84b5c64cdbdc474fd4a7daaaecf5f0a3636790e85e8ebb86e9e5a9dd1a64a9fbd728c39ae68fe94f9e kholidays-5.50.0.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index bf0408cc7..304a1faee 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66d714d33550539893f4ddad26749251705579c806207e93a029cbe00a561acaab13cb2f3a6e0d9bcf99411300e8cc773f09216e078cbe4f094757fec9be0324 khtml-5.48.0.tar.xz" +sha512sums="b2259a11635ea9a363eb17b73e5112d144f86c6ed258d1c7e7bb3571587a526a852a98c51b503d2dee4c8d3478cd4e3ae28beaab1e4f2e5633709ff5b69508d9 khtml-5.50.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index d8f35f12b..04b434549 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" arch="all" +options="!check" license="LGPL-2.1-only" depends="" depends_dev="qt5-qtbase-dev qt5-qtscript-dev qt5-qtdeclarative-dev" @@ -13,8 +14,7 @@ makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz qt5-qttools-dev" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ki18n-$pkgver.tar.xz - libintl.patch" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ki18n-$pkgver.tar.xz" build() { cd "$builddir" @@ -43,5 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b757ce1d0dd1becbe658f628f4840cf82d5abf97ccad7657305166a5c7928b315269e9641773cb17d7bf02cba043d24f962578038a07f2de10cdffc186452af2 ki18n-5.48.0.tar.xz -b2b74bf07e49e0451b880fadea5d2a1566f69bb7f7751bef97f29a4cb35e08a144bcf5c2dc5f793cb71fdd4504237140af1ab98b4372bf1a89d534f5ec9aeedd libintl.patch" +sha512sums="4d05eda1f5ab6f08a7aa5617c456c646a7037f1b099f60dbaead1fdabb02ad4579306c3774cf86cc45713c14dcc1b3c12013380150de95ed2e4bb40511aa4e9f ki18n-5.50.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 2db479802..8ece5a3cb 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f3f5a8e69e71f4eedd2c39300075ebd3932548271178432abcdf5bfd4df63df8c05649ef0f5fff889a6855faea5680a2bb4cc96e45dc3b44b8b8726bf54e5d0 kiconthemes-5.48.0.tar.xz" +sha512sums="b5fae1e7f8f6881e963ab9afd4d25988f8df98443f3bd526a67e4ca7c390dc4be0be4564e26dfbf6b10c15dcbada70adec60b383463b142dd7f6d2df77b885d9 kiconthemes-5.50.0.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index 285de8da2..a307714f9 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.48.0 +pkgver=5.50.0 pkgrel=1 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ac2b16e5870e7123ef20b5a0f42104657a1d587bb0cac6476ca4f07e80faf367733fa54f0f16cb3348e5f41560deabd948c10552183dc68b9483b76f88f1281 kidletime-5.48.0.tar.xz" +sha512sums="825d7b509c8bca1042b453d600165574c72d684a07159e9eea436e37c720ff2f40c165075d7c9d076689f1f25c75d5e20779e25a29b069ed25339fd83e9baef8 kidletime-5.50.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 0bdf3454f..e5d1f36c7 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url=" https://www.kde.org/applications/education/kig/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2aad655a06f96434e05c64e7170fc905fcf6e7ec513d0d4498e0873ebfb4103bf9b8cff4df92ceca25eb86989e027497ed6e2365a4148fa16ed433f07412754a kig-18.08.0.tar.xz" +sha512sums="db82e76ea91bcb263f5bea85a0dc5fb50d6cfe88c37d1acde1f0ec237a666a05a51effac1fea1a5648377eafe265a430838fdcbda64589641699565572aade5e kig-18.08.1.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index 7fe9c35f4..181fd3d68 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0d6d1c166cbe677a889243742f878fbf04212cd7b8ad17acd30b4ac787d2672d9dcc16cf5ed20f1a0cf934c8099dbfa5308d99189377275e770e24d13ae00e3e kigo-18.08.0.tar.xz" +sha512sums="664b5827f505198cd173020b36ebe45f1721143c0a0ca5867e7ebf576d490f043c09a681cc44403368a88c1f5abf81bc0a4e1c9d1f437740ae7a81f8ec770972 kigo-18.08.1.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 24106c74b..a5d21099a 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8713931418a2b7af212d120d81729b2fb6b5af967baa155139d4a7434b2bc658f06f980ac84b0ce6501748edeb59fab735ffe1d171d5a879b559587ec21cdc96 killbots-18.08.0.tar.xz" +sha512sums="471d20aec8e9e9391c3125f52d34a8e687819838510937180ce51aa5f6ae3bb61b82bf076475a16514a4aec024cac2c52166c25a2c60a16b3327915c3700a45d killbots-18.08.1.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index 4067167ef..29e5d5e0e 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8ccad1a037889a1a32885087da02bc2fe1a5bfbe144517ec8553e0b9b4dae86b61bd54ea27bd9f3e07d745d8e63a44db263d364aa8ca885a7b18f0fde762cd87 kinit-5.48.0.tar.xz" +sha512sums="8b0187f0e7d67b1d6b5d773cd651ae438291ea2a801fb05292811e7b109afee62c4166953b09f6c1c958690c2b9a3c769d005f3ae008513eaf2eac933e1a8a63 kinit-5.50.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index ab2abf465..49dbdadda 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7f20fa9ac75e8543e073ac9ddffeb2d6e668ca391be63e3e51d3d42ecd6756f0eea68fcc64d62f2b45af28802db825b2aee11ea66bcc1531d10b33f8d04af1a1 kio-extras-18.08.0.tar.xz" +sha512sums="152b62c43c81df4b874d68d3504a18891f68b047e74edd2eae37fddcf72302696db9e0c006b037d3ea5a688cf838e69c949fb5a9253dde7c26c8e1ba1cf7f7bf kio-extras-18.08.1.tar.xz" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index e1cd4f1f3..cd27cc371 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a25f5664d3ac993a115dc13597ab758fc24122d02441c20d98d42dd67d5dd9a57e7e5013716de1b3e9d2c523bf45b843fd726a4ce20a3eccd3a25e1e4dba5ad kio-5.48.0.tar.xz +sha512sums="18a6e4b1d2fb71b16aa4b08862fe0abea691c4f60d4fccc316c654455786a705cc94232b5bcffdb6ea39917722f237d0de00e9ea22273c26e7c3a0282148244a kio-5.50.0.tar.xz 280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623 strcpy-ppc.patch" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index fd4a8ea2a..6d0c326d5 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -49,4 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="591b100e3e3646ed04b35ed759a8bc44c7dbc8428e3cdff3f79f963d9d6ef5ae1bed38344a2926dcd205f9a270dcc8673282b74f59ef93236e4bc32f6d274cfc kirigami2-5.48.0.tar.xz" +sha512sums="f43b9c0adf35ece8153334cc4f66c3d6e30f5603f9a29b8b54eb358c14f98124838a19a1073b17cd3e00975963782cfff664d811171a7f58238a49c84c7faec8 kirigami2-5.50.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 581b5f997..2ebc8ae4d 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7a1aa180454de46ae914ae2d75457a2e4d42eccca791ddca6c4c32e2073aff86cc621ac65e490082e51f051a119c2ea0c7408ec44d544ccad7b5130715ef4b8e kiriki-18.08.0.tar.xz" +sha512sums="5e14d301148e9c333bca36753291228337b7b3b00c2ba7946ba7fb0f7bcaf52f6a570825a9d68053e2df5b4b24db237f2fd94198b47a5305662c68a63a5dd64e kiriki-18.08.1.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index e6af44978..674f9cf48 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d5a9033193c4ae734110ba01de39c5986999782ebb9f931f1b9f156edd20728e36706663895b1c06d9ee0e9d80496d7255f4ab8ff7488394df87e77b259fb93e kitemmodels-5.48.0.tar.xz" +sha512sums="1df3636da596a67255ac460658868d83f42955bff8085586a846f8e37d9a6d7ca29daaa96d03d686b9d2ff0647f40e7188c0619e11af6b93de0df627463de0a1 kitemmodels-5.50.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index b34360adb..2255c2c41 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4aca1a7e2a2fa2a89c12b9ecaac99d28219eaf88fb3fc3a3884cc2ff5a218f76ca1eecaab599450d63b17c3cacef4f8c123e4fbf55b8c6041573381d15ecaf96 kitemviews-5.48.0.tar.xz" +sha512sums="e2e1fbccde1f7f9aa4cbb6feb175aff3055621cd39e5aed60d6cdbc807cea2763e35847825a70f310276335ee37eacc066ede5d297fe58fe19d33fec094ac121 kitemviews-5.50.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 8d901ed91..16d738f1e 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bb99130b1a74d7294a0c1f2ad9f7305b1c926a9980f8cc005eb8c63f6d27901ad70457635e16bae604a4f749840fa489bdec84efe030a1eda87cb36c74b61d78 kiten-18.08.0.tar.xz" +sha512sums="32d542778e8ef63df9da29be94e76ffdf8839b88419906c78733449531a4fb4b62bcb9940e1c49eae09c9da75ad6c35e9d18d426848f6bcabfcd0b6c71da3525 kiten-18.08.1.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index 5d31412eb..0dfdfb4c1 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c4015ed11d71702a88e34f1c929ceb47c76e056e9f29a1854125fbd01573e4bcbe8338fd3e7ecf8609a53815e86c037e281601f7497cd5b872468af86ffd5e1 kjobwidgets-5.48.0.tar.xz" +sha512sums="9f8af0073912311fe6572606682f56952736d7cb3218646a6086c5830003dff0aa4f13d3fd59a1617d393d17d14abc6bb4f9762822e423373252cf6b6d0fbc8f kjobwidgets-5.50.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index 4a6a1e97e..08e13397b 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="527a77e4da885327edf0769e2560e39e474c6fe29b2eddfe278b12eb8d790f99f5810d96d044b7d2a44aeb19d545f0b2b95e328d05f0781d055e6ab43c0d779b kjs-5.48.0.tar.xz" +sha512sums="698ef596c03b88a35dba48363034223366e14ae94c805e68d34d913ca9944a1f8c67a3db15c0454e6ea726391b6a120a21d24fdec3ba25c7b2d4480f34da3f37 kjs-5.50.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 8e5344698..85fdbebbf 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8e01e4d78a081f6946ce5d18e33f815a0336afc06c2ce08c4808bacadccd1378cad6eae03d846ed3ab721d00ec895a4f926ce084a6ead317388dacb491e5322 kjsembed-5.48.0.tar.xz" +sha512sums="2b7a86569217304a0b6a5ebfaa03df000b08e6779be0cfeb4109de8861e6d262b5f415863b831d89eb9992e8bf73d8273572e2838ae1c95be61bbbcc65fbd43d kjsembed-5.50.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 521a48ced..0245aec1b 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="056454370ef59e78f7919a4a722182d2e013bed40309aa33fc7679ede114e5142ba3313e8dcccad0c536a467b7d07528965c8d045a794e4aec806140cc9a39ef kjumpingcube-18.08.0.tar.xz" +sha512sums="b50c87a94f5c560e665a145ddd3e62db2ab637149b41f0a5f0fbc726d36eeea90e42615d3fb10b27f65325ae84ad460d0ecbd837e35a4f7a245617202553c338 kjumpingcube-18.08.1.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 22ef8b74c..fee0cad00 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2a846b2503be748c07ed161bbbefff1129fc711118bc2394639a31c7a710ca7e370422c3bc35d6c2501041888c8d4c186550296910594e6e3b61dd307bed7761 kleopatra-18.08.0.tar.xz" +sha512sums="dd13d287f645a263e460f91528e7eec5d2e8523702770fe4f7c4f49da5303344d6a6fe2b2124ce39c480546ba126d518921f49ef746d34c66f40c2aa99f85c1c kleopatra-18.08.1.tar.xz" diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index 92bb0465f..2a66e234b 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66e266518526c7db2216e928631dbbcb146d5b12d0b52ae9b18825b8249328cddd5f49c69dcf665c80559b9ee68078fad2e42340fb3f3f9593674f035a6eabbd klettres-18.08.0.tar.xz" +sha512sums="6e0aadf89c9bae1f06e2318d40830b1793c5410548e706ab66545c26528e7f516c0b3986f36b2cfd083d53fef50a2199b30a110b7149d06a6264ad19f9be74ee klettres-18.08.1.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 0c182e5f6..f5a4338eb 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6155b98a62f465383146dba75c96ad50776ecbf5bc72a39940f6330a52ca2c963a390f8a804a918be7d93aee27bb0af53d7ab1b15fd926309643d67efad407e klickety-18.08.0.tar.xz" +sha512sums="2df34e87cdeb9f0edd7516f0ab280eed02ad1beea7b4ad85b9d6ec496c744c0bc15a9661792a09196021aea12754ab7569e3395ab80d98f37193a27cd79f5268 klickety-18.08.1.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index fb9a92443..18cc6ec80 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c9a5fa028286e67331ea58d2ae0dbfa12b31034ce999b815932b4f806d0752d53bdc62e3154b7a919e117b74dd40cba85ddf385d64883c1e4c8bec04fc3d5d47 klines-18.08.0.tar.xz" +sha512sums="cee1b2d23de590f6449869485d213f8d87b0dd97f376af9f4dbcb7463053b915d6a9b5dbd17b46116e04802ddfb42cfe5413f8e5f92aaa8dc323e71bb786f814 klines-18.08.1.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index a9aa0a8d4..243eebce5 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="831fbb916c0614fb486cca16225dbe950a5371ea5ec58b374f26d0ccf5f5666151e3cc3a00e757a2a03bad2a5a0cf4920b978d09b1cbd317b3306d807bac8baf kmag-18.08.0.tar.xz" +sha512sums="ca35b13fc309df8b8d2c7ca4af726b57823ad01bd6dc8d307e81294625d8f8f98e4fdb6827260b00b4427f5980de0ec1c3d9664ad89b54699125ca0dfe6a8b18 kmag-18.08.1.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 9ecab53b2..6bd04a4c6 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32adcca1cfada61c92a3b286be76b2311e68bec25482f0f95b2e1b784a375fc0e57c30a29de8fd7ad1d40150b4a672e075e3322afba639437093e8e73c7d2b56 kmahjongg-18.08.0.tar.xz" +sha512sums="2969e334808f396825ab7370a0c76e3836c89deb6ba46841e0355a10257a9daf53beb6675655729c94af225167e78bccbc13deba4f8a331eba50e0213195c27d kmahjongg-18.08.1.tar.xz" diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index e115a9585..8c2c3369b 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -11,7 +11,7 @@ depends="" depends_dev="qt5-qtbase-dev kparts-dev kxmlgui-dev" makedepends="$depends_dev cmake extra-cmake-modules" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/frameworks/5.48/portingAids/kmediaplayer-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/5.50/portingAids/kmediaplayer-$pkgver.tar.xz" build() { cd "$builddir" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bea8f58843a8164bbecda9da751d5a53e43ea630580590c96f1af30fcced027f18b6bb484b114269feb1f56cefbe66c7df85b5416d382202e47bdf15b49eb728 kmediaplayer-5.48.0.tar.xz" +sha512sums="20307ad83e787cdae856362ffc5cead82ac2cb46ab469de3d27d9c635d2123404c44fe28067c8712fc99cb0be78c755361811816d697d12f4415adffdbbefe2e kmediaplayer-5.50.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index 9fdce5ef6..94e748891 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a7a4d26dbb29e2c863dd3692253b5033130dcb373dac662fbdf5f0952949a8aafcb27fd3e74f42537dd690062b2ebcca772b40c95e7fbfdb3519e6a1fb28c6c kmime-18.08.0.tar.xz" +sha512sums="2a3ab2f7e69e14f8ad86ac9f6a9c33a3fd3da703da82ec7b53d126f6d8c7a51608b4f221a7903d37c2db429b444e643130a8687b1e02d5cc746d5c8d34c151d4 kmime-18.08.1.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 1f109924b..0779e4192 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4555bc707948c371b009ad7904d24bf924fa31686d74dcc8b4c8e973479397bdcc63351ee90286f6b129441d98e2632e4738c5ff3de9a74f3d08d51c29c40d2d kmines-18.08.0.tar.xz" +sha512sums="b578fba58b776921d8a051dbf5dae02e91f2a41a4fa832543b671b1454a0fc16e108535299be33499f13a01aab0a75675394d43f0d804c96c45ab3cedf3074b2 kmines-18.08.1.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 9325b1139..ef2a0f629 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dd6eb78f204af8b466cb4e7627052fc6e2cecb1fd97531d882c8450e7f7d5c0457c93c330c6b00501bf1d315e823c7c8cc588b0131e870d8c3055f2eb4387b7d kmix-18.08.0.tar.xz" +sha512sums="2e532d9041604e9d7661add070eeedb7fccf85bf9d6c01160f67cd3a2b20d95322afa9813d45938774456eb9cee342e888f742839b423dab327c898bed9b846f kmix-18.08.1.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index c70790d30..dd870f305 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="686fd44c3a6b5a68586ea2dd16a929faa3314d31db7de9e5faeebefc2b2b9ad786af9c7c19ed9dbf479d0b1634285850996d91be8ea4d968937786c694619181 kmousetool-18.08.0.tar.xz" +sha512sums="d7ff0284453c39a8c3be8f7937ac0439d17af4313ab56a6903eb39473d8fad06c836fe836ec4e061dd5a96317bef916e9a3ac9771c5a829061d1ad20ef32be08 kmousetool-18.08.1.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 8b75299b8..4420fcada 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7bf479efc175c405c05917907df0f9c1977a45b8c6730f8bd51be44653be00af7c94304e6b140bcbef0a721eef1d88af701030177852e7c03b9f1f65a2bee99 kmplot-18.08.0.tar.xz" +sha512sums="b5e5944875bc49f2bbe55aad41212f68973995e0de1926195a4f16e2b4dbc67f46bf745a577f6bd07d9ad30b7795ff65e853920f6fc3333e46b74f256a1b266a kmplot-18.08.1.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index 59ac44410..963150b46 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b46975c0cab3f29f8f3be3f91b91efeaed57b56d6865f3fe905e730ba530a701090547816153cdac3f884f0133a4906974a4a58c55c9483c86d6c02c2eda498 knetwalk-18.08.0.tar.xz" +sha512sums="2e85f38874c8c8e6929ef84b39cf5498d3b44e924aeb623cf58b55e0c9a213f3e25150aace852ae6082d50414468b90a59a288440860102a06f7e6296d662611 knetwalk-18.08.1.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index d1c685660..ed21673ad 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d74f024b9dd7756f912cfd46424e0921e64f7fff7bbfef593a228a4749da10e638cd67cacd962cd481aada183d58a56fc05588067f0261a5d48375e4c5b6b55b knewstuff-5.48.0.tar.xz" +sha512sums="492adcfe5542c39483f30be026a1d6d69ed438448d57c062aeaf4fb7fe1676c9e91c11a3a29bf2ad738c6581aadc0f45b5c252935a7530bb34e051b207e6af51 knewstuff-5.50.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 13b32c38b..a16b5122c 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fff0d688a9e083adc2809490ffff84abe38039afda8628b605016a825a9f9a7fb22e65d5b557f13d3af726e1baab3e99665064d46a788e2a7024f64c49dba6eb knotifications-5.48.0.tar.xz" +sha512sums="3128717e747baf8a3fecc3147ebfbd256fe1f330e1199222f276eabd17321c8e63272f0b252bdbf3372f712436046e4f7a725abfcee5345a9c1f823da218ab28 knotifications-5.50.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 4d3e249fe..527ffae25 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ac2fedd6ecea150e59a3f55b6b161771f08d7b9f172031e46a540f04e2f186a53500724e69fb57b55e7c23bdb14e65690a8170cb3701fdee5506609d3f068794 knotifyconfig-5.48.0.tar.xz" +sha512sums="1a00c395e2cc52b3215a4e8d87e1b4d376f4b5f4b4ef0a4afd48ec776924314604549d9b6b0d3514e70a090643fdc8f30be405593f108f2cdf05ecd7c9a920c4 knotifyconfig-5.50.0.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index d0571be25..459157fcb 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b5b193c26d6c1d67650b1af38961284a2377bf9588aedc09637adc2911a89ebc178c20bfddb515999cf27516acb14f34fc0c01e94057546086d5c1fbd25d2ef kollision-18.08.0.tar.xz" +sha512sums="ec2c7d2ac4cbbfc9dbb7fae4046984f5acae8ca68c2a2f493dba3edc649a7cd834c9cca23a579f75c704aa76efdd4cd920ae5fc431ff3343ba9d304f5ea3daf9 kollision-18.08.1.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 125770b87..f674cb6e0 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple painting program for KDE" url="https://www.kolourpaint.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e89d6c8e9732341155a67c6e29f9b1da701b8ba93a7e0299f62f297ab752ef976a84d16da92c635c48d2c18bfce10fe7219936147114191f39fe4c427cd3a97c kolourpaint-18.08.0.tar.xz" +sha512sums="ffd286a272bb0152238f73ab510d9eab006b9362f1d4d4f35b30d3ba9d3335be24f86b6aa71e29a5c5faf87c6d72e96f58ff2b0fbcbcaf1471c94a9fff8949c0 kolourpaint-18.08.1.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index d09aa9a67..8c753ac6b 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a148daea17bb9d6f6c4e38f9351459067c7111f2bd550c1a05d057c5adf07f8caeffc24d5f082b943d43425de5da0318148f67fb9320d949635b526b0e16412a konquest-18.08.0.tar.xz" +sha512sums="a3fd61d8b167d9b1cb00771c12a1cbdefc6230484f0e79069647b8c6b104b3993d326bf5c4e202be69ad8794d0c0058b13569bc2cae071aafb352235eccaec44 konquest-18.08.1.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 526959fb6..705d23523 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af5158815fd0903b1417d8ad4c3794feb1a7bec9e76519f915662ae25e352cf2311564086b811181664929d1b5502921e2e6316fceb44da90359a2fd95b6a03f konsole-18.08.0.tar.xz" +sha512sums="ec450f0393fece73394d7c77afba0b7adbf4e18d7b0d216de3e135f0e01371c3b5833ebbc79dc356fa102d2d8e3bea3667a5f42695793058b406d38b1f8e81a6 konsole-18.08.1.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index b0183d944..a9b058ba7 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0a2e0e8cba221b48153019426a469b247fc61cc265ee2114568574faee1408a2ba51a3fb1ef0289e00a94238385723ba0ade64e922f46af700fc87ce8c893c5b kpackage-5.48.0.tar.xz" +sha512sums="f56de9577b6de69724967f1ea911097d03d8bf5de8dcfeb10dc040e0fa61504d5db5e3330ceff85c1590899289f1a4b904b1d7cefa9516fa14a635b1da14650a kpackage-5.50.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 8e06e2812..da0d7ab42 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8adb238406a5c70d80e2f53a9005fa61f8cd3f4712bea1d152184db8e461d0ed92bb71a3ed28140d3741e2621e26da5815aaae482364ca366a589bebe1fbb213 kparts-5.48.0.tar.xz" +sha512sums="c787e7b85cd4053e014eed5610812715b6bfd9a450e86fddc5259f8bbfd5fddb215720cb3ef7a190a345343042712ccda7e55082807e3a2dd168decf30f13fd2 kparts-5.50.0.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 5f2f8f786..5ab7534a2 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.48.0 +pkgver=5.50.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" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="68e3c87f2387b73406dcee20cda1980d7ec2129deb04f0740ff1ee9a8b3f10fd3dbbd00ae8b81c3047a6aa691090767f99d487236319f6138ed47bc271457120 kpeople-5.48.0.tar.xz +sha512sums="1e52717038027a0bb7e8e6a4007b095f44ac6932aa8766c947d96046184927946464d56e0253fe231a80a3b95ba4f2980e474b58d1a5261ce0cbedf59e5b737e kpeople-5.50.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index b60ff2428..80f407c1f 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abb62c4db0178bd96bae5a7e4998c2ed83978cc3d0601535c20c321c7ea7a12aef4c37b66e88cef52d93911ba76cd2d9612950962894a86d051651c33951ece1 kpimtextedit-18.08.0.tar.xz" +sha512sums="e7830227a74331e399d030dfd8058382329512b85ccd36061d7ddeba2c1eca287d41890847203afb6df254e2d9927fda7974feb4c48ab433f5b037fe48c588f5 kpimtextedit-18.08.1.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 04b1c5139..be0cd160b 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="626917c0f08e94d5c56ccb6a6cd770e1312d8dc1191a25e4d19b3f2fe76fa481ee76bac5fceafc41d85aab9b59814f01b55cb759d377f051d93191d3d0364e49 kplotting-5.48.0.tar.xz" +sha512sums="352c424d842ddbe277c7a71acb7fe50fb7cdc78bc750c85ac5a364a6e330bd69344cd5dbdd7922725e1b143bd0d7b1ac1b6d003f5baa67edb33981d27f830838 kplotting-5.50.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index 7be0928dc..5f4f9400a 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -27,6 +27,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ + -DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter \ ${CMAKE_CROSSOPTS} make } @@ -41,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="71bf28660812e8ab0b94fd658995c377075459712d16af7002031d926e2b1fbd64615a3be57063cbd5d86e64a0a5249bdf957598ee86a470383daed97e5093e9 kpty-5.48.0.tar.xz" +sha512sums="22b394b8d53ab5aae05a51470a3a9ed209c8533425da6f1d6fdb26c82cc5fc1fec2c6869caa5192f067bb60a819a4ce6c19784c5fb8b7bb1691b507e77aae54d kpty-5.50.0.tar.xz" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index aee8ab82e..89d6a6391 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aca66ef21b1dcf7250ab57be9ed4245bac56af4c82f17044b91802371b45d92a1601b506cbd09759aa9abc117ba39dd857c4ee13a3fa88ea991a6995828bf0c9 krdc-18.08.0.tar.xz" +sha512sums="9765378af2d792958511f7359a12c7da1c032c1b23abf5859d679c4aab47260b1d4ae208ddaf6a08b69b4de8340b3fc3eafd9bd171b906f088dd80db52f6c032 krdc-18.08.1.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 785682ea8..2c20058b7 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="49fff0dac874fe09094fbc87f0abb01700fed73cc6994afa6a14e9bbc1e71748d79f76bc604360474c67114b74506f11bdd2a6a97b47299d23620981471a78ca kreversi-18.08.0.tar.xz" +sha512sums="5811bb3cc0aa2e7b9b5a56c0f5cb4c3de2120179878ec06eb387190618951d3315bf06184272b70ccb995c5c06b84b56949ca49d8c3ae6896b5d264aa8d13cca kreversi-18.08.1.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 007c44b7e..139ffeeec 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a2e660cdcb4f80fc650ab1687e4eb9d8b0d5d7ef81b2aeb1ce61a73fa49863bcf5290b57ba5823b9c84a2ea4f4628565eeaf168ff5591d9258df748e17525fe krfb-18.08.0.tar.xz" +sha512sums="1024222c35f4c73774635ccf6e65109f6ecdf29ddb2d63a9d6ae4821647115b2945320ea3cd4f1d3bb13009e853f5d045dfc7bea7f94d41ebccb42dbaa86433c krfb-18.08.1.tar.xz" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index 0a8beec2a..ad145f237 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev qt5-qtscript-dev kparts-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev kcompletion-dev kcoreaddons-dev ki18n-dev kiconthemes-dev kio-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/5.48/portingAids/kross-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/5.50/portingAids/kross-$pkgver.tar.xz" build() { cd "$builddir" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4790f6317d82bcb2d6ca1136e41ede2912310a393a9eb4809da2d0fcbfd3cd5505a343da7490ab16120d880580da3f2d878e58f5da143994a94bf0e4464b877 kross-5.48.0.tar.xz" +sha512sums="6c1f4062d87bfa691b6323ec6210cb1f321525e012ff8e37a90271f05eb7dde489f64fa36c027d7890b220ac7af89f3571547d267033a451fedb85522d01577b kross-5.50.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index 2f19f30e7..ccaa5a9f1 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04811011a70ca2e88850785a4198d9785f7ae23c8d8f529548b77ca8dab7f99b6d7cf1bd74ed08494654b796c60fc9c9981d1ab99646b3d8d9ddeea974fb828a kruler-18.08.0.tar.xz" +sha512sums="8facbb509eada0762264bef0435d2d4888a5e6a9a102f6c4d5746f4e299a67be888543ff12c4f53970c4371ac85cf4877d307193e9f33d4bf776a6ffd61922dc kruler-18.08.1.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 3656160de..93aa18030 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b91f2de6e13375f05643b3e9e20f3a69ffa4206281eab08114d8565fa0aceb4dffe5a36ec4b2f68ee399a2a6682f4f2dee48c0a718f1f205c8ed7a87d0265ca0 krunner-5.48.0.tar.xz" +sha512sums="c1f14161c39c718f6dd9e3dca818a53d86d05b33d8115e26ce7e76d66dd3d54d22a15ea7b6c1865a5d374bd4175b9bc351db949b373e2b9de1fac8e3efb6542c krunner-5.50.0.tar.xz" diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD index 9830c6b0a..5e586643b 100644 --- a/user/krusader/APKBUILD +++ b/user/krusader/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krusader -pkgver=2.7.0 +pkgver=2.7.1 pkgrel=0 pkgdesc="Advanced, twin-panel (commander style) file manager" url="https://krusader.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="254b1a0a68fca010dfe79d8364ca745dacc2b5899c9b99d6c576b95e9ac8a564a59a291568158ec1f114b0e2c0137e2a9e7a9b4c01497539e6a9a9d5b7411b1d krusader-2.7.0.tar.xz +sha512sums="860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d krusader-2.7.1.tar.xz 6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch" diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index f6b634a29..b1acd8701 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -16,8 +16,13 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kservice-$pkgver.tar.xz" -build() { +prepare() { cd "$builddir" + mkdir -p build +} + +build() { + cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +35,14 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} \ + .. make } package() { - cd "$builddir" + cd "$builddir"/build make DESTDIR="$pkgdir" install } -sha512sums="3c781f0634e646ad287a02d3fc65ef1850984e637a9a01c2f5f86805c6962429a2cfeedb7e3d81ac12c60b6786b5c51545a15a049d5dcf2d339a235c060e34e9 kservice-5.48.0.tar.xz" +sha512sums="d239647335f0c72e1c76f36f4f23dfdd4614467b1f95d75bffc3ffd11c2bcf307dbbbc7f67c0197030a1c27875bf256a751721204f06769d9fdc3f1e49172e87 kservice-5.50.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 8a64135a4..2bef40a11 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73104dd675f493d8b27b4d45d5c14908ebf211f4405c0088d5f30669ee3a01d1bbc741666f4974212efa22dd01c8cccf6e004ebba1e411ad1fe9ae6f9f86de53 kshisen-18.08.0.tar.xz" +sha512sums="aa215ad4b30f91ac262d99657ff093ff9b24529af33c3f1c9ee5a79d3eb7bca5ff6515112430f4b4e70ce06fe75289082ec26ef9092418de2f5d8df291860f28 kshisen-18.08.1.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 132c39bb3..fb062a554 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e71117614c29d6c968c217df431869e80f21ae45733b5ba9b8a6b067ffc8112b87721f5b32b134087ec80296db356ac173bd5d3f1f26e699d1e764828505eff2 ksnakeduel-18.08.0.tar.xz" +sha512sums="ae8ffbc8fa2489ec3aaf2d2ea866b6df5d1a9ea6e24708c584b21db69e93bff659d418bed33063a8a4c36735f6cf0664a3a117f4a55a4fe19e441b71d5c3a4b7 ksnakeduel-18.08.1.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index ebf7b1cb0..70623fe6e 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8e05db8c40d58477cb06384dd8a4cdb408565cacb619e73745f953bf6ea53d37e192464c0d12f34a74f79988b2530e23355f2375a2cd025749b219962f7f766 ksquares-18.08.0.tar.xz" +sha512sums="8c5fbb1e5989adf061571a63a16d86f38b3f68d977162ce8fab4ea2b1b41eb58dee9371cca1f97052497a4a72d101fa4478941ea39022d87e885c23a39aef028 ksquares-18.08.1.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index a513f4bb2..a00cd06f5 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bdcd5ef56ae6c22fe26de474b4b20cc66ac0d85c3e20fc15ee63bbdc43c002c6abf8b74f3cf003f58d6ebc16d61464eaaf281183339062205520375b1194c218 ksudoku-18.08.0.tar.xz" +sha512sums="c310e1ea217e0c7cf56562c6ac5e2d028567031b7f4c710d132ea4149e658577d659689a607c3ae27337f0c09a9674a5d38d229651401fb98cc8b01adc2544de ksudoku-18.08.1.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index 460c7317e..0f836fa04 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d86d8e1818d1154e5cc011930a81153b582902faf743ddbde18a80f3ea958d3e5e50a41947e0fae84d3e92a26c2bb718c69a103284528f5ead964f96f41e326f ksystemlog-18.08.0.tar.xz" +sha512sums="096c335bc4b461548d7d16dbee738ee06fb5fae91ab3f02869b73af18f1dd8ef4ea27568a265e6a40f3777e7749e9f5a11e9b3402ac5f698836e00475a759308 ksystemlog-18.08.1.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 23e937bab..799131cc0 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dc645c28495aee44e5d4e82638e49e47ada60f7e3ec64b1ef3dce3bd42234266aa6b9e2ce37fa414cdc2043151f4a8f0b1eb81d62087debb6be1bef215aa5892 kteatime-18.08.0.tar.xz" +sha512sums="61d0233dc81a492f2fa3caec2a0a028c66a0f9b0ceb18ff1d395dedee3ea184b221dd59bb35886d65ba7c4bd32f84a6ac8aaab0b0ccc61d3989824a5410539c3 kteatime-18.08.1.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index 51a2e4a69..21c0fe277 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -18,7 +18,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ktexteditor-$pkgver.tar.xz" # secfixes: -# 5.48.0-r0: +# 5.50.0-r0: # - CVE-2018-10361 build() { @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1db1f2967d9fa806f29538dd3289780ecfb3ed1ff12e8ecb1ad012d7d7e18acb69952b018e22246c2a75297a351fd9258fd199fe090c3e00fda4b2fd2bbe18cd ktexteditor-5.48.0.tar.xz" +sha512sums="ab58d937d7b3e6374f7800fa81d52522a8fe73e67a222402b557b41770f1067348bb6b0e8a4e76cf4c983cc3e2e9df0760bd10791531b6d59cbd438c39e93537 ktexteditor-5.50.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index 15fb7ea72..0476c3c52 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c36cb5ee98f9c2968e7ffd68ff4bf40a8e593baaeb3ab7d768b5f0ed3f4f7b11bcb0030200dc06e9b1a420257a083a3c010c96c3172552f9af57330853e89be ktextwidgets-5.48.0.tar.xz" +sha512sums="bbb886b5f3520d7aba4b2f0fb3b63fcba7df16cf551077bc6827ca402fda4849a6148b21706c3c733cb788042a2ed1870a28104f7cb7227cbf5f3f4e14128db0 ktextwidgets-5.50.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index d09892e1a..ecc6bf036 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc1230643d7be455fae090440e303ffa81695808bc36bb8a0c6f49ed4b61caa2232fec4c6545a8b56e4cd3cda56563e5c6c31291e168d62aec5fc2dc42fa3b17 ktimer-18.08.0.tar.xz" +sha512sums="54916845190dcf9e80deefbdf1cfa583cfc37c4ab7fca9ba56a0542a934719f98b56bc879768a0f6822d255ead23446edad9bf21886fd341a11f2ad3296f2947 ktimer-18.08.1.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index f239a08a3..0f816ab37 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktorrent -pkgver=5.1.0 -pkgrel=1 +pkgver=5.1.1 +pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" arch="all" @@ -16,9 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kwindowsystem-dev kxmlgui-dev libktorrent-dev taglib-dev kplotting-dev kdnssd-dev plasma-workspace-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1/ktorrent-$pkgver.tar.xz - qtimer.patch - " +source="https://download.kde.org/stable/ktorrent/$pkgver/ktorrent-$pkgver.tar.xz" build() { cd "$builddir" @@ -46,5 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25 ktorrent-5.1.0.tar.xz -94972e958b44850686d6853090bb0ba7b709b68f5b3c8715c42c1cab602ce2b22710fc120bad4a1cc824fc6de9e9aedc94f5bb8b9f9d31170d24adaefabdce28 qtimer.patch" +sha512sums="bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 ktorrent-5.1.1.tar.xz" diff --git a/user/ktorrent/qtimer.patch b/user/ktorrent/qtimer.patch deleted file mode 100644 index efbf740c0..000000000 --- a/user/ktorrent/qtimer.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6d7433d44c7f18cd84d2de105beb5c646ed0e355 Mon Sep 17 00:00:00 2001 -From: Adriaan de Groot <groot@kde.org> -Date: Tue, 24 Apr 2018 19:15:32 +0200 -Subject: QTimer may not be an incomplete type as it is used as a member - variable. Add the #include to fully define the type. This problem shows up - when this header is included in a context that doesn't already have QTimer - included -- CMake 3.11 exposes that accidentally. - -Upstreamed from FreeBSD ports. ---- - ktorrent/dialogs/torrentcreatordlg.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h -index 68dde8a..12a1a43 100644 ---- a/ktorrent/dialogs/torrentcreatordlg.h -+++ b/ktorrent/dialogs/torrentcreatordlg.h -@@ -23,6 +23,8 @@ - #define KT_TORRENTCREATORDLG_HH - - #include <QDialog> -+#include <QTimer> -+ - #include "ui_torrentcreatordlg.h" - #include <torrent/torrentcreator.h> - --- -cgit v0.11.2 - diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 49f24c703..e9d79daa6 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fe5df8a7bf197bf66b2a00ecb004aa2270321cfea12bfb3d797ed8f176911da1595ccf234f9b1dd44ffa014ee7ae2fb32ee299294c7091a50a69a067e257593b ktouch-18.08.0.tar.xz" +sha512sums="83fb8fefff5a3fbb8124fb7a0d545f5d2edbcf1b2c1e134cf8c9984809bbe1f4b50e566782a9eed78233e9716f8638b86e177f5ed9f1f1304fbe70942abdf3ed ktouch-18.08.1.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index 959647cc7..af37697bc 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5139b406bdd12c1a767a2ea39192fe6f8df1f1f5acb0c4b89cf5b63f2bd99a4d8da98f803a80192bd56db54fba261f30f84f24dbd4f61741f33568478e45043 ktuberling-18.08.0.tar.xz" +sha512sums="71381b04656f15e1c9409bfae15252f4a8ebe8c6de139d432e88ab23f942d8662a07dfb1d93901097c4d83227229e5becdebf1da10935cbb830848dfe8d4b18a ktuberling-18.08.1.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 45a1b8f4a..10b73a429 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8f69158b20d95dffb9dee0cb8ef9554302abf78f9f7fdad3347b8cb11a602e07cc935b5f5fa40943183abd489013824afb640f286a97b96073ce7c86946965e kturtle-18.08.0.tar.xz" +sha512sums="d33694c95676579a72c4065009f86f9a4aef9576057a4215267b16d5a37ba2b1d57e103bc9b3824dd5691b63d078e964291775a067f85c74d542b3654cd276a7 kturtle-18.08.1.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index bef106a9c..0ab818f4c 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15705521f408a32c9ceaea8eef7e13de53845ea39f67d3f899649adc138f5f95056f295efe622046a1d643ad38c1ec771399cae7982b882aebb50314e2b30edc kubrick-18.08.0.tar.xz" +sha512sums="37cd3bb1488f3cf0704010a3b9d10ba8861f3e258fbab63703b255e999f326899ddd5c50bf8409598ebced62e532105bfe541f5fe768e9a942fff3dd09cfb443 kubrick-18.08.1.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index a12c118f4..39d7a3515 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9415de7ddbc354bc3121692677ec79de0a0628eea5fdbe1e6743c3c7d44ae09a6476e4e4a3d70dff643644bf7c1864bf501605e938600be89d59d01bf684660c kunitconversion-5.48.0.tar.xz" +sha512sums="82dc61f9893e6d1f7215226a1bc87404a09d8c29f384dab21fb78a2620ffb3ba45621beb057ef803f95635f2e8b1b0f3e57a9dbcbf815871d45c87f70d53750f kunitconversion-5.50.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index c92e50463..1ed6014d1 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="465c6839f5a47126f785381f0a8b01c03aa6952c606ff1beb639f48f0f57baecff89a48590cebde1b731e8a931f96ccc0ec9e4df786aa947962cc1999c188db4 kwallet-5.48.0.tar.xz +sha512sums="45d798775898a8781be3341411c55f07df668d2f13806b3085e3c9f77926f564d6dc5ea3425aa3e0fdc42276125f320136725cd988807fb1a29b22ccc1bdccf8 kwallet-5.50.0.tar.xz edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index 4509dba18..e05deca6d 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="22f1545a6305af1cfab37e4d7bd9bf1bab62ea3be27c073ace2b4ec1937397cea779d9d7e0e33790e9c8f778d72e9b9f7b1ed809ccd8093b9d66615833a95f40 kwalletmanager-18.08.0.tar.xz" +sha512sums="9e5d37f3600dc8f6499e791c92858a0e16afe8cce6b60232af8736e161ad67936f4e4e2ec49cfd413aae410d4b1ef24e27dca42e3c04ab1fc05c61ed39698740 kwalletmanager-18.08.1.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 8984d1250..d99fa5a64 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Sound editor built for KDE" url="https://kwave.sourceforge.net/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1389f4467221e2f5d57006ad1126efa15112e2993018a51df021082beccf813fbb1324c87a87b6f7f187d8f366f0e74a79cf56bd7cda18df67f20fefdb7ee1e8 kwave-18.08.0.tar.xz +sha512sums="5e9abc54dbd3e757ffb287ce68f43eb91c4b7ee8c231fca194139d0c2183f1b1e8acd23f713d15ea40dca6cea03d4567591ac78d58650e554422772cd7a53660 kwave-18.08.1.tar.xz 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index 372e08e5b..ab6e4bb2d 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cc446d6e9262a1ee3d6c3800fd833c28218ecf035ec156490bbd922567e47dd10ee103631b4be5db0d1520a2856c080f06698250afa8d1e5b7d7813013a41e68 kwayland-5.48.0.tar.xz" +sha512sums="6698eace0b13d276b24ccb47cf15cb04c6ee473d5e21adcbd8729a02bb481387faf280b4fff5a7e94965671424e8a1be6364f17e738b929d2a5b1d6638c15428 kwayland-5.50.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index 72e80d263..8e9a19a09 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="561db5f830aecb92569c3c3e3a55bd1c062b42e0d84675b73d60d03d7f53d24501b61aeea876b1f39128d4256db1473cf1ce7a5ad523a6a863db84afad6168b3 kwidgetsaddons-5.48.0.tar.xz" +sha512sums="91c4824d1c5b889c11f84fe95f0e48453275451d3e2e7c5b4a5603fa5db4ffbe0ab20dfd48bb3fcec8576c4f1d494a5fcb5d53e84ff11af01ded26b93377cfe7 kwidgetsaddons-5.50.0.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index f02eb5f75..12be7c657 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be6b4b0aa86762908dd9dc8bbff593342d8913cca91f899773c8f8cb81b2e3e92b1a8ecabd86098ee0c3820c5fd05e0b878fd3b6f48160d1e4555eb00673770a kwindowsystem-5.48.0.tar.xz" +sha512sums="7e83e07ab587ef4a0edd58ca22ecba8277f97ca6438f537b6475bf03225559d207e80c2fde4c1ce5ebdb78b5a4c1e04407af9cba0a5dacbbaeacf3d7b14a9ed6 kwindowsystem-5.50.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index f0b8f5798..5fdb2bb57 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd010a0cc59110abfa84f70caf9802c4f9e1037d706f4d7be80d2773b4ffb0a0a646be7ffef9c84cb7738e0e230a97edec1e9c254982bdc6adb15efdcce23c54 kwordquiz-18.08.0.tar.xz" +sha512sums="40a00ca117b4a4a14921b84c312bd4afc98b83e45d0f7a1cc9cc24d365b57bb5a3a383dae65e8517e835991e02e1841fb5470a215003467c29f93e7e04427a28 kwordquiz-18.08.1.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index d66ef34d6..d7b3e60b4 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4f0bfac2f795fccc021cc139397e0691dfe9fa0a273ab8ad95783f4a415cd15c2f84dc5b0d80d0e37d92c7b884c3cb9f338fcf67964f89ac9d0d40cc6f6acef2 kxmlgui-5.48.0.tar.xz" +sha512sums="01915037c1709df0a04d9651d0c56f21856448636937188c50ff5785de374f68d87e9bb8a4f553b8247a601e186c4291b1e5ff4ec9bf89dbfd7d975c527e064a kxmlgui-5.50.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 62a78ac38..c865e581e 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ee236b34950fd8ce9475acadaf1e404a79ebbc3a95b53ba0749706e201569cfbd1dfb19837ca829e7fb0597781c436f94a0cbf5401042316c757d321ffee98a kxmlrpcclient-5.48.0.tar.xz" +sha512sums="08c207cc2c0db165ed76ea2c92bfbb1ed9eb49ace49ffb3bfbfb8780a0b335e0938504fe370465dc074ee6bb02f64a4d5f5bce459729215a334bfdbebba4ca98 kxmlrpcclient-5.50.0.tar.xz" diff --git a/user/libatomic_ops/APKBUILD b/user/libatomic_ops/APKBUILD index eb8d23914..6c8423843 100644 --- a/user/libatomic_ops/APKBUILD +++ b/user/libatomic_ops/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libatomic_ops -pkgver=7.6.4 +pkgver=7.6.6 pkgrel=0 pkgdesc="Provides semi-portable access to hardware provided atomic memory operations" arch="all" @@ -40,4 +40,4 @@ package() { install -Dm644 doc/LICENSING.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b libatomic_ops-7.6.4.tar.gz" +sha512sums="ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8 libatomic_ops-7.6.6.tar.gz" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 5eb8347f0..05785a223 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.18 +pkgver=2.19 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65e2f795ced3e902af889f3bd9e303234e1611fb25555123b4edaf0b1e3aca24d399422f96eb0694ada025e57ddeb207f60c8666d0640110e228cfb8da92d5ab libblockdev-2.18.tar.gz" +sha512sums="bc0e9524b95ca7b32478cb2e9195df336b44921825832393189d04611e6cb634aa033485507239add55d126021f103c7528d912be950c58d46e130c09b4d5167 libblockdev-2.19.tar.gz" diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD index d7b9c4727..4c80ef88a 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=1.3 +pkgver=1.4 pkgrel=0 pkgdesc="Library for working with sizes in bytes" url="https://github.com/storaged-project/libbytesize/" @@ -46,5 +46,5 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="a8e5b5d59d0a97ae52a2c0f437c4d7fd8afc8249762be99027e3beeadc6c54ad52a09c1d30e66466b99496fcf3419fa799d0fcccf61c0661b3e9cff48d0054af libbytesize-1.3.tar.gz +sha512sums="54aba1f605ad662ff525c47206e8342e727c807692225361f1fa8d6a66c00f2740fc3d3672978eec2806227d85f146034042a9808e458d8d6271a08934032959 libbytesize-1.4.tar.gz 5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d no-msgcat.patch" diff --git a/user/libdbusmenu-qt/APKBUILD b/user/libdbusmenu-qt/APKBUILD index 4a1df2f48..8b95777ca 100644 --- a/user/libdbusmenu-qt/APKBUILD +++ b/user/libdbusmenu-qt/APKBUILD @@ -2,10 +2,11 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdbusmenu-qt -pkgver=0.9.3_pre20160218 -pkgrel=2 +pkgver=0.9.3.16.04.20160218 +_realver=${pkgver/.16.04/+16.04} +pkgrel=0 pkgdesc="library to export QMenu over DBusMenu protocol" -url="http://people.canonical.com/~agateau/dbusmenu/index.html" +url="https://launchpad.net/libdbusmenu-qt/" arch="all" options="!check" # requires as-of-yet unpkg'd qjson, may require dbus? license="LGPL-2.1+" @@ -13,8 +14,8 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake doxygen" subpackages="$pkgname-dev $pkgname-doc" -source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${pkgver/_pre/+16.04.}.orig.tar.gz" -builddir="$srcdir"/"$pkgname-0.9.3+16.04.20160218" +source="https://launchpad.net/ubuntu/+archive/primary/+files/"$pkgname"_"$_realver".orig.tar.gz" +builddir="$srcdir"/$pkgname-$_realver prepare() { cd "$builddir" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 84829d77d..ad5143e17 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -52,4 +52,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="8ecf3104275c845ae5b914dd507ab77ce0554bda21b0bdece4593e8b8be2041a734987ad19666b8718f2151c1f903ecc5e42bcd38f11d9c4c68d6b6f6961e548 libkdegames-18.08.0.tar.xz" +sha512sums="09769549944b42f8c0381ba691b787b9ab00575343047ee1763d8c1a5347e62716d0cada05b0688aee7f160846a6d16aa7d68978d99bdf65c5dc3a21ce5619e1 libkdegames-18.08.1.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index df20dab94..7e50fe8b9 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc758e00080cfc22994d7777aff740725426233f325e3dae6586e2e39d81d9b2114be7345a583c824e2392909ec6ef6845e46768dbfe6dc0b9df1ebfb0823f8d libkeduvocdocument-18.08.0.tar.xz" +sha512sums="fb71a7c76426a959f25c5bb2d01c8d843bcd31c0b28f4acf37fe860a2dff7a9ee5dfc67e9a51715f137ee5b7c284f885cae0f7941888ef0c75607b03ad90d11c libkeduvocdocument-18.08.1.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index e83db4aa1..d96026984 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="12706cacddd38a3b6ac5bc242c32ffc8ab109bea4d93499800910d74982e891a33cf0f22b02a0666fe3c372e006223a03a787637eea022a80f47883331d33432 libkipi-18.08.0.tar.xz" +sha512sums="d209b81bfe29d41816347d8292fabd572579ad4ba916127ea1fa1a9d247f08347dc6f2f1c91dbe5ba4e8f7e3305b411246a14c8c776e16af9b36fa57d8cd6641 libkipi-18.08.1.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 03398ad1b..f73aa01c5 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64d8a5ed747df1d2289fefecbea443666010cd855636cc6a3e21a9f2d71d0b031a6bfee4295d8726be8f6eed554a590a6c09eaa67b13a3ecda6b011ee8b10ec2 libkleo-18.08.0.tar.xz" +sha512sums="3df1d5236d31636de4811dea600b660d1920613a56c0ec7821fdf3451737d896ba129746f5a838cfb96d106dcd68b3170efdf2616f8e56b562e59cd7ec7ce1ed libkleo-18.08.1.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index 15ed7d91b..2fcb476ae 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="80ec033a111699427084ef978c94ccc594bdc31679906bd87e31eeccb17ff046a5e8abc04aadbcf3a7884c42476b0768675d3e0266b28084cd980c9235d966d3 libkmahjongg-18.08.0.tar.xz" +sha512sums="bfcae260ec5baef8ff8f881331442448d6e40619321c0034f9d638df91283ea50bd57a1ac90e118b99ab662d4d08c29b9493946119b9f378b1fa6fb823dcdc70 libkmahjongg-18.08.1.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 00849f535..1fe14d367 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c04aec3e49679417762c2c9bbdf1dadc3078fc45e7a865e736929492670e1a399c997bc3e975720d7ad7bf256ba228980ae3f260445e6707e3038384c4222f67 libksane-18.08.0.tar.xz" +sha512sums="fdd65c8857a31f2d805f12308b6ccb0027c5960b9af5f80553740f6ebe86e84278f2d078d651003c1f95835893794feabb76ce13c516f03783e65eacc82be48d libksane-18.08.1.tar.xz" diff --git a/user/libpthread-stubs/APKBUILD b/user/libpthread-stubs/APKBUILD index 5c5301b08..02af44664 100644 --- a/user/libpthread-stubs/APKBUILD +++ b/user/libpthread-stubs/APKBUILD @@ -1,21 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpthread-stubs -pkgver=0.3 -pkgrel=6 -pkgdesc="Pthread functions stubs for platforms missing them" +pkgver=0.4 +pkgrel=0 +pkgdesc="POSIX threading functions stubs for platforms missing them" url="https://cgit.freedesktop.org/xcb/pthread-stubs" arch="all" options="!dbg" license="X11" source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" -prepare() { - default_prepare - - cd "$builddir" - update_config_sub -} - build() { cd "$builddir" ./configure \ @@ -35,4 +28,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="c7cf63fa82ce9e8c37c6dc3b8cc30f8883655f95683c4466c54b617b086dd26a43bfa36363e47dc5730af6d59ac70443d211eb01b07d276edd144030a3580b15 libpthread-stubs-0.3.tar.bz2" +sha512sums="0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954 libpthread-stubs-0.4.tar.bz2" diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index 966a9ed57..170e00fae 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtirpc -pkgver=1.0.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="http://libtirpc.sourceforge.net/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc libtirpc-1.0.3.tar.bz2" +sha512sums="392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 libtirpc-1.1.4.tar.bz2" diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index a98f8bcc0..d2ab224f4 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ivan Tham <pickfire@riseup.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom -pkgver=0.30 +pkgver=0.31 pkgrel=0 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" @@ -10,8 +10,7 @@ license="MIT" depends="" makedepends="libgudev-dev" checkdepends="bash findutils" -install="" -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" build() { @@ -38,4 +37,4 @@ package() { > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules } -sha512sums="863df2bca6778181b8cbe2546d4766143f78b3f9e555d6ac62ffe7f6ce53729dd78badfd1d795f217b0d4a335b600921932850c1ca2bfe832614bf22f93e09ae libwacom-0.30.tar.bz2" +sha512sums="fb1fd470000bf3a620c4dd2293fff483bf6e1ffddaffc176e7b88f13d44347f4b322e1827b53ce61ae25e2d99f36c50767c201f38161498969c7c8215dad1c36 libwacom-0.31.tar.bz2" diff --git a/user/libx11/APKBUILD b/user/libx11/APKBUILD index c6ecfdeb6..5917acfa6 100644 --- a/user/libx11/APKBUILD +++ b/user/libx11/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libx11 -pkgver=1.6.5 -pkgrel=2 +pkgver=1.6.6 +pkgrel=0 pkgdesc="X11 client-side library" url="https://www.X.Org/" arch="all" license="MIT AND X11" -depends= +depends="" depends_dev="xtrans" makedepends="$depends_dev libxcb-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" @@ -38,4 +38,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0 libX11-1.6.5.tar.bz2" +sha512sums="9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7 libX11-1.6.6.tar.bz2" diff --git a/user/libxxf86misc/APKBUILD b/user/libxxf86misc/APKBUILD index b092aa30d..2ead4d544 100644 --- a/user/libxxf86misc/APKBUILD +++ b/user/libxxf86misc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxxf86misc -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=0 pkgdesc="X11 XFree86 miscellaneous extension library" url="https://www.X.Org/" arch="all" @@ -12,11 +12,6 @@ makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" source="https://www.X.Org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2" builddir="$srcdir/libXxf86misc-$pkgver" -prepare() { - cd "$builddir" - update_config_sub -} - build() { cd "$builddir" ./configure \ @@ -37,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f libXxf86misc-1.0.3.tar.bz2" +sha512sums="1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb libXxf86misc-1.0.4.tar.bz2" diff --git a/user/links/APKBUILD b/user/links/APKBUILD index 1450559f5..572f9d977 100644 --- a/user/links/APKBUILD +++ b/user/links/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=links -pkgver=2.16 +pkgver=2.17 pkgrel=0 pkgdesc="Text Web browser, similar to Lynx" url="http://links.twibright.com/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a links-2.16.tar.bz2" +sha512sums="871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5 links-2.17.tar.bz2" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index c376af321..0276048d8 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Lieutenant Skat is an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b85cb66e23394aaaf948c8b61d652c16dd52075fa643b2eca287498c7bd11cbfe77bdeb0f35d38dcde690e3aed161e26384d8cae6243841e9d6c254d9b7b04a8 lskat-18.08.0.tar.xz" +sha512sums="958ca673414a700f253c2b61d3e15502161fa3b3724e16b9ef1a1e3827c0093721a866a4ff00a9056ad027a541ce6873e192421d2b473f5e1dd7d307498c4715 lskat-18.08.1.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index de2cbcf77..a80a9a2e0 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ec62619fd6f0d7f6160dbe3ed0f7c08d19ce9c0ead87067bec3b52c295db8fd52438b3400e167a1c7997d39cd66199c8a0876575a4395b37b4a341fa917c8b8 marble-18.08.0.tar.xz" +sha512sums="e6bf16f7b26f8f1ba88448378c1d97506140f87c0d75481f9cc2435f5f7e09a55ae510475397c6ccfecd4252a618287638cb350425895ad216c1d74115f81956 marble-18.08.1.tar.xz" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 3943557c0..c0ba61046 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=18.1.3 -pkgrel=2 +pkgver=18.1.7 +pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" @@ -245,7 +245,7 @@ _wayland() { || return 1 } -sha512sums="f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887 mesa-18.1.3.tar.xz +sha512sums="697c4f441ae52bc867d9d73b103094a29102168c248a502c4ea0fc48f51bcb86b2e741da39e882f24131326d460cdb1416415604c6994d1b8c09fb8a153a5c77 mesa-18.1.7.tar.xz c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch diff --git a/user/minivmac/APKBUILD b/user/minivmac/APKBUILD index 56e7814f4..71a16a1b2 100644 --- a/user/minivmac/APKBUILD +++ b/user/minivmac/APKBUILD @@ -4,7 +4,7 @@ pkgname=minivmac pkgver=3.5.8 pkgrel=1 pkgdesc="a simple and accurate emulator of early Macintosh computers" -url="http://www.gryphel.com/c/minivmac/" +url="https://www.gryphel.com/c/minivmac/" arch="all !s390x" options="!check" # minivmac does not ship a test suite license="GPL-2.0-only" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index ba995935a..bcbb4ceeb 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a5cb6329a5eab6b7c10952af23653906ec4a13a87ddd3f90633dcf848e9b7f58b54a5391dbdd8933c0aee3638668f86180cf21ea9374d0834cd6624cedd9e9e6 minuet-18.08.0.tar.xz" +sha512sums="653db86bc761f59df02a8d8ff82e59afeb71ef078a62ba5712d5092b0d9651dde9ddee027d303e622bd143c6aee49b01da1476d8cdc484b89192c08669cc6bef minuet-18.08.1.tar.xz" diff --git a/user/npth/APKBUILD b/user/npth/APKBUILD index b286a58fd..7f73efd37 100644 --- a/user/npth/APKBUILD +++ b/user/npth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=npth -pkgver=1.5 -pkgrel=2 +pkgver=1.6 +pkgrel=0 pkgdesc="Portable threading library from GNU" url="https://www.gnupg.org/software/npth/index.html" arch="all" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a npth-1.5.tar.bz2" +sha512sums="2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2 npth-1.6.tar.bz2" diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 1462ba86f..9fbbd1741 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=obconf-qt -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=0 pkgdesc="Qt5-based Openbox configuration tool" url="https://lxqt.org/" @@ -17,6 +17,7 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -25,18 +26,18 @@ build() { -DPULL_TRANSLATIONS=False \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} .. make } check() { - cd "$builddir" + cd "$builddir"/build CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" + cd "$builddir"/build make DESTDIR="$pkgdir" install } -sha512sums="087d453d111c4aa5e9be7e03b1253192bf8c274bbee822f0c9bc9375fef79763c48cba0096ce153b1da3a6fe59429d228ffe3611746cfa20d0193232768f372e obconf-qt-0.12.0.tar.xz" +sha512sums="537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703 obconf-qt-0.13.0.tar.xz" diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index 784f51f2d..6f5c1111b 100644 --- a/user/okteta/APKBUILD +++ b/user/okteta/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okteta -pkgver=0.25.1 +pkgver=0.25.3 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174 okteta-0.25.1.tar.xz" +sha512sums="f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7 okteta-0.25.3.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 4fdeedfa0..ba2fd75c2 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65ae305186c2cc992927f997ce3de065486b5a1caaa6ac839d807beb1c8a0921ef9dc8638571d50a15077e78ab9c6e43e3d528e17b48086c6b2ee6a4ac5f1ba5 okular-18.08.0.tar.xz" +sha512sums="4114c614c3d773de158469a201c976ad36d706a0eb00b238af49d5e5a97fb272ce6033f744101c7e26110a7ac6b9c6cda26e3fc8c9c1bde22277f3ba2c55a375 okular-18.08.1.tar.xz" diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index e73ac3911..3b4c6dc49 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -2,15 +2,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg pkgver=2.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" options="!check" # No test suite. license="BSD-2-Clause-NetBSD" +depends_dev="$pkgname-tools" makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake" subpackages="$pkgname-dev $pkgname-tools" -source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz + fix-include-path.patch + " build() { cd "$builddir" @@ -48,4 +51,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz" +sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz +354fb181a25eeabe231d28216bcb8e401648cf8e71ba476cabd25e297f46bbc1ea5b091b4d2d4450501422b8b20649bf109ff5b3f3b49f1492650dbb46ed6e22 fix-include-path.patch" diff --git a/user/openjpeg/fix-include-path.patch b/user/openjpeg/fix-include-path.patch new file mode 100644 index 000000000..f5ff1e60d --- /dev/null +++ b/user/openjpeg/fix-include-path.patch @@ -0,0 +1,11 @@ +--- openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in.old 2017-10-04 22:23:14.000000000 +0000 ++++ openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in 2018-09-06 00:53:22.860000000 +0000 +@@ -26,7 +26,7 @@ + if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) + # This is an install tree + include(${SELF_DIR}/OpenJPEGTargets.cmake) +- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) ++ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) + set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) + + else() diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD new file mode 100644 index 000000000..06317735b --- /dev/null +++ b/user/openvpn/APKBUILD @@ -0,0 +1,69 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=openvpn +pkgver=2.4.6 +pkgrel=1 +pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" +url="https://openvpn.net/" +arch="all" +license="GPL-2.0-only WITH openvpn-openssl-exception" +subpackages="$pkgname-doc $pkgname-dev $pkgname-auth-pam:pam $pkgname-openrc" +depends="iproute2" +makedepends="openssl-dev lzo-dev linux-pam-dev linux-headers" +install="$pkgname.pre-install" +source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz + openvpn.initd + openvpn.confd + openvpn.up + openvpn.down + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/openvpn \ + --enable-crypto \ + --enable-iproute2 + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + + # install samples + mkdir -p "$pkgdir"/usr/share/doc/$pkgname/samples + cp -a sample/sample-* "$pkgdir"/usr/share/doc/$pkgname/samples + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING + + # install init.d and conf.d + install -Dm755 "$srcdir"/openvpn.initd "$pkgdir"/etc/init.d/openvpn + install -Dm644 "$srcdir"/openvpn.confd "$pkgdir"/etc/conf.d/openvpn + + # install up and down scripts + install -Dm755 "$srcdir"/openvpn.up "$pkgdir"/etc/openvpn/up.sh + install -Dm755 "$srcdir"/openvpn.down "$pkgdir"/etc/openvpn/down.sh +} + +pam() { + pkgdesc="OpenVPN plugin for PAM authentication" + mkdir -p "$subpkgdir"/usr/lib/openvpn/plugins + mv "$pkgdir"/usr/lib/openvpn/plugins/*-auth-pam* \ + "$subpkgdir"/usr/lib/openvpn/plugins/ +} + +sha512sums="cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8 openvpn-2.4.6.tar.gz +3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd +6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd +cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up +4456880d5c2db061219ba94e4052786700efa5e685f03b0d12d75a6023e3c0fc7b5242cc3d2bd3988e42fcd99701ab13a6257b1a0943b812318d30c64843ad27 openvpn.down" diff --git a/user/openvpn/openvpn.confd b/user/openvpn/openvpn.confd new file mode 100644 index 000000000..7274a079d --- /dev/null +++ b/user/openvpn/openvpn.confd @@ -0,0 +1,24 @@ +# Configuration for /etc/init.d/openvpn{,.*} + +# OpenVPN can run in many modes. Most people want the init script to +# automatically detect the mode and try and apply a good default configuration +# and setup scripts. However, there are cases where the OpenVPN configuration +# looks like a client, but it's really a peer or something else. +# detect_client controls this behaviour. +#detect_client="yes" + +# Path of the OpenVPN configuration file to load. +# Default is /etc/openvpn/openvpn.conf, or /etc/openvpn/<vpn>.conf if +# the runscript is symlinked to openvpn.<vpn> or <vpn>. +#cfgfile= + +# The script to run in client mode after successful TUN/TAP device open. +#up_script="/etc/openvpn/up.sh" + +# The script to run in client mode after TUN/TAP device close. +#down_script="/etc/openvpn/down.sh" + +# OpenVPN automatically creates an /etc/resolv.conf (or sends it to +# resolvconf) if given DNS information by the OpenVPN server. +# Set to "no" to stop this. +#peer_dns="yes" diff --git a/user/openvpn/openvpn.down b/user/openvpn/openvpn.down new file mode 100644 index 000000000..50d463f16 --- /dev/null +++ b/user/openvpn/openvpn.down @@ -0,0 +1,33 @@ +#!/bin/sh +# Copyright (c) 2006-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Contributed by Roy Marples (uberlord@gentoo.org) + +# If we have a service specific script, run this now +if [ -x /etc/openvpn/"${RC_SVCNAME}"-down.sh ] ; then + /etc/openvpn/"${RC_SVCNAME}"-down.sh "$@" +fi + +# Restore resolv.conf to how it was +if [ "${PEER_DNS}" != "no" ]; then + if [ -x /sbin/resolvconf ] ; then + /sbin/resolvconf -d "${dev}" + elif [ -e /etc/resolv.conf-"${dev}".sv ] ; then + # Important that we cat instead of move incase resolv.conf is + # a symlink and not an actual file + cat /etc/resolv.conf-"${dev}".sv > /etc/resolv.conf + rm -f /etc/resolv.conf-"${dev}".sv + fi +fi + +if [ -n "${RC_SVCNAME}" ]; then + # Re-enter the init script to start any dependant services + if /etc/init.d/"${RC_SVCNAME}" --quiet status ; then + export IN_BACKGROUND=true + /etc/init.d/"${RC_SVCNAME}" --quiet stop + fi +fi + +exit 0 + +# vim: ts=4 : diff --git a/user/openvpn/openvpn.initd b/user/openvpn/openvpn.initd new file mode 100644 index 000000000..dae0e3833 --- /dev/null +++ b/user/openvpn/openvpn.initd @@ -0,0 +1,130 @@ +#!/sbin/openrc-run + +extra_commands="checkconfig" + +instance_name=${RC_SVCNAME#*.} +[ "$instance_name" != "openvpn" ] \ + && name="OpenVPN ($instance_name)" \ + || name="OpenVPN" + +# Upper case variables are for backward compatibility with Alpine < v3.8. +: ${cfgdir:=${VPNDIR:-"/etc/openvpn"}} +: ${cfgfile:="$cfgdir/$instance_name.conf"} +: ${detect_client:="${DETECT_CLIENT:-yes}"} +: ${up_script:="$cfgdir/up.sh"} +: ${down_script:="$cfgdir/down.sh"} +: ${peer_dns:=${PEER_DNS:-"yes"}} + +pidfile="/run/$RC_SVCNAME.pid" +command="/usr/sbin/openvpn" +command_args=" + --daemon + --config $cfgfile + --writepid $pidfile + --setenv RC_SVCNAME $RC_SVCNAME + --setenv PEER_DNS $peer_dns" + +required_dirs="$cfgdir" +required_files="$cfgfile" + + +depend() { + need localmount net + use dns + after bootmisc +} + +checkconfig() { + # Note: This is not just a check; we need to detect the mode both for + # "start" and "checkconfig" commands, that's why it's here. + if [ -z "$client_mode" ] && yesno "$detect_client"; then + cfgfile_has_option 'remote' \ + && client_mode=yes \ + || client_mode=no + fi + + if [ ! -e /dev/net/tun ]; then + if ! modprobe tun; then + eerror "TUN/TAP support is not available in this kernel" + return 1 + fi + fi + if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then + ebegin "Detected broken /dev/net/tun symlink, fixing..." + rm -f /dev/net/tun + ln -s /dev/misc/net/tun /dev/net/tun + eend $? + fi + + if yesno "$client_mode"; then + local f; for f in "$up_script" "$down_script"; do + [ -r "$f" ] || { eerror "'$f' is not readable"; return 1; } + done + + # Warn about setting scripts as we override them + if cfgfile_has_option "(up|down)"; then + ewarn "WARNING: You have defined your own up/down scripts" + ewarn "As you're running as a client, we now force Alpine specific" + ewarn "scripts to be run for up and down events." + ewarn "These scripts will call /etc/openvpn/$RC_SVCNAME-{up,down}.sh" + ewarn "where you can put your own code." + fi + # Warn about the inability to change ip/route/dns information when + # dropping privs + if cfgfile_has_option "user"; then + ewarn "WARNING: You are dropping root privileges!" + ewarn "As such openvpn may not be able to change ip, routing" + ewarn "or DNS configuration." + fi + fi +} + +start_pre() { + checkconfig || return 1 + + if yesno "$client_mode"; then + command_args="$command_args + --up-delay + --up-restart + --down-pre + --script-security 2 + --up $up_script + --down $down_script" + start_inactive="yes" + else + # Run as openvpn unless otherwise specified. + cfgfile_has_option "user" || command_args="$command_args --user openvpn" + cfgfile_has_option "group" || command_args="$command_args --group openvpn" + fi + + # If the config file does not specify the cd option, we do. + # But if we specify it, we override the config option which we do not want. + if cfgfile_has_option "cd"; then + command_args="$command_args --cd $cfgdir" + fi +} + +start() { + # If we are re-called by the up.sh script, then we don't actually want + # to start OpenVPN. We do this so we can "start" ourselves from + # inactive (from the up.sh script) which then triggers other + # services to start which depend on us. + yesno "$IN_BACKGROUND" && return 0 + + default_start +} + +stop() { + # If we are re-called by the down.sh script, then we don't actually + # want to stop OpenVPN. + if yesno "$IN_BACKGROUND"; then + mark_service_inactive "$RC_SVCNAME" + return 0 + fi + + default_stop +} + +cfgfile_has_option() { + grep -Eq "^\s*$1\s" "$cfgfile" +} diff --git a/user/openvpn/openvpn.pre-install b/user/openvpn/openvpn.pre-install new file mode 100644 index 000000000..c07253531 --- /dev/null +++ b/user/openvpn/openvpn.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S openvpn 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G openvpn -g openvpn openvpn 2>/dev/null + +exit 0 diff --git a/user/openvpn/openvpn.up b/user/openvpn/openvpn.up new file mode 100644 index 000000000..2923bef7a --- /dev/null +++ b/user/openvpn/openvpn.up @@ -0,0 +1,82 @@ +#!/bin/sh +# Copyright (c) 2006-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Contributed by Roy Marples (uberlord@gentoo.org) + +# Setup our resolv.conf +# Vitally important that we use the domain entry in resolv.conf so we +# can setup the nameservers are for the domain ONLY in resolvconf if +# we're using a decent dns cache/forwarder like dnsmasq and NOT nscd/libc. +# nscd/libc users will get the VPN nameservers before their other ones +# and will use the first one that responds - maybe the LAN ones? +# non resolvconf users just the the VPN resolv.conf + +# FIXME:- if we have >1 domain, then we have to use search :/ +# We need to add a flag to resolvconf to say +# "these nameservers should only be used for the listed search domains +# if other global nameservers are present on other interfaces" +# This however, will break compatibility with Debians resolvconf +# A possible workaround would be to just list multiple domain lines +# and try and let resolvconf handle it + +if [ "${PEER_DNS}" != "no" ]; then + NS= + DOMAIN= + SEARCH= + i=1 + while true ; do + eval opt=\$foreign_option_${i} + [ -z "${opt}" ] && break + if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ] ; then + if [ -z "${DOMAIN}" ] ; then + DOMAIN="${opt#dhcp-option DOMAIN *}" + else + SEARCH="${SEARCH}${SEARCH:+ }${opt#dhcp-option DOMAIN *}" + fi + elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then + NS="${NS}nameserver ${opt#dhcp-option DNS *}\n" + fi + i=$((${i} + 1)) + done + + if [ -n "${NS}" ] ; then + DNS="# Generated by openvpn for interface ${dev}\n" + if [ -n "${SEARCH}" ] ; then + DNS="${DNS}search ${DOMAIN} ${SEARCH}\n" + elif [ -n "${DOMAIN}" ]; then + DNS="${DNS}domain ${DOMAIN}\n" + fi + DNS="${DNS}${NS}" + if [ -x /sbin/resolvconf ] ; then + printf "${DNS}" | /sbin/resolvconf -a "${dev}" + else + # Preserve the existing resolv.conf + if [ -e /etc/resolv.conf ] ; then + cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv + fi + printf "${DNS}" > /etc/resolv.conf + chmod 644 /etc/resolv.conf + fi + fi +fi + +# Below section is Gentoo specific +# Quick summary - our init scripts are re-entrant and set the RC_SVCNAME env var +# as we could have >1 openvpn service + +if [ -n "${RC_SVCNAME}" ]; then + # If we have a service specific script, run this now + if [ -x /etc/openvpn/"${RC_SVCNAME}"-up.sh ] ; then + /etc/openvpn/"${RC_SVCNAME}"-up.sh "$@" + fi + + # Re-enter the init script to start any dependant services + if ! /etc/init.d/"${RC_SVCNAME}" --quiet status ; then + export IN_BACKGROUND=true + /etc/init.d/${RC_SVCNAME} --quiet start + fi +fi + +exit 0 + +# vim: ts=4 : diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index 1a0af56bd..1afc13380 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -5,7 +5,7 @@ pkgname=pcsc-lite pkgver=1.8.23 pkgrel=2 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" -url="http://pcsclite.alioth.debian.org/pcsclite.html" +url="https://pcsclite.apdu.fr/" arch="all" license="Custom" depends="" diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD index 1562ac465..bde0ece21 100644 --- a/user/perl-gd/APKBUILD +++ b/user/perl-gd/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-gd _pkgreal=GD -pkgver=2.68 +pkgver=2.69 pkgrel=0 pkgdesc="Perl module for GD graphics library" url="https://metacpan.org/release/GD" @@ -44,4 +44,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="089d5482f55bd7a2990422fac41f6351f73492bb08fdb47c9acfed593e0f05a1a077ef3bf3179676f59e1b0de8ffc0f92b40597283ab2df3d24bb8a5d8d60698 GD-2.68.tar.gz" +sha512sums="9df5bc704c7723c032874f2c715c8abac9102826278c7502ec8396568176abb11f95a4fcc91f1d5fac7c92685481f3d759b760c3dfadf86564d110128e41c677 GD-2.69.tar.gz" diff --git a/user/perl-xml-parser/APKBUILD b/user/perl-xml-parser/APKBUILD index 35d4d1f10..92367af8b 100644 --- a/user/perl-xml-parser/APKBUILD +++ b/user/perl-xml-parser/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=XML-Parser pkgver=2.44 pkgrel=5 pkgdesc="Perl module for parsing XML documents" -url="http://search.cpan.org/dist/XML-Parser/" +url="https://metacpan.org/release/XML-Parser" arch="all" license="Artistic-2.0-Perl OR GPL-2.0-only" cpandepends="perl-libwww" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 194120417..8d3d77ffe 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -25,7 +25,7 @@ pkgname=php7 _pkgname=php -pkgver=7.2.8 +pkgver=7.2.9 pkgrel=0 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" @@ -522,7 +522,7 @@ _mv() { mv $@ } -sha512sums="4eaab35ff99c6829e4e67b99d0dbc1d25b83210c9d894fbb9e6810dd3de8b7d5bd62b2d8a9f2ecb3c1f2f5a9c28116a22b36f019a21b8770f02fe1e3149728d9 php-7.2.8.tar.bz2 +sha512sums="45ff1b090646d3d8516250c88951d797831dc449aad15c809995462c7df72c347a4012578d0c923a036aaebd761844bfc6804639f21e386e53fe68b0445b091a php-7.2.9.tar.bz2 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f php-fpm.initd 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index c2fecd3b2..6234f9b56 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -47,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8a3757ca735e5846d2e6ae437803057102f928a89d8faa320f8aaaddee0ab005a01d98cf65842458aa0c52db9f7cec0813d4467c3ffa1afffa4416ed8db7373 plasma-framework-5.48.0.tar.xz" +sha512sums="b0cee3cbca89f5497ea3525b52dafe1c0219fa29086454ba235bc02e9a2870ac1dcbddd3c05f5eb9b0fd2e9a5ac04b9aafcd4d03939f5023b907a5749fb22d87 plasma-framework-5.50.0.tar.xz" diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD index 701481f1c..854e018a7 100644 --- a/user/poppler-qt5/APKBUILD +++ b/user/poppler-qt5/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=poppler-qt5 _realname=poppler -pkgver=0.66.0 +pkgver=0.68.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)" url="https://poppler.freedesktop.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf0ce3855d7cc28021685731308bfdeca0a7a764345432242887852d67fb4119b149ab7ba692e7031e2f0e79b9982e71446efbd75bb7886450d13ea6c5035b51 poppler-0.66.0.tar.xz" +sha512sums="98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a poppler-0.68.0.tar.xz" diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD index 01394737e..41371d01e 100644 --- a/user/poppler/APKBUILD +++ b/user/poppler/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: pkgname=poppler -pkgver=0.66.0 -pkgrel=1 +pkgver=0.68.0 +pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" arch="all" options="!check" # Test data is available in Git only. license="GPL-2.0+" -depends= +depends="" depends_dev="cairo-dev glib-dev" makedepends="$depends_dev libjpeg-turbo-dev cairo-dev libxml2-dev openjpeg-dev fontconfig-dev gobject-introspection-dev lcms2-dev libpng-dev tiff-dev @@ -17,6 +17,7 @@ source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz" builddir="$srcdir"/$pkgname-$pkgver/build prepare() { + default_prepare mkdir "$builddir" } @@ -58,4 +59,4 @@ _cpp() { "$subpkgdir"/usr/lib/ } -sha512sums="cf0ce3855d7cc28021685731308bfdeca0a7a764345432242887852d67fb4119b149ab7ba692e7031e2f0e79b9982e71446efbd75bb7886450d13ea6c5035b51 poppler-0.66.0.tar.xz" +sha512sums="98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a poppler-0.68.0.tar.xz" diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 24a527f98..5ccc01d17 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -47,4 +47,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="d47110b7d95b9392eda6d49d54972bd981cd55bef00ad44073b780b5ad9e267c2aec68836b6ee3d3ed34397dfe7e5bafb01478449ea3b44b6d0ecf138ea6e51c prison-5.48.0.tar.xz" +sha512sums="69baa1f0fb3859d7c32e53463e4c81d4f394ddf61ed6b11bd907a9edc98098b1895b01990bfe787359b9f5eae5b214a1c514b4bdacdbd0f7de2a10dfe90163d9 prison-5.50.0.tar.xz" diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD index 8dbcdd0b6..86910481a 100644 --- a/user/pulseaudio/APKBUILD +++ b/user/pulseaudio/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pulseaudio -pkgver=12.0 +pkgver=12.2 pkgrel=0 pkgdesc="A featureful, general-purpose sound server" url="https://www.freedesktop.org/wiki/Software/PulseAudio" @@ -20,7 +20,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez $pkgname-alsa $pkgname-utils $pkgname-system:system:noarch $pkgname-bash-completion:bashcomp:noarch $pkgname-lang $pkgname-zsh-completion:zshcomp:noarch" -source="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz +source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz $pkgname.initd $pkgname.confd" @@ -127,6 +127,6 @@ zshcomp() { mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share } -sha512sums="e9b02522f1e9cc2cf2e9db3364153fff5bc70561df34bc8e254e373a24c45585c1c722de8b6ebd7cd1814f523cf29b67c6940390a6fcc1ccbdde5aeff48f8d8c pulseaudio-12.0.tar.xz +sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz 34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd 75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index e2cd812c1..3f10c708b 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-lxml _pkgname=lxml -pkgver=4.2.1 +pkgver=4.2.4 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="17dfa309f1066ba2478cdc87b8ec018f99dd9d43dd088c458dcae83683dbde2f9c341f64dfeab4e1d1f341b8294e6168b24294bec21e393c4f4bf9513b271124 lxml-4.2.1.tar.gz" +sha512sums="fdbc0f15c20047d2e6ee616f73f84b57e1effcecb009cbd90e16f405e3a4e12cc320a0eb31782922d934441580870991331f9a2f1ce6a319be8bf7b92312319f lxml-4.2.4.tar.gz" diff --git a/user/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/user/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch deleted file mode 100644 index 7ea1dba6d..000000000 --- a/user/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3e231fa7a2dc66e2ef06ac44f4f719b08fc0c67e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 29 Apr 2014 15:51:31 +0200 -Subject: [PATCH 6/6] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU - platforms - -The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available -on all platforms, so we define those if they are missing. - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - linux-user/signal.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 7d6246f..6019dbb 100644 ---- a/linux-user/signal.c -+++ b/linux-user/signal.c -@@ -32,6 +32,13 @@ - - //#define DEBUG_SIGNAL - -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+#ifndef __SIGRTMAX -+#define __SIGRTMAX (NSIG-1) -+#endif -+ - static struct target_sigaltstack target_sigaltstack_used = { - .ss_sp = 0, - .ss_size = 0, --- -1.9.2 - diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index 35e961a62..41a6647bf 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qemu -pkgver=2.12.1 +pkgver=3.0.0 pkgrel=0 pkgdesc="Machine emulator and virtualisation software" url="https://www.qemu.org/" @@ -139,7 +139,6 @@ subpackages="$subpackages $pkgname-img" # -img must be declared the last source="https://download.qemu.org/$pkgname-$pkgver.tar.xz 0001-elfload-load-PIE-executables-to-right-address.patch - 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch 0001-linux-user-fix-build-with-musl-on-aarch64.patch musl-F_SHLCK-and-F_EXLCK.patch fix-sigevent-and-sigval_t.patch @@ -149,8 +148,8 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz 0001-linux-user-fix-build-with-musl-on-ppc64le.patch fix-sockios-header.patch test-crypto-ivgen-skip-essiv.patch - ppc-Fix-size-of-ppc64-xer-register-fwd.patch ppc32-musl-support.patch + signal-fixes.patch sysinfo-header.patch fix-lm32-underlinking.patch @@ -390,9 +389,8 @@ guest() { "$subpkgdir"/etc/conf.d/$pkgname-guest-agent } -sha512sums="e05c2bcd06640322452e64e26e4964b3bc9419645de8356f4e83484e37968a0b47dc8377c8c6641941973b247cb0dc22c7dad302d039baa194b1864f2c6ad7e4 qemu-2.12.1.tar.xz +sha512sums="a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a qemu-3.0.0.tar.xz 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch -ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch 1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56 0001-linux-user-fix-build-with-musl-on-aarch64.patch 224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0 musl-F_SHLCK-and-F_EXLCK.patch 5da8114b9bd2e62f0f1f0f73f393fdbd738c5dea827ea60cedffd6f6edd0f5a97489c7148d37a8ec5a148d4e65d75cbefe9353714ee6b6f51a600200133fc914 fix-sigevent-and-sigval_t.patch @@ -402,8 +400,8 @@ fd178f2913639a0c33199b3880cb17536961f2b3ff171c12b27f4be6bca032d6b88fd16302d09c69 d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f8965f1ef3105580fceffdfddbb2c9221dc1c62066722ba65 0001-linux-user-fix-build-with-musl-on-ppc64le.patch 39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4 fix-sockios-header.patch 8b8db136f78bd26b5da171effa9e11016ec2bc3e2fc8107228b5543b47aa370978ed883794aa4f917f334e284a5b49e82070e1da2d31d49301195b6713a48eff test-crypto-ivgen-skip-essiv.patch -a4cbb020d6a839b5a129964027169babff2c1455170c5fec855232d999481eea2cae186fa66ceaa5c8a05f3eb87f9565aaf9bdcc0e56edf3060e39e80c10c782 ppc-Fix-size-of-ppc64-xer-register-fwd.patch fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55885bc784a96a99b28aeacbc6a5549b2e6750c9d3099a897c ppc32-musl-support.patch +c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd diff --git a/user/qemu/ppc-Fix-size-of-ppc64-xer-register-fwd.patch b/user/qemu/ppc-Fix-size-of-ppc64-xer-register-fwd.patch deleted file mode 100644 index 87fd4a1ee..000000000 --- a/user/qemu/ppc-Fix-size-of-ppc64-xer-register-fwd.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c -index 7a33813..b6f6693 100644 ---- a/target/ppc/gdbstub.c -+++ b/target/ppc/gdbstub.c -@@ -37,10 +37,10 @@ static int ppc_gdb_register_len_apple(int n) - case 65+32: /* msr */ - case 67+32: /* lr */ - case 68+32: /* ctr */ -- case 69+32: /* xer */ - case 70+32: /* fpscr */ - return 8; - case 66+32: /* cr */ -+ case 69+32: /* xer */ - return 4; - default: - return 0; -@@ -61,6 +61,8 @@ static int ppc_gdb_register_len(int n) - return 8; - case 66: - /* cr */ -+ case 69: -+ /* xer */ - return 4; - case 64: - /* nip */ -@@ -70,8 +72,6 @@ static int ppc_gdb_register_len(int n) - /* lr */ - case 68: - /* ctr */ -- case 69: -- /* xer */ - return sizeof(target_ulong); - case 70: - /* fpscr */ -@@ -152,7 +152,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) - gdb_get_regl(mem_buf, env->ctr); - break; - case 69: -- gdb_get_regl(mem_buf, env->xer); -+ gdb_get_reg32(mem_buf, env->xer); - break; - case 70: - gdb_get_reg32(mem_buf, env->fpscr); -@@ -208,7 +208,7 @@ int ppc_cpu_gdb_read_register_apple(CPUState *cs, uint8_t *mem_buf, int n) - gdb_get_reg64(mem_buf, env->ctr); - break; - case 69 + 32: -- gdb_get_reg64(mem_buf, env->xer); -+ gdb_get_reg32(mem_buf, env->xer); - break; - case 70 + 32: - gdb_get_reg64(mem_buf, env->fpscr); -@@ -259,7 +259,7 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) - env->ctr = ldtul_p(mem_buf); - break; - case 69: -- env->xer = ldtul_p(mem_buf); -+ env->xer = ldl_p(mem_buf); - break; - case 70: - /* fpscr */ -@@ -309,7 +309,7 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n) - env->ctr = ldq_p(mem_buf); - break; - case 69 + 32: -- env->xer = ldq_p(mem_buf); -+ env->xer = ldl_p(mem_buf); - break; - case 70 + 32: - /* fpscr */ diff --git a/user/qemu/signal-fixes.patch b/user/qemu/signal-fixes.patch new file mode 100644 index 000000000..7cde67d01 --- /dev/null +++ b/user/qemu/signal-fixes.patch @@ -0,0 +1,12 @@ +--- qemu-3.0.0/linux-user/signal.c.old 2018-09-06 23:06:29.040000000 +0000 ++++ qemu-3.0.0/linux-user/signal.c 2018-09-06 23:09:23.370000000 +0000 +@@ -37,6 +37,9 @@ + static void host_signal_handler(int host_signum, siginfo_t *info, + void *puc); + ++#define __SIGRTMIN 35 ++#define __SIGRTMAX _NSIG-1 ++ + static uint8_t host_to_target_signal_table[_NSIG] = { + [SIGHUP] = TARGET_SIGHUP, + [SIGINT] = TARGET_SIGINT, diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD new file mode 100644 index 000000000..78ce5b969 --- /dev/null +++ b/user/qt5-qtserialport/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtserialport +_pkgname=qtserialport-opensource-src +pkgver=5.9.6 +pkgrel=0 +pkgdesc="Qt 5 - Connect Qt applications to serial ports" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPLv2 with exceptions OR GPLv3 with exceptions" +depends="" +makedepends="eudev-dev qt5-qtbase-dev" +subpackages="$pkgname-dev" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + qmake + make +} + +package() { + cd "$builddir" + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847 qtserialport-opensource-src-5.9.6.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index 68f3308b2..f8cb02cd8 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qt5ct -pkgver=0.35 +pkgver=0.36 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -23,4 +23,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a qt5ct-0.35.tar.bz2" +sha512sums="dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88 qt5ct-0.36.tar.bz2" diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD index 681e5eb53..e3e861748 100644 --- a/user/qtkeychain/APKBUILD +++ b/user/qtkeychain/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qtkeychain -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=0 pkgdesc="Platform-independent Qt-based API for storing passwords securely" url="https://github.com/frankosterfeld/qtkeychain" @@ -13,7 +13,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev" install="" subpackages="$pkgname-dev" source="qtkeychain-$pkgver.tar.gz::https://github.com/frankosterfeld/qtkeychain/archive/v$pkgver.tar.gz" -sha512sums="d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df qtkeychain-0.9.0.tar.gz" build() { cd "$builddir" @@ -46,3 +45,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a qtkeychain-0.9.1.tar.gz" diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD index 6e83b18d8..ec71b8eb9 100644 --- a/user/redis/APKBUILD +++ b/user/redis/APKBUILD @@ -4,7 +4,7 @@ pkgname=redis pkgver=4.0.10 pkgrel=0 pkgdesc="Advanced key-value store" -url="http://redis.io/" +url="https://redis.io/" arch="all" license="BSD-3-Clause" depends="" @@ -14,7 +14,7 @@ subpackages="$pkgname-openrc" install="redis.pre-install" pkgusers="redis" pkggroups="redis" -source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz +source="https://download.redis.io/releases/$pkgname-$pkgver.tar.gz fix-ppc-atomics.patch posix-runtest.patch redis.initd diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 2b106842f..3cf0d9ef7 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0ba9057e9e1a64f3c87fd0a255e4072c37f13ab4204f49f8ecd7c2cb044c289838716bbcf057064fcdca6c196fc9087ab86bf3bcd07c0f2332912dd8bc724b4a rocs-18.08.0.tar.xz" +sha512sums="3b850415274bbc9155d56b7ff25dc17467d5947609133fe8d903263311b9a5551080110ee9af6f9a28c8e50c96e7f1a7d28fb5e6f91c94debf6b3ddf6631d45d rocs-18.08.1.tar.xz" diff --git a/user/rxvt-unicode/APKBUILD b/user/rxvt-unicode/APKBUILD new file mode 100644 index 000000000..f9c836dde --- /dev/null +++ b/user/rxvt-unicode/APKBUILD @@ -0,0 +1,71 @@ +# Contributor: Moritz Wilhelmy +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=rxvt-unicode +pkgver=9.22 +pkgrel=4 +pkgdesc="Fork of the rxvt terminal emulator with improved unicode support" +url="http://software.schmorp.de/pkg/rxvt-unicode.html" +arch="all" +options="!check" # No test suite. +license="(GPL-2.0+ OR BSD-2-Clause) AND GPL-2.0+ AND GPL-3.0+" +depends="$pkgname-terminfo" +makedepends="libx11-dev libxft-dev ncurses fontconfig-dev + gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev" +subpackages="$pkgname-doc $pkgname-terminfo::noarch" +source="http://dist.schmorp.de/$pkgname/$pkgname-$pkgver.tar.bz2 + gentables.patch + kerning.patch" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --with-terminfo=/usr/share/terminfo \ + --enable-256-color \ + --enable-font-styles \ + --enable-xim \ + --enable-keepscrolling \ + --enable-selectionscrolling \ + --enable-smart-resize \ + --enable-pixbuf \ + --enable-transparency \ + --enable-frills \ + --enable-perl \ + --enable-mousewheel \ + --enable-text-blink \ + --enable-fading \ + --enable-startup-notification \ + --enable-unicode3 \ + --disable-utmp \ + --disable-wtmp \ + --disable-lastlog + make +} + +package() { + # despite having a separate terminfo subpackage + # TERMINFO env var is used by rxvt-unicode makefile + # leaving it as is ~skrzyp + export TERMINFO="$pkgdir/usr/share/terminfo" + mkdir -p "$TERMINFO" + + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +terminfo() { + pkgdesc="$pkgdesc (terminfo data)" + depends="" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/terminfo "$subpkgdir"/usr/share/terminfo +} + +sha512sums="b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 rxvt-unicode-9.22.tar.bz2 +a45074b8fe39ffb712bd53b03521a8611fe5887a97ea09c1e85a7086de1042dd0360269803ffe5fcc56425af3c0cc3a55c214b2ef0fcfa2c3a298b4b37d261cb gentables.patch +42314393f7f061f1aa2cf2fedd3d84e96d3104868b0629cefd9e9b313529afde52127a412992e76935fa2de8d4e685d6b5ce42162cb8d1b0365de63d10c11925 kerning.patch" diff --git a/user/rxvt-unicode/gentables.patch b/user/rxvt-unicode/gentables.patch new file mode 100644 index 000000000..577d0d78f --- /dev/null +++ b/user/rxvt-unicode/gentables.patch @@ -0,0 +1,8 @@ +--- ./src/gentables.orig Wed Aug 4 04:59:09 2004
++++ ./src/gentables Tue Aug 10 00:03:21 2004
+@@ -1,4 +1,4 @@
+-#!/opt/bin/perl
++#!/usr/bin/perl
+
+ # the generated tables mostly have NOT been checked so far!
+
diff --git a/user/rxvt-unicode/kerning.patch b/user/rxvt-unicode/kerning.patch new file mode 100644 index 000000000..a29a6f608 --- /dev/null +++ b/user/rxvt-unicode/kerning.patch @@ -0,0 +1,21 @@ +--- a/src/rxvtfont.C 2008-07-09 12:21:45.000000000 +0400
++++ b/src/rxvtfont.C 2009-10-30 14:32:53.000000000 +0300
+@@ -1195,12 +1195,14 @@
+ XGlyphInfo g;
+ XftTextExtents16 (disp, f, &ch, 1, &g);
+
+- g.width -= g.x;
+-
++/*
++ * bukind: don't use g.width as a width of a character!
++ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
++ */
+ int wcw = WCWIDTH (ch);
+- if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
++ if (wcw > 1) g.xOff = g.xOff / wcw;
++ if (width < g.xOff) width = g.xOff;
+
+- if (width < g.width ) width = g.width;
+ if (height < g.height ) height = g.height;
+ if (glheight < g.height - g.y) glheight = g.height - g.y;
+ }
diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD new file mode 100644 index 000000000..8c4ae8f36 --- /dev/null +++ b/user/scummvm/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Tambra Wilcox <Tambra@J30AD.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=scummvm +pkgver=2.0.0 +pkgrel=0 +pkgdesc="Allows running classic point-and-click adventure games" +url="https://www.scummvm.org/" +arch="all" +options="!check" # No tests provided. +license="GPL-2.0+" +depends="" +makedepends="alsa-lib-dev curl-dev flac-dev fluidsynth-dev freetype-dev + libjpeg-turbo-dev libmpeg2-dev libogg-dev libpng-dev libvorbis-dev + sdl-dev zlib-dev" +subpackages="$pkgname-doc" +source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --prefix=/usr \ + --disable-readline + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="66c689d776b8098d752ef696232f80f175f3bff9f523e6dceb246849e785889d135452f48eafa5f2664047297de8592c862677270de4bf83731f10e178ad6847 scummvm-2.0.0.tar.bz2" diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index 1e43d6db6..d29ac7ad0 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="213019ef96f1531d9a893cfd3664d880b488c5b02a88f1b5aec057a942d2f8d3aa9d5fef3aca5d3110223b5d83f500800247fa501983cd11f8d5349da6f3b016 solid-5.48.0.tar.xz" +sha512sums="f51c7bcaed7b2390f1b290791d7e9dc4a86ce8a925a2955c072be66274257c81c7872f76105fa8a03b35c184a8598551aa2bfa74017de487fc5a3521ea49d6a1 solid-5.50.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index a9ad64e57..740351e1d 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -50,4 +50,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="70fdcdad762b1418b2a22100451d2609e698fcd436f975faeea53b2615e946a886eaa44d88e1ad6e0f4df73f3d1ef022fc5f32715ced8e03ab11791a80c92f8a sonnet-5.48.0.tar.xz" +sha512sums="ac0f5a0f729150d305410a4b91e3db7f1ede4148116821364611984eabfe4533fcd0a0ae4fd25f515a1b44b8983156224ef0da9fc4513be04b5b411a4dc62174 sonnet-5.50.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 8c376789f..aae2e4984 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="62ed1cbd02e26111f9593b610b105d3c3c252119a777ab809d0aa4f70dadb8dc55012b82a1460ee8c6b17f047fd0406ff472574c3eb72d6549428d368473fda7 spectacle-18.08.0.tar.xz" +sha512sums="659cf0f49793437903caea703ab54cc9f6077645dea7a6823830cf803d7fe35a5dfbc66265fecbeacaf1e4b80762b6e54b7f07a6f52a2a0fddfa88aa752d53c6 spectacle-18.08.1.tar.xz" diff --git a/user/spice/APKBUILD b/user/spice/APKBUILD index 2492cede3..4ca90937f 100644 --- a/user/spice/APKBUILD +++ b/user/spice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spice -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=0 pkgdesc="Solution for seamless access to virtual machines" url="https://www.spice-space.org/" @@ -12,7 +12,11 @@ makedepends="$depends_dev openssl-dev zlib-dev libjpeg-turbo-dev cyrus-sasl-dev opus-dev lz4-dev gstreamer-dev gst-plugins-base-dev glib-dev orc-dev python3 spice-protocol pixman-dev gstreamer-tools" subpackages="$pkgname-dev" -source="https://www.spice-space.org/download/releases/spice-$pkgver.tar.bz2" +source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver.tar.bz2" + +# secfixes: +# 0.14.1-r0: +# - CVE-2018-10873 build() { cd "$builddir" @@ -37,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f spice-0.14.0.tar.bz2" +sha512sums="2c0b4fbcb68c76bc0404a807f28c9645a30c6b88e81d2bc574d63b036778a299cebc0ae12aa72f2e1496f66cbf414325125948d440541a40e1b9e53b8956542d spice-0.14.1.tar.bz2" diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 271dfb5eb..4b7b0e5f8 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="62729d6d048ab34ad34d727e73e1d70075731a51d34ece60002ab9c13c1a9254857685fdd348f693ce08197730a8cf6b70c929b95396f41d621147d7f41442c4 step-18.08.0.tar.xz" +sha512sums="7d35e51ccdb388fd56e3c03e2db7404146f0d8fe4294c8c6e21e376d5d09c36c79814a471164e606c664f47c42fa8bb08d4bb759be8a23d3298e976c2fa6c2ed step-18.08.1.tar.xz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 08a7a9ad5..3c96bddb1 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="79eaba8a3211d8eb12f6eabc07875cd88ec20486a892fdf8a9bbd5ee0b4d1e1c0ef1929ec9a48e1070ab5f33ac36d69757321f3012ebc14fa50543f2fce08f7e syntax-highlighting-5.48.0.tar.xz" +sha512sums="9f452946747a6f524b299547b608b0903ef359ea736182684f3ea2d7709659604bb4a9c8a474ab88123e9d066a35d81a6a67748e05e4bb9e66d20838113ff874 syntax-highlighting-5.50.0.tar.xz" diff --git a/user/taglib/APKBUILD b/user/taglib/APKBUILD index b8559a8f7..60586f78e 100644 --- a/user/taglib/APKBUILD +++ b/user/taglib/APKBUILD @@ -3,7 +3,7 @@ pkgname=taglib pkgver=1.11.1 pkgrel=2 pkgdesc="Library for manipulating audio file metadata" -url="http://taglib.org/" +url="https://taglib.org/" arch="all" options="!check" # No test suite. license="LGPL-2.1-only AND MPL-1.1" diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index da12e9f4b..2fa1e5e8d 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.48.0 +pkgver=5.50.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="76b042f6206c9b7035d188f5e67e9dd3ed3f46d85f2688e24e3da37dbf9afd725cd569228aeee71d5d30ad48199c683c2dff1c2bcbbd1505131385e9fc630d9b threadweaver-5.48.0.tar.xz" +sha512sums="a452aea4ca141c4964129412b42f8fe6457ca156edbd99770453564960714abeec395d78ab2686f01fa602822938fd50cb706920c25ec909d4446bfd14602175 threadweaver-5.50.0.tar.xz" diff --git a/user/tint2/APKBUILD b/user/tint2/APKBUILD new file mode 100644 index 000000000..b8ec7a53b --- /dev/null +++ b/user/tint2/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Mari Hahn <mari.hahn@wwu.de> +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=tint2 +pkgver=16.6 +pkgrel=0 +pkgdesc="Simple, unintrusive panel/taskbar" +url="https://gitlab.com/o9000/tint2" +arch="all" +license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement" +options="!check" # No test suite. +depends="" +makedepends="cmake imlib2-dev glib-dev pango-dev cairo-dev + libxcomposite-dev libxdamage-dev libxinerama-dev libxrandr-dev + gtk+2.0-dev librsvg-dev startup-notification-dev linux-headers" +subpackages="$pkgname-doc $pkgname-lang" +source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/$pkgname/repository/v$pkgver/archive.tar.bz2" + +prepare() { + mv "$srcdir/$pkgname-v$pkgver"-* "$builddir" + mkdir "$builddir"/build +} + +build() { + cd "$builddir"/build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + .. + make +} + +package() { + cd "$builddir"/build + make DESTDIR="$pkgdir" install +} + +sha512sums="70ba1b338c19d2b61804b6cedda659f1dfe90cbeb2c02e2e37a8b35770f2ef826b373c050449bddc1995628e6b413ea18a0f939766c4f22b8147bf39af3e81cd tint2-16.6.tar.bz2" diff --git a/user/ttf-liberation/APKBUILD b/user/ttf-liberation/APKBUILD index 02374ad24..7f0029af5 100644 --- a/user/ttf-liberation/APKBUILD +++ b/user/ttf-liberation/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ttf-liberation -pkgver=2.00.1 +pkgver=2.00.3 # Note: 2.00.0 onward releases does not includes Liberation Sans Narrow font due to licensing problems. # we use narrowver to grab older release which does include narrow fonts _narrowver=1.07.4 @@ -14,7 +14,7 @@ depends="fontconfig" makedepends="" # added fontconfig configuration from: # https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings -source="https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-$pkgver.tar.gz +source="https://github.com/liberationfonts/liberation-fonts/files/2012634/liberation-fonts-ttf-$pkgver.tar.gz https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-$_narrowver.tar.gz 30-liberation-mono.conf 30-liberation-sans-narrow.conf @@ -40,7 +40,7 @@ package() { done } -sha512sums="52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739 liberation-fonts-ttf-2.00.1.tar.gz +sha512sums="a83ab0c05bfa97ec30a946ff4b2d23dd1e29974999241b2a058f3c052879eb48e818e09a42a7fe27f04728fea56ddbbf67c60820b10e93e3b99f50892372565d liberation-fonts-ttf-2.00.3.tar.gz 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f liberation-fonts-ttf-1.07.4.tar.gz 585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a 30-liberation-mono.conf cf017383d4390d52bef7c79abb2f48fc4440880ca03ee4dc11647ced524e45a944c4c3e3b318837bef9632b5aa1445e8f29e87f2ea195a8a47899cdeef67aae7 30-liberation-sans-narrow.conf diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 7132606b3..8c5337b9c 100644 --- a/user/udisks2/APKBUILD +++ b/user/udisks2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=udisks2 -pkgver=2.7.7 -pkgrel=1 +pkgver=2.8.0 +pkgrel=0 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" arch="all" @@ -50,5 +50,5 @@ libs() { "$subpkgdir"/usr/lib/ } -sha512sums="f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e udisks-2.7.7.tar.bz2 +sha512sums="3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb udisks-2.8.0.tar.bz2 269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a O_CLOEXEC.patch" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index c9a3058db..4207012ae 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=18.08.0 +pkgver=18.08.1 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="746e1a850879d00bb4e48dde675c37c91f52699a32c4fa627bb11e1ca2faa3025f1edb56de7e06210c4eaff44b12b79f81edd8b369167308468932154198fe37 umbrello-18.08.0.tar.xz" +sha512sums="614ad45d95bc7f07eec668b5f2a54e6748be31b4bb0fe60fd86fe35df3df73a7ce6e12b867118674dd6961ed167249824344e2fb2155e8a58b1e07074dec8679 umbrello-18.08.1.tar.xz" diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index 84583b2f7..2458cd906 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=upower -pkgver=0.99.7 +pkgver=0.99.8 pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" @@ -11,7 +11,7 @@ depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev" -source="https://upower.freedesktop.org/releases/upower-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/upower-$pkgver.tar.xz" build() { cd "$builddir" @@ -22,7 +22,8 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/upower \ - --disable-static + --disable-static \ + --with-udevrulesdir=/lib/udev/rules.d make } @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4 upower-0.99.7.tar.xz" +sha512sums="dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1 upower-0.99.8.tar.xz" diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD new file mode 100644 index 000000000..40b0da945 --- /dev/null +++ b/user/urw-base35-fonts/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Tambra Wilcox <Tambra@J30AD.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=urw-base35-fonts +pkgver=20170801.1 +pkgrel=0 +pkgdesc="(URW)++ core font set" +url="https://github.com/ArtifexSoftware/urw-base35-fonts" +arch="noarch" +options="!check" # No tests provided. +license="AGPL-3.0-only WITH font-exception" +depends="" +makedepends="" +source="urw-base35-fonts-$pkgver.tar.gz::https://github.com/ArtifexSoftware/urw-base35-fonts/archive/$pkgver.tar.gz" + +package() { + local _fconf + + mkdir -p "$pkgdir"/usr/share/fonts/ttf-urw-base35 + cp -a "$builddir"/fonts/*.otf "$pkgdir"/usr/share/fonts/ttf-urw-base35/ + + mkdir -p "$pkgdir"/usr/share/fonts/urw-base35 + cp -a "$builddir"/fonts/*.afm "$pkgdir"/usr/share/fonts/urw-base35/ + cp -a "$builddir"/fonts/*.t1 "$pkgdir"/usr/share/fonts/urw-base35/ + + mkdir -p "$pkgdir"/etc/fonts/conf.d/ + pushd "$builddir"/fontconfig + for _fconf in *.conf; do + install -m 644 "$_fconf" "$pkgdir"/etc/fonts/conf.d/61-${_fconf}.conf + done + popd +} + +sha512sums="897fef5968d659ff49dc144f6c94513b32f8d9167c4fabcd7c3b13d2ce4c82d4182b25528291a36158d7a6e1cd864c67d22ce64a2c55dad4e984305f2fd65a91 urw-base35-fonts-20170801.1.tar.gz" diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index c0e8cce47..dea31e948 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.3 -pkgrel=3 +pkgver=3.0.4 +pkgrel=0 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -64,7 +64,6 @@ source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz disable-sub-autodetect-fuzzy-1-test.patch endian-fix.patch fix-testing.patch - fribidi-update.patch lua.patch omxil-rpi-codecs.patch tar-compat.patch @@ -294,12 +293,11 @@ plugins_video_filter() { _mv_plugins video_filter; } plugins_video_output() { _mv_plugins video_output; } plugins_visualization() { _mv_plugins visualization; } -sha512sums="1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab vlc-3.0.3.tar.xz +sha512sums="55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 vlc-3.0.4.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch -3338531d385f76d9eedf10498d1b0b78565c531eedb3018d4500e377815f9ccbfcc16ec398cb8559bcc624f65b61d376125c4a5e6880cbad90ec9880dd4b9ce5 fribidi-update.patch 35f83e38a6a0dd1e3c37e3dc6d63b1406d2f9454ed246854c1408d6f35ad74b743c5b0dbc19442bab65aad4268707ffa85bfda9e72b2d711c1d3412d955bf150 lua.patch e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3 tar-compat.patch diff --git a/user/vlc/fribidi-update.patch b/user/vlc/fribidi-update.patch deleted file mode 100644 index fd293eea4..000000000 --- a/user/vlc/fribidi-update.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001 -From: Shaleen Jain <shaleen@jain.sh> -Date: Sun, 25 Feb 2018 18:42:27 +0530 -Subject: [PATCH 1/1] fribidi: update for version 1.0 - -Update functions deprecated in version 1.0 when building with release 1.0 and -above. - -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c -index 13efd567b4..1a28786d09 100644 ---- a/modules/text_renderer/freetype/text_layout.c -+++ b/modules/text_renderer/freetype/text_layout.c -@@ -153,6 +153,9 @@ typedef struct paragraph_t - - #ifdef HAVE_FRIBIDI - FriBidiCharType *p_types; -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ FriBidiBracketType *p_btypes; -+#endif - FriBidiLevel *p_levels; - FriBidiStrIndex *pi_reordered_indices; - FriBidiParType paragraph_type; -@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, - #ifdef HAVE_FRIBIDI - p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) ); - p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) ); -+#endif - p_paragraph->pi_reordered_indices = - vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) ); - -@@ -398,6 +404,9 @@ error: - #ifdef HAVE_FRIBIDI - if( p_paragraph->p_levels ) free( p_paragraph->p_levels ); - if( p_paragraph->p_types ) free( p_paragraph->p_types ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes ); -+#endif - if( p_paragraph->pi_reordered_indices ) - free( p_paragraph->pi_reordered_indices ); - #endif -@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph ) - #ifdef HAVE_FRIBIDI - free( p_paragraph->pi_reordered_indices ); - free( p_paragraph->p_types ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ free( p_paragraph->p_btypes ); -+#endif - free( p_paragraph->p_levels ); - #endif - -@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph ) - fribidi_get_bidi_types( p_paragraph->p_code_points, - p_paragraph->i_size, - p_paragraph->p_types ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ fribidi_get_bracket_types( p_paragraph->p_code_points, -+ p_paragraph->i_size, -+ p_paragraph->p_types, -+ p_paragraph->p_btypes ); -+ fribidi_get_par_embedding_levels_ex( p_paragraph->p_types, -+ p_paragraph->p_btypes, -+ p_paragraph->i_size, -+ &p_paragraph->paragraph_type, -+ p_paragraph->p_levels ); -+#else - fribidi_get_par_embedding_levels( p_paragraph->p_types, - p_paragraph->i_size, - &p_paragraph->paragraph_type, - p_paragraph->p_levels ); -+#endif - - #ifdef HAVE_HARFBUZZ - hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default(); --- -2.11.0 - diff --git a/user/volume_key/APKBUILD b/user/volume_key/APKBUILD index 6b9a7c0c7..85ed4d482 100644 --- a/user/volume_key/APKBUILD +++ b/user/volume_key/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=volume_key -pkgver=0.3.10 +pkgver=0.3.11 pkgrel=0 pkgdesc="Storage volume encryption key management library" url="https://pagure.io/volume_key" @@ -13,9 +13,7 @@ makedepends="cryptsetup-dev glib-dev gpgme-dev nss-dev python3-dev util-linux-dev" checkdepends="nss-tools" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-$pkgname:py" -source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz - worst-python-hack-ever.patch - " +source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz" build() { cd "$builddir" @@ -45,5 +43,4 @@ py() { mv "$pkgdir"/usr/lib/python3.6 "$subpkgdir"/usr/lib/ } -sha512sums="b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b volume_key-0.3.10.tar.xz -63f197e7d72e08110ad2fc13e2aa0cf50b5cbac91b10244778552adec8a2ee34255a795f90fbb50bb4ebb3404ce9bc5caf877c536f11396291ba6f71a0c07526 worst-python-hack-ever.patch" +sha512sums="b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97 volume_key-0.3.11.tar.xz" diff --git a/user/volume_key/worst-python-hack-ever.patch b/user/volume_key/worst-python-hack-ever.patch deleted file mode 100644 index 1ecb334f4..000000000 --- a/user/volume_key/worst-python-hack-ever.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- volume_key-0.3.10/Makefile.in.old 2018-05-21 08:29:56.000000000 +0000 -+++ volume_key-0.3.10/Makefile.in 2018-07-14 09:27:05.430000000 +0000 -@@ -683,7 +683,7 @@ - $(libcryptsetup_CFLAGS) $(nss_CFLAGS) - - LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' --PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) -+PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)m - SUBDIRS = po - dist_man_MANS = doc/volume_key.8 - lib_LTLIBRARIES = lib/libvolume_key.la -@@ -713,7 +713,7 @@ - python__volume_key_la_SOURCES = python/volume_key_wrap.c - python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) - python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) --python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \ -+python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION)m \ - $(glib_LIBS) $(nss_LIBS) - - src_volume_key_SOURCES = src/volume_key.c diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD index 1454b1a31..e754a868e 100644 --- a/user/xdg-user-dirs/APKBUILD +++ b/user/xdg-user-dirs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xdg-user-dirs -pkgver=0.16 -pkgrel=1 +pkgver=0.17 +pkgrel=0 pkgdesc="Utilities for locale-aware management of user directories." url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs/" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae xdg-user-dirs-0.16.tar.gz" +sha512sums="a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f xdg-user-dirs-0.17.tar.gz" diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD new file mode 100644 index 000000000..6c9f0d745 --- /dev/null +++ b/user/xf86-video-intel/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=xf86-video-intel +verbase=2.99.917 +pkgver=${verbase}_git20180803 +pkgrel=0 +pkgdesc="Legacy X.Org driver for Intel graphics cards" +url="https://xorg.freedesktop.org" +arch="x86 x86_64" +options="!check" # No test suite. +license="MIT" +subpackages="$pkgname-doc" +depends="mesa-dri-intel" +makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev + xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto + " +source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz" +giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" +reporev="3d395062ce73f85e8340218df01c2ebf4bc25023" + +prepare() { + cd "$builddir" + default_prepare + autoreconf -vif +} + +build() { + cd "$builddir" + export LDFLAGS="$LDFLAGS -Wl,-z,lazy" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --enable-xvmc \ + --disable-selective-werror \ + --with-default-dri=3 + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING + rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper +} + +sha512sums="a96e627ed1b3fb6b66f02caaafb0f94967df9a2409158aacc9d8958538ef47bd84176ce71a4785f21944beb764450b1560c6dc59eef435f75959e27704be41f1 xf86-video-intel-2.99.917_git20180803.tar.gz" diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index bcfc77eca..78a942af4 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.0 +pkgver=1.20.1 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" @@ -143,6 +143,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde xorg-server-1.20.0.tar.bz2 +sha512sums="ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b xorg-server-1.20.1.tar.bz2 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 9c2a3a434..57656637c 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=333 +pkgver=335 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -12,8 +12,6 @@ makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev libxext-dev freetype-dev ncurses-dev pcre-dev" subpackages="$pkgname-doc" source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz" -sha512sums="90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0 xterm-333.tgz" -builddir="$srcdir/xterm-$pkgver" build() { cd "$builddir" @@ -33,3 +31,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="386c3f4c9b3ee7750c4f03316fc94dfc6601d82b0fbac5714031e9e3c6f1acf5c949689fcc58deb8569516977eb88173356d3c890a263b7a1d0f383190a43362 xterm-335.tgz" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index b18b2b888..91dd88bf9 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=3.0.4 +pkgver=3.0.5 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e50fe742349e02116bb9d7edd61178fcbc215ace39d50b48fb8ec3095c948a7ff91add7be5d8778c817f9d5b4663d4cefe3e0ef197c7ec6e0b88b3158ff39659 yakuake-3.0.4.tar.xz" +sha512sums="17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22 yakuake-3.0.5.tar.xz" |