summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/adwaita-icon-theme/APKBUILD4
-rw-r--r--user/apache-httpd/APKBUILD9
-rw-r--r--user/audacious-plugins/APKBUILD16
-rw-r--r--user/audacious/APKBUILD14
-rw-r--r--user/bluedevil/APKBUILD6
-rw-r--r--user/breeze-grub/APKBUILD6
-rw-r--r--user/breeze-gtk/APKBUILD6
-rw-r--r--user/breeze/APKBUILD6
-rw-r--r--user/cbindgen/APKBUILD6
-rw-r--r--user/checkbashisms/APKBUILD6
-rw-r--r--user/cyrus-sasl/APKBUILD10
-rw-r--r--user/cyrus-sasl/CVE-2019-19906.patch25
-rw-r--r--user/dialog/APKBUILD4
-rw-r--r--user/dracut/APKBUILD8
-rw-r--r--user/dracut/fts.patch30
-rw-r--r--user/drkonqi/APKBUILD6
-rw-r--r--user/erlang/APKBUILD4
-rw-r--r--user/evince/APKBUILD36
-rw-r--r--user/farstream/APKBUILD12
-rw-r--r--user/farstream/make43.patch38
-rw-r--r--user/firefox-esr/APKBUILD11
-rw-r--r--user/fuse3/APKBUILD14
-rw-r--r--user/gmime/APKBUILD4
-rw-r--r--user/hwids/APKBUILD5
-rw-r--r--user/ipmiutil/APKBUILD4
-rw-r--r--user/kactivitymanagerd/APKBUILD6
-rw-r--r--user/kde-cli-tools/APKBUILD6
-rw-r--r--user/kde-gtk-config/APKBUILD6
-rw-r--r--user/kdecoration/APKBUILD6
-rw-r--r--user/kdeplasma-addons/APKBUILD6
-rw-r--r--user/kdiagram/APKBUILD4
-rw-r--r--user/kgamma5/APKBUILD6
-rw-r--r--user/khotkeys/APKBUILD6
-rw-r--r--user/kinfocenter/APKBUILD6
-rw-r--r--user/kmenuedit/APKBUILD6
-rw-r--r--user/kscreenlocker/APKBUILD6
-rw-r--r--user/ksshaskpass/APKBUILD6
-rw-r--r--user/ksysguard/APKBUILD6
-rw-r--r--user/kwin/APKBUILD6
-rw-r--r--user/lesscpy/APKBUILD8
-rw-r--r--user/libbytesize/APKBUILD4
-rw-r--r--user/libdca/APKBUILD7
-rw-r--r--user/libdrm/APKBUILD41
-rw-r--r--user/libdrm/ioctl.patch11
-rw-r--r--user/libgd/APKBUILD35
-rw-r--r--user/libgd/CVE-2016-7568.patch33
-rw-r--r--user/libgd/CVE-2018-1000222.patch73
-rw-r--r--user/libgd/CVE-2018-14553.patch99
-rw-r--r--user/libgd/CVE-2018-5711.patch61
-rw-r--r--user/libgd/CVE-2019-6977.patch21
-rw-r--r--user/libgd/CVE-2019-6978.patch216
-rw-r--r--user/libinput/APKBUILD4
-rw-r--r--user/libkscreen/APKBUILD6
-rw-r--r--user/libksysguard/APKBUILD6
-rw-r--r--user/libkworkspace/APKBUILD8
-rw-r--r--user/libkworkspace/standalone.patch2
-rw-r--r--user/libmbim/APKBUILD4
-rw-r--r--user/libnftnl/APKBUILD9
-rw-r--r--user/libnftnl/nft-flowtable-test.patch37
-rw-r--r--user/libnotify/APKBUILD14
-rw-r--r--user/libqmi/APKBUILD4
-rw-r--r--user/libsecret/APKBUILD4
-rw-r--r--user/libslirp/APKBUILD34
-rw-r--r--user/libslirp/static.patch14
-rw-r--r--user/libuninameslist/APKBUILD4
-rw-r--r--user/libwacom/APKBUILD6
-rw-r--r--user/libwacom/musl-test.patch8
-rw-r--r--user/libzip/APKBUILD6
-rw-r--r--user/milou/APKBUILD6
-rw-r--r--user/modemmanager/APKBUILD4
-rw-r--r--user/musl-locales/APKBUILD28
-rw-r--r--user/networkmanager/APKBUILD4
-rw-r--r--user/nftables/APKBUILD6
-rw-r--r--user/opengfx/APKBUILD11
-rw-r--r--user/opengfx/Makefile.patch22
-rw-r--r--user/openttd/APKBUILD4
-rw-r--r--user/oxygen/APKBUILD6
-rw-r--r--user/papirus-icons/APKBUILD4
-rw-r--r--user/perl-gd/APKBUILD2
-rw-r--r--user/php7-apcu/APKBUILD7
-rw-r--r--user/php7/APKBUILD437
-rw-r--r--user/php7/disabled-tests.list87
-rw-r--r--user/php7/enchant-2.patch75
-rw-r--r--user/php7/fix-tests-devserver.patch23
-rw-r--r--user/php7/getsockopt.patch37
-rw-r--r--user/php7/install-pear.patch7
-rw-r--r--user/php7/no-max-ent-size.patch257
-rw-r--r--user/php7/pwbuflen.patch15
-rw-r--r--user/php7/test-fixes.patch71
-rw-r--r--user/php7/zend_bool.patch19
-rw-r--r--user/php7/zip-glob-pathc.patch15
-rw-r--r--user/pixman/APKBUILD6
-rw-r--r--user/plasma-browser-integration/APKBUILD6
-rw-r--r--user/plasma-desktop/APKBUILD6
-rw-r--r--user/plasma-integration/APKBUILD6
-rw-r--r--user/plasma-meta/APKBUILD2
-rw-r--r--user/plasma-nm/APKBUILD6
-rw-r--r--user/plasma-pa/APKBUILD6
-rw-r--r--user/plasma-thunderbolt/APKBUILD6
-rw-r--r--user/plasma-vault/APKBUILD9
-rw-r--r--user/plasma-vault/fix-crash.patch26
-rw-r--r--user/plasma-workspace-wallpapers/APKBUILD6
-rw-r--r--user/plasma-workspace/APKBUILD6
-rw-r--r--user/polkit-kde-agent-1/APKBUILD6
-rw-r--r--user/powerdevil/APKBUILD6
-rw-r--r--user/protobuf/APKBUILD4
-rw-r--r--user/qemu/APKBUILD115
-rw-r--r--user/qemu/CVE-2020-11102.patch144
-rw-r--r--user/qemu/CVE-2020-1711.patch61
-rw-r--r--user/qemu/MAP_SYNC-fix.patch22
-rw-r--r--user/qemu/fix-sockios-header.patch13
-rw-r--r--user/qqc2-desktop-style/APKBUILD4
-rw-r--r--user/qt5-qtbase/APKBUILD11
-rw-r--r--user/qt5-qtbase/CVE-2020-0569.patch29
-rw-r--r--user/qt5-qtbase/CVE-2020-0570.patch55
-rw-r--r--user/rsibreak/APKBUILD4
-rw-r--r--user/ruby-bundler/APKBUILD6
-rw-r--r--user/ruby-diff-lcs/APKBUILD6
-rw-r--r--user/ruby-rake-compiler/APKBUILD4
-rw-r--r--user/ruby-rspec-core/APKBUILD4
-rw-r--r--user/ruby-rspec-expectations/APKBUILD6
-rw-r--r--user/ruby-rspec-mocks/APKBUILD4
-rw-r--r--user/ruby-rspec-support/APKBUILD4
-rw-r--r--user/ruby-rspec/APKBUILD4
-rw-r--r--user/scummvm/APKBUILD4
-rw-r--r--user/sddm-kcm/APKBUILD6
-rw-r--r--user/sdl2/APKBUILD10
-rw-r--r--user/sdl2/gles.patch12
-rw-r--r--user/sdl2/sdl2-soname.patch2
-rw-r--r--user/sg3_utils/APKBUILD4
-rw-r--r--user/spice-gtk/APKBUILD50
-rw-r--r--user/spice-gtk/macro.patch33
-rw-r--r--user/spice-protocol/APKBUILD4
-rw-r--r--user/spice/APKBUILD4
-rw-r--r--user/sshfs/APKBUILD16
-rw-r--r--user/systemsettings/APKBUILD6
-rw-r--r--user/telegram/APKBUILD4
-rw-r--r--user/user-manager/APKBUILD6
-rw-r--r--user/uwsgi/APKBUILD2
-rw-r--r--user/weechat/APKBUILD8
-rw-r--r--user/wireguard-module/APKBUILD4
-rw-r--r--user/wireguard-tools/APKBUILD4
-rw-r--r--user/xorg-server/APKBUILD4
-rw-r--r--user/xxhash/APKBUILD4
-rw-r--r--user/youtube-dl/APKBUILD4
145 files changed, 1729 insertions, 1363 deletions
diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD
index dbed574fe..4996402cb 100644
--- a/user/adwaita-icon-theme/APKBUILD
+++ b/user/adwaita-icon-theme/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adwaita-icon-theme
-pkgver=3.34.3
+pkgver=3.36.0
pkgrel=0
pkgdesc="GNOME system icon set"
url="https://www.gnome.org/"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="77d8fa2cd0a82a7d539b5f9c8c1ed0dc8727de4975a8a770b05f78e4df9dda36aa40232a3ec71f87e24cd1fd6c6a369bcb20c909c1367b89b5327cf3771b48b5 adwaita-icon-theme-3.34.3.tar.xz"
+sha512sums="b5414e4e38d9ffdd5ae8e14cb2f467fc449ca833b3ffd888fa8dde8708ba0cd9292bec8d3c0bc9d917c3117a8d21f828d4113a85c3786d5dcadde46367659934 adwaita-icon-theme-3.36.0.tar.xz"
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index 6488ffa9f..48fcaf26d 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=apache-httpd
_pkgreal=httpd
-pkgver=2.4.41
-pkgrel=1
+pkgver=2.4.43
+pkgrel=0
pkgdesc="Open-source HTTP server"
url="https://httpd.apache.org"
arch="all"
@@ -37,6 +37,9 @@ builddir="$srcdir/$_pkgreal-$pkgver"
options="suid !check"
# secfixes: http_server
+# 2.4.43-r0:
+# - CVE-2020-1934
+# - CVE-2020-1927
# 2.4.34-r0:
# - CVE-2017-15710
# - CVE-2017-15715
@@ -143,7 +146,7 @@ ldap() {
"$subpkgdir"/usr/libexec/apache2
}
-sha512sums="02807a576ea29bd93e648c68e3ad853d5e4971177a0881d6a4873e9c4c5afd6d56877454b666429e70732488a258e0333a0f354d9dbbfd89fc3b38f12f0a0dce httpd-2.4.41.tar.gz
+sha512sums="d9879b8f8ef7d94dee1024e9c25b56d963a3b072520878a88a044629ad577c109a5456791b39016bf4f6672c04bf4a0e5cfd32381211e9acdc81d4a50b359e5e httpd-2.4.43.tar.gz
c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout
336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd
5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd
diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD
index 6a53e2d56..3b9fca102 100644
--- a/user/audacious-plugins/APKBUILD
+++ b/user/audacious-plugins/APKBUILD
@@ -1,9 +1,7 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=audacious-plugins
-pkgver=3.10.1
-pkgrel=1
+pkgver=4.0.1
+pkgrel=0
pkgdesc="Playlist-oriented media player (plugins)"
url="https://audacious-media-player.org/"
arch="all"
@@ -17,16 +15,10 @@ makedepends="audacious-dev>=${pkgver%.*} autoconf automake
libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev
libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev
qt5-qtmultimedia-dev sdl-dev wavpack-dev"
-install_if="audacious=$pkgver"
subpackages="$pkgname-lang"
+install_if="audacious=$pkgver"
source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
-prepare() {
- default_prepare
- msg "Rebuilding configure..."
- aclocal -I m4 && autoheader && autoconf
-}
-
build() {
./configure \
--build=$CBUILD \
@@ -44,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565 audacious-plugins-3.10.1.tar.bz2"
+sha512sums="6611a9204f3f6e70b126ec4712078ba3e5a317b8a41e6d753a24e37e9b19894444ae091654240c6aa0c4d13d53b72d722549edf6077a565ebdd8caf3000823a0 audacious-plugins-4.0.1.tar.bz2"
diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD
index 42e37fd98..473e37ff2 100644
--- a/user/audacious/APKBUILD
+++ b/user/audacious/APKBUILD
@@ -1,8 +1,6 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=audacious
-pkgver=3.10.1
+pkgver=4.0.1
pkgrel=0
pkgdesc="A playlist-oriented media player with multiple interfaces"
url="https://audacious-media-player.org/"
@@ -11,16 +9,10 @@ options="!check" # No test suite.
license="ISC"
depends=""
depends_dev="qt5-qtbase-dev dbus-glib-dev"
-makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake"
+makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
-prepare() {
- default_prepare
- msg "Rebuilding configure..."
- aclocal -I m4 && autoheader && autoconf
-}
-
build() {
./configure \
--build=$CBUILD \
@@ -37,4 +29,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43 audacious-3.10.1.tar.bz2"
+sha512sums="bd1387af281e7f533d4a21bf9fdb8ae49d5a406c051bcfa3a509b9d3cf8fdf6faff21dee841fad9ce1c9bf1a24ce1c08d9dc27a7a28b78ade3f0075fa89aad3d audacious-4.0.1.tar.bz2"
diff --git a/user/bluedevil/APKBUILD b/user/bluedevil/APKBUILD
index 3c6c4bc9d..be3635ac2 100644
--- a/user/bluedevil/APKBUILD
+++ b/user/bluedevil/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bluedevil
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Bluetooth framework for KDE"
url="https://userbase.kde.org/Bluedevil"
@@ -15,7 +15,7 @@ makedepends="bluez-qt-dev cmake extra-cmake-modules kauth-dev kcodecs-dev
kwindowsystem-dev kxmlgui-dev plasma-framework-dev qt5-qtbase-dev
qt5-qtdeclarative-dev solid-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/bluedevil-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/bluedevil-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b1f00b35b44d14d52ba8eb68d6519af0486cb3db2dba4607860730ca2afa825e473d93383097e733e5e322ba9868415d154c81b1f377dd93ed312329a2d840bb bluedevil-5.18.2.tar.xz"
+sha512sums="dbefd648e525b4dc15dad77748e27726bcdd4790d9a12b57cbcb878c45a8bba25d94e49f68fcf28fb77e41e95a26d0bfb00c1c7faf3983197ff500f462ae2c2d bluedevil-5.18.4.1.tar.xz"
diff --git a/user/breeze-grub/APKBUILD b/user/breeze-grub/APKBUILD
index 2c62f2f6a..a43740724 100644
--- a/user/breeze-grub/APKBUILD
+++ b/user/breeze-grub/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=breeze-grub
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE Breeze theme for GRUB boot screen"
url="https://www.kde.org/"
@@ -12,11 +12,11 @@ depends="grub"
makedepends=""
subpackages=""
install_if="grub breeze"
-source="https://download.kde.org/stable/plasma/$pkgver/breeze-grub-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-grub-$pkgver.tar.xz"
package() {
mkdir -p "$pkgdir"/usr/share/grub/themes
cp -r breeze "$pkgdir"/usr/share/grub/themes/
}
-sha512sums="39636bec70735e05dca3e544f541fd4483e90b57394fb514a12f80ec71fa96db7bb29ed5f122499a39fff2a81d7b0c69cbc1e48b3a00b48f0e94a93b51c3ae3f breeze-grub-5.18.2.tar.xz"
+sha512sums="1b170cc767f6d2178db4713d4ce68d61d9462ae2deda633b1afb3973e37cb16e156a012c94c98853855ef82d1087b4f95c0f0f0480b7b38a876e8bf3eedc762a breeze-grub-5.18.4.1.tar.xz"
diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD
index 8308c281a..07b9fca4e 100644
--- a/user/breeze-gtk/APKBUILD
+++ b/user/breeze-gtk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=breeze-gtk
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="GTK+ style that matches KDE Breeze"
url="https://www.kde.org/"
@@ -11,7 +11,7 @@ depends="breeze gtk+2.0"
makedepends="breeze-dev cmake extra-cmake-modules py3-pycairo qt5-qtbase-dev sassc"
# XXX should be installed if breeze and gtk+3.0 are installed, as well
install_if="breeze~$pkgver gtk+2.0"
-source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-gtk-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="124a55280936a24519bcf1fd17009c7da7dc3b7b96c86101e2fc2fe1628b1740f5aeb04fd019f60a15a73c64f2d035c7d9815a2b40c59d37e6519f5c7c1b491a breeze-gtk-5.18.2.tar.xz"
+sha512sums="c04b7b438dd3f23526627b1c416ff9b29d8cb6d8f27370731ffae9aad53c6554251a36663097d84645597b3cc541fbb80988cad093786a5d497958bd5e9ff57b breeze-gtk-5.18.4.1.tar.xz"
diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD
index 6b0122e72..721d99c3f 100644
--- a/user/breeze/APKBUILD
+++ b/user/breeze/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=breeze
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Default KDE Plasma 5 style"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 kcmutils-dev
kconfigwidgets-dev kcoreaddons-dev kdecoration-dev kguiaddons-dev
ki18n-dev kpackage-dev frameworkintegration-dev kwindowsystem-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ebd888aeb2b81043e8d389b5596c44b5da585015d603978509bf0551c0cec145db042b277483061cef71e55ff36eb762fe184f7b7c71094247fcb249f4d19310 breeze-5.18.2.tar.xz"
+sha512sums="41c540c0136dafb35da6abcf84f6d0d9be905599c1448c1efa8a8c61a77a1b0903a11bfd821e26691deeb8aa7e5268e198c9d1846ab1d4c6590fbecc83d75342 breeze-5.18.4.1.tar.xz"
diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD
index 2a735e5ce..8d0a30b7e 100644
--- a/user/cbindgen/APKBUILD
+++ b/user/cbindgen/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Contributor: Gentoo Rust Maintainers <rust@gentoo.org>
# Contributor: Samuel Holland <samuel@sholland.org>
-# Maintainer: Molly Miller <adelie@m-squa.red>
+# Maintainer: Molly Miller <sysvinit@adelielinux.org>
pkgname=cbindgen
-pkgver=0.12.1
+pkgver=0.13.2
pkgrel=0
pkgdesc="Tool to generate C bindings from Rust code"
url="https://github.com/eqrion/cbindgen"
@@ -102,7 +102,7 @@ package() {
}
-sha512sums="851f82cfdd4304dc57dab1a145f78a05a6c5f05ad607d27e0ae909920a5d99013ffb7f7e87950541bda98462f73f0c338d9761b94a96c3073f39163c2ddacf08 cbindgen-0.12.1.tar.gz
+sha512sums="2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66 cbindgen-0.13.2.tar.gz
a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz
4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz
ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz
diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD
index 26345d0ac..b616e4fab 100644
--- a/user/checkbashisms/APKBUILD
+++ b/user/checkbashisms/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=checkbashisms
-pkgver=2.19.7
+pkgver=2.20.2
pkgrel=0
pkgdesc="Check shell scripts for POSIX compliance"
-url="https://tracker.debian.org/pkg/devscripts"
+url="https://salsa.debian.org/debian/devscripts"
arch="noarch"
license="GPL-2.0+"
depends="perl"
@@ -37,4 +37,4 @@ bashcomp() {
"$subpkgdir/usr/share/bash-completion/completions/$pkgname"
}
-sha512sums="6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7 devscripts_2.19.7.tar.xz"
+sha512sums="d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510 devscripts_2.20.2.tar.xz"
diff --git a/user/cyrus-sasl/APKBUILD b/user/cyrus-sasl/APKBUILD
index be7505b82..b061d41ad 100644
--- a/user/cyrus-sasl/APKBUILD
+++ b/user/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=cyrus-sasl
pkgver=2.1.27
-pkgrel=0
+pkgrel=1
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -15,11 +15,14 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-gssapi $pkgname-gs2
libsasl $pkgname-openrc"
source="https://github.com/cyrusimap/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
saslauthd.initd
+ CVE-2019-19906.patch
"
# secfixes:
# 2.1.26-r7:
-# - CVE-2013-4122
+# - CVE-2013-4122
+# 2.1.27-r1:
+# - CVE-2019-19906
build() {
./configure \
@@ -76,4 +79,5 @@ libsasl() {
}
sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b cyrus-sasl-2.1.27.tar.gz
-71a00a22f91f0fb6ba2796acede321a0f071b1d7a99616f0e36c354213777f30575c340b6df392dcbfc103ba7640d046144882f6a7b505f59709bb5c429b44d8 saslauthd.initd"
+71a00a22f91f0fb6ba2796acede321a0f071b1d7a99616f0e36c354213777f30575c340b6df392dcbfc103ba7640d046144882f6a7b505f59709bb5c429b44d8 saslauthd.initd
+35d2fc8d1ea905898d526af515ee6c1c23f46092d2a034c7fa1b989ec2985ff68f74b7dc26e86525beecb6997562f29aea87a0c945953db1b6a0fac807c294ae CVE-2019-19906.patch"
diff --git a/user/cyrus-sasl/CVE-2019-19906.patch b/user/cyrus-sasl/CVE-2019-19906.patch
new file mode 100644
index 000000000..acdf68243
--- /dev/null
+++ b/user/cyrus-sasl/CVE-2019-19906.patch
@@ -0,0 +1,25 @@
+From dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1 Mon Sep 17 00:00:00 2001
+From: Quanah Gibson-Mount <quanah@symas.com>
+Date: Tue, 18 Feb 2020 19:05:12 +0000
+Subject: [PATCH] Fix #587
+
+Off by one error in common.c, CVE-2019-19906.
+
+Thanks to Stephan Zeisberg for reporting
+---
+ lib/common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/common.c b/lib/common.c
+index bc3bf1df..9969d6aa 100644
+--- a/lib/common.c
++++ b/lib/common.c
+@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen,
+
+ if (add==NULL) add = "(null)";
+
+- addlen=strlen(add); /* only compute once */
++ addlen=strlen(add)+1; /* only compute once */
+ if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
+ return SASL_NOMEM;
+
diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD
index 0c077d307..d00813c2d 100644
--- a/user/dialog/APKBUILD
+++ b/user/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dialog
-pkgver=1.3.20191210
+pkgver=1.3.20200327
_realver="${pkgver%.*}-${pkgver##*.}"
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4196287f26da2aab8376141a1442bccea52bcc6f7003042101df0c6a72aa3e25aa909d9fbcb937b047ab12a2e4349ec4b71b26f6e5cd4ba41cfd5665f732975d dialog-1.3-20191210.tgz"
+sha512sums="c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59 dialog-1.3-20200327.tgz"
diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index fd0988844..40f60f469 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dracut
-pkgver=048
-pkgrel=4
+pkgver=050
+pkgrel=0
pkgdesc="Event-driven initramfs infrastructure"
url="https://dracut.wiki.kernel.org/"
arch="all"
@@ -13,6 +13,7 @@ makedepends="fts-dev kmod-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
$pkgname-crypt::noarch $pkgname-lvm::noarch"
source="https://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.xz
+ fts.patch
header-fix.patch
mount-run-without-noexec.patch
"
@@ -67,6 +68,7 @@ lvm() {
mkdir -p "$subpkgdir"
}
-sha512sums="97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0 dracut-048.tar.xz
+sha512sums="eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850 dracut-050.tar.xz
+ce84e527e441e18494ea9011b4b10cf723ce5981c4717140f43861b6ed3e0f0aa78545be41c111d3338422f2ad158edc8704376c3dca207ae4445c58f54a4574 fts.patch
988f03a3fd2e7ee62409d3c57e8029403513dcec5efb37e64633d989728e4c7b619ce5b8775a04c5a0b654f7f093777d94fe6e4098a99a690c353a94f537e24c header-fix.patch
d7aa2b35def975ec2a9620d3e8c94da5fad5be51e81ac913b9f3497b3ca62beefb9d4cf8e4ba3b292f89b936373486d0e3184f65eb1eaed972f38d17424a32b1 mount-run-without-noexec.patch"
diff --git a/user/dracut/fts.patch b/user/dracut/fts.patch
new file mode 100644
index 000000000..f2bbb03b7
--- /dev/null
+++ b/user/dracut/fts.patch
@@ -0,0 +1,30 @@
+From 7f6517b7dc3f3d160ae43de43d1184b137c0c96f Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 5 Apr 2020 04:52:19 -0500
+Subject: [PATCH] configure: Find FTS library with --as-needed
+
+When LDFLAGS contains ``-Wl,--as-needed``, the FTS library will be
+ignored if it is specified before the .c source.
+
+Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
+Fixes: 62f27ee6f145 ("configure: find cflags and libs for fts on musl")
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 3f724ef2..aceec138 100755
+--- a/configure
++++ b/configure
+@@ -85,7 +85,7 @@ EOF
+
+ found=no
+ for lib in "-lc" "-lfts"; do
+- ${CC} $CFLAGS -Wl,$lib $LDFLAGS conftest.c >/dev/null 2>&1
++ ${CC} $CFLAGS $LDFLAGS conftest.c -Wl,$lib >/dev/null 2>&1
+ ret=$?
+ if test $ret -eq 0; then
+ FTS_LIBS="$lib"
+--
+2.25.1
+
diff --git a/user/drkonqi/APKBUILD b/user/drkonqi/APKBUILD
index 7c2089579..3356bc9ce 100644
--- a/user/drkonqi/APKBUILD
+++ b/user/drkonqi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=drkonqi
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Crash diagnostic system for KDE"
url="https://www.kde.org/"
@@ -15,7 +15,7 @@ makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev
kwallet-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev
qt5-qtbase-dev qt5-qtx11extras-dev solid-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/drkonqi-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/drkonqi-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c878a9348fe270a84321e5bc3f22063c39acde8ff1378d32c6d3f009f17374bb861cfb71559cdfe2c8046ce60c1198e7946ab181ebfa27a02c6e0aa74c9adb0b drkonqi-5.18.2.tar.xz"
+sha512sums="5d9c7dfbe4687d88ffe43e6676d6dbd04c97816acb4819604ff6ea5a1f9b987834b2831e75281f8fbe6837a42c410a6a595d61e6f2a4b8a9bd6c23b2102ee544 drkonqi-5.18.4.1.tar.xz"
diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD
index 733fcae80..32250cbf3 100644
--- a/user/erlang/APKBUILD
+++ b/user/erlang/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=erlang
-pkgver=22.2.7
+pkgver=22.3
pkgrel=0
pkgdesc="Soft real-time system programming language"
url="https://www.erlang.org/"
@@ -50,5 +50,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b erlang-22.2.7.tar.gz
+sha512sums="138c4807f1116ad507d5ce2899438aebf3e1d5503d0de1cf81535dfa2d7bf9224dc45adeeabe5e479bb83293002c0d03e7f78be9f93394e9b85f1d83a3381446 erlang-22.3.tar.gz
4331f4b9a8cd0787d79f26304415604118cf2f750cb2e98f3d0bb16dbf9e2b5e230b4b4b15fed4ac207a0ae83a0963adebd3f5e9423b98f0b7f733334669709d fix-wx-linking.patch"
diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD
index 6811c1bef..6ddc8cf92 100644
--- a/user/evince/APKBUILD
+++ b/user/evince/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=evince
-pkgver=3.34.2
+pkgver=3.36.0
pkgrel=0
pkgdesc="GNOME document viewer"
url="https://wiki.gnome.org/Apps/Evince"
@@ -32,38 +32,6 @@ build() {
--disable-nautilus \
--enable-introspection \
--enable-ps
-
- # our msgfmt(1) can't do --desktop
- cp data/org.gnome.Evince.desktop.in data/org.gnome.Evince.desktop
- cp data/org.gnome.Evince-previewer.desktop.in \
- data/org.gnome.Evince-previewer.desktop
- cp backend/pdf/evince-pdfdocument.metainfo.xml.in \
- backend/pdf/evince-pdfdocument.metainfo.xml
- cp backend/pdf/pdfdocument.evince-backend.desktop.in \
- backend/pdf/pdfdocument.evince-backend
- cp backend/djvu/evince-djvudocument.metainfo.xml.in \
- backend/djvu/evince-djvudocument.metainfo.xml
- cp backend/djvu/djvudocument.evince-backend.desktop.in \
- backend/djvu/djvudocument.evince-backend
- cp backend/tiff/evince-tiffdocument.metainfo.xml.in \
- backend/tiff/evince-tiffdocument.metainfo.xml
- cp backend/tiff/tiffdocument.evince-backend.desktop.in \
- backend/tiff/tiffdocument.evince-backend
- cp backend/comics/evince-comicsdocument.metainfo.xml.in \
- backend/comics/evince-comicsdocument.metainfo.xml
- cp backend/comics/comicsdocument.evince-backend.desktop.in \
- backend/comics/comicsdocument.evince-backend
- cp backend/xps/evince-xpsdocument.metainfo.xml.in \
- backend/xps/evince-xpsdocument.metainfo.xml
- cp backend/xps/xpsdocument.evince-backend.desktop.in \
- backend/xps/xpsdocument.evince-backend
- cp backend/ps/evince-psdocument.metainfo.xml.in \
- backend/ps/evince-psdocument.metainfo.xml
- cp backend/ps/psdocument.evince-backend.desktop.in \
- backend/ps/psdocument.evince-backend
- cp org.gnome.Evince.appdata.xml.in org.gnome.Evince.appdata.xml
-
- # we now return you to your regularly scheduled build
make
}
@@ -75,4 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12 evince-3.34.2.tar.xz"
+sha512sums="914c182f0ca71a0df99036339fe18f7c93514bae461ddecd719c5659c1cc67701f825e7a58b1eb203051ec55ccd402371fc70d3a27134ccdf915966e5bad8b7a evince-3.36.0.tar.xz"
diff --git a/user/farstream/APKBUILD b/user/farstream/APKBUILD
index c5a6f422e..cba6a5fad 100644
--- a/user/farstream/APKBUILD
+++ b/user/farstream/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=farstream
-pkgver=0.2.8
+pkgver=0.2.9
pkgrel=0
pkgdesc="Audio/Video communications framework"
url="https://www.freedesktop.org/wiki/Software/Farstream/"
@@ -11,11 +11,14 @@ license="LGPL-2.1+"
depends="gst-plugins-base gst-plugins-good"
depends_dev="glib-dev"
makedepends="$depends_dev gobject-introspection-dev gstreamer-dev
- gst-plugins-base-dev libnice-dev"
+ gst-plugins-base-dev libnice-dev autoconf automake libtool cmd:which"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz"
+source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz
+ make43.patch
+ "
build() {
+ ./autogen.sh --disable-gtk-doc
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,4 +38,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e farstream-0.2.8.tar.gz"
+sha512sums="8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd farstream-0.2.9.tar.gz
+ea863d7e72e6c0311c1e6f4718721f4f03955e0c9a61066db833cc0b73246b27387067abfe677f594c6a132c7e3836de50cc216903ba12e286638988f41e3bd5 make43.patch"
diff --git a/user/farstream/make43.patch b/user/farstream/make43.patch
new file mode 100644
index 000000000..7b1ec9a9e
--- /dev/null
+++ b/user/farstream/make43.patch
@@ -0,0 +1,38 @@
+From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@freedesktop.org>
+Date: Thu, 12 Mar 2020 14:07:23 +0100
+Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
+
+GNU Make 4.3 has a backwards incompatible change affecting the use of
+number signs or hashes (ie., #) inside function invocations. See:
+https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
+
+In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
+argument to the foreach call to '\#', not '#'. This would lead to
+spurious backslashes in front of the '#include' directives in the
+generated fs-enumtypes.c file.
+
+Spotted by Ernestas Kulik.
+
+https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
+---
+ common-modified/gst-glib-gen.mak | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
+index 14f1ba37c788..2247a41c49ea 100644
+--- a/common-modified/gst-glib-gen.mak
++++ b/common-modified/gst-glib-gen.mak
+@@ -6,7 +6,8 @@
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++hash:=\#
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
+--
+2.24.1
+
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index 649a95029..a04dacd5f 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Molly Miller <adelie@m-squa.red>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=firefox-esr
-pkgver=68.6.0
+pkgver=68.7.0
pkgrel=0
pkgdesc="Firefox web browser (extended support release)"
url="https://www.mozilla.org/firefox/"
@@ -114,7 +114,12 @@ ldpath="$_mozappdir"
# - CVE-2020-6811
# - CVE-2020-6812
# - CVE-2020-6814
-
+# 68.7.0-r0:
+# - CVE-2020-6819
+# - CVE-2020-6820
+# - CVE-2020-6821
+# - CVE-2020-6822
+# - CVE-2020-6825
unpack() {
default_unpack
@@ -230,7 +235,7 @@ package() {
EOF
}
-sha512sums="84565d654ed8bd2d036d08de4d16e41ae8881f0b20b34424ab347d50a37384acf50c04f74269720e79db28028569dff79f2b910848939ff87c078f36684a75a3 firefox-68.6.0esr.source.tar.xz
+sha512sums="a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593 firefox-68.7.0esr.source.tar.xz
16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz
f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig
ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch
diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD
index 821be29db..14cafec71 100644
--- a/user/fuse3/APKBUILD
+++ b/user/fuse3/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=fuse3
_pkgname=fuse
-pkgver=3.9.0
+pkgver=3.9.1
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -26,18 +26,26 @@ builddir="$srcdir/$_pkgname-$pkgver"
# - CVE-2018-10906
build() {
+ # The examples are required for the tests to work, and aren't
+ # otherwise installed
+
meson \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
--buildtype=release \
- -Dexamples=false \
+ -Dexamples=true \
. output
ninja -C output
}
check() {
+ # Recommended procedure:
+ # 1. modprobe fuse
+ # 2. chown root and chmod u+s $builddir/output/util/fusermount3
+ # 3. abuild check
+
cd "$builddir"/output
python3 -m pytest test/
}
@@ -72,6 +80,6 @@ openrc() {
install_if="openrc fuse-common=$pkgver-r$pkgrel"
}
-sha512sums="0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7 fuse-3.9.0.tar.xz
+sha512sums="295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329 fuse-3.9.1.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd"
diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD
index 659a0d1b1..cad989ef8 100644
--- a/user/gmime/APKBUILD
+++ b/user/gmime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gmime
-pkgver=3.2.6
+pkgver=3.2.7
pkgrel=0
pkgdesc="MIME utility library"
url="https://developer.gnome.org/gmime/"
@@ -42,5 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d gmime-3.2.6.tar.xz
+sha512sums="2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b gmime-3.2.7.tar.xz
443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch"
diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD
index 17760d3c6..183bda57d 100644
--- a/user/hwids/APKBUILD
+++ b/user/hwids/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=hwids
-pkgver=20200204
+pkgver=20200306
pkgrel=0
pkgdesc="Hardware identification databases"
url="https://github.com/gentoo/hwids/"
@@ -25,7 +25,6 @@ package() {
}
_mv() {
- local _file
pkgdesc="$pkgdesc ($1)"
shift
depends=""
@@ -65,4 +64,4 @@ udev() {
mv "$pkgdir"/etc "$subpkgdir"/
}
-sha512sums="1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741 hwids-20200204.tar.gz"
+sha512sums="eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250 hwids-20200306.tar.gz"
diff --git a/user/ipmiutil/APKBUILD b/user/ipmiutil/APKBUILD
index 56172ac63..914a43491 100644
--- a/user/ipmiutil/APKBUILD
+++ b/user/ipmiutil/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ipmiutil
-pkgver=3.1.5
+pkgver=3.1.6
pkgrel=0
pkgdesc="IPMI Management Utilities"
url="http://ipmiutil.sourceforge.net/"
@@ -40,5 +40,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a9bd4d99d5bcad8a9f64c3636d6774d09e1d4c20927a6803891777ba035ee3c114b06295185cf00fb0c5d4b4b9afd335fd19c06f64298130e42945dc5f6e8010 ipmiutil-3.1.5.tar.gz
+sha512sums="9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef ipmiutil-3.1.6.tar.gz
74e8951bccd004f765b99de87dc5f04834e594b3e14ba885148fb971eaf15164ccac2de880e409f201a38cba5c0948a0fabc04e1e34fb396f50b1ecddb6b305b ipmiutil-3.0.7-fix-sha256.patch"
diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD
index bbcd6f519..ce56755c7 100644
--- a/user/kactivitymanagerd/APKBUILD
+++ b/user/kactivitymanagerd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kactivitymanagerd
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Service to manage KDE Plasma activities"
url="https://www.kde.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev
boost-dev python3 kconfig-dev kcoreaddons-dev kwindowsystem-dev kio-dev
kglobalaccel-dev kxmlgui-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kactivitymanagerd-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="3e387114cb4245357d8c7a042077b9591de1743a89efdeb0199ff354d67670d5021bca69bcb70679ea5f9f61ba95aed209370f98c48ce3c7f051b7f9dd9a55b3 kactivitymanagerd-5.18.2.tar.xz"
+sha512sums="b3231305643247fa82f267ac942878136f1710faf1fe3b084efad25e8a3fb124ebbab5cf88251dd54d8e8bbbf3ac31088b25bf8047307adef95b5d40c8175ee0 kactivitymanagerd-5.18.4.1.tar.xz"
diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD
index 3688e24c9..02419dc38 100644
--- a/user/kde-cli-tools/APKBUILD
+++ b/user/kde-cli-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kde-cli-tools
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE command-like utilities"
url="https://www.kde.org/"
@@ -15,7 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev
kdeclarative-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev
kinit-dev kio-dev kservice-dev kwindowsystem-dev libkworkspace-dev"
subpackages="$pkgname-lang $pkgname-doc"
-source="https://download.kde.org/stable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kde-cli-tools-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d87cec3a791f2fc17533bac3901a578df842d110afc0c9ce85e02e50d401a909beff4f16d144f3e79c0a7b4e308e2a4ed40359629a833ffe8b7bc179771c0f12 kde-cli-tools-5.18.2.tar.xz"
+sha512sums="9cf32f4b87b1cf45f9e034c9929ed38a39de989c36cc0118d4f544fbb9ceb4b9419d2d518165a1c2d0b0dca4ec20f063f771dad4859bb6df1975afaa6388412e kde-cli-tools-5.18.4.1.tar.xz"
diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD
index be224072d..c6e951067 100644
--- a/user/kde-gtk-config/APKBUILD
+++ b/user/kde-gtk-config/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kde-gtk-config
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE System Settings panel for configuring GTK+ application styles"
url="https://www.kde.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev gtk+2.0-dev gtk+3.0-dev
karchive-dev kcmutils-dev kconfigwidgets-dev ki18n-dev kiconthemes-dev
kio-dev knewstuff-dev gsettings-desktop-schemas-dev"
subpackages=""
-source="https://download.kde.org/stable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kde-gtk-config-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="950be06b4aee8d51c21b60a9b698426dd3444a63edff92e1dec0fc62269fcd1054cbebb602e5b26e84399959038f26a221590ebf084a6118bb6a84cde78d6083 kde-gtk-config-5.18.2.tar.xz"
+sha512sums="9a6ba26c4d0b4936fcdc8a32a8d0e48294757a3315de38bba64bbeaed2d23a0ccf117d54208af502f30e5d5878a4a925a84c061adf23741d5f64db539efa2737 kde-gtk-config-5.18.4.1.tar.xz"
diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD
index 58585fbdf..6dc6957d9 100644
--- a/user/kdecoration/APKBUILD
+++ b/user/kdecoration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kdecoration
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Window decoration plugin library"
url="https://www.kde.org/"
@@ -12,7 +12,7 @@ depends=""
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kdecoration-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kdecoration-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b7408a3c57951d6038c1a603bfe34093a95848b7fa341352a19ead272c8e9241876138321b135c1ee6461b4bdfcc10a8606f2650cf2444733ba2038dae105462 kdecoration-5.18.2.tar.xz"
+sha512sums="32ba5c14b8b11a9874131405f0cddcec8eec634afd016cb8454a0247ccef55a8411a718e1d3eccc5f23efedafa0a1d32a62e0dc9b20ce9133a09e23f4c6739e1 kdecoration-5.18.4.1.tar.xz"
diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD
index 87073b883..1d40d7213 100644
--- a/user/kdeplasma-addons/APKBUILD
+++ b/user/kdeplasma-addons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kdeplasma-addons
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Extra applets and toys for KDE Plasma"
url="https://www.kde.org/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kross-dev krunner-dev kservice-dev kunitconversion-dev kholidays-dev
plasma-framework-dev plasma-workspace-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kdeplasma-addons-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +41,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="ae20b08ac7624dbad78d4bc30086a115bcd8d97c59c67452902afa63d3288f896b760ca7ef54e53f06f4cd14edacf5603f33842ebd25517dad775f24389cd8b2 kdeplasma-addons-5.18.2.tar.xz"
+sha512sums="1ec38e56b132e1d774973d2a8a758bfc88de01c96a11e95507bfebb4c5fcce35c6f9e446fabf5e9754678232d31ee95d8470340f7d5c861960ceca81b20b45ee kdeplasma-addons-5.18.4.1.tar.xz"
diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD
index 5c5b7e882..6fbff8e0a 100644
--- a/user/kdiagram/APKBUILD
+++ b/user/kdiagram/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdiagram
-pkgver=2.6.1
+pkgver=2.6.2
pkgrel=0
pkgdesc="Charting libraries used by KDE"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128 kdiagram-2.6.1.tar.xz"
+sha512sums="008688e76e30b933576523e2204b029ce2a5f5d232002d481c7c49f4ad2955b3f46cbe4b51a046a771130f3584225127b21df30efc042cddc9440f81ea8f495a kdiagram-2.6.2.tar.xz"
diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD
index 33b326b0a..f033c706a 100644
--- a/user/kgamma5/APKBUILD
+++ b/user/kgamma5/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kgamma5
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Control monitor gamma from KDE 5"
url="https://www.KDE.org/"
@@ -11,7 +11,7 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev
kconfigwidgets-dev kdoctools-dev ki18n-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kgamma5-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2a5a470f55a0d68c6083725ce157039c9965c0262ceb0b34a67269eca696110191d4c5dce11be16944e86eb03df7b11d2162953b40b682ea55d5fef29091eab2 kgamma5-5.18.2.tar.xz"
+sha512sums="5ad1154a84568d0cfa7640f028f9059e5b9f09f1104990ef21d06fb7fdc3d74ba7c6fafcaaff7b4f303682bf521f10db76849b131f9a020a2b8d354b5e1160a5 kgamma5-5.18.4.1.tar.xz"
diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD
index 0eacef73e..e9aee7205 100644
--- a/user/khotkeys/APKBUILD
+++ b/user/khotkeys/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=khotkeys
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Hot key mapping for KDE Plasma 5"
url="https://www.KDE.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev libx11-dev
kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev
kxmlgui-dev libice-dev libkworkspace-dev plasma-framework-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/khotkeys-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5acf66cf3bc7fb3c9ea5bda5e7af9af04883d7e00b82d66357bbc7651d279e9a7f280d94cce7da8427df9377c8161332676333f3ae8d38ef11f0ccf25b2cbb80 khotkeys-5.18.2.tar.xz"
+sha512sums="9c290c75caf175e66b69f182cb81348d0926b03dd569533dd6da380c299d416fd42f06d6c18fc6791c913e31f955c9adc98c20215442d7d93561b9bdb278e36d khotkeys-5.18.4.1.tar.xz"
diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD
index c0d3c7dcd..c015c7713 100644
--- a/user/kinfocenter/APKBUILD
+++ b/user/kinfocenter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kinfocenter
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Information about the running computer"
url="https://userbase.kde.org/KInfoCenter"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
kservice-dev solid-dev kwidgetsaddons-dev kxmlgui-dev kdeclarative-dev
kpackage-dev libraw1394-dev pciutils-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kinfocenter-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="de8786eba290778af51eed8335a7026f06fac809a913b340321739b0e815e37c19b91b544c86054aedf835d6316d8b897547e9bdd3fa823a5d1e9c5e2439067e kinfocenter-5.18.2.tar.xz"
+sha512sums="6b7c5c4c755afdc3c04ca15f6a958cf541d33b03c731fa77a5cf99fa015d0e35a00016ab7f21b6b1f30afd7c423dc4fdde03557645b040d325509a6ae8c44dcb kinfocenter-5.18.4.1.tar.xz"
diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD
index 2e66d85df..0c3734bbb 100644
--- a/user/kmenuedit/APKBUILD
+++ b/user/kmenuedit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kmenuedit
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Menu editor for Plasma 5"
url="https://www.KDE.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev
kiconthemes-dev kglobalaccel-dev kinit-dev kio-dev kitemviews-dev kxmlgui-dev
sonnet-dev kdoctools-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kmenuedit-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2b38ff3ae5a05125d08e27a6591d424035fede907c2cb21b95b4c9f5aa24174367ff00b123d015448d2871a82c95c8bef5d40cf488b779cfb7b2fb4d03aa03a0 kmenuedit-5.18.2.tar.xz"
+sha512sums="6a4e45a8c97de0badea82d70ec1085b3b34c06fd11723dd024263e966bbbbae5cfc4c42dfe217f79e59d84723c418f7146f0dee55ace0fbb77645714731f4a49 kmenuedit-5.18.4.1.tar.xz"
diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD
index 0f5d0c768..19f6a0c4d 100644
--- a/user/kscreenlocker/APKBUILD
+++ b/user/kscreenlocker/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kscreenlocker
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Secure X11 screen locker"
url="https://www.kde.org/"
@@ -17,7 +17,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev
ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev
consolekit2-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kscreenlocker-$pkgver.tar.xz
kde.pam
kde-np.pam
"
@@ -47,6 +47,6 @@ package() {
install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np
}
-sha512sums="904c6438c8afea186896ffd508fc30020f12456eb3631dd97596096b00a51928654382091c7aca5e0db927c18173ea5b6d60877591b1f4e5eb23a5617cb4f9d4 kscreenlocker-5.18.2.tar.xz
+sha512sums="f58e46b6b86ab49f458ca00604655369755d51b54e7f97ad1f640d4fa51bab5d904ee26c0981a2252ee4edff3063a40f5792b860cd39d19f3db8ba93ec9aed5b kscreenlocker-5.18.4.1.tar.xz
56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam
565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam"
diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD
index e1e349f2b..f0c780cd9 100644
--- a/user/ksshaskpass/APKBUILD
+++ b/user/ksshaskpass/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=ksshaskpass
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Plasma integration for SSH agents"
url="https://www.KDE.org/"
@@ -11,7 +11,7 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
kdoctools-dev ki18n-dev kwallet-dev kwidgetsaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/ksshaskpass-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6cf83ddee7273a4dcae9e6a73c204edfe4318c20277c9526af4faf49c28c7dc27d041836e11cd4cf93b5eb15175ad4f88451ff506c209ddd98986e06713975b8 ksshaskpass-5.18.2.tar.xz"
+sha512sums="42d3615b631b225a455c939a72a0a1cd1766c7baa7bf9396b4509c880f37784beddaf2596d124362d9720901bad776aaf6b248ccf8b53e0691d74c948272c952 ksshaskpass-5.18.4.1.tar.xz"
diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD
index 7ae8ab039..11537dc35 100644
--- a/user/ksysguard/APKBUILD
+++ b/user/ksysguard/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=ksysguard
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE system monitor utility"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev
knotifications-dev kwindowsystem-dev libksysguard-dev
cmake extra-cmake-modules kdoctools-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/ksysguard-$pkgver.tar.xz
ksysguard-5.6.5-rindex-header.patch
"
@@ -40,5 +40,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2d1f02fa4ca05b130ebf2bf3ec82ab5d8966451ae078f0c5c5d8807f17d8d2067b3dc028da6f92d69aad89a7818849cb9a8d0b3e0cfa519957592b6e63415595 ksysguard-5.18.2.tar.xz
+sha512sums="2c2bb6596987effe558eeafe855a4914186da815a7688b68c75bf44daa29e5153b0cae4b2692f780fe2001042dbb12568e3c708b711c179f93fb7110f50dc696 ksysguard-5.18.4.1.tar.xz
75e07b80c647bc6fdfb092ad3855813ef6bfe91b0ad03562dacfe4e680cfdee201364a2e452db162822045684635c1791ab2392c47d8e5c560c9e617a970cf39 ksysguard-5.6.5-rindex-header.patch"
diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD
index 2487fe332..b9573edc3 100644
--- a/user/kwin/APKBUILD
+++ b/user/kwin/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kwin
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Modern, stylish window manager (requires OpenGL)"
url="https://www.kde.org/"
@@ -24,7 +24,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3
kservice-dev ktextwidgets-dev kwayland-dev kwidgetsaddons-dev
kxmlgui-dev plasma-framework-dev qt5-qtvirtualkeyboard-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/kwin-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -50,4 +50,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="dab807fd97d501b6dd90cb881a571a9c60be0fc6a7159460d7b025416d10fbfbe152d3cb13c067cd0ac035590e28ed5e72d971b8fd4e10cf2d3883309230b129 kwin-5.18.2.tar.xz"
+sha512sums="5e2ef7a8bd2969121d560e6558791298d8506d1af4c67aca8e6d2377af76e10b8e6ee32f116911a85352a74195a1cbd6dd4d40054f1796ff4b54b1e5418a5772 kwin-5.18.4.1.tar.xz"
diff --git a/user/lesscpy/APKBUILD b/user/lesscpy/APKBUILD
index 00f5933d5..b85dd07b5 100644
--- a/user/lesscpy/APKBUILD
+++ b/user/lesscpy/APKBUILD
@@ -1,16 +1,18 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lesscpy
-pkgver=0.13.0
+pkgver=0.14.0
pkgrel=0
pkgdesc="LESS language compiler, written in Python"
url=" "
arch="noarch"
+options="!check" # Unpackaged dependencies
license="MIT"
depends="python3 py3-ply py3-six"
+#checkdepends="coverage py3-flake8 py3-nose"
makedepends="python3-dev"
subpackages=""
-source="lesscpy-$pkgver.tar.gz::https://github.com/lesscpy/lesscpy/archive/$pkgver.tar.gz"
+source="https://pypi.python.org/packages/source/l/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
python3 setup.py build
@@ -24,4 +26,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="fc540e792dd5b094e284d23257ee48aef7c72cd1733a3d5ffa1ab87821db694c6ab3f2afc0d3b39b82bc5b8a8d52b496e5b413186c4190b6fd59eb687cd38014 lesscpy-0.13.0.tar.gz"
+sha512sums="333015e3d4169fafedf0c295d12d5f0eadb8bea2576d147f1461e5854638b0501ea3038a945924efd81629b66dcc7ffcd3fabd12933529cb5fd4b962e87fe2c3 lesscpy-0.14.0.tar.gz"
diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD
index c013f2953..3c91d3cb2 100644
--- a/user/libbytesize/APKBUILD
+++ b/user/libbytesize/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libbytesize
-pkgver=2.1
+pkgver=2.2
pkgrel=0
pkgdesc="Library for working with sizes in bytes"
url="https://github.com/storaged-project/libbytesize/"
@@ -44,5 +44,5 @@ py() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8 libbytesize-2.1.tar.gz
+sha512sums="4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1 libbytesize-2.2.tar.gz
5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d no-msgcat.patch"
diff --git a/user/libdca/APKBUILD b/user/libdca/APKBUILD
index aa4925405..151f517f8 100644
--- a/user/libdca/APKBUILD
+++ b/user/libdca/APKBUILD
@@ -1,18 +1,19 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libdca
-pkgver=0.0.6
+pkgver=0.0.7
pkgrel=0
pkgdesc="Free DTS Coherent Acoustics decoder"
url="https://www.videolan.org/developers/libdca.html"
arch="all"
license="GPL-2.0+"
depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.videolan.org/pub/videolan/libdca/$pkgver/libdca-$pkgver.tar.bz2"
build() {
+ ./bootstrap
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d264128019e7fd295a35691636311f81960c17802dbbc67764c4e00b2fdf12ebc69b057a4947b57551a130e5cfd1fef3fe3558c7067216ea04a0b6bbb881b4f1 libdca-0.0.6.tar.bz2"
+sha512sums="dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a libdca-0.0.7.tar.bz2"
diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD
index 59c09b360..99534d596 100644
--- a/user/libdrm/APKBUILD
+++ b/user/libdrm/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libdrm
-pkgver=2.4.100
+pkgver=2.4.101
pkgrel=0
pkgdesc="Userspace interface to kernel DRM services"
url="https://dri.freedesktop.org/"
@@ -12,39 +12,34 @@ depends=""
depends_dev="linux-headers"
checkdepends="bash cunit-dev"
makedepends="$depends_dev bash eudev-dev libpciaccess-dev libpthread-stubs
- xmlto"
+ meson ninja xmlto"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
- ioctl.patch
- "
+source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
case $CARCH in
- arm*|aarch64*) _arch_conf="--enable-omap-experimental-api
- --enable-exynos-experimental-api
- --enable-tegra-experimental-api" ;;
+ arm*|aarch64*) _arch_conf="-Domap=true
+ -Dexynos=true
+ -Detnaviv=true
+ -Dtegra=true" ;;
esac
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --enable-udev \
- --disable-valgrind \
- $_arch_conf
- make
+ meson \
+ -Dprefix=/usr \
+ -Dman-pages=true \
+ -Dudev=true \
+ -Dvalgrind=false \
+ $_arch_conf \
+ build
+ ninja -C build
}
check() {
- make check
+ ninja -C build test
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 libdrm-2.4.100.tar.bz2
-af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f ioctl.patch"
+sha512sums="658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz"
diff --git a/user/libdrm/ioctl.patch b/user/libdrm/ioctl.patch
deleted file mode 100644
index 9ffe5f933..000000000
--- a/user/libdrm/ioctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdrm-2.4.83/tests/nouveau/threaded.c
-+++ libdrm-2.4.83/tests/nouveau/threaded.c
-@@ -40,7 +40,7 @@
-
- static int import_fd;
-
--int ioctl(int fd, unsigned long request, ...)
-+int ioctl(int fd, int request, ...)
- {
- va_list va;
- int ret;
diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD
index 2a537dfca..c5da3861e 100644
--- a/user/libgd/APKBUILD
+++ b/user/libgd/APKBUILD
@@ -1,27 +1,24 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=libgd
-pkgver=2.2.5
-pkgrel=2
+pkgver=2.3.0
+pkgrel=0
pkgdesc="Library for dynamic image creation"
url="http://libgd.github.io/"
arch="all"
-options="!check" # Upstream bug 201 regression.
+options="!check" # Multiple test suite failures. Assumes SSE+ math.
license="MIT"
depends=""
makedepends="autoconf automake bash fontconfig-dev freetype-dev
libjpeg-turbo-dev libpng-dev libtool libwebp-dev tiff-dev zlib-dev
"
+# While the fontconfig/basic test checks for what happens if an empty
+# fontlist is passed to gdImageStringFT(), there still needs to be at
+# least one font installed on the system...
+checkdepends="ttf-liberation"
subpackages="$pkgname-dev"
replaces="gd"
-source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz
- CVE-2016-7568.patch
- CVE-2018-5711.patch
- CVE-2018-14553.patch
- CVE-2018-1000222.patch
- CVE-2019-6977.patch
- CVE-2019-6978.patch
- "
+source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz"
# secfixes:
# 2.2.5-r1:
@@ -31,11 +28,8 @@ source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgna
# - CVE-2019-6978
# 2.2.5-r2:
# - CVE-2018-14553
-
-prepare() {
- default_prepare
- autoreconf -vif
-}
+# 2.3.0-r0:
+# - CVE-2019-11038
build() {
./configure \
@@ -61,13 +55,8 @@ dev() {
default_dev
depends="$pkgname perl"
replaces="gd-dev"
+ mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin
}
-sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b libgd-2.2.5.tar.xz
-8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch
-d6577566814cbe2d93b141a4216b32acdeb2989dc1712eb137565081b913151bbb4c69911c96b2bb7c90695078a85152d368aad183de494d1283fde25021751b CVE-2018-5711.patch
-353491fab6c6e0916dca910c9d14f0e0efab6d9d88c48f6f3f2f69e60312489039b25d26980e7c5c2c04ed9e56003b99eae77bd412fbbed1d8eb47d561f7af74 CVE-2018-14553.patch
-d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b CVE-2018-1000222.patch
-df84e469515f684d79ebad163e137401627310a984ac1ae6a4d31b739b3dc6d9144f101e9bfc3211af1d7cdbaa827721d21a9fe528e69b9b60a943ec8a7ab74b CVE-2019-6977.patch
-3bf31941365a878bef899afa14a89e4ad0fbfb3280d34b2118c8484698e15eff600751ae3ce146a4f006e6c21730cb18899bae3538f6cc2651025274b40cf1ca CVE-2019-6978.patch"
+sha512sums="5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a libgd-2.3.0.tar.xz"
diff --git a/user/libgd/CVE-2016-7568.patch b/user/libgd/CVE-2016-7568.patch
deleted file mode 100644
index 56156411e..000000000
--- a/user/libgd/CVE-2016-7568.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2806adfdc27a94d333199345394d7c302952b95f Mon Sep 17 00:00:00 2001
-From: trylab <trylab@users.noreply.github.com>
-Date: Tue, 6 Sep 2016 18:35:32 +0800
-Subject: [PATCH] Fix integer overflow in gdImageWebpCtx
-
-Integer overflow can be happened in expression gdImageSX(im) * 4 *
-gdImageSY(im). It could lead to heap buffer overflow in the following
-code. This issue has been reported to the PHP Bug Tracking System. The
-proof-of-concept file will be supplied some days later. This issue was
-discovered by Ke Liu of Tencent's Xuanwu LAB.
----
- src/gd_webp.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/gd_webp.c b/src/gd_webp.c
-index 8eb4dee..9886399 100644
---- a/src/gd_webp.c
-+++ b/src/gd_webp.c
-@@ -199,6 +199,14 @@ BGD_DECLARE(void) gdImageWebpCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
- quality = 80;
- }
-
-+ if (overflow2(gdImageSX(im), 4)) {
-+ return;
-+ }
-+
-+ if (overflow2(gdImageSX(im) * 4, gdImageSY(im))) {
-+ return;
-+ }
-+
- argb = (uint8_t *)gdMalloc(gdImageSX(im) * 4 * gdImageSY(im));
- if (!argb) {
- return;
diff --git a/user/libgd/CVE-2018-1000222.patch b/user/libgd/CVE-2018-1000222.patch
deleted file mode 100644
index 80f9712bf..000000000
--- a/user/libgd/CVE-2018-1000222.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Jul 2018 13:54:08 -0400
-Subject: [PATCH] bmp: check return value in gdImageBmpPtr
-
-Closes #447.
----
- src/gd_bmp.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/gd_bmp.c b/src/gd_bmp.c
-index bde0b9d3..78f40d9a 100644
---- a/src/gd_bmp.c
-+++ b/src/gd_bmp.c
-@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
- static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header);
- static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info);
-
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);
-+
- #define BMP_DEBUG(s)
-
- static int gdBMPPutWord(gdIOCtx *out, int w)
-@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageBmpCtx(im, out, compression);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageBmpCtx(im, out, compression))
-+ rv = gdDPExtractData(out, size);
-+ else
-+ rv = NULL;
- out->gd_free(out);
- return rv;
- }
-@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression)
- compression - whether to apply RLE or not.
- */
- BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
-+{
-+ _gdImageBmpCtx(im, out, compression);
-+}
-+
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- {
- int bitmap_size = 0, info_size, total_size, padding;
- int i, row, xpos, pixel;
-@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL;
- FILE *tmpfile_for_compression = NULL;
- gdIOCtxPtr out_original = NULL;
-+ int ret = 1;
-
- /* No compression if its true colour or we don't support seek */
- if (im->trueColor) {
-@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- out_original = NULL;
- }
-
-+ ret = 0;
- cleanup:
- if (tmpfile_for_compression) {
- #ifdef _WIN32
-@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- if (out_original) {
- out_original->gd_free(out_original);
- }
-- return;
-+ return ret;
- }
-
- static int compress_row(unsigned char *row, int length)
diff --git a/user/libgd/CVE-2018-14553.patch b/user/libgd/CVE-2018-14553.patch
deleted file mode 100644
index 7510101d1..000000000
--- a/user/libgd/CVE-2018-14553.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= <fcabralpacheco@gmail.com>
-Date: Fri, 20 Dec 2019 12:03:33 -0300
-Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone()
-
----
- src/gd.c | 9 +--------
- tests/gdimageclone/CMakeLists.txt | 1 +
- tests/gdimageclone/Makemodule.am | 3 ++-
- tests/gdimageclone/style.c | 30 ++++++++++++++++++++++++++++++
- 5 files changed, 35 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimageclone/style.c
-
-diff --git a/src/gd.c b/src/gd.c
-index 592a0286..d564d1f9 100644
---- a/src/gd.c
-+++ b/src/gd.c
-@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
- }
- }
-
-- if (src->styleLength > 0) {
-- dst->styleLength = src->styleLength;
-- dst->stylePos = src->stylePos;
-- for (i = 0; i < src->styleLength; i++) {
-- dst->style[i] = src->style[i];
-- }
-- }
--
- dst->interlace = src->interlace;
-
- dst->alphaBlendingFlag = src->alphaBlendingFlag;
-@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
-
- if (src->style) {
- gdImageSetStyle(dst, src->style, src->styleLength);
-+ dst->stylePos = src->stylePos;
- }
-
- for (i = 0; i < gdMaxColors; i++) {
-diff --git a/tests/gdimageclone/CMakeLists.txt b/tests/gdimageclone/CMakeLists.txt
-index e6ccc318..662f4e96 100644
---- a/tests/gdimageclone/CMakeLists.txt
-+++ b/tests/gdimageclone/CMakeLists.txt
-@@ -1,5 +1,6 @@
- LIST(APPEND TESTS_FILES
- bug00300
-+ style
- )
-
- ADD_GD_TESTS()
-diff --git a/tests/gdimageclone/Makemodule.am b/tests/gdimageclone/Makemodule.am
-index 4b1b54c0..51abf5c1 100644
---- a/tests/gdimageclone/Makemodule.am
-+++ b/tests/gdimageclone/Makemodule.am
-@@ -1,5 +1,6 @@
- libgd_test_programs += \
-- gdimageclone/bug00300
-+ gdimageclone/bug00300 \
-+ gdimageclone/style
-
- EXTRA_DIST += \
- gdimageclone/CMakeLists.txt
-diff --git a/tests/gdimageclone/style.c b/tests/gdimageclone/style.c
-new file mode 100644
-index 00000000..c2b246ed
---- /dev/null
-+++ b/tests/gdimageclone/style.c
-@@ -0,0 +1,30 @@
-+/**
-+ * Cloning an image should exactly reproduce all style related data
-+ */
-+
-+
-+#include <string.h>
-+#include "gd.h"
-+#include "gdtest.h"
-+
-+
-+int main()
-+{
-+ gdImagePtr im, clone;
-+ int style[] = {0, 0, 0};
-+
-+ im = gdImageCreate(8, 8);
-+ gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0]));
-+
-+ clone = gdImageClone(im);
-+ gdTestAssert(clone != NULL);
-+
-+ gdTestAssert(clone->styleLength == im->styleLength);
-+ gdTestAssert(clone->stylePos == im->stylePos);
-+ gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0])));
-+
-+ gdImageDestroy(clone);
-+ gdImageDestroy(im);
-+
-+ return gdNumFailures();
-+}
diff --git a/user/libgd/CVE-2018-5711.patch b/user/libgd/CVE-2018-5711.patch
deleted file mode 100644
index dff2b9ea2..000000000
--- a/user/libgd/CVE-2018-5711.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 29 Nov 2017 19:37:38 +0100
-Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx
-
-Due to a signedness confusion in `GetCode_` a corrupt GIF file can
-trigger an infinite loop. Furthermore we make sure that a GIF without
-any palette entries is treated as invalid *after* open palette entries
-have been removed.
-
-CVE-2018-5711
-
-See also https://bugs.php.net/bug.php?id=75571.
----
- src/gd_gif_in.c | 12 ++++++------
- tests/gif/.gitignore | 1 +
- tests/gif/CMakeLists.txt | 1 +
- tests/gif/Makemodule.am | 2 ++
- tests/gif/php_bug_75571.c | 28 ++++++++++++++++++++++++++++
- tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes
- 6 files changed, 38 insertions(+), 6 deletions(-)
- create mode 100644 tests/gif/php_bug_75571.c
- create mode 100644 tests/gif/php_bug_75571.gif
-
-diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
-index daf26e79..0a8bd717 100644
---- a/src/gd_gif_in.c
-+++ b/src/gd_gif_in.c
-@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
- return 0;
- }
-
-- if(!im->colorsTotal) {
-- gdImageDestroy(im);
-- return 0;
-- }
--
- /* Check for open colors at the end, so
- * we can reduce colorsTotal and ultimately
- * BitsPerPixel */
-@@ -351,6 +346,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
- }
- }
-
-+ if(!im->colorsTotal) {
-+ gdImageDestroy(im);
-+ return 0;
-+ }
-+
- return im;
- }
-
-@@ -447,7 +447,7 @@ static int
- GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
- {
- int i, j, ret;
-- unsigned char count;
-+ int count;
-
- if(flag) {
- scd->curbit = 0;
diff --git a/user/libgd/CVE-2019-6977.patch b/user/libgd/CVE-2019-6977.patch
deleted file mode 100644
index 4cfb9ab98..000000000
--- a/user/libgd/CVE-2019-6977.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bts.adelielinux.org/show_bug.cgi?id=159
-Backported-From: http://git.php.net/?p=php-src.git;a=commit;h=7a12dad4dd6c370835b13afae214b240082c7538
-Author: A. Wilcox <awilfox@adelielinux.org>
-Bug: https://bugs.php.net/bug.php?id=77270
-Author: Christoph M. Becker <cmbecker69@gmx.de>
-Committer: Stanislav Malyshev <stas@php.net>
-Upstream-Status: unknown
-
---- libgd-2.2.5/src/gd_color_match.c.old 2017-08-30 11:05:54.000000000 +0000
-+++ libgd-2.2.5/src/gd_color_match.c 2019-10-03 16:17:55.842322245 +0000
-@@ -31,8 +31,8 @@
- return -4; /* At least 1 color must be allocated */
- }
-
-- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal);
-- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal );
-+ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors);
-+ memset( buf, 0, sizeof(unsigned long) * 5 * gdMaxColors );
-
- for (x=0; x < im1->sx; x++) {
- for( y=0; y<im1->sy; y++ ) {
diff --git a/user/libgd/CVE-2019-6978.patch b/user/libgd/CVE-2019-6978.patch
deleted file mode 100644
index 0cfdda919..000000000
--- a/user/libgd/CVE-2019-6978.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Thu, 17 Jan 2019 11:54:55 +0100
-Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr()
-
-Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we
-must not call `gdDPExtractData()`; otherwise a double-free would
-happen. Since `gdImage*Ctx()` are void functions, and we can't change
-that for BC reasons, we're introducing static helpers which are used
-internally.
-
-We're adding a regression test for `gdImageJpegPtr()`, but not for
-`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to
-trigger failure of the respective `gdImage*Ctx()` calls.
-
-This potential security issue has been reported by Solmaz Salimi (aka.
-Rooney).
----
- src/gd_gif_out.c | 18 +++++++++++++++---
- src/gd_jpeg.c | 20 ++++++++++++++++----
- src/gd_wbmp.c | 21 ++++++++++++++++++---
- tests/jpeg/.gitignore | 1 +
- tests/jpeg/CMakeLists.txt | 1 +
- tests/jpeg/Makemodule.am | 3 ++-
- tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++
- 7 files changed, 84 insertions(+), 11 deletions(-)
- create mode 100644 tests/jpeg/jpeg_ptr_double_free.c
-
-diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c
-index 298a5812..d5a95346 100644
---- a/src/gd_gif_out.c
-+++ b/src/gd_gif_out.c
-@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx);
- static void char_out(int c, GifCtx *ctx);
- static void flush_char(GifCtx *ctx);
-
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
-
-
-
-@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageGifCtx(im, out);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageGifCtx(im, out)) {
-+ rv = gdDPExtractData(out, size);
-+ } else {
-+ rv = NULL;
-+ }
- out->gd_free(out);
- return rv;
- }
-@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile)
-
- */
- BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
-+{
-+ _gdImageGifCtx(im, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- {
- gdImagePtr pim = 0, tim = im;
- int interlace, BitsPerPixel;
-@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- based temporary image. */
- pim = gdImageCreatePaletteFromTrueColor(im, 1, 256);
- if(!pim) {
-- return;
-+ return 1;
- }
- tim = pim;
- }
-@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- /* Destroy palette based temporary image. */
- gdImageDestroy( pim);
- }
-+
-+ return 0;
- }
-
-
-diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
-index fc058420..96ef4302 100644
---- a/src/gd_jpeg.c
-+++ b/src/gd_jpeg.c
-@@ -123,6 +123,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo)
- exit(99);
- }
-
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality);
-+
- /*
- * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
- * QUALITY. If QUALITY is in the range 0-100, increasing values
-@@ -237,8 +239,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageJpegCtx(im, out, quality);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageJpegCtx(im, out, quality)) {
-+ rv = gdDPExtractData(out, size);
-+ } else {
-+ rv = NULL;
-+ }
- out->gd_free(out);
- return rv;
- }
-@@ -259,6 +264,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile);
-
- */
- BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
-+{
-+ _gdImageJpegCtx(im, outfile, quality);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- {
- struct jpeg_compress_struct cinfo;
- struct jpeg_error_mgr jerr;
-@@ -293,7 +304,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- if(row) {
- gdFree(row);
- }
-- return;
-+ return 1;
- }
-
- cinfo.err->emit_message = jpeg_emit_message;
-@@ -334,7 +345,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- if(row == 0) {
- gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n");
- jpeg_destroy_compress(&cinfo);
-- return;
-+ return 1;
- }
-
- rowptr[0] = row;
-@@ -411,6 +424,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- jpeg_finish_compress(&cinfo);
- jpeg_destroy_compress(&cinfo);
- gdFree(row);
-+ return 0;
- }
-
-
-diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c
-index f19a1c96..a49bdbec 100644
---- a/src/gd_wbmp.c
-+++ b/src/gd_wbmp.c
-@@ -88,6 +88,8 @@ int gd_getin(void *in)
- return (gdGetC((gdIOCtx *)in));
- }
-
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);
-+
- /*
- Function: gdImageWBMPCtx
-
-@@ -100,6 +102,12 @@ int gd_getin(void *in)
- out - the stream where to write
- */
- BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
-+{
-+ _gdImageWBMPCtx(image, fg, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- {
- int x, y, pos;
- Wbmp *wbmp;
-@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- /* create the WBMP */
- if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) {
- gd_error("Could not create WBMP\n");
-- return;
-+ return 1;
- }
-
- /* fill up the WBMP structure */
-@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
-
- /* write the WBMP to a gd file descriptor */
- if(writewbmp(wbmp, &gd_putout, out)) {
-+ freewbmp(wbmp);
- gd_error("Could not save WBMP\n");
-+ return 1;
- }
-
- /* des submitted this bugfix: gdFree the memory. */
- freewbmp(wbmp);
-+
-+ return 0;
- }
-
- /*
-@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageWBMPCtx(im, fg, out);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageWBMPCtx(im, fg, out)) {
-+ rv = gdDPExtractData(out, size);
-+ } else {
-+ rv = NULL;
-+ }
- out->gd_free(out);
- return rv;
- }
diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD
index 21aeed83d..1e2c6d670 100644
--- a/user/libinput/APKBUILD
+++ b/user/libinput/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libinput
-pkgver=1.15.2
+pkgver=1.15.4
pkgrel=0
pkgdesc="Library for handling input devices"
url="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -32,4 +32,4 @@ package() {
DESTDIR="$pkgdir" ninja -C builddir/ install
}
-sha512sums="f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2 libinput-1.15.2.tar.xz"
+sha512sums="4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz"
diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD
index 0e4679641..c262c702f 100644
--- a/user/libkscreen/APKBUILD
+++ b/user/libkscreen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=libkscreen
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE Plasma screen management software"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev
qt5-qttools-dev kwayland-dev doxygen"
subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-doc $pkgname-wayland"
-source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/libkscreen-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -53,4 +53,4 @@ wayland() {
"$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/
}
-sha512sums="fba933c4b26a32f19a6352738e3704f8a35ad24b268bed6fca173c2c4abe0b899845ce1750ce6473b3b9185239332980384a8bb708081484162ee30ff4b3e29a libkscreen-5.18.2.tar.xz"
+sha512sums="73e5d105701d11f1bbe403034614d89a6aab3e4f47d949633e2104c590c62a4e89e7643558056d45d16e43d326c52a950024b84f184dd86fff9cfd57f37efa43 libkscreen-5.18.4.1.tar.xz"
diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD
index b79e945db..a72a949e6 100644
--- a/user/libksysguard/APKBUILD
+++ b/user/libksysguard/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=libksysguard
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE system monitor library"
url="https://www.kde.org/"
@@ -16,7 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev zlib-dev
kwindowsystem-dev kwidgetsaddons-dev qt5-qtwebchannel-dev kio-dev
kglobalaccel-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/libksysguard-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="75de2526ffeaabf623163f6fd1f592a8eb3edb0f25b70a1f7c8715d83a01158079addc5ea3cf81baa4650049370a0efefcbece1b3f80edfe511c6942d08ad2a6 libksysguard-5.18.2.tar.xz"
+sha512sums="4407bb15ca4e1e70f8c082ba11c25b4855330ca54fea15c900610245e2966bf2eeebbb6d5ea94bc0627df869363837660bfcca0a88fbfec9cc2ca43e0b635cd8 libksysguard-5.18.4.1.tar.xz"
diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD
index 487c573a7..84b7e5e7a 100644
--- a/user/libkworkspace/APKBUILD
+++ b/user/libkworkspace/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=libkworkspace
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE Plasma 5 workspace library"
url="https://www.kde.org/plasma-desktop"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules libice-dev libsm-dev libxau-dev
kcoreaddons-dev ki18n-dev kscreenlocker-dev kwin-dev kwindowsystem-dev
plasma-framework-dev"
subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-workspace-$pkgver.tar.xz
header-generation.patch
session.patch
standalone.patch
@@ -45,7 +45,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0fa91451e28b70d7602de79686afb57143eecd86e3856ed9c773bc4f5394610e5a5cf2f13fd03398b7a01624b45ab86d7e12da016980cb91ab23adac41a6793e plasma-workspace-5.18.2.tar.xz
+sha512sums="683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7 plasma-workspace-5.18.4.1.tar.xz
3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755 header-generation.patch
1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8 session.patch
-b9dc109c4a2dafddceba194cfa268ef3b34b21826d715d680447c0d3932d16daa16a7cf12c6456f48d6c654beeb7fcb02f30512bd74b80264e9af26871164e4c standalone.patch"
+520a29666deed549b9d6bafe9ae6576aae39004616a46383e40d874fc0622710497de85da508cf6299f55e27c2d2681fc140678efef592abb14253b02d0fce59 standalone.patch"
diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch
index 23ccb2de2..27ad62eab 100644
--- a/user/libkworkspace/standalone.patch
+++ b/user/libkworkspace/standalone.patch
@@ -15,7 +15,7 @@ index 3c4c47870..53bc780b5 100644
+project(libkworkspace)
+
+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+ set(PROJECT_VERSION "5.18.2")
++ set(PROJECT_VERSION "5.18.4.1")
+ set(PROJECT_VERSION_MAJOR 5)
+
+ cmake_minimum_required(VERSION 3.0)
diff --git a/user/libmbim/APKBUILD b/user/libmbim/APKBUILD
index ab32fba1b..360392390 100644
--- a/user/libmbim/APKBUILD
+++ b/user/libmbim/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libmbim
-pkgver=1.20.4
+pkgver=1.22.0
pkgrel=0
pkgdesc="Library for interfacing with WWAN modems"
url="https://www.freedesktop.org/wiki/Software/libmbim/"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="246f601ddda48b10e8a7b337d6e996dc65f6300e87f13d5260a5c903f95e9035e8a8d1c88540101c22fb3c44eca242451ab75bbfdb6503cfbce279c6d4cf99c8 libmbim-1.20.4.tar.xz"
+sha512sums="ec7ecf1c65dd7b6017cc3e91eadd6700a954065d070640ab97e583b1791cc315133dd6c882f569fff2efe1f56e3766821533c20d814fe7db75aeb0bbcd7ed3ee libmbim-1.22.0.tar.xz"
diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD
index b634ff0c2..2456f0522 100644
--- a/user/libnftnl/APKBUILD
+++ b/user/libnftnl/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Luis Ressel <aranea@aixah.de>
-# Maintainer:
+# Maintainer: Molly Miller <sysvinit@adelielinux.org>
pkgname=libnftnl
-pkgver=1.1.5
+pkgver=1.1.6
pkgrel=0
pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
url="https://netfilter.org/projects/libnftnl"
@@ -12,7 +12,6 @@ depends=""
makedepends="libmnl-dev"
subpackages="$pkgname-dev"
source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2
- nft-flowtable-test.patch
"
build() {
@@ -34,5 +33,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7 libnftnl-1.1.5.tar.bz2
-0978037a5dec71a96f5713dbc5a4dc8dc30b7b37d79ec7dd6ec8b201740303785c3625c21a2388f8fd5d9d446f8706ac14d0bf5909a48ed3ef3e7417173dd2c8 nft-flowtable-test.patch"
+sha512sums="3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d libnftnl-1.1.6.tar.bz2
+"
diff --git a/user/libnftnl/nft-flowtable-test.patch b/user/libnftnl/nft-flowtable-test.patch
deleted file mode 100644
index 719c1f2cf..000000000
--- a/user/libnftnl/nft-flowtable-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Mon, 2 Dec 2019 18:29:56 +0100
-Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
-
-Marshalling code around that attribute has been dropped by commit
-d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
-lost during the test.
-
-Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
-later point, leave the test code in place but just comment it out.
-
-Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
-Signed-off-by: Phil Sutter <phil@nwl.cc>
-Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- tests/nft-flowtable-test.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
-index 3edb00d..8ab8d4c 100644
---- a/tests/nft-flowtable-test.c
-+++ b/tests/nft-flowtable-test.c
-@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
- if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
- nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
- print_err("Flowtable use mismatches");
-+#if 0
- if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
- nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
- print_err("Flowtable size mismatches");
-+#endif
- if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
- nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
- print_err("Flowtable flags mismatches");
---
-2.24.1
diff --git a/user/libnotify/APKBUILD b/user/libnotify/APKBUILD
index ad021ad4f..9e7ded542 100644
--- a/user/libnotify/APKBUILD
+++ b/user/libnotify/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libnotify
-pkgver=0.7.8
+pkgver=0.7.9
pkgrel=0
pkgdesc="Desktop notification library"
url="https://developer.gnome.org/notification-spec/"
@@ -9,17 +9,19 @@ options="!check" # Test suite requires running X11
license="LGPL-2.1+"
depends=""
makedepends="gdk-pixbuf-dev glib-dev gobject-introspection-dev gtk-doc
- gtk+3.0-dev meson ninja"
+ gtk+3.0-dev meson ninja docbook-xsl-ns xmlto"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
build() {
- meson --prefix=/usr builddir/
- ninja -C builddir/
+ meson \
+ -Dprefix=/usr \
+ build
+ ninja -C build
}
package() {
- DESTDIR="$pkgdir" ninja -C builddir/ install
+ DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94 libnotify-0.7.8.tar.xz"
+sha512sums="8a842b50777279efdb7d96a836a546c47decad158a4f03f7ffc818860d1f6276a657619e4f4a19a4e2f5ad55e0371c793420d50d802983700e8c342273b73874 libnotify-0.7.9.tar.xz"
diff --git a/user/libqmi/APKBUILD b/user/libqmi/APKBUILD
index f662aa30d..fe44ce40b 100644
--- a/user/libqmi/APKBUILD
+++ b/user/libqmi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libqmi
-pkgver=1.24.4
+pkgver=1.24.8
pkgrel=0
pkgdesc="Library for interfacing with Qualcomm modems"
url="https://www.freedesktop.org/wiki/Software/libqmi/"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7850c2754763d3d0addfa6760ed11ba895dd78421a6b3453224b50bd97d09109ccacf16c322d81c8e512321e45fd8e611015796c86a94f30acf8611eb37e8a1a libqmi-1.24.4.tar.xz"
+sha512sums="b60ac355792373afbb202b2791c641468b48a1e54e5f34336fe37fa799c24ac566d6070ba4faaaf6b5693ae2bb5cc75c1240c7f2ee04c8e35eeeb66ec2677093 libqmi-1.24.8.tar.xz"
diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD
index 828b3ed74..cf4630962 100644
--- a/user/libsecret/APKBUILD
+++ b/user/libsecret/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libsecret
-pkgver=0.20.1
+pkgver=0.20.2
pkgrel=0
pkgdesc="Library for storing and retrieving passphrases"
url="https://wiki.gnome.org/Projects/Libsecret"
@@ -33,4 +33,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d8fca5f4da63427f594e1cb38c91330a98ab706aa945f8e735337f3fd342895bc96ceb36390ba01a4c0b9c5d503c4b544753c3243c444579f46f7b2e7836d1ac libsecret-0.20.1.tar.xz"
+sha512sums="89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857 libsecret-0.20.2.tar.xz"
diff --git a/user/libslirp/APKBUILD b/user/libslirp/APKBUILD
new file mode 100644
index 000000000..07d7eea31
--- /dev/null
+++ b/user/libslirp/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=libslirp
+pkgver=4.2.0
+pkgrel=0
+pkgdesc="A general-purpose TCP/IP emulator"
+url="https://gitlab.freedesktop.org/slirp/libslirp"
+arch="all"
+options="!check" # No test suite.
+license="BSD-3-Clause AND MIT"
+depends=""
+makedepends="glib-dev meson"
+subpackages="$pkgname-dev"
+source="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$pkgver/libslirp-v$pkgver.tar.gz
+ static.patch
+ "
+builddir="$srcdir/libslirp-v$pkgver"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . output
+ ninja -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="514744ac8325857915b9946a76f4a55d48c8361b6167cd69c533086928ae06f059d923c5f057e92a0915921bb363b69d34a939a0bcc28233515125a5d1858d25 libslirp-v4.2.0.tar.gz
+bb1bb5443d8083099d2a270b78b7ec74daa26634b2062d2c30460ed118b333942a9a555c96910216bb746311ae021d457f39a304a60fe07a3908a0c315a7c756 static.patch"
diff --git a/user/libslirp/static.patch b/user/libslirp/static.patch
new file mode 100644
index 000000000..46451a168
--- /dev/null
+++ b/user/libslirp/static.patch
@@ -0,0 +1,14 @@
+library = shared
+both_libraries = shared and static (needed by qemu)
+
+--- libslirp-v4.2.0/meson.build 2020-03-17 10:07:35.000000000 +0000
++++ libslirp-v4.2.0/meson.build 2020-03-24 20:41:57.030331048 +0000
+@@ -100,7 +100,7 @@ configure_file(
+ configuration : conf
+ )
+
+-lib = library('slirp', sources,
++lib = both_libraries('slirp', sources,
+ version : lt_version,
+ c_args : cargs,
+ link_args : vflag,
diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD
index 66be1f6ef..73d53a4e1 100644
--- a/user/libuninameslist/APKBUILD
+++ b/user/libuninameslist/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libuninameslist
-pkgver=20190701
+pkgver=20200313
pkgrel=0
pkgdesc="Library of Unicode names and annotation data"
url=" "
@@ -38,4 +38,4 @@ py3() {
python3 setup.py install --prefix=/usr --root="$subpkgdir"
}
-sha512sums="05cd3cbba195e270e1cb23886d0fa666d47fbe5eb23b89388025683ae7e2380de43ac4137056ec8f386e53fc869218e7417566f29ccfd86f26168bcfe472ee52 libuninameslist-dist-20190701.tar.gz"
+sha512sums="7f42d839b251859d94cca44d4f8a789aeed0554ce86bbdba38f25da2c2ce0626d95801679a1ce3c9f691ceb4988960c56f1268478e55175d94744a969e1bd6c3 libuninameslist-dist-20200313.tar.gz"
diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD
index 58de8225a..aa80bcae0 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=1.2
+pkgver=1.3
pkgrel=0
pkgdesc="Tablet description library"
url="http://linuxwacom.sourceforge.net/"
@@ -31,5 +31,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="595c073d8160bce2d6cec13d5c672594c73ae677e37dbba0ac088c9010d6e2f824d442ccdb7f695642bd06cce75c85473d863823c20a46fbe27e966ae3fed147 libwacom-1.2.tar.bz2
-5aebef9f8b224c83fa9f175b2cfec0198aeb0b462b2bb55c02e0cf10ef78f8af66def81f715fc3d95e8d7191f6fb688795f3561eb6850eed76105f865229d3f4 musl-test.patch"
+sha512sums="beb92051d1a2be5079518b9f254e5621bf7c13ab92f811d5a1b7d19eb0ecddb28d94db0e1724b379be8970b0de0e7d3eb4d3c15b4aeedacc623357e10740355c libwacom-1.3.tar.bz2
+62b1a137d74e32bd38f807e1dd51150a59f8be105cf1f8a56ec7da8d7139ec5dcd7e4590e12e5cd1e4a81a34d9a50d4c82df933187026760a39f351b4b5d1789 musl-test.patch"
diff --git a/user/libwacom/musl-test.patch b/user/libwacom/musl-test.patch
index 74625f02b..cc4add634 100644
--- a/user/libwacom/musl-test.patch
+++ b/user/libwacom/musl-test.patch
@@ -1,6 +1,6 @@
--- libwacom-1.2/meson.build.old 2019-12-22 21:45:06.000000000 +0000
+++ libwacom-1.2/meson.build 2019-12-25 11:43:51.004107631 +0000
-@@ -555,7 +555,7 @@
+@@ -588,7 +588,7 @@
# because of the tricks we use in calling the function and exposing
# it to begin with, LTO gets confused and this fails to link.
# Let's just disable it here.
@@ -12,9 +12,9 @@
--- libwacom-1.2/meson_options.txt.old 2019-11-07 02:25:47.000000000 +0000
+++ libwacom-1.2/meson_options.txt 2019-12-25 11:45:11.585452086 +0000
@@ -10,4 +10,8 @@
- type: 'boolean',
- value: true,
- description: 'Build the tests [default=true]')
+ type: 'feature',
+ value: 'enabled',
+ description: 'Build the tests [default=enabled]')
+option('test_deprecated',
+ type: 'boolean',
+ value: true,
diff --git a/user/libzip/APKBUILD b/user/libzip/APKBUILD
index 379075ae7..62a55bfba 100644
--- a/user/libzip/APKBUILD
+++ b/user/libzip/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=libzip
-pkgver=1.5.2
+pkgver=1.6.1
pkgrel=0
pkgdesc="C library for manipulating ZIP archives"
url="https://libzip.org/"
@@ -11,7 +11,7 @@ arch="all"
license="BSD-3-Clause"
depends=""
depends_dev="zlib-dev"
-makedepends="$depends_dev cmake openssl-dev perl"
+makedepends="$depends_dev cmake groff openssl-dev perl"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="https://libzip.org/download/$pkgname-$pkgver.tar.xz"
@@ -44,4 +44,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
}
-sha512sums="1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 libzip-1.5.2.tar.xz"
+sha512sums="dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 libzip-1.6.1.tar.xz"
diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD
index 1aed6cff3..68bc29b40 100644
--- a/user/milou/APKBUILD
+++ b/user/milou/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=milou
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Search and launch plasmoid"
url="https://www.kde.org/"
@@ -11,7 +11,7 @@ depends=""
makedepends="cmake extra-cmake-modules python3 kcoreaddons-dev kdeclarative-dev
ki18n-dev kitemmodels-dev krunner-dev kservice-dev plasma-framework-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/milou-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5f5cdf1ff5d18413cc747d3c06b542678bc44af6dcc3670d2805c4902b18997ce8af81f26d94dbe59a49b8c2b882ef25556ae54276e89d85a14f023cae5ddb9a milou-5.18.2.tar.xz"
+sha512sums="812b1ac049c7af9cf625e1203cbb9ae0e36a99ac3b89781f4e007974dca460cbf9e866b3773a2117261bd845d4a7c65f70860b45e54b6b87124695c011a3e51e milou-5.18.4.1.tar.xz"
diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD
index 62cf584ce..c239f17fc 100644
--- a/user/modemmanager/APKBUILD
+++ b/user/modemmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=modemmanager
-pkgver=1.12.6
+pkgver=1.12.8
pkgrel=0
pkgdesc="Software to control mobile broadband modems"
url="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -43,6 +43,6 @@ package() {
"$srcdir"/01-org.freedesktop.ModemManager.rules
}
-sha512sums="63c2f874c8ac62ddddf02735cc3dc0dec0c3ea62be39eb7f69cfb899ae04f6d14cfe59d63cd2fa4a5150afa15560d4a6db7a3fdb7c4467f228cd1b4b30fbd1ec ModemManager-1.12.6.tar.xz
+sha512sums="9469b6c1e9927d578c79b821fad05ce9ade4d8d62be8b2399e3c892155ff7125ccc03b8a16912ae534bac32e053cef13bd8d0f79435df1e0cd554b320286f7cd ModemManager-1.12.8.tar.xz
78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch
31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules"
diff --git a/user/musl-locales/APKBUILD b/user/musl-locales/APKBUILD
deleted file mode 100644
index 9bbf0c49b..000000000
--- a/user/musl-locales/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Alyx <alyx@leuhta.com>
-# Maintainer: Alyx <alyx@leuhta.com>
-pkgname=musl-locales
-pkgver=0.20190626
-pkgrel=0
-pkgdesc="Locale program for musl"
-url="https://gitlab.com/rilian-la-te/musl-locales"
-arch="all"
-options="!check" # No test suite.
-license="MIT"
-depends=""
-makedepends="cmake make gettext-tiny-dev"
-subpackages="$pkgname-lang"
-source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname"
-
-build() {
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- .
- make
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="f65381b6eec64e69e649dacd3a3f75e74d9236164a1277bd2493afb3cb469049bee026d590a7207413b4d92675f877d1d8d3b16c58840a6e15a81638a2f731f2 musl-locales-0.20190626.tar.gz"
diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD
index 19ba6c868..a86436b13 100644
--- a/user/networkmanager/APKBUILD
+++ b/user/networkmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=networkmanager
-pkgver=1.22.8
+pkgver=1.22.10
pkgrel=0
pkgdesc="Network management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -90,7 +90,7 @@ openrc() {
"$subpkgdir"/etc/NetworkManager/dispatcher.d/
}
-sha512sums="3533f6d0cfb2723078aece287101feda0d4f65a1f0160ae17dd77142ca5e126a0f27f5904c2e2c4dcdf9433dacc3990e1bf366f14e67b94fa1cd3006dd6b3a4c NetworkManager-1.22.8.tar.xz
+sha512sums="342d0c8db2c94992f8f53b13dc4432fe566637e03e1d65cdc44ebf51a4f70d4ec804ebc48ed9cbe010c61abc665f1bb1be22f9364de991d6e5ffc5212b9efd23 NetworkManager-1.22.10.tar.xz
ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7 editline.patch
b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95 errno.patch
7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a musl.patch
diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD
index 41e356d37..bc96a18f1 100644
--- a/user/nftables/APKBUILD
+++ b/user/nftables/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: Luis Ressel <aranea@aixah.de>
-# Maintainer:
+# Maintainer: Molly Miller <sysvinit@adelielinux.org>
pkgname=nftables
-pkgver=0.9.3
+pkgver=0.9.4
pkgrel=0
pkgdesc="Netfilter tables userspace tools"
url="https://netfilter.org/projects/nftables"
@@ -47,7 +47,7 @@ package() {
install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43 nftables-0.9.3.tar.bz2
+sha512sums="cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0 nftables-0.9.4.tar.bz2
f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch
4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd
58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd"
diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD
index 6393b9717..0e79f2369 100644
--- a/user/opengfx/APKBUILD
+++ b/user/opengfx/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=opengfx
-pkgver=0.5.5
+pkgver=0.6.0
pkgrel=0
pkgdesc="Graphics files for OpenTTD"
url="https://www.openttd.org/en/"
@@ -9,11 +9,9 @@ arch="noarch"
options="!check" # Requires GIMP
license="GPL-2.0-only"
depends=""
-makedepends="grfcodec nml"
+makedepends="grfcodec nml cmd:unix2dos cmd:which"
subpackages=""
-source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-source.tar.xz
- Makefile.patch
- "
+source="https://cdn.openttd.org/opengfx-releases/$pkgver/$pkgname-$pkgver-source.tar.xz"
builddir="$srcdir/$pkgname-$pkgver-source"
build() {
@@ -27,5 +25,4 @@ package() {
done
}
-sha512sums="952fb52e19bd790e335a9df0f11fa29b2fc570b49903419904956cc65883adde93d432160b16682366ab8b973b7852d2d30f574f1840f6fbd082e1addbe5bfe8 opengfx-0.5.5-source.tar.xz
-a337ab4ade493a87d2687a7aa2fb05dcd5718725645950486975a6df309dd1e6631d4b04fa6dcbf590e869b45b037caa32468ea6f677ce458d61950f77c5a006 Makefile.patch"
+sha512sums="275b9040e6938bdd5bee2d39361e0b78f447a8e497cc8ff018c7874dc16a357870f8b560999ebb2f2f0b275644c7c9ce85c964875f5a798e2ec45e62a8bc768f opengfx-0.6.0-source.tar.xz"
diff --git a/user/opengfx/Makefile.patch b/user/opengfx/Makefile.patch
deleted file mode 100644
index 1e4585311..000000000
--- a/user/opengfx/Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- opengfx-0.5.3-source/Makefile
-+++ opengfx-0.5.3-source/Makefile
-@@ -99,8 +99,8 @@
- AWK ?= awk
- GREP ?= grep
- PYTHON ?= python
--UNIX2DOS ?= $(shell which unix2dos)
--UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
-+UNIX2DOS ?= $(shell which unix2dos 2>/dev/null)
-+UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "")
-
- # Graphics processing
- GIMP ?= gimp
-@@ -719,7 +719,7 @@
- $(_E)
- endif
- $(_E) "Release:"
-- $(_E) "bananas: Upload bundle to BaNaNaS
-+ $(_E) "bananas: Upload bundle to BaNaNaS"
- $(_E)
- $(_E) "Valid command line variables are:"
- $(_E) "Helper programmes:"
diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD
index c5cf85a3a..44417d5a2 100644
--- a/user/openttd/APKBUILD
+++ b/user/openttd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=openttd
-pkgver=1.9.3
+pkgver=1.10.0
pkgrel=0
pkgdesc="Simulation game based on Transport Tycoon Deluxe"
url="https://www.openttd.org/en/"
@@ -28,4 +28,4 @@ package() {
make install
}
-sha512sums="e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 openttd-1.9.3-source.tar.xz"
+sha512sums="f1727b81a059aa04bea1fb6a9a89ae0619942d6406a77f99e642a60ea9416daa215bbd0cbd183747c2df5f6dea81766b7e04493a52211e55522e8b2642db701a openttd-1.10.0-source.tar.xz"
diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD
index e85c84980..b7ab67af6 100644
--- a/user/oxygen/APKBUILD
+++ b/user/oxygen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=oxygen
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="'Oxygen' theme for KDE"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev
kdecoration-dev kguiaddons-dev ki18n-dev kservice-dev
kwidgetsaddons-dev kwindowsystem-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/oxygen-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/oxygen-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="02c840d4e7130da9468c01818d9999f2ac8f8ffba0bac27805614ab8ad5133aa76a9153ff0b63553822a0367341dcfd900498366d98fca1ac60e1730e8e4166e oxygen-5.18.2.tar.xz"
+sha512sums="b6804c0ff7b2234603c6e9d0e9957b8eb5b44b663aa427571a841b7ee421c7e95da2213afb4d956390c5a87828a530a13aecf7f86be63c0f56410259771c516d oxygen-5.18.4.1.tar.xz"
diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD
index 6dff3c80d..c3201a64d 100644
--- a/user/papirus-icons/APKBUILD
+++ b/user/papirus-icons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=papirus-icons
-pkgver=20200201
+pkgver=20200301
pkgrel=0
pkgdesc="Material, flat style icon theme"
url="https://store.kde.org/p/1166289/"
@@ -39,4 +39,4 @@ epapirus() {
mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/
}
-sha512sums="07ed45eb409ed12f57657f058f9a5a03dec77679ed598dc8645536a614ecc5424c60be57f10de20ca72204d2a21152fdd62adadf2637bbfa1266d588c787d7e9 papirus-icons-20200201.tar.gz"
+sha512sums="8b9f0a9b0fdb676365d6b30af8ba8dee71ff433a4c4317151899f09614da3fc9764e5e9c48743cdf7c8fde6eea53a1d3ab37eb890f1486fc54ce328e6af9b348 papirus-icons-20200301.tar.gz"
diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD
index 6ac163fb6..df76050da 100644
--- a/user/perl-gd/APKBUILD
+++ b/user/perl-gd/APKBUILD
@@ -6,7 +6,7 @@ _author=RURBAN
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
pkgver=2.71
-pkgrel=0
+pkgrel=1
pkgdesc="Perl module for GD graphics library"
url="https://metacpan.org/release/GD"
arch="all"
diff --git a/user/php7-apcu/APKBUILD b/user/php7-apcu/APKBUILD
index e9ad17ae4..94f95e03f 100644
--- a/user/php7-apcu/APKBUILD
+++ b/user/php7-apcu/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=php7-apcu
_pkgname=${pkgname#php7-}
-pkgver=5.1.17
+pkgver=5.1.18
pkgrel=0
pkgdesc="Userland cache for PHP"
url="https://pecl.php.net/package/APCu"
@@ -34,6 +34,9 @@ check() {
package() {
# It didn't listen to DESTDIR
make INSTALL_ROOT="$pkgdir" install
+
+ install -d "$pkgdir"/etc/php/conf.d/
+ echo 'extension=apcu.so' > "$pkgdir"/etc/php/conf.d/00_apcu.ini
}
-sha512sums="7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793 apcu-5.1.17.tgz"
+sha512sums="5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9 apcu-5.1.18.tgz"
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index a8ef4976e..c86d41e84 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -8,10 +8,10 @@
# ----------+---------+------------------------+---------
# bcmath | LGPL2 | ext/bcmath/libbcmath | used
# date | MIT | ext/date/lib | used
-# gd | BSD | ext/gd/libgd | used
+# gd | BSD | ext/gd/libgd | not used
# file | BSD | ext/fileinfo/libmagic | used
# libmbfl | LGPLv2 | ext/mbstring/libmbfl | used
-# oniguruma | BSD | ext/mbstring/oniguruma | used
+# oniguruma | BSD | ext/mbstring/oniguruma | not used
# pcre | BSD | ext/pcre/pcrelib | not used
# sqlite3 | Public | ext/sqlite3/libsqlite | not used
# libzip | BSD | ext/zip/lib | not used
@@ -25,63 +25,68 @@
pkgname=php7
_pkgname=php
-pkgver=7.2.21
+pkgver=7.4.4
pkgrel=0
-_apiver=20170718
+_apiver=20190902
+_zendver=20190902
+_pdover=20170320
pkgdesc="The PHP7 language runtime engine"
url="https://php.net/"
arch="all"
license="PHP-3.01 AND Zend-2.0 AND Custom:TSRM AND LGPL-2.1+ AND MIT AND Beerware AND Public-Domain AND BSD-3-Clause AND Apache-1.0 AND PostgreSQL AND BSD-2-Clause AND Zlib AND BSD-4-Clause"
depends=""
depends_dev="$pkgname=$pkgver-r$pkgrel autoconf icu-dev libedit-dev libxml2-dev
- pcre-dev zlib-dev"
+ pcre2-dev zlib-dev"
makedepends="autoconf
apache-httpd-dev
aspell-dev
+ automake
bison
bzip2-dev
+ cmd:which
curl-dev
db-dev
enchant-dev
freetds-dev
- freetype-dev
gdbm-dev
gettext-tiny
gmp-dev
icu-dev
krb5-dev
libedit-dev
+ libgd-dev
libical-dev
- libjpeg-turbo-dev
- libpng-dev
openssl-dev
- libwebp-dev
libxml2-dev
- libxpm-dev
libxslt-dev
libzip-dev
net-snmp-dev
+ oniguruma-dev
openldap-dev
- pcre-dev
+ pcre2-dev
postgresql-dev
re2c
sqlite-dev
unixodbc-dev
- zlib-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-apache $pkgname-phpdbg
- $pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm
+ zlib-dev
+ "
+subpackages="$pkgname-dev $pkgname-doc $pkgname-phpdbg
+ $pkgname-embed $pkgname-cgi $pkgname-fpm $pkgname-apache
$pkgname-pear::noarch $pkgname-dbg"
source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2
$_pkgname-fpm.initd
$_pkgname-fpm.logrotate
$_pkgname-module.conf
disabled-tests.list
- install-pear.patch
+ enchant-2.patch
fpm-paths.patch
- allow-build-recode-and-imap-together.patch
- fix-tests-devserver.patch
- pwbuflen.patch
- enchant-2.patch"
+ getsockopt.patch
+ install-pear.patch
+ no-max-ent-size.patch
+ test-fixes.patch
+ zend_bool.patch
+ zip-glob-pathc.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
_libdir="/usr/lib/$_pkgname"
_extension_dir="$_libdir/modules"
@@ -105,137 +110,133 @@ _extension_confd="/etc/$_pkgname/conf.d"
# 7.2.21-r0:
# - CVE-2019-11041
# - CVE-2019-11042
-
-# Usage: add_ext [with|enable] name [extension dependencies...] [configure options...]
-add_ext() {
- local ext="$1"
+# 7.4.4-r0:
+# - CVE-2019-11043
+# - CVE-2019-11045
+# - CVE-2019-11046
+# - CVE-2019-11047
+# - CVE-2019-11050
+# - CVE-2019-13224
+# - CVE-2020-7059
+# - CVE-2020-7060
+# - CVE-2020-7062
+# - CVE-2020-7063
+# - CVE-2020-7064
+# - CVE-2020-7066
+
+# Usage: _add_ext [with|enable] name [extension dependencies...] [configure options...]
+_add_ext() {
+ _ext="$1"
shift
- # add_ext [with|enable] name -> --[with|enable]-name=shared
- if [ "$ext" = "with" ] || [ "$ext" = "enable" ]; then
- _configure_ext_opts="$_configure_ext_opts --$ext-$1=shared"
- ext="$1"
+ # _add_ext [with|enable] name -> --[with|enable]-name=shared
+ case "$_ext" in
+ with|enable)
+ _configure_ext_opts="$_configure_ext_opts --$_ext-$1=shared"
+ _ext="$1"
shift
- fi
+ ;;
+ esac
- case "$ext" in
- phar) subpackages="$subpackages $pkgname-$ext:$ext";;
- *) subpackages="$subpackages $pkgname-$ext:_extension";;
+ case "$_ext" in
+ phar) subpackages="$subpackages $pkgname-$_ext:$_ext";;
+ *) subpackages="$subpackages $pkgname-$_ext:_extension";;
esac
- _extensions="$_extensions $ext"
+ _extensions="$_extensions $_ext"
- local opt
- local prev
- for opt in $@; do
- case "$opt" in
+ for _opt; do
+ case "$_opt" in
-*)
# Add more configure options
- _configure_ext_opts="$_configure_ext_opts $opt"
+ _configure_ext_opts="$_configure_ext_opts $_opt"
;;
license:*)
# Add custom license
- opt="$(printf '%s' "${opt#license:}" | sed 's/:/ AND /g')"
- eval "_licenses_$ext='$opt'"
+ _opt="$(printf '%s' "${_opt#license:}" | sed 's/:/ AND /g')"
+ eval "_licenses_$_ext='$_opt'"
;;
*)
# Add dependencies
- prev="$(eval echo \$_deps_$ext)"
- eval "_deps_$ext='$prev $opt'"
+ eval "_deps_$_ext=\"\$_deps_$_ext $_opt\""
;;
- esac
+ esac
done
}
-enable_ext() { add_ext enable $@; }
-with_ext() { add_ext with $@; }
+_enable_ext() { _add_ext enable "$@"; }
+_with_ext() { _add_ext with "$@"; }
-enable_ext 'bcmath' \
+_enable_ext bcmath \
license:LGPL-2.0+:PHP-3.01
-with_ext 'bz2'
-enable_ext 'calendar'
-enable_ext 'ctype'
-with_ext 'curl'
-enable_ext 'dba' \
+_with_ext bz2
+_enable_ext calendar
+_enable_ext ctype
+_with_ext curl
+_enable_ext dba \
--with-db4 \
--with-dbmaker=shared \
--with-gdbm
-enable_ext 'dom'
-with_ext 'enchant'
-enable_ext 'exif' mbstring
-enable_ext 'fileinfo' \
+_enable_ext dom
+_with_ext enchant
+_enable_ext exif mbstring
+_enable_ext fileinfo \
license:PHP-3.0:BSD-2-Clause:BSD-3-Clause:Public-Domain
-enable_ext 'ftp'
-with_ext 'gd' \
- --with-freetype-dir=/usr \
- --disable-gd-jis-conv \
- --with-jpeg-dir=/usr \
- --with-png-dir=/usr \
- --with-webp-dir=/usr \
- --with-xpm-dir=/usr
-with_ext 'gettext'
-with_ext 'gmp'
-with_ext 'iconv'
-# Needs makedepeneds=imap-dev
-#with_ext 'imap' \
-# --with-imap-ssl
-enable_ext 'intl'
-enable_ext 'json'
-with_ext 'ldap' \
+_enable_ext ftp
+_enable_ext gd \
+ --with-external-gd
+_with_ext gettext
+_with_ext gmp
+_with_ext iconv
+_enable_ext intl
+_enable_ext json
+_with_ext ldap \
--with-ldap-sasl
-enable_ext 'mbstring' \
+_enable_ext mbstring \
license:PHP-3.01:OLDAP-2.8:BSD-2-Clause:Public-Domain:LGPL-2.0-only:LGPL-2.1-only
-add_ext 'mysqli' mysqlnd openssl \
+_add_ext mysqli mysqlnd openssl \
--with-mysqli=shared,mysqlnd \
--with-mysql-sock=/run/mysqld/mysqld.sock
-enable_ext 'mysqlnd' openssl
-add_ext 'odbc' \
+_enable_ext mysqlnd openssl
+_add_ext odbc \
--with-unixODBC=shared,/usr
-enable_ext 'opcache'
-with_ext 'openssl' \
+_enable_ext opcache
+_with_ext openssl \
--with-system-ciphers \
--with-kerberos
-enable_ext 'pcntl'
-enable_ext 'pdo'
-add_ext 'pdo_dblib' pdo \
+_enable_ext pcntl
+_enable_ext pdo
+_add_ext pdo_dblib pdo \
--with-pdo-dblib=shared
-add_ext 'pdo_mysql' pdo mysqlnd \
+_add_ext pdo_mysql pdo mysqlnd \
--with-pdo-mysql=shared,mysqlnd
-add_ext 'pdo_odbc' pdo \
+_add_ext pdo_odbc pdo \
license:PHP-3.0 \
--with-pdo-odbc=shared,unixODBC,/usr
-add_ext 'pdo_pgsql' pdo \
+_add_ext pdo_pgsql pdo \
--with-pdo-pgsql=shared
-add_ext 'pdo_sqlite' pdo \
+_add_ext pdo_sqlite pdo \
--with-pdo-sqlite=shared,/usr
-with_ext 'pgsql'
-enable_ext 'phar'
-enable_ext 'posix'
-with_ext 'pspell'
-# Needs makedepends=recode-dev
-#with_ext 'recode'
-enable_ext 'session'
-enable_ext 'shmop'
-enable_ext 'simplexml'
-with_ext 'snmp'
-enable_ext 'soap' \
+_with_ext pgsql
+_enable_ext phar
+_enable_ext posix
+_with_ext pspell
+_enable_ext session
+_enable_ext shmop
+_enable_ext simplexml
+_with_ext snmp
+_enable_ext soap \
license:PHP-3.01:PHP-2.02
-# Needs makedepends=libsodium-dev
-#with_ext 'sodium'
-enable_ext 'sockets'
-add_ext 'sqlite3' \
+_enable_ext sockets
+_add_ext sqlite3 \
--with-sqlite3=shared,/usr
-enable_ext 'sysvmsg'
-enable_ext 'sysvsem'
-enable_ext 'sysvshm'
-# Needs makedepends=tidyhtml-dev
-#with_ext 'tidy'
-enable_ext 'tokenizer'
-enable_ext 'wddx' xml
-enable_ext 'xml'
-enable_ext 'xmlreader' dom
-with_ext 'xmlrpc' xml
-enable_ext 'xmlwriter'
-with_ext 'xsl' dom
-enable_ext 'zip' \
- --with-libzip=/usr
+_enable_ext sysvmsg
+_enable_ext sysvsem
+_enable_ext sysvshm
+_enable_ext tokenizer
+_enable_ext xml
+_enable_ext xmlreader dom
+_with_ext xmlrpc xml
+_enable_ext xmlwriter
+_with_ext xsl dom
+_with_ext zip
# secfixes:
# 7.2.5-r0:
@@ -248,13 +249,23 @@ enable_ext 'zip' \
prepare() {
default_prepare
- update_config_sub
- local vapi="$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)"
- if [ "$vapi" != "$_apiver" ]; then
- error "Upstreram API version is now $vapi. Expecting $_apiver"
- error "After updating _apiver, all 3rd-party extensions must be rebuilt."
- return 1
+ _vapi="$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)"
+ if [ "$_vapi" != "$_apiver" ]; then
+ error "Upstream API version $_vapi != $_apiver"
+ die "All third-party extensions must be rebuilt"
+ fi
+
+ _zapi="$(sed -n '/#define ZEND_MODULE_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_modules.h)"
+ if [ "$_zapi" != "$_zendver" ]; then
+ error "Upstream Zend API version $_zapi != $_zendver"
+ die "All third-party extensions must be rebuilt"
+ fi
+
+ _papi="$(sed -n '/#define PDO_DRIVER_API/{s/.*[ ]//;p}' ext/pdo/php_pdo_driver.h)"
+ if [ "$_papi" != "$_pdover" ]; then
+ error "Upstream PDO API version $_papi != $_pdover"
+ die "All third-party extensions must be rebuilt"
fi
# https://bugs.php.net/63362 - Not needed but installed headers.
@@ -271,21 +282,17 @@ prepare() {
# Fix some bogus permissions.
find . -name '*.[ch]' -exec chmod 644 {} +
- # XXX: Delete failing tests.
- sed -n '/^[^#]/p' "$srcdir/disabled-tests.list" | while read item; do
- rm $item
+ # XXX: Disable failing tests.
+ sed -n '/^[^#]/p' "$srcdir/disabled-tests.list" | while read _test; do
+ mv "$_test" "${_test}d"
done
autoconf
}
-# Notes:
-# * gd-jis-conv breaks any non-latin font rendering (vakartel).
-# * libxml cannot be build as shared.
-# * Doesn't work with system-provided onigurama, some tests fail (invalid code
-# point); probably because bundled onigurama is version 5.x, but we have 6.x.
_build() {
- EXTENSION_DIR=$_extension_dir PCRE_INCDIR="/usr/include" ./configure \
+ # libxml cannot be build as shared.
+ EXTENSION_DIR="$_extension_dir" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -301,56 +308,61 @@ _build() {
--with-config-file-path=/etc/$_pkgname \
--with-config-file-scan-dir=$_extension_confd \
--disable-short-tags \
- --with-icu-dir=/usr \
--with-libedit \
--without-readline \
- --enable-libxml \
- --with-libxml-dir=/usr \
- --with-pcre-regex=/ \
+ --with-external-pcre \
--with-zlib \
--with-zlib-dir=/usr \
$_configure_ext_opts \
- $@
+ "$@"
make
}
build() {
- # phpdbg
- _build --enable-phpdbg \
- --enable-phpdbg-webhelper \
- --disable-cgi \
- --disable-cli
+ export CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-pointer-sign"
# apache-httpd module
- _build --disable-phpdbg \
+ _build --disable-fpm \
+ --disable-embed \
+ --disable-phpdbg \
--disable-cgi \
--disable-cli \
--with-apxs2
mv libs/libphp7.so sapi/apache2handler/mod_php.so
- # cgi, cli, fpm, embed, litespeed
- _build --disable-phpdbg \
- --enable-fpm \
- --enable-embed \
- --with-litespeed
+ _build --enable-fpm=yes \
+ --enable-embed=yes \
+ --enable-phpdbg=yes \
+ --enable-phpdbg-webhelper=yes
}
check() {
# PHP is so stupid that it's not able to resolve dependencies
# between extensions and load them in correct order, so we must
# help it...
- # opcache is Zend extension, it's handled specially in Makefile
- local php_modules="$(_extensions_by_load_order \
- | grep -vx opcache \
- | xargs -n 1 printf "'$builddir/modules/%s.la' ")"
- sed -i "/^PHP_TEST_SHARED_EXTENSIONS/,/extension=/ \
- s|in \$(PHP_MODULES)\"*|in $php_modules|" Makefile
+ #
+ # * opcache is Zend extension, it's handled specially in Makefile
+ # * skip pdo_dblib since it slowly tries to connect to nonexistent
+ # * ditto snmp
+
+ cat > php-check.ini <<-EOF
+ extension_dir=$builddir/modules
+ $(_extensions_by_load_order \
+ | grep -vxe opcache -e pdo_dblib -e snmp \
+ | sed -e 's/^/extension=/' -e 's/$/.so/')
+ EOF
+
+ # Note: We use the combination of PHPRC=... and
+ # PHP_MODULES=(nothing) so we can set the module load order
+ # correctly. Cf. test-fixes.patch
NO_INTERACTION=1 REPORT_EXIT_STATUS=1 \
SKIP_SLOW_TESTS=1 SKIP_ONLINE_TESTS=1 TEST_TIMEOUT=10 \
+ TEST_PHP_ARGS="-j$JOBS -W test.log" \
TZ= LANG= LC_ALL= \
- make test
+ PHPRC="$builddir"/php-check.ini \
+ make test PHP_MODULES=
echo 'NOTE: We have skipped quite a lot tests, see disabled-tests.list.'
}
@@ -376,14 +388,13 @@ doc() {
cd "$builddir"
mkdir -p "$subpkgdir/usr/share/doc/$_pkgname"
- cp CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS \
- README* UPGRADING* \
+ cp EXTENSIONS LICENSE NEWS README* UPGRADING* \
"$subpkgdir/usr/share/doc/$_pkgname/"
}
apache() {
pkgdesc="PHP7 Module for apache-httpd"
- depends="$pkgname apache-httpd"
+ depends="$pkgname=$pkgver-r$pkgrel apache-httpd"
install -D -m 755 "$builddir"/sapi/apache2handler/mod_php.so \
"$subpkgdir"/usr/libexec/apache2/mod_php.so
@@ -393,37 +404,26 @@ apache() {
phpdbg() {
pkgdesc="Interactive PHP7 debugger"
- #depends="$pkgname" ?
- install -Dm755 "$builddir"/sapi/phpdbg/phpdbg \
- "$subpkgdir"/usr/bin/phpdbg
+ _mv "$pkgdir"/usr/bin/phpdbg "$subpkgdir"/usr/bin/
}
embed() {
pkgdesc="PHP7 Embedded Library"
- #depends="$pkgname" ?
_mv "$pkgdir"/usr/lib/libphp*.so "$subpkgdir"/usr/lib/
}
-litespeed() {
- pkgdesc="PHP7 LiteSpeed SAPI"
- #depends="$pkgname" ?
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/lsphp "$subpkgdir"/usr/bin
-}
-
cgi() {
pkgdesc="PHP7 Common Gateway Interface"
- depends="$pkgname"
+ depends="$pkgname=$pkgver-r$pkgrel"
_mv "$pkgdir"/usr/bin/php-cgi "$subpkgdir"/usr/bin/
}
fpm() {
pkgdesc="PHP7 FastCGI Process Manager"
- depends="$pkgname"
+ depends="$pkgname=$pkgver-r$pkgrel"
cd "$pkgdir"
_mv var "$subpkgdir"/
@@ -431,9 +431,9 @@ fpm() {
_mv usr/sbin "$subpkgdir"/usr/
_mv etc/$_pkgname/php-fpm* "$subpkgdir"/etc/$_pkgname/
- local file; for file in php-fpm.conf php-fpm.d/www.conf; do
- mv "$subpkgdir"/etc/$_pkgname/$file.default \
- "$subpkgdir"/etc/$_pkgname/$file
+ for _file in php-fpm.conf php-fpm.d/www.conf; do
+ mv "$subpkgdir/etc/$_pkgname/$_file.default" \
+ "$subpkgdir/etc/$_pkgname/$_file"
done
install -D -m 755 "$srcdir"/$_pkgname-fpm.initd \
@@ -447,7 +447,7 @@ fpm() {
pear() {
pkgdesc="PHP7 Extension and Application Repository"
- depends="$pkgname $pkgname-xml"
+ depends="$pkgname=$pkgver-r$pkgrel $pkgname-xml=$pkgver-r$pkgrel"
cd "$pkgdir"
# pecl needs xml extension and since we build it as shared, it must be
@@ -455,8 +455,8 @@ pear() {
sed -i 's/\$INCARG/& -d extension=xml.so/' usr/bin/pecl
mkdir -p "$subpkgdir"/usr/bin
- local file; for file in pecl pear peardev; do
- mv usr/bin/$file "$subpkgdir"/usr/bin/$file
+ for _file in pecl pear peardev; do
+ mv "usr/bin/$_file" "$subpkgdir/usr/bin/$_file"
done
_mv etc/php/pear.conf "$subpkgdir"/etc/php/
@@ -475,73 +475,70 @@ phar() {
}
_extension() {
- local ext="${subpkgname#$pkgname-}"
- local extdesc="$(head -n1 "$builddir"/ext/$ext/CREDITS 2>/dev/null ||:)"
- depends="$pkgname"
- local dep; for dep in $(eval echo \$_deps_$ext); do
- depends="$depends $pkgname-$dep"
+ _ext="${subpkgname#$pkgname-}"
+
+ depends="$pkgname=$pkgver-r$pkgrel"
+ for _dep in $(eval echo \$_deps_$_ext); do
+ depends="$depends $pkgname-$_dep=$pkgver-r$pkgrel"
done
- pkgdesc="PHP7 extension: ${extdesc:-$ext}"
- if [ -n "$(eval echo \$_licenses_$ext)" ]; then
- license="$(eval echo \$_licenses_$ext)"
- fi
- local load_order=$(_extension_load_order "$ext")
+ pkgdesc="$(head -n1 "$builddir/_ext/$_ext/CREDITS" 2>/dev/null ||:)"
+ pkgdesc="PHP7 extension: ${pkgdesc:-$_ext}"
- # extension prefix
- local prefix=
- [ "$ext" = "opcache" ] && prefix="zend_"
+ if [ -n "$(eval echo \$_licenses_$_ext)" ]; then
+ license="$(eval echo \$_licenses_$_ext)"
+ fi
- _mv "$pkgdir"/$_extension_dir/$ext.so \
- "$subpkgdir"/$_extension_dir/
+ _mv "$pkgdir/$_extension_dir/$_ext.so" \
+ "$subpkgdir/$_extension_dir/"
- mkdir -p "$subpkgdir"/$_extension_confd
- echo "${prefix}extension=$ext.so" \
- > "$subpkgdir"/$_extension_confd/$(printf %02d $load_order)_$ext.ini
+ _load_order="$(printf %02d "$(_extension_load_order "$_ext")")"
+ case "$_ext" in
+ opcache) _prefix=zend_;;
+ *) _prefix=;;
+ esac
+ mkdir -p "$subpkgdir/$_extension_confd"
+ cat > "$subpkgdir/$_extension_confd/${_load_order}_$_ext.ini" <<-EOF
+ ${_prefix}extension=$_ext.so
+ EOF
}
# Prints a load order (0-based integer) for the given extension name. Extension
# with lower load order should be loaded before exts with higher load order.
-# It's based on number of dependencies of the extension (with exception for
-# "imap"), which is flawed, but simple and good enough for now.
+# It's based on number of dependencies of the extension which is flawed,
+# but simple and good enough for now.
_extension_load_order() {
- local ext="$1"
- local deps="$(eval echo \$_deps_$ext)"
-
- case "$ext" in
- # This must be loaded after recode, even though it does
- # not depend on it.
- imap) echo 1;;
- # depends=$pkgname
- phar) echo 1;;
- *) echo "$deps" | wc -w;;
+ _ext="$1"
+ case "$_ext" in
+ # depends=$pkgname
+ phar) echo 1;;
+ *) echo "$(eval echo \$_deps_$_ext)" | wc -w;;
esac
}
# Prints $_extensions sorted by load order and name.
_extensions_by_load_order() {
- local deps list ext
-
- for ext in $_extensions; do
- list="$list $(_extension_load_order $ext);$ext"
- done
- printf '%s\n' $list | sort -t ';' -k 1 | sed -E 's/\d+;//'
+ for _ext in $_extensions; do
+ printf '%s\n' "$(_extension_load_order $_ext);$_ext"
+ done | sort -t ';' -k 1 | sed -E 's/[0-9]+;//'
}
_mv() {
- local dest; for dest; do true; done # get last argument
- mkdir -p "$dest"
- mv $@
+ for _dest; do true; done # get last argument
+ mkdir -p "$_dest"
+ mv "$@"
}
-sha512sums="b234305f04bd621d355450ba38b34558a5b08403571749ac3b04ffa60d7639e847750109bef09a14f616110ba175b970d68cbae0d0b671c2dfeac6917f12f21d php-7.2.21.tar.bz2
+sha512sums="5676023858ffbef4997c2ed99ce1689de2b56d09a0925b8fc6527d56e7f6031b380e433e417e44f84196e713d84c16b33212ed6d116b5c347d1d60586288c248 php-7.4.4.tar.bz2
cb3ba48fbd412f12d98ef1f88b509b40bc4ca44a16779a06d43e4db3cb8d24d54404b9e11ca941b5339af8d3281ca9c8ea3ba5ced4339f91fb40608b5ce9a647 php-fpm.initd
01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate
a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf
-b1008eabc86fcff88336fe2961e3229c159c930a05d97359136c381c5c1cc572a33110308a3e5ef5e31c60327f76c9ef02b375cd2ea8ff9caa7deeddc216f4ce disabled-tests.list
-f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 install-pear.patch
+587057aaf93feec2936e2851dbb42ba78310fc012e340d90c58a8912437a8b6a15585895490c31ac31cf36969ea1f2999993c5ca42031c378f31fb83d361fd73 disabled-tests.list
+7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch
a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d1c249702d6afb193398dd3199ae58e42b32b95d434fb1883 fpm-paths.patch
-f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc allow-build-recode-and-imap-together.patch
-f8bb322e56df79dd9f391737fb8737945cc730b14c7dc2ae8688979c565a9b97f5f2a12c9fcd0d8124624a9d09bd10228147d9e999bb94909bbe249f0a50646c fix-tests-devserver.patch
-8e538063d872f6770a57cdb844226a771ccda3d387dd1f199bb08c274b94fbe12ec0ef6df75c32071f308cb8f4ab51b91b520c7c2ed687adf96d0d322788e463 pwbuflen.patch
-03de56676449ddc1ba1fc9c4fee2b2ed620cd1a8ce52d288c91b42e081182871ade55c8dbbe1c8286bc4eadcd92d497a62ac7b689ea8d6b1bcb5eb25225595c4 enchant-2.patch"
+821bf6fde83302e7613429a61066e2bd3ca4e998dcb7c11e39f4ae84829056537501b47a051e1feba752f72d98644b9a214633db9ccb16d137d3242d145acfe0 getsockopt.patch
+951fa8445c20513aa48bf7c7d773c6b4012322e7e7592c13d965758e761b9898c484f0dbc5ae565c05787e6ab868769c97c71504624b10c9570e1d4214f75b10 install-pear.patch
+5fd358dfd660901c8ffdaffe0bce398ab020f8c1beb89e26ba1b21646212fe132927d52ae088220d0b9c53017cfc67f4c9b88f7602df61d36eba5768ce94e355 no-max-ent-size.patch
+9160e5c6b8bf2d87299f38421caf498519eb42243118570754a5764b5e682c546309548e76df6163df49e841ff51fb07e50fadeed1687da5d73dec1810c393ee test-fixes.patch
+0cd6b8739533511c0d1edcb1ecff4d8d21a6b51d21f77c382645cf31d1645eeb2ebd80e2720557ceefa58f538385e097402bdc50e613dc7699bd8f033aefa543 zend_bool.patch
+1b22dfa547bd1e14e065966f5268adda771c4ad039b83acee30772cd95f0f0b1a320d75fc6ab71a0bc6ca5ce04d58d9f410767c4fae4d5e16537393c78439f21 zip-glob-pathc.patch"
diff --git a/user/php7/disabled-tests.list b/user/php7/disabled-tests.list
index 10117801e..fc1386e2e 100644
--- a/user/php7/disabled-tests.list
+++ b/user/php7/disabled-tests.list
@@ -1,18 +1,14 @@
# Dumb failures
# Expects permissions on /etc to be 40755
ext/standard/tests/file/006_error.phpt
-# session_start() missing - needs session.so
-# Test manually using the following:
-# test.ini contains "extension=./modules/session.so"
-# TEST_PHP_EXECUTABLE=sapi/cli/php sapi/cli/php run-tests.php -c test.ini $f
-Zend/tests/unset_cv05.phpt
-Zend/tests/unset_cv06.phpt
# Tests undefined behavior (integer underflow or overflow)
Zend/tests/dval_to_lval_32.phpt
Zend/tests/int_underflow_32bit.phpt
ext/date/tests/bug53437_var3.phpt
ext/date/tests/bug53437_var5.phpt
ext/date/tests/bug53437_var6.phpt
+ext/exif/tests/bug79046.phpt
+ext/exif/tests/float_cast_overflow.phpt
# General glibc/musl incompatibility related failures
# stdout printed in wrong order
@@ -25,10 +21,17 @@ ext/standard/tests/strings/007.phpt
ext/standard/tests/file/popen_pclose_error.phpt
# "Address in use" instead of "Address already in use" printed for EADDRINUSE
sapi/fpm/tests/socket-ipv4-fallback.phpt
+# strerror differences
+ext/sockets/tests/socket_strerror.phpt
+ext/sockets/tests/socket_create_pair-wrongparams.phpt
+# socket_addrinfo_explain has unexpected ai_canonname member
+ext/sockets/tests/socket_addrinfo_explain.phpt
# locale related failures
# LC_NUMERIC unsupported
ext/standard/tests/strings/sprintf_f_3.phpt
+ext/intl/tests/bug67052.phpt
+ext/json/tests/bug41403.phpt
tests/lang/034.phpt
tests/lang/bug30638.phpt
# LC_ALL unsupported
@@ -43,8 +46,10 @@ ext/standard/tests/strings/htmlentities03.phpt
ext/standard/tests/strings/htmlentities04.phpt
ext/standard/tests/strings/htmlentities15.phpt
ext/standard/tests/strings/strtoupper.phpt
+ext/fileinfo/tests/bug74170.phpt
# LC_MONETARY unsupported
ext/standard/tests/strings/moneyformat.phpt
+ext/soap/tests/bugs/bug39815.phpt
# locale: command not found
ext/standard/tests/strings/setlocale_basic1.phpt
ext/standard/tests/strings/setlocale_basic2.phpt
@@ -53,6 +58,17 @@ ext/standard/tests/strings/setlocale_variation1.phpt
ext/standard/tests/strings/setlocale_variation2.phpt
# setlocale allows "en_US.invalid"
ext/standard/tests/strings/setlocale_error.phpt
+# bind_textdomain_codeset is a stub
+ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
+# //IGNORE
+ext/iconv/tests/bug48147.phpt
+ext/iconv/tests/bug76249.phpt
+# //TRANSLIT
+ext/iconv/tests/iconv_basic_001.phpt
+# misc musl iconv incompatibilities
+ext/iconv/tests/bug52211.phpt
+ext/iconv/tests/eucjp2iso2022jp.phpt
+ext/iconv/tests/iconv_mime_encode.phpt
# strftime and strptime related failures
# strftime %Z (timezone abbreviation) returns a single space
@@ -91,5 +107,64 @@ ext/standard/tests/crypt/des_fallback_invalid_salt.phpt
#sapi/fpm/tests/015.phpt
# Times out on builders but runs fine manually
+ext/zlib/tests/bug67724.phpt
ext/zlib/tests/inflate_add_basic.phpt
sapi/cli/tests/upload_2G.phpt
+
+# gd errors more verbose than expected
+ext/gd/tests/bug39780_extern.phpt
+ext/gd/tests/bug45799.phpt
+ext/gd/tests/bug77973.phpt
+ext/gd/tests/createfromwbmp2_extern.phpt
+ext/gd/tests/libgd00086_extern.phpt
+
+# no XPM support in system gd
+ext/gd/tests/xpm2gd.phpt
+ext/gd/tests/xpm2jpg.phpt
+ext/gd/tests/xpm2png.phpt
+
+# misc differences when using system gd
+ext/gd/tests/bug43073.phpt
+ext/gd/tests/bug48732-mb.phpt
+ext/gd/tests/bug48732.phpt
+ext/gd/tests/bug48801-mb.phpt
+ext/gd/tests/bug48801.phpt
+ext/gd/tests/bug53504.phpt
+ext/gd/tests/bug65148.phpt
+ext/gd/tests/bug73272.phpt
+ext/gd/tests/bug73869.phpt
+ext/gd/tests/bug79067.phpt
+ext/gd/tests/bug79068.phpt
+
+# requires a default route to be set, which isn't the case during
+# network isolation
+ext/sockets/tests/bug63000.phpt
+
+# This should be skipped like long_columns.phpt is but it's missing the
+# additional checks
+ext/pdo_odbc/tests/max_columns.phpt
+
+# enchant-2 doesn't support enchant_broker_(get|set)_dict_path
+# https://news-web.php.net/php.internals/100882
+ext/enchant/tests/bug53070.phpt
+
+# Warning: zend_signal: handler was replaced
+ext/readline/tests/libedit_callback_handler_install_001.phpt
+ext/readline/tests/libedit_callback_handler_remove_001.phpt
+
+# soap server's sum is not accumulating
+ext/soap/tests/server009.phpt
+
+# "Resource bundle source files are compiled with the genrb tool into a
+# binary runtime form (.res files) that is portable among platforms with
+# the same charset family (ASCII vs. EBCDIC) and **endianness**."
+#
+# Therefore these tests which use little-endian .res files will not work
+# on our big endian arches...
+ext/intl/tests/resourcebundle_arrayaccess.phpt
+ext/intl/tests/resourcebundle_countable.phpt
+ext/intl/tests/resourcebundle_create.phpt
+ext/intl/tests/resourcebundle_individual.phpt
+ext/intl/tests/resourcebundle_iterator.phpt
+ext/intl/tests/resourcebundle_locales.phpt
+ext/intl/tests/resourcebundle_traversable.phpt
diff --git a/user/php7/enchant-2.patch b/user/php7/enchant-2.patch
index ed048de28..9d421c3bf 100644
--- a/user/php7/enchant-2.patch
+++ b/user/php7/enchant-2.patch
@@ -1,31 +1,33 @@
-Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enchant-2.patch?h=packages/php
-
---- php-7.1.13/ext/enchant/config.m4.orig 2018-01-03 02:32:29.000000000 +0000
-+++ php-7.1.13/ext/enchant/config.m4 2018-01-21 22:10:03.788875780 +0000
-@@ -14,9 +14,9 @@
- ENCHANT_SEARCH_DIRS="/usr/local /usr"
- fi
- for i in $ENCHANT_SEARCH_DIRS; do
-- if test -f $i/include/enchant/enchant.h; then
-+ if test -f $i/include/enchant-2/enchant.h; then
- ENCHANT_DIR=$i
-- ENCHANT_INCDIR=$i/include/enchant
-+ ENCHANT_INCDIR=$i/include/enchant-2
- elif test -f $i/include/enchant.h; then
- ENCHANT_DIR=$i
- ENCHANT_INCDIR=$i/include
-@@ -31,7 +31,7 @@
-
- AC_DEFINE(HAVE_ENCHANT,1,[ ])
- PHP_SUBST(ENCHANT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
- PHP_ADD_INCLUDE($ENCHANT_INCDIR)
- PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
- [
---- php-7.2.1/ext/enchant/enchant.c.orig 2018-01-02 22:36:05.000000000 +0000
-+++ php-7.2.1/ext/enchant/enchant.c 2018-01-21 22:34:50.205791491 +0000
-@@ -741,7 +741,7 @@
+--- php-7.4.4/ext/enchant/config.m4 2020-03-17 10:40:22.000000000 +0000
++++ php-7.4.4/ext/enchant/config.m4 2020-03-27 21:25:27.754470703 +0000
+@@ -4,21 +4,21 @@ PHP_ARG_WITH([enchant],
+ [Include Enchant support])])
+
+ if test "$PHP_ENCHANT" != "no"; then
+- PKG_CHECK_MODULES([ENCHANT], [enchant])
++ PKG_CHECK_MODULES([ENCHANT], [enchant-2])
+
+ PHP_EVAL_INCLINE($ENCHANT_CFLAGS)
+ PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
+
+ AC_DEFINE(HAVE_ENCHANT, 1, [ ])
+
+- PHP_CHECK_LIBRARY(enchant, enchant_get_version,
++ PHP_CHECK_LIBRARY(enchant-2, enchant_get_version,
+ [
+ AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ ])
+ ], [ ], [
+ $ENCHANT_LIBS
+ ])
+
+- PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
++ PHP_CHECK_LIBRARY(enchant-2, enchant_broker_set_param,
+ [
+ AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+ ], [ ], [
+--- a/ext/enchant/enchant.c.orig
++++ b/ext/enchant/enchant.c
+@@ -738,7 +738,7 @@
for (i = 0; i < n_sugg; i++) {
add_next_index_string(sugg, suggs[i]);
}
@@ -34,7 +36,7 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
}
-@@ -798,7 +798,7 @@
+@@ -793,7 +793,7 @@
add_next_index_string(return_value, suggs[i]);
}
@@ -43,7 +45,7 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
}
}
/* }}} */
-@@ -818,7 +818,7 @@
+@@ -813,7 +813,7 @@
PHP_ENCHANT_GET_DICT;
@@ -52,7 +54,7 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
}
/* }}} */
-@@ -856,7 +856,7 @@
+@@ -851,7 +851,7 @@
PHP_ENCHANT_GET_DICT;
@@ -61,3 +63,14 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
}
/* }}} */
+--- php-7.4.4/build/php.m4 2020-03-17 06:40:21.000000000 -0400
++++ php-7.4.4/build/php.m4 2020-04-05 09:27:14.634620646 -0400
+@@ -1541,7 +1541,7 @@ AC_DEFUN([PHP_CHECK_LIBRARY], [
+ ],[
+ LDFLAGS=$save_old_LDFLAGS
+ ext_shared=$save_ext_shared
+- unset ac_cv_lib_$1[]_$2
++ unset ac_cv_lib_[]translit($1, -, _)_$2
+ $4
+ ])dnl
+ ])
diff --git a/user/php7/fix-tests-devserver.patch b/user/php7/fix-tests-devserver.patch
deleted file mode 100644
index 80a72f0f1..000000000
--- a/user/php7/fix-tests-devserver.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Mon, 01 May 2017 01:33:00 +0200
-Subject: [PATCH] Fix tests failing due to extra message from built-in web server
-
-Remove messages like:
-
- PHP 7.1.4 Development Server started at Mon May 1 00:42:39 2017
-
-from test outputs, because tests do not expect them. I have no clue what
-happens here...
-
---- a/run-tests.php
-+++ b/run-tests.php
-@@ -2005,6 +2005,9 @@
- // Does the output match what is expected?
- $output = preg_replace("/\r\n/", "\n", trim($out));
-
-+ // Remove message from built-in development server.
-+ $output = preg_replace("/^PHP [0-9.]+ Development Server started at .*\n\n?/m", "", $output);
-+
- /* when using CGI, strip the headers from the output */
- $headers = array();
-
diff --git a/user/php7/getsockopt.patch b/user/php7/getsockopt.patch
new file mode 100644
index 000000000..81f2bc232
--- /dev/null
+++ b/user/php7/getsockopt.patch
@@ -0,0 +1,37 @@
+Socket options with level IPPROTO_IP and IPPROTO_IPV6 cannot be handled
+in the same switch statement as options with level SOL_SOCKET since
+there may be collisions in their numerical values.
+
+For example, on ppc64:
+
+* IPV6_MULTICAST_HOPS and SO_RCVTIMEO are both 18
+* IPV6_MULTICAST_LOOP and SO_SNDTIMEO are both 19
+
+etc.
+
+--- php-7.4.4/ext/sockets/sockets.c 2020-03-17 06:40:21.000000000 -0400
++++ php-7.4.4/ext/sockets/sockets.c 2020-03-29 22:39:57.506751737 -0400
+@@ -2008,6 +2008,7 @@ PHP_FUNCTION(socket_get_option)
+ }
+ }
+ }
++ goto handle_default;
+ }
+ #if HAVE_IPV6
+ else if (level == IPPROTO_IPV6) {
+@@ -2017,6 +2018,7 @@ PHP_FUNCTION(socket_get_option)
+ } else if (ret == FAILURE) {
+ RETURN_FALSE;
+ } /* else continue */
++ goto handle_default;
+ }
+ #endif
+
+@@ -2063,6 +2065,7 @@ PHP_FUNCTION(socket_get_option)
+ break;
+
+ default:
++ handle_default:
+ optlen = sizeof(other_val);
+
+ if (getsockopt(php_sock->bsd_socket, level, optname, (char*)&other_val, &optlen) != 0) {
diff --git a/user/php7/install-pear.patch b/user/php7/install-pear.patch
index 18747be94..8f5fb3444 100644
--- a/user/php7/install-pear.patch
+++ b/user/php7/install-pear.patch
@@ -1,7 +1,6 @@
---- ./pear/Makefile.frag.orig 2013-04-12 07:02:27.041602514 +0000
-+++ ./pear/Makefile.frag 2013-04-12 07:04:09.065836822 +0000
-@@ -2,8 +2,11 @@
-
+--- php-7.4.4/pear/Makefile.frag 2020-03-17 10:40:21.000000000 +0000
++++ php-7.4.4/pear/Makefile.frag 2020-03-25 03:57:55.940744663 +0000
+@@ -1,7 +1,10 @@
peardir=$(PEAR_INSTALLDIR)
+# help the built php to find xml extension so we can install pear
diff --git a/user/php7/no-max-ent-size.patch b/user/php7/no-max-ent-size.patch
new file mode 100644
index 000000000..7f28ba3f1
--- /dev/null
+++ b/user/php7/no-max-ent-size.patch
@@ -0,0 +1,257 @@
+--- php-7.4.4/ext/posix/posix.c 2020-03-17 10:40:22.000000000 +0000
++++ php-7.4.4/ext/posix/posix.c 2020-03-27 03:19:13.133440186 +0000
+@@ -1084,8 +1084,11 @@ PHP_FUNCTION(posix_getgrnam)
+ ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
+
+ #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
++ errno = 0;
+ buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+- if (buflen < 1) {
++ if (buflen == -1 && errno == 0) {
++ buflen = 1024;
++ } else if (buflen < 1) {
+ RETURN_FALSE;
+ }
+ buf = emalloc(buflen);
+@@ -1127,9 +1130,7 @@ PHP_FUNCTION(posix_getgrgid)
+ {
+ zend_long gid;
+ #if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
+- int ret;
+ struct group _g;
+- struct group *retgrptr = NULL;
+ long grbuflen;
+ char *grbuf;
+ #endif
+@@ -1141,20 +1142,27 @@ PHP_FUNCTION(posix_getgrgid)
+
+ #if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
+
++ errno = 0;
+ grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+- if (grbuflen < 1) {
++ if (grbuflen == -1 && errno == 0) {
++ grbuflen = 1024;
++ } else if (grbuflen < 1) {
+ RETURN_FALSE;
+ }
+-
+ grbuf = emalloc(grbuflen);
++try_again:
++ g = &_g;
+
+- ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr);
+- if (ret || retgrptr == NULL) {
+- POSIX_G(last_error) = ret;
++ if (getgrgid_r(gid, g, grbuf, grbuflen, &g) || g == NULL) {
++ if (errno == ERANGE) {
++ grbuflen *= 2;
++ grbuf = erealloc(grbuf, grbuflen);
++ goto try_again;
++ }
++ POSIX_G(last_error) = errno;
+ efree(grbuf);
+ RETURN_FALSE;
+ }
+- g = &_g;
+ #else
+ if (NULL == (g = getgrgid(gid))) {
+ POSIX_G(last_error) = errno;
+@@ -1210,14 +1218,23 @@ PHP_FUNCTION(posix_getpwnam)
+ ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
+
+ #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
++ errno = 0;
+ buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+- if (buflen < 1) {
++ if (buflen == -1 && errno == 0) {
++ buflen = 1024;
++ } else if (buflen < 1) {
+ RETURN_FALSE;
+ }
+ buf = emalloc(buflen);
++try_again:
+ pw = &pwbuf;
+
+ if (getpwnam_r(name, pw, buf, buflen, &pw) || pw == NULL) {
++ if (errno == ERANGE) {
++ buflen *= 2;
++ buf = erealloc(buf, buflen);
++ goto try_again;
++ }
+ efree(buf);
+ POSIX_G(last_error) = errno;
+ RETURN_FALSE;
+@@ -1248,10 +1265,8 @@ PHP_FUNCTION(posix_getpwuid)
+ zend_long uid;
+ #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
+ struct passwd _pw;
+- struct passwd *retpwptr = NULL;
+ long pwbuflen;
+ char *pwbuf;
+- int ret;
+ #endif
+ struct passwd *pw;
+
+@@ -1260,19 +1275,27 @@ PHP_FUNCTION(posix_getpwuid)
+ ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
+
+ #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
++ errno = 0;
+ pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+- if (pwbuflen < 1) {
++ if (pwbuflen == -1 && errno == 0) {
++ pwbuflen = 1024;
++ } else if (pwbuflen < 1) {
+ RETURN_FALSE;
+ }
+ pwbuf = emalloc(pwbuflen);
++try_again:
++ pw = &_pw;
+
+- ret = getpwuid_r(uid, &_pw, pwbuf, pwbuflen, &retpwptr);
+- if (ret || retpwptr == NULL) {
+- POSIX_G(last_error) = ret;
++ if (getpwuid_r(uid, pw, pwbuf, pwbuflen, &pw) || pw == NULL) {
++ if (errno == ERANGE) {
++ pwbuflen *= 2;
++ pwbuf = erealloc(pwbuf, pwbuflen);
++ goto try_again;
++ }
++ POSIX_G(last_error) = errno;
+ efree(pwbuf);
+ RETURN_FALSE;
+ }
+- pw = &_pw;
+ #else
+ if (NULL == (pw = getpwuid(uid))) {
+ POSIX_G(last_error) = errno;
+--- php-7.4.4/ext/standard/filestat.c 2020-03-17 10:40:30.000000000 +0000
++++ php-7.4.4/ext/standard/filestat.c 2020-03-27 04:00:18.333479165 +0000
+@@ -302,15 +302,25 @@ PHPAPI int php_get_gid_by_name(const cha
+ #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
+ struct group gr;
+ struct group *retgrptr;
++ errno = 0;
+ long grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ char *grbuf;
+
+- if (grbuflen < 1) {
++ if (grbuflen == -1 && errno == 0) {
++ grbuflen = 1024;
++ } else if (grbuflen < 1) {
+ return FAILURE;
+ }
+
+ grbuf = emalloc(grbuflen);
+- if (getgrnam_r(name, &gr, grbuf, grbuflen, &retgrptr) != 0 || retgrptr == NULL) {
++try_again:
++ retgrptr = &gr;
++ if (getgrnam_r(name, &gr, grbuf, grbuflen, &retgrptr) || retgrptr == NULL) {
++ if (errno == ERANGE) {
++ grbuflen *= 2;
++ grbuf = erealloc(grbuf, grbuflen);
++ goto try_again;
++ }
+ efree(grbuf);
+ return FAILURE;
+ }
+@@ -438,15 +448,25 @@ PHPAPI uid_t php_get_uid_by_name(const c
+ #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
+ struct passwd pw;
+ struct passwd *retpwptr = NULL;
++ errno = 0;
+ long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ char *pwbuf;
+
+- if (pwbuflen < 1) {
++ if (pwbuflen == -1 && errno == 0) {
++ pwbuflen = 1024;
++ } else if (pwbuflen < 1) {
+ return FAILURE;
+ }
+
+ pwbuf = emalloc(pwbuflen);
+- if (getpwnam_r(name, &pw, pwbuf, pwbuflen, &retpwptr) != 0 || retpwptr == NULL) {
++try_again:
++ retpwptr = &pw;
++ if (getpwnam_r(name, &pw, pwbuf, pwbuflen, &retpwptr) || retpwptr == NULL) {
++ if (errno == ERANGE) {
++ pwbuflen *= 2;
++ pwbuf = erealloc(pwbuf, pwbuflen);
++ goto try_again;
++ }
+ efree(pwbuf);
+ return FAILURE;
+ }
+--- php-7.4.4/main/fopen_wrappers.c 2020-03-17 10:40:21.000000000 +0000
++++ php-7.4.4/main/fopen_wrappers.c 2020-03-27 04:08:46.553487201 +0000
+@@ -366,10 +366,13 @@ PHPAPI int php_fopen_primary_script(zend
+ struct passwd *pw;
+ #if defined(ZTS) && defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)
+ struct passwd pwstruc;
++ errno = 0;
+ long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ char *pwbuf;
+
+- if (pwbuflen < 1) {
++ if (pwbuflen == -1 && errno == 0) {
++ pwbuflen = 1024;
++ } else if (pwbuflen < 1) {
+ return FAILURE;
+ }
+
+@@ -382,7 +385,14 @@ PHPAPI int php_fopen_primary_script(zend
+ memcpy(user, path_info + 2, length);
+ user[length] = '\0';
+ #if defined(ZTS) && defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)
+- if (getpwnam_r(user, &pwstruc, pwbuf, pwbuflen, &pw)) {
++try_again:
++ pw = &pwstruc;
++ if (getpwnam_r(user, pw, pwbuf, pwbuflen, &pw) || pw == NULL) {
++ if (errno == ERANGE) {
++ pwbuflen *= 2;
++ pwbuf = erealloc(pwbuf, pwbuflen);
++ goto try_again;
++ }
+ efree(pwbuf);
+ return FAILURE;
+ }
+--- php-7.4.4/main/main.c 2020-03-17 10:40:21.000000000 +0000
++++ php-7.4.4/main/main.c 2020-03-27 03:33:22.663453619 +0000
+@@ -1487,23 +1487,27 @@ PHPAPI char *php_get_current_user(void)
+ struct passwd *pwd;
+ #if defined(ZTS) && defined(HAVE_GETPWUID_R) && defined(_SC_GETPW_R_SIZE_MAX)
+ struct passwd _pw;
+- struct passwd *retpwptr = NULL;
++ errno = 0;
+ int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ char *pwbuf;
+
+- if (pwbuflen < 1) {
++ if (pwbuflen == -1 && errno == 0) {
++ pwbuflen = 1024;
++ } else if (pwbuflen < 1) {
+ return "";
+ }
+ pwbuf = emalloc(pwbuflen);
+- if (getpwuid_r(pstat->st_uid, &_pw, pwbuf, pwbuflen, &retpwptr) != 0) {
+- efree(pwbuf);
+- return "";
+- }
+- if (retpwptr == NULL) {
++try_again:
++ pwd = &_pw;
++ if (getpwuid_r(pstat->st_uid, pwd, pwbuf, pwbuflen, &pwd) || pwd == NULL) {
++ if (errno == ERANGE) {
++ pwbuflen *= 2;
++ pwbuf = erealloc(pwbuf, pwbuflen);
++ goto try_again;
++ }
+ efree(pwbuf);
+ return "";
+ }
+- pwd = &_pw;
+ #else
+ if ((pwd=getpwuid(pstat->st_uid))==NULL) {
+ return "";
diff --git a/user/php7/pwbuflen.patch b/user/php7/pwbuflen.patch
deleted file mode 100644
index 7d2685b55..000000000
--- a/user/php7/pwbuflen.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on musl and 1024 on glibc.
-
---- php-7.2.6/main/main.c 2018-06-04 23:30:18.790089810 -0400
-+++ php-7.2.6/main/main.c 2018-06-04 23:30:14.660089806 -0400
-@@ -1315,7 +1315,9 @@
- int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *pwbuf;
-
-- if (pwbuflen < 1) {
-+ if (pwbuflen == -1) {
-+ pwbuflen = 1024;
-+ } else if (pwbuflen < 1) {
- return "";
- }
- pwbuf = emalloc(pwbuflen);
diff --git a/user/php7/test-fixes.patch b/user/php7/test-fixes.patch
new file mode 100644
index 000000000..976783d77
--- /dev/null
+++ b/user/php7/test-fixes.patch
@@ -0,0 +1,71 @@
+Don't filter out "extension=" settings from INI files during check() so
+we can inject our own module load order.
+
+--- php-7.4.4/build/Makefile.global 2020-03-17 10:40:21.000000000 +0000
++++ php-7.4.4/build/Makefile.global 2020-03-27 06:11:09.713603308 +0000
+@@ -83,7 +83,7 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
+ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d zend_extension=$(top_builddir)/modules/$$dlname"; \
+ done; \
+ fi`
+-PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
++PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?)[\t\ ]*='
+
+ test: all
+ @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+
+
+
+
+Likewise, make sure these settings are honored for these tests.
+
+--- php-7.4.4/ext/opcache/tests/php_cli_server.inc 2020-03-17 10:40:23.000000000 +0000
++++ php-7.4.4/ext/opcache/tests/php_cli_server.inc 2020-03-27 22:36:13.054537829 +0000
+@@ -11,7 +11,7 @@ function php_cli_server_start($ini = "")
+ $ini_array = array_map(function($arg) {
+ return trim($arg, '\'"');
+ }, $ini_array);
+- $cmd = [$php_executable, '-t', $doc_root, '-n', ...$ini_array, '-S', PHP_CLI_SERVER_ADDRESS];
++ $cmd = [$php_executable, '-d', 'extension_dir='.ini_get('extension_dir'), '-t', $doc_root, '-n', ...$ini_array, '-S', PHP_CLI_SERVER_ADDRESS];
+ $descriptorspec = array(
+ 0 => STDIN,
+ 1 => STDOUT,
+--- php-7.4.4/ext/session/tests/session_regenerate_id_cookie.phpt 2020-03-17 10:40:28.000000000 +0000
++++ php-7.4.4/ext/session/tests/session_regenerate_id_cookie.phpt 2020-03-27 06:43:24.043633893 +0000
+@@ -56,7 +56,7 @@ var_dump(session_destroy());
+ ob_end_flush();
+ ?>');
+
+-var_dump(`$php -n -d session.name=PHPSESSID $file`);
++var_dump(`$php -c php-check.ini -d session.name=PHPSESSID $file`);
+
+ unlink($file);
+
+--- php-7.4.4/ext/soap/tests/bug73037.phpt 2020-03-17 10:40:24.000000000 +0000
++++ php-7.4.4/ext/soap/tests/bug73037.phpt 2020-03-27 23:02:05.964562383 +0000
+@@ -63,8 +63,7 @@ function get_data($max)
+ }
+
+ $router = "bug73037_server.php";
+-$args = substr(PHP_OS, 0, 3) == 'WIN'
+- ? ["-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=php_soap.dll"] : [];
++$args = ["-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=soap.so"];
+ $code = <<<'PHP'
+ $s = new SoapServer(NULL, array('uri' => 'http://here'));
+ $s->setObject(new stdclass());
+
+
+
+Don't include useless message on startup which will break every test.
+
+--- php-7.4.4/run-tests.php 2020-03-17 10:40:21.000000000 +0000
++++ php-7.4.4/run-tests.php 2020-03-25 04:01:26.320747990 +0000
+@@ -2503,6 +2503,9 @@ COMMAND $cmd
+ // Does the output match what is expected?
+ $output = preg_replace("/\r\n/", "\n", trim($out));
+
++ // Remove message from built-in development server.
++ $output = preg_replace("/^PHP [0-9.]+ Development Server started at .*\n\n?/m", "", $output);
++
+ /* when using CGI, strip the headers from the output */
+ $headers = array();
+
diff --git a/user/php7/zend_bool.patch b/user/php7/zend_bool.patch
new file mode 100644
index 000000000..b2e0b0f8f
--- /dev/null
+++ b/user/php7/zend_bool.patch
@@ -0,0 +1,19 @@
+zend_parse_parameters can't be passed &int if it's expecting zend_bool
+("b", unsigned char).
+
+Ironically, this code (Reflect::export) is scheduled to be removed in
+the next 7.4 release[1], so don't bother forwarding.
+
+[1] https://github.com/php/php-src/pull/5188
+
+--- php-7.4.4/ext/reflection/php_reflection.c 2020-03-17 06:40:26.000000000 -0400
++++ php-7.4.4/ext/reflection/php_reflection.c 2020-03-30 01:00:27.938405046 -0400
+@@ -1304,7 +1304,7 @@ static void _reflection_export(INTERNAL_
+ zval *argument_ptr, *argument2_ptr;
+ zval retval, params[2];
+ int result;
+- int return_output = 0;
++ zend_bool return_output = 0;
+ zend_fcall_info fci;
+ zend_fcall_info_cache fcc;
+
diff --git a/user/php7/zip-glob-pathc.patch b/user/php7/zip-glob-pathc.patch
new file mode 100644
index 000000000..74b81754a
--- /dev/null
+++ b/user/php7/zip-glob-pathc.patch
@@ -0,0 +1,15 @@
+Upstream: https://github.com/php/php-src/pull/5311
+
+--- php-7.4.4/ext/zip/php_zip.c 2020-03-17 10:40:30.000000000 +0000
++++ php-7.4.4/ext/zip/php_zip.c 2020-03-27 15:28:13.259857804 -0500
+@@ -606,8 +606,9 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
+ add_next_index_string(return_value, globbuf.gl_pathv[n]+cwd_skip);
+ }
+
++ ret = globbuf.gl_pathc;
+ globfree(&globbuf);
+- return globbuf.gl_pathc;
++ return ret;
+ #else
+ zend_throw_error(NULL, "Glob support is not available");
+ return 0;
diff --git a/user/pixman/APKBUILD b/user/pixman/APKBUILD
index d36f5a1ee..50ff4f981 100644
--- a/user/pixman/APKBUILD
+++ b/user/pixman/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pixman
pkgver=0.38.4
-pkgrel=0
+pkgrel=1
pkgdesc="Low-level pixel manipulation library"
url="https://www.X.Org/"
arch="all"
@@ -14,11 +14,13 @@ source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
"
build() {
+ # Static is needed by qemu
+
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --disable-static \
+ --enable-static \
--disable-openmp \
--disable-arm-iwmmxt
make
diff --git a/user/plasma-browser-integration/APKBUILD b/user/plasma-browser-integration/APKBUILD
index 6c898c7d1..833facbb8 100644
--- a/user/plasma-browser-integration/APKBUILD
+++ b/user/plasma-browser-integration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-browser-integration
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Integrate Web browsers into the KDE Plasma desktop"
url="https://www.kde.org/"
@@ -10,7 +10,7 @@ license="GPL-3.0+"
depends=""
makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev kcrash-dev kdbusaddons-dev kfilemetadata-dev ki18n-dev kio-dev knotifications-dev krunner-dev purpose-dev qt5-qtbase-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-browser-integration-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-browser-integration-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
rm -r "$pkgdir"/etc
}
-sha512sums="76fc14ccea545f480ffc617bc373a7384dc95b709ac4d880b0249306c6b18e7280267703cb62a0b69e30bc46125e9322b2ce66b5ebc79b2e6a028765134a1e5f plasma-browser-integration-5.18.2.tar.xz"
+sha512sums="05fcc78f68a029862daaae816d2c95a14b7b3133c9ea00cfad7cac32337a6b1642b15f23313dec665686c928f0405d18cafa20b06d16afa1ae8ce752d74e9066 plasma-browser-integration-5.18.4.1.tar.xz"
diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD
index d74a4a885..b66828fe1 100644
--- a/user/plasma-desktop/APKBUILD
+++ b/user/plasma-desktop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-desktop
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Modern, functional, integrated libre desktop environment"
url="https://www.kde.org/plasma-desktop"
@@ -28,7 +28,7 @@ makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev
kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev
qqc2-desktop-style-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-desktop-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -54,4 +54,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3f850eb9ab6f7a7ee86b11d024a0e9c5552fbfb24a17502bca141bd01e52a99a509e64669abd708ec7a2617fcbb5c65eaa401084388a812785573ed1c5f9c097 plasma-desktop-5.18.2.tar.xz"
+sha512sums="4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089 plasma-desktop-5.18.4.1.tar.xz"
diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD
index c7c199e5d..0f599182e 100644
--- a/user/plasma-integration/APKBUILD
+++ b/user/plasma-integration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-integration
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Qt platform theme plugin for Plasma"
url="https://www.kde.org/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules python3 qt5-qtbase-dev libxcursor-dev
kiconthemes-dev knotifications-dev kwayland-dev kwidgetsaddons-dev
kwindowsystem-dev breeze-dev qt5-qtquickcontrols2-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-integration-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d605bba7e1ac1786bbdceecd38a571cf8f9d71f95b31a9beb66100af85d0d607304ee00d7df135e7f76c295e4832ccd197e666dd2ea3c3842307fb649ff53559 plasma-integration-5.18.2.tar.xz"
+sha512sums="ebc6080457d1958e2cccc7db25b30443e21759c95c29dc8f72538ec2945f99019ad0598369253ec552c4a77dc49979ef3e1a46da93362a34793c0af6209c5e3d plasma-integration-5.18.4.1.tar.xz"
diff --git a/user/plasma-meta/APKBUILD b/user/plasma-meta/APKBUILD
index 929b30f9b..17bc50741 100644
--- a/user/plasma-meta/APKBUILD
+++ b/user/plasma-meta/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-meta
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Metapackage for optional KDE Plasma dependencies"
url="https://www.adelielinux.org/"
diff --git a/user/plasma-nm/APKBUILD b/user/plasma-nm/APKBUILD
index 62133f18f..5ddc6ca52 100644
--- a/user/plasma-nm/APKBUILD
+++ b/user/plasma-nm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-nm
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="NetworkManager integration for KDE Plasma desktop"
url="https://www.kde.org/"
@@ -18,7 +18,7 @@ makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev
subpackages="$pkgname-lang"
# We don't want to pull NM into plasma-meta, so we do this as a workaround.
install_if="plasma-desktop networkmanager"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-nm-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-nm-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -44,4 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="efb126d690ba1460d6c58cc96fb0f5a533b3846bdd11898ee96be23a311a1bee651f1b9df5ea2a1d24248a12baa80a1d0765d3a5a3d4672b4bfa8fad268432a5 plasma-nm-5.18.2.tar.xz"
+sha512sums="7534267b7e9507b5963c5226eb375bfff426291761db4bfaa8a9c60e491d296d5aebb6cb2373e75dd10b321e706ccdcdce036f174cfb6c5fb12df218f112228b plasma-nm-5.18.4.1.tar.xz"
diff --git a/user/plasma-pa/APKBUILD b/user/plasma-pa/APKBUILD
index 40816cbe2..84ec701be 100644
--- a/user/plasma-pa/APKBUILD
+++ b/user/plasma-pa/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-pa
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="PulseAudio integration for KDE Plasma desktop"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules glib-dev kcoreaddons-dev kdeclarative-dev
libcanberra-dev plasma-framework-dev pulseaudio-dev qt5-qtbase-dev
qt5-qtdeclarative-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-pa-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-pa-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="51604dc9310d0ea9314bb04ac54852ae756d2f2c7eb0a3f37abaf707a52afff24fedf3c676e412c198df4cc13716fe539e76cfd9ec2536d7040d595277b94282 plasma-pa-5.18.2.tar.xz"
+sha512sums="877a861b7f3811958f911a082f037916697f148969229ed6d96c2ef7238533726157637548798ca318b5b1ee89cd5ed8f9a66fad2e8cb3e9035a5ee311cae7e3 plasma-pa-5.18.4.1.tar.xz"
diff --git a/user/plasma-thunderbolt/APKBUILD b/user/plasma-thunderbolt/APKBUILD
index ebe1e8cca..a537527de 100644
--- a/user/plasma-thunderbolt/APKBUILD
+++ b/user/plasma-thunderbolt/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-thunderbolt
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Thunderbolt device integration for KDE Plasma desktop"
url="https://www.kde.org/"
@@ -12,7 +12,7 @@ depends="bolt"
makedepends="cmake extra-cmake-modules kcmutils-dev kcoreaddons-dev
knotifications-dev qt5-qtbase-dev qt5-qtdeclarative-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-thunderbolt-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-thunderbolt-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e42cdbc6ce4da2a7e38ed3cbeb4f1dec6c6e9a1c9dc160d256b5701b1bf3f4e298f9e6d19c6c5cdf48155f3f792961f2f20e5971e80b80e3670ba5bba86af05e plasma-thunderbolt-5.18.2.tar.xz"
+sha512sums="2ae5e65741717f38f343adf3e52de67db29d069b93147236cec6172f03ffcfb64bbbaaed5056987a747feb0c27ec01aaefa954274092f34f709c955f8099b35a plasma-thunderbolt-5.18.4.1.tar.xz"
diff --git a/user/plasma-vault/APKBUILD b/user/plasma-vault/APKBUILD
index 56af52654..1fdd39903 100644
--- a/user/plasma-vault/APKBUILD
+++ b/user/plasma-vault/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-vault
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Secure storage plugin for KDE Plasma desktop"
url="https://www.kde.org/"
@@ -13,7 +13,9 @@ makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev
kwidgetsaddons-dev libksysguard-dev plasma-framework-dev
qt5-qtbase-dev qt5-qtdeclarative-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-vault-$pkgver.tar.xz
+ fix-crash.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,4 +41,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="5abeb6adb721b0933217dc0a2cc6fcd07e682b48c17b983d0f7d50c2ea206b06f4fb05dcb58f20009f7f1bf95ce104722cc70f83a09dd752fdb6331c3babdda7 plasma-vault-5.18.2.tar.xz"
+sha512sums="c06bb9129e25396c44a9a7155253ebb18eeefe7d44d3f288b79f3308964ae4dbca9375820c1a5c2f389b46e17f2f3a2cee35e73b5d4a0c23051dcad8dfcff6f0 plasma-vault-5.18.4.1.tar.xz
+b093d6fa4e82a3342ec75dc0ef9318f38dbce413a38fef1aa08b6bb74d6b3a46c178e10d3551e88937907f9b3946565084726f158f86f97ea5436f072b2e05d7 fix-crash.patch"
diff --git a/user/plasma-vault/fix-crash.patch b/user/plasma-vault/fix-crash.patch
new file mode 100644
index 000000000..306b7dfe2
--- /dev/null
+++ b/user/plasma-vault/fix-crash.patch
@@ -0,0 +1,26 @@
+From f6a924b37880b7340e796846a6e5474413ca6533 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
+Date: Tue, 17 Mar 2020 14:37:24 +0100
+Subject: Make sure we have saved network state before accessing it
+
+BUG:418262
+---
+ kded/service.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kded/service.cpp b/kded/service.cpp
+index 4b5f65a..ff67d43 100644
+--- a/kded/service.cpp
++++ b/kded/service.cpp
+@@ -420,7 +420,7 @@ void PlasmaVaultService::openVaultInFileManager(const QString &device)
+ new KRun(QUrl::fromLocalFile((QString)vault->mountPoint().data()), nullptr);
+ },
+ [this, vault] {
+- if (vault->status() != VaultInfo::Opened) {
++ if (vault->status() != VaultInfo::Opened && d->savedNetworkingState) {
+ auto& devicesInhibittingNetworking = d->savedNetworkingState->devicesInhibittingNetworking;
+ devicesInhibittingNetworking.removeAll(vault->device().data());
+ d->restoreNetworkingState();
+--
+cgit v1.1
+
diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD
index f8bcad63e..c531e9954 100644
--- a/user/plasma-workspace-wallpapers/APKBUILD
+++ b/user/plasma-workspace-wallpapers/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-workspace-wallpapers
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Default wallpapers from KDE"
url="https://www.KDE.org/"
@@ -10,7 +10,7 @@ license="LGPL-3.0-only"
depends=""
makedepends="cmake extra-cmake-modules"
subpackages=""
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-workspace-wallpapers-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -35,4 +35,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7901c54a414602a1a0a4bde50b851afb86c505bbd8600dce2fa0979628b180d7adba6f26dd53797082dfc108a87a427e4e55ca7d146f9a9697db5c9a57274a95 plasma-workspace-wallpapers-5.18.2.tar.xz"
+sha512sums="e3fe98fd4e3265281bda7c223cb086fdc96031421d735df05fb52acca778dba0fa78110810b1c482706cb6e937bc40160130a525ab104b44ed801042ba6d71ca plasma-workspace-wallpapers-5.18.4.1.tar.xz"
diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD
index da67d4b2d..9851b6de5 100644
--- a/user/plasma-workspace/APKBUILD
+++ b/user/plasma-workspace/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-workspace
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE Plasma 5 workspace"
url="https://www.kde.org/plasma-desktop"
@@ -31,7 +31,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev
plasma-framework-dev prison-dev kactivities-stats-dev kpeople-dev
kirigami2-dev kuserfeedback-dev libkscreen-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-workspace-$pkgver.tar.xz
libkworkspace.patch
"
@@ -59,5 +59,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0fa91451e28b70d7602de79686afb57143eecd86e3856ed9c773bc4f5394610e5a5cf2f13fd03398b7a01624b45ab86d7e12da016980cb91ab23adac41a6793e plasma-workspace-5.18.2.tar.xz
+sha512sums="683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7 plasma-workspace-5.18.4.1.tar.xz
f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch"
diff --git a/user/polkit-kde-agent-1/APKBUILD b/user/polkit-kde-agent-1/APKBUILD
index 529ea4116..3ae1768a8 100644
--- a/user/polkit-kde-agent-1/APKBUILD
+++ b/user/polkit-kde-agent-1/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=polkit-kde-agent-1
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="PolKit agent for KDE"
url="https://www.kde.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules kcoreaddons-dev kcrash-dev
kdbusaddons-dev ki18n-dev kiconthemes-dev kwidgetsaddons-dev
kwindowsystem-dev polkit-qt-1-dev qt5-qtbase-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/polkit-kde-agent-1-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/polkit-kde-agent-1-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a34515c1173bc439b0659df891ac35830dfc05916b4c3c622045cbaef2ce93f91be000eac31c8c0f669e7064628d09a999251237bdd5c381f74dd34e06a722fe polkit-kde-agent-1-5.18.2.tar.xz"
+sha512sums="e83c762fce852fb3835e53db8f4940a8b02f06b505f4347027c23171ce6e4cad512b002a0154459c952305f922b8f881b3c0b51ca7b9553d16a78e668deadfe3 polkit-kde-agent-1-5.18.4.1.tar.xz"
diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD
index 9f63547a1..be33f6c62 100644
--- a/user/powerdevil/APKBUILD
+++ b/user/powerdevil/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=powerdevil
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE Plasma power management utilities"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
ki18n-dev kidletime-dev kio-dev knotifyconfig-dev kdelibs4support-dev
kwayland-dev libkscreen-dev libkworkspace-dev solid-dev eudev-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/powerdevil-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/powerdevil-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2c3059566e649e00eee1e34e20dfd08d8070e5d8c2afceded0bbd8e534d3b1128fb28f9ddacbd5318cc56b19328d49991a928f122ab31b440171a7f4566864f1 powerdevil-5.18.2.tar.xz"
+sha512sums="b7985f30965cc445cd4426ca9978a721174a3b0c371d69e044cb36edee080a99b3993ad553461e9212158f13a730210a687be2bc1f205722591307cbe87f4c20 powerdevil-5.18.4.1.tar.xz"
diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index c94b096e0..382f3cfa3 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=protobuf
_gemname=google-protobuf
-pkgver=3.11.3
+pkgver=3.11.4
_tstver=1.8.1
pkgrel=0
pkgdesc="Library for extensible, efficient structure packing"
@@ -111,5 +111,5 @@ vim() {
"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
}
-sha512sums="beac21d495bfd8e9b40120d1db9fd82251958f954533fc6f76cd0b9c28f92533ac35368a4c298ebb1d8e09047b670ed3bd948bb7da6eb5cca7fdc0c1c44aa39b protobuf-3.11.3.tar.gz
+sha512sums="777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 protobuf-3.11.4.tar.gz
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz"
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index e64bb2510..bc3744541 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -2,10 +2,11 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qemu
-pkgver=3.0.0
-pkgrel=5
+pkgver=4.2.0
+pkgrel=1
pkgdesc="Machine emulator and virtualisation software"
url="https://www.qemu.org/"
arch="all"
@@ -27,13 +28,14 @@ makedepends="
libjpeg-turbo-dev
libnfs-dev
libpng-dev
- libssh2-dev
+ libslirp-dev
libusb-dev
libx11-dev
libxml2-dev
linux-headers
lzo-dev
ncurses-dev
+ py3-sphinx
python3
snappy-dev
spice-dev
@@ -109,7 +111,6 @@ _system_subsystems="
system-or1k
system-ppc
system-ppc64
- system-ppcemb
system-riscv32
system-riscv64
system-s390x
@@ -151,13 +152,15 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz
ncurses.patch
ignore-signals-33-and-64-to-allow-golang-emulation.patch
0001-linux-user-fix-build-with-musl-on-ppc64le.patch
- fix-sockios-header.patch
test-crypto-ivgen-skip-essiv.patch
ppc32-musl-support.patch
signal-fixes.patch
sysinfo-header.patch
fix-lm32-underlinking.patch
time64.patch
+ MAP_SYNC-fix.patch
+ CVE-2020-1711.patch
+ CVE-2020-11102.patch
$pkgname-guest-agent.confd
$pkgname-guest-agent.initd
@@ -168,31 +171,68 @@ builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 2.8.1-r1:
-# - CVE-2016-7994
-# - CVE-2016-7995
-# - CVE-2016-8576
-# - CVE-2016-8577
-# - CVE-2016-8578
-# - CVE-2016-8668
-# - CVE-2016-8909
-# - CVE-2016-8910
-# - CVE-2016-9101
-# - CVE-2016-9102
-# - CVE-2016-9103
-# - CVE-2016-9104
-# - CVE-2016-9105
-# - CVE-2016-9106
-# - CVE-2017-2615
-# - CVE-2017-2620
-# - CVE-2017-5525
-# - CVE-2017-5552
-# - CVE-2017-5578
-# - CVE-2017-5579
-# - CVE-2017-5667
-# - CVE-2017-5856
-# - CVE-2017-5857
-# - CVE-2017-5898
-# - CVE-2017-5931
+# - CVE-2016-7994
+# - CVE-2016-7995
+# - CVE-2016-8576
+# - CVE-2016-8577
+# - CVE-2016-8578
+# - CVE-2016-8668
+# - CVE-2016-8909
+# - CVE-2016-8910
+# - CVE-2016-9101
+# - CVE-2016-9102
+# - CVE-2016-9103
+# - CVE-2016-9104
+# - CVE-2016-9105
+# - CVE-2016-9106
+# - CVE-2017-2615
+# - CVE-2017-2620
+# - CVE-2017-5525
+# - CVE-2017-5552
+# - CVE-2017-5578
+# - CVE-2017-5579
+# - CVE-2017-5667
+# - CVE-2017-5856
+# - CVE-2017-5857
+# - CVE-2017-5898
+# - CVE-2017-5931
+# 4.2.0-r0:
+# - CVE-2018-10839
+# - CVE-2018-16847
+# - CVE-2018-16867
+# - CVE-2018-16872
+# - CVE-2018-17958
+# - CVE-2018-17962
+# - CVE-2018-17963
+# - CVE-2018-18849
+# - CVE-2018-18954
+# - CVE-2018-19364
+# - CVE-2018-19489
+# - CVE-2018-20123
+# - CVE-2018-20124
+# - CVE-2018-20125
+# - CVE-2018-20126
+# - CVE-2018-20191
+# - CVE-2018-20216
+# - CVE-2018-20815
+# - CVE-2019-3812
+# - CVE-2019-5008
+# - CVE-2019-6501
+# - CVE-2019-6778
+# - CVE-2019-8934
+# - CVE-2019-9824
+# - CVE-2019-12068
+# - CVE-2019-12155
+# - CVE-2019-13164
+# - CVE-2019-14378
+# - CVE-2019-15034
+# - CVE-2019-15890
+# - CVE-2019-20382
+# - CVE-2020-1711
+# - CVE-2020-7039
+# - CVE-2020-8608
+# 4.2.0-r1:
+# - CVE-2020-11102
prepare() {
default_prepare # apply patches
@@ -218,6 +258,7 @@ _compile_common() {
--disable-gcrypt \
--cc="${CC:-gcc}" \
--python="/usr/bin/python3" \
+ --enable-slirp=system \
"$@"
make ARFLAGS="rc"
}
@@ -233,7 +274,6 @@ _compile_system() {
--enable-cap-ng \
--enable-linux-aio \
--enable-usb-redir \
- --enable-libssh2 \
--enable-vhost-net \
--enable-snappy \
--enable-tpm \
@@ -248,16 +288,19 @@ _compile_system() {
build() {
local systems
+
mkdir -p "$builddir"/build \
"$builddir"/build-user \
"$builddir"/build-gtk
+ msg "Building -user..."
cd "$builddir"/build-user
_compile_common \
--enable-linux-user \
--disable-system \
--static
+ msg "Building -system..."
cd "$builddir"/build
_compile_system \
--enable-vnc \
@@ -268,10 +311,10 @@ build() {
--disable-gtk
if [ -n "$_arch" ]; then
+ msg "Building -gtk..."
cd "$builddir"/build-gtk
_compile_system \
--enable-gtk \
- --with-gtkabi=3.0 \
--disable-vnc \
--disable-spice \
--disable-guest-agent \
@@ -287,9 +330,11 @@ check() {
}
package() {
+ msg "Installing -user..."
cd "$builddir"/build-user
make DESTDIR="$pkgdir" install
+ msg "Installing -system..."
cd "$builddir"/build
make DESTDIR="$pkgdir" install
@@ -395,7 +440,7 @@ guest() {
"$subpkgdir"/etc/conf.d/$pkgname-guest-agent
}
-sha512sums="a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a qemu-3.0.0.tar.xz
+sha512sums="2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56 qemu-4.2.0.tar.xz
405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch
1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56 0001-linux-user-fix-build-with-musl-on-aarch64.patch
224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0 musl-F_SHLCK-and-F_EXLCK.patch
@@ -404,13 +449,15 @@ sha512sums="a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000b
b6ed02aaf95a9bb30a5f107d35371207967edca058f3ca11348b0b629ea7a9c4baa618db68a3df72199eea6d86d14ced74a5a229d17604cc3f0adedcfeae7a73 ncurses.patch
fd178f2913639a0c33199b3880cb17536961f2b3ff171c12b27f4be6bca032d6b88fd16302d09c692bb34883346babef5c44407a6804b20a39a465bb2bc85136 ignore-signals-33-and-64-to-allow-golang-emulation.patch
d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f8965f1ef3105580fceffdfddbb2c9221dc1c62066722ba65 0001-linux-user-fix-build-with-musl-on-ppc64le.patch
-39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4 fix-sockios-header.patch
8b8db136f78bd26b5da171effa9e11016ec2bc3e2fc8107228b5543b47aa370978ed883794aa4f917f334e284a5b49e82070e1da2d31d49301195b6713a48eff test-crypto-ivgen-skip-essiv.patch
fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55885bc784a96a99b28aeacbc6a5549b2e6750c9d3099a897c ppc32-musl-support.patch
c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch
698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch
2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch
87f659800b78b31731ea1828a27a3762662ef124d10e942f6029b332d5e8cf4487f62a3d742ad59709c2eb9e3ae8af36fa849d6cbac89978a282d29786b9b41a time64.patch
+d7de79ea74e36702cac4a59e472564a55f0a663be7e63c3755e32b4b5dfbc04b390ee79f09f43f6ae706ee2aec9e005eade3c0fd4a202db60d11f436874a17d7 MAP_SYNC-fix.patch
+0ea3745c45507c00c3c036241992d594b5f7e9aa1f0fa9b425dd222390066e1ea2d0aa4923bde0e7f27b7cc2f759a122ae4b600c2fa682a5aad509e7d03ccad9 CVE-2020-1711.patch
+5d9e7e065c6716024eab4984331071f42dcd5363c5456023f81a3ef0329ae578348d0f875868f85c9e1fee5e435d86e2eb7e342a957c36cd099cb5d5d9f3a78d CVE-2020-11102.patch
d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd
1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6 qemu-guest-agent.initd
9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules
diff --git a/user/qemu/CVE-2020-11102.patch b/user/qemu/CVE-2020-11102.patch
new file mode 100644
index 000000000..c437a7d47
--- /dev/null
+++ b/user/qemu/CVE-2020-11102.patch
@@ -0,0 +1,144 @@
+From 8ffb7265af64ec81748335ec8f20e7ab542c3850 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Tue, 24 Mar 2020 22:57:22 +0530
+Subject: [PATCH 1/1] net: tulip: check frame size and r/w data length
+
+Tulip network driver while copying tx/rx buffers does not check
+frame size against r/w data length. This may lead to OOB buffer
+access. Add check to avoid it.
+
+Limit iterations over descriptors to avoid potential infinite
+loop issue in tulip_xmit_list_update.
+
+Reported-by: Li Qiang <pangpei.lq@antfin.com>
+Reported-by: Ziming Zhang <ezrakiez@gmail.com>
+Reported-by: Jason Wang <jasowang@redhat.com>
+Tested-by: Li Qiang <liq3ea@gmail.com>
+Reviewed-by: Li Qiang <liq3ea@gmail.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/tulip.c | 36 +++++++++++++++++++++++++++---------
+ 1 file changed, 27 insertions(+), 9 deletions(-)
+
+diff --git a/hw/net/tulip.c b/hw/net/tulip.c
+index cfac271..1295f51 100644
+--- a/hw/net/tulip.c
++++ b/hw/net/tulip.c
+@@ -170,6 +170,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
+ } else {
+ len = s->rx_frame_len;
+ }
++
++ if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
++ return;
++ }
+ pci_dma_write(&s->dev, desc->buf_addr1, s->rx_frame +
+ (s->rx_frame_size - s->rx_frame_len), len);
+ s->rx_frame_len -= len;
+@@ -181,6 +185,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
+ } else {
+ len = s->rx_frame_len;
+ }
++
++ if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
++ return;
++ }
+ pci_dma_write(&s->dev, desc->buf_addr2, s->rx_frame +
+ (s->rx_frame_size - s->rx_frame_len), len);
+ s->rx_frame_len -= len;
+@@ -227,7 +235,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t size)
+
+ trace_tulip_receive(buf, size);
+
+- if (size < 14 || size > 2048 || s->rx_frame_len || tulip_rx_stopped(s)) {
++ if (size < 14 || size > sizeof(s->rx_frame) - 4
++ || s->rx_frame_len || tulip_rx_stopped(s)) {
+ return 0;
+ }
+
+@@ -275,7 +284,6 @@ static ssize_t tulip_receive_nc(NetClientState *nc,
+ return tulip_receive(qemu_get_nic_opaque(nc), buf, size);
+ }
+
+-
+ static NetClientInfo net_tulip_info = {
+ .type = NET_CLIENT_DRIVER_NIC,
+ .size = sizeof(NICState),
+@@ -558,7 +566,7 @@ static void tulip_tx(TULIPState *s, struct tulip_descriptor *desc)
+ if ((s->csr[6] >> CSR6_OM_SHIFT) & CSR6_OM_MASK) {
+ /* Internal or external Loopback */
+ tulip_receive(s, s->tx_frame, s->tx_frame_len);
+- } else {
++ } else if (s->tx_frame_len <= sizeof(s->tx_frame)) {
+ qemu_send_packet(qemu_get_queue(s->nic),
+ s->tx_frame, s->tx_frame_len);
+ }
+@@ -570,23 +578,31 @@ static void tulip_tx(TULIPState *s, struct tulip_descriptor *desc)
+ }
+ }
+
+-static void tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *desc)
++static int tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *desc)
+ {
+ int len1 = (desc->control >> TDES1_BUF1_SIZE_SHIFT) & TDES1_BUF1_SIZE_MASK;
+ int len2 = (desc->control >> TDES1_BUF2_SIZE_SHIFT) & TDES1_BUF2_SIZE_MASK;
+
++ if (s->tx_frame_len + len1 > sizeof(s->tx_frame)) {
++ return -1;
++ }
+ if (len1) {
+ pci_dma_read(&s->dev, desc->buf_addr1,
+ s->tx_frame + s->tx_frame_len, len1);
+ s->tx_frame_len += len1;
+ }
+
++ if (s->tx_frame_len + len2 > sizeof(s->tx_frame)) {
++ return -1;
++ }
+ if (len2) {
+ pci_dma_read(&s->dev, desc->buf_addr2,
+ s->tx_frame + s->tx_frame_len, len2);
+ s->tx_frame_len += len2;
+ }
+ desc->status = (len1 + len2) ? 0 : 0x7fffffff;
++
++ return 0;
+ }
+
+ static void tulip_setup_filter_addr(TULIPState *s, uint8_t *buf, int n)
+@@ -651,13 +667,15 @@ static uint32_t tulip_ts(TULIPState *s)
+
+ static void tulip_xmit_list_update(TULIPState *s)
+ {
++#define TULIP_DESC_MAX 128
++ uint8_t i = 0;
+ struct tulip_descriptor desc;
+
+ if (tulip_ts(s) != CSR5_TS_SUSPENDED) {
+ return;
+ }
+
+- for (;;) {
++ for (i = 0; i < TULIP_DESC_MAX; i++) {
+ tulip_desc_read(s, s->current_tx_desc, &desc);
+ tulip_dump_tx_descriptor(s, &desc);
+
+@@ -675,10 +693,10 @@ static void tulip_xmit_list_update(TULIPState *s)
+ s->tx_frame_len = 0;
+ }
+
+- tulip_copy_tx_buffers(s, &desc);
+-
+- if (desc.control & TDES1_LS) {
+- tulip_tx(s, &desc);
++ if (!tulip_copy_tx_buffers(s, &desc)) {
++ if (desc.control & TDES1_LS) {
++ tulip_tx(s, &desc);
++ }
+ }
+ }
+ tulip_desc_write(s, s->current_tx_desc, &desc);
+--
+1.8.3.1
+
diff --git a/user/qemu/CVE-2020-1711.patch b/user/qemu/CVE-2020-1711.patch
new file mode 100644
index 000000000..c57b5c984
--- /dev/null
+++ b/user/qemu/CVE-2020-1711.patch
@@ -0,0 +1,61 @@
+From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001
+From: Felipe Franciosi <felipe@nutanix.com>
+Date: Thu, 23 Jan 2020 12:44:59 +0000
+Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711)
+
+When querying an iSCSI server for the provisioning status of blocks (via
+GET LBA STATUS), Qemu only validates that the response descriptor zero's
+LBA matches the one requested. Given the SCSI spec allows servers to
+respond with the status of blocks beyond the end of the LUN, Qemu may
+have its heap corrupted by clearing/setting too many bits at the end of
+its allocmap for the LUN.
+
+A malicious guest in control of the iSCSI server could carefully program
+Qemu's heap (by selectively setting the bitmap) and then smash it.
+
+This limits the number of bits that iscsi_co_block_status() will try to
+update in the allocmap so it can't overflow the bitmap.
+
+Fixes: CVE-2020-1711
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
+Signed-off-by: Peter Turschmid <peter.turschm@nutanix.com>
+Signed-off-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/iscsi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/block/iscsi.c b/block/iscsi.c
+index 2aea7e3f13..cbd57294ab 100644
+--- a/block/iscsi.c
++++ b/block/iscsi.c
+@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs,
+ struct scsi_get_lba_status *lbas = NULL;
+ struct scsi_lba_status_descriptor *lbasd = NULL;
+ struct IscsiTask iTask;
+- uint64_t lba;
++ uint64_t lba, max_bytes;
+ int ret;
+
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs,
+ }
+
+ lba = offset / iscsilun->block_size;
++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size;
+
+ qemu_mutex_lock(&iscsilun->mutex);
+ retry:
+@@ -764,7 +765,7 @@ retry:
+ goto out_unlock;
+ }
+
+- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size;
++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes);
+
+ if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED ||
+ lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) {
+--
+2.25.1
+
diff --git a/user/qemu/MAP_SYNC-fix.patch b/user/qemu/MAP_SYNC-fix.patch
new file mode 100644
index 000000000..e13609d73
--- /dev/null
+++ b/user/qemu/MAP_SYNC-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
+index f7f177d..7598960 100644
+--- a/util/mmap-alloc.c
++++ b/util/mmap-alloc.c
+@@ -10,14 +10,16 @@
+ * later. See the COPYING file in the top-level directory.
+ */
+
++#include "qemu/osdep.h"
++
+ #ifdef CONFIG_LINUX
+ #include <linux/mman.h>
++#include <asm-generic/mman.h> /* for ppc64le */
+ #else /* !CONFIG_LINUX */
+ #define MAP_SYNC 0x0
+ #define MAP_SHARED_VALIDATE 0x0
+ #endif /* CONFIG_LINUX */
+
+-#include "qemu/osdep.h"
+ #include "qemu/mmap-alloc.h"
+ #include "qemu/host-utils.h"
+
diff --git a/user/qemu/fix-sockios-header.patch b/user/qemu/fix-sockios-header.patch
deleted file mode 100644
index 1f3cd767c..000000000
--- a/user/qemu/fix-sockios-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 43d0562..afa0ac4 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -59,6 +59,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
- #include <linux/icmp.h>
- #include <linux/icmpv6.h>
- #include <linux/errqueue.h>
-+#include <linux/sockios.h>
- #include <linux/random.h>
- #include "qemu-common.h"
- #ifdef CONFIG_TIMERFD
- #include <sys/timerfd.h>
diff --git a/user/qqc2-desktop-style/APKBUILD b/user/qqc2-desktop-style/APKBUILD
index a9468cd1f..2281459a7 100644
--- a/user/qqc2-desktop-style/APKBUILD
+++ b/user/qqc2-desktop-style/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qqc2-desktop-style
-pkgver=5.67.1
+pkgver=5.68.0
pkgrel=0
pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="c2a88c81e2f4f1c586c7b512624cb631a1e8b84aea1caa69647aa939b34f44c66a1369bfbcbfa32d152f674e852399877c88abcb038eefd99a7480929b085f66 qqc2-desktop-style-5.67.1.tar.xz"
+sha512sums="6f3a9c54715140971b92d88822e00fca2d84ab61819e60be8819629b2ab78444aa5215f3bcf4470d572691230e9ff9589788e313b9b439aa92b38e78b3a41605 qqc2-desktop-style-5.68.0.tar.xz"
diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD
index 18b5b88ad..4cb68524d 100644
--- a/user/qt5-qtbase/APKBUILD
+++ b/user/qt5-qtbase/APKBUILD
@@ -2,7 +2,7 @@
pkgname=qt5-qtbase
_pkgname=qtbase-everywhere-src
pkgver=5.12.6
-pkgrel=0
+pkgrel=1
pkgdesc="Cross-platform application and UI framework"
url="https://www.qt.io/"
arch="all"
@@ -27,6 +27,8 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
link-to-execinfo.patch
qt-musl-iconv-no-bom.patch
time64.patch
+ CVE-2020-0569.patch
+ CVE-2020-0570.patch
"
# secfixes: qt
@@ -36,6 +38,9 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
# - CVE-2018-19870
# - CVE-2018-19871
# - CVE-2018-19873
+# 5.12.6-r1:
+# - CVE-2020-0569
+# - CVE-2020-0570
_qt5_prefix=/usr/lib/qt5
_qt5_datadir=/usr/share/qt5
@@ -175,4 +180,6 @@ sha512sums="5fb82d903b0db95c23c55785047722dea7979e7f94ecaaf374e0c73b4787aabd768a
d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c big-endian-scroll-wheel.patch
ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch
e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch
-436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch"
+436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch
+ddeb0a59cf0901b38669314fd2f14dffba63c6cbd06a3d864cd329081cc2b10323ec52053a6ffe7baf5ee8a1e137331acfe5d874c03596660630dd151828da56 CVE-2020-0569.patch
+b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch"
diff --git a/user/qt5-qtbase/CVE-2020-0569.patch b/user/qt5-qtbase/CVE-2020-0569.patch
new file mode 100644
index 000000000..fa0efdce3
--- /dev/null
+++ b/user/qt5-qtbase/CVE-2020-0569.patch
@@ -0,0 +1,29 @@
+From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <ogoffart@woboq.com>
+Date: Fri, 8 Nov 2019 11:30:40 +0100
+Subject: Do not load plugin from the $PWD
+
+I see no reason why this would make sense to look for plugins in the current
+directory. And when there are plugins there, it may actually be wrong
+
+Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/plugin/qpluginloader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index cadff4f32b..c2443dbdda 100644
+--- a/src/corelib/plugin/qpluginloader.cpp
++++ b/src/corelib/plugin/qpluginloader.cpp
+@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
+ paths.append(fileName.left(slash)); // don't include the '/'
+ } else {
+ paths = QCoreApplication::libraryPaths();
+- paths.prepend(QStringLiteral(".")); // search in current dir first
+ }
+
+ for (const QString &path : qAsConst(paths)) {
+--
+cgit v1.2.1
+
diff --git a/user/qt5-qtbase/CVE-2020-0570.patch b/user/qt5-qtbase/CVE-2020-0570.patch
new file mode 100644
index 000000000..dcf507c0d
--- /dev/null
+++ b/user/qt5-qtbase/CVE-2020-0570.patch
@@ -0,0 +1,55 @@
+From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Fri, 10 Jan 2020 09:26:27 -0800
+Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD
+
+I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to
+find libraries in a haswell/ subdir of the main path, but we only need
+to do that transformation if the library is contains at least one
+directory seprator. That is, if the user asks to load "lib/foo", then we
+should try "lib/haswell/foo" (often, the path prefix will be absolute).
+
+When the library name the user requested has no directory separators, we
+let dlopen() do the transformation for us. Testing on Linux confirms
+glibc does so:
+
+$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor
+ 1972475: find library=libXcursor.so.1 [0]; searching
+ 1972475: trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1
+ 1972475: trying file=/usr/lib64/haswell/libXcursor.so.1
+ 1972475: trying file=/usr/lib64/libXcursor.so.1
+ 1972475: calling init: /usr/lib64/libXcursor.so.1
+ 1972475: calling fini: /usr/lib64/libXcursor.so.1 [0]
+
+Fixes: QTBUG-81272
+Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/plugin/qlibrary_unix.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
+index f0de1010d7..135b82cd37 100644
+--- a/src/corelib/plugin/qlibrary_unix.cpp
++++ b/src/corelib/plugin/qlibrary_unix.cpp
+@@ -1,7 +1,7 @@
+ /****************************************************************************
+ **
+ ** Copyright (C) 2016 The Qt Company Ltd.
+-** Copyright (C) 2018 Intel Corporation
++** Copyright (C) 2020 Intel Corporation
+ ** Contact: https://www.qt.io/licensing/
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+@@ -218,6 +218,8 @@ bool QLibraryPrivate::load_sys()
+ for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) {
+ if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix)))
+ continue;
++ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/')))
++ continue;
+ if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix)))
+ continue;
+ if (loadHints & QLibrary::LoadArchiveMemberHint) {
+--
+cgit v1.2.1
+
diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD
index d07cd72eb..3a6d8214e 100644
--- a/user/rsibreak/APKBUILD
+++ b/user/rsibreak/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=rsibreak
-pkgver=0.12.11
+pkgver=0.12.13
pkgrel=0
pkgdesc="Helps you avoid wrist injury by telling you when to stop for a rest"
url="https://www.kde.org/applications/utilities/rsibreak/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="78498b747eeef842e40170236ace9d1ddd8b1f4bcc378134f2935cd2cf1c6933d44fa232f2f9b0724ee6b2638a34e4f71ebee2eac7664946093ed4df8eeb12ec rsibreak-0.12.11.tar.xz"
+sha512sums="dc1411221828afab1c8f3ee89238be44d9fd3784cb5cce4f5a50ce063e14d1683257bffa1b24509d7009e74d0be16f1c788754690b503490fb8be1bedc9657fd rsibreak-0.12.13.tar.xz"
diff --git a/user/ruby-bundler/APKBUILD b/user/ruby-bundler/APKBUILD
index b553c1187..3d8cb5145 100644
--- a/user/ruby-bundler/APKBUILD
+++ b/user/ruby-bundler/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alyx Wolcott <alyx@leuhta.com>
_gemname=bundler
pkgname=ruby-$_gemname
-pkgver=2.1.2
+pkgver=2.1.4
pkgrel=0
pkgdesc="Manage an application's gem dependencies"
url="https://bundler.io/"
@@ -16,7 +16,7 @@ source="https://rubygems.org/downloads/$_gemname-$pkgver.gem"
builddir="$srcdir/$_gemname-$pkgver"
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
@@ -39,4 +39,4 @@ package() {
}
-sha512sums="2a3b42fa2c6f40998c900eaf9d81d6417970f3daa572e4f1c5cc954fd8ce1e3cacbda0dc9b77d44b2fa756cfb1e72838ef3edee1812881198bbe8c946017e22b bundler-2.1.2.gem"
+sha512sums="6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6 bundler-2.1.4.gem"
diff --git a/user/ruby-diff-lcs/APKBUILD b/user/ruby-diff-lcs/APKBUILD
index 5dbca7146..c03e0e033 100644
--- a/user/ruby-diff-lcs/APKBUILD
+++ b/user/ruby-diff-lcs/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-diff-lcs
_gemname=${pkgname#ruby-}
pkgver=1.3
-pkgrel=1
+pkgrel=2
pkgdesc="Generate difference sets between Ruby sequences"
url="http://halostatue.github.io/diff-lcs/"
arch="noarch"
@@ -19,8 +19,8 @@ build() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
- local geminstdir="$gemdir/gems/$_gemname-$pkgver"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ geminstdir="$gemdir/gems/$_gemname-$pkgver"
gem install --local \
--install-dir "$gemdir" \
diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD
index 828a9b1ac..eb5431649 100644
--- a/user/ruby-rake-compiler/APKBUILD
+++ b/user/ruby-rake-compiler/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-rake-compiler
_gemname=${pkgname#ruby-}
pkgver=1.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="Provide a standard and simplified way to build and package Ruby extensions"
url="https://github.com/rake-compiler/rake-compiler"
arch="noarch"
@@ -24,7 +24,7 @@ check() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD
index 9a7ad8d68..9749114a6 100644
--- a/user/ruby-rspec-core/APKBUILD
+++ b/user/ruby-rspec-core/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-rspec-core
_gemname=${pkgname#ruby-}
pkgver=3.9.1
-pkgrel=0
+pkgrel=1
pkgdesc="RSpec runner and formatters"
url="https://relishapp.com/rspec/rspec-core"
arch="noarch"
@@ -21,7 +21,7 @@ build() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD
index b78363e57..c465c5c4b 100644
--- a/user/ruby-rspec-expectations/APKBUILD
+++ b/user/ruby-rspec-expectations/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec-expectations
_gemname=${pkgname#ruby-}
-pkgver=3.9.0
+pkgver=3.9.1
pkgrel=0
pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec"
url="https://relishapp.com/rspec/rspec-expectations/"
@@ -21,7 +21,7 @@ build() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
@@ -36,5 +36,5 @@ package() {
"$gemdir"/doc
}
-sha512sums="663b9739681c19b5bb1301447017ce4e10bc377ea3f4e51745ccfaa12b014a47e893aeb262b6fa3792e823adb90ae7a15f5c146c48aa80c72eec5faaf84d516c ruby-rspec-expectations-3.9.0.tar.gz
+sha512sums="23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572 ruby-rspec-expectations-3.9.1.tar.gz
1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch"
diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD
index aff6a8008..f84c951d9 100644
--- a/user/ruby-rspec-mocks/APKBUILD
+++ b/user/ruby-rspec-mocks/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-rspec-mocks
_gemname=${pkgname#ruby-}
pkgver=3.9.1
-pkgrel=0
+pkgrel=1
pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking"
url="https://relishapp.com/rspec/rspec-mocks/"
arch="noarch"
@@ -21,7 +21,7 @@ build() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD
index a5d1536f9..5f8457dd0 100644
--- a/user/ruby-rspec-support/APKBUILD
+++ b/user/ruby-rspec-support/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-rspec-support
_gemname=${pkgname#ruby-}
pkgver=3.9.2
-pkgrel=0
+pkgrel=1
pkgdesc="Support utilities for RSpec gems"
url="https://rubygems.org/gems/rspec-support"
arch="noarch"
@@ -21,7 +21,7 @@ build() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
diff --git a/user/ruby-rspec/APKBUILD b/user/ruby-rspec/APKBUILD
index d95857860..a3055f056 100644
--- a/user/ruby-rspec/APKBUILD
+++ b/user/ruby-rspec/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-rspec
_gemname=${pkgname#ruby-}
pkgver=3.9.0
-pkgrel=0
+pkgrel=1
pkgdesc="Behaviour Driven Development for Ruby"
url="http://rspec.info/"
arch="noarch"
@@ -23,7 +23,7 @@ build() {
}
package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+ gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD
index d6e001f70..edbb2078b 100644
--- a/user/scummvm/APKBUILD
+++ b/user/scummvm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Tambra Wilcox <Tambra@J30AD.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=scummvm
-pkgver=2.1.1
+pkgver=2.1.2
pkgrel=0
pkgdesc="Allows running classic point-and-click adventure games"
url="https://www.scummvm.org/"
@@ -28,5 +28,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c27de3cf226ca6b11b1b431d40ab416c4e10e93244ab96535ead4f704c74267d816545448ae3618be2762ae148b0008952c26784fa4937ac0f3697b2d77f98d9 scummvm-2.1.1.tar.bz2
+sha512sums="de3ce5c9363f59ed151aeedc04870343070acbc2ac7d07a641a0cdcd9cdb9210138dc4b3669818f736c0b0d40bdf9e07d9c015796ceef0c81881ac15e31eaebe scummvm-2.1.2.tar.bz2
20b20a68263c691efb7db83aa8132ec980f2732af728300a641d30c4035d4aa8fcf6efdcebb8c5b924e68fafb50e39ed1825cd64d1f81145259493e858bd50f4 fluidsynth.patch"
diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD
index e1515db7e..35b89755f 100644
--- a/user/sddm-kcm/APKBUILD
+++ b/user/sddm-kcm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=sddm-kcm
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE configuration applet for SDDM"
url="https://www.kde.org/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
knewstuff-dev"
install_if="systemsettings sddm"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/sddm-kcm-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0d08f06ec50ae48453e8e4fecb80fced6d237d89ca85a7d9776b312c1e224e631e2e8407db34d9c98593f2e99f1520a0861e17de776f3228ec3f63268db78fe0 sddm-kcm-5.18.2.tar.xz"
+sha512sums="6500b3a721e4f8798fe1e79647beac11ae6d22bb5df1f5c35d815956535e74aadc9c4ffaee72afd99c2f5ea7acefca040185fe1fc106f3e0a7d62f862c8cfdf0 sddm-kcm-5.18.4.1.tar.xz"
diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD
index e11d9d7ae..c7dd81e68 100644
--- a/user/sdl2/APKBUILD
+++ b/user/sdl2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sdl2
-pkgver=2.0.10
-pkgrel=1
+pkgver=2.0.12
+pkgrel=0
pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library"
url="https://www.libsdl.org/"
arch="all"
@@ -14,7 +14,6 @@ makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev
libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev cmake"
subpackages="$pkgname-dev"
source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz
- gles.patch
sdl2-soname.patch
"
builddir="$srcdir/SDL2-$pkgver"
@@ -38,6 +37,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz
-c345096eb98617c41ea5a7b79864082d869800dd54fb9d4aa565446dfafc9ec345193555c25c03f318fa13ed82f267eab6b164a1870ead5fb98a1216cbfd4a0b gles.patch
-23fbb178730f0955732cbb3a61145e7ec1bf7810a2589c259cd715557cb4ff5bcbc676197db375ad31be46dab93c6ea7e06b3549414205ae56e1b65a8c8ab21a sdl2-soname.patch"
+sha512sums="3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 SDL2-2.0.12.tar.gz
+81b5807cd9f2683231c14562e961467fcd7ba257140d1a266932d6a6a5103633e3af896c09b261620b2934d521809e08ed79d3287c0897f4783c6afc1c01a566 sdl2-soname.patch"
diff --git a/user/sdl2/gles.patch b/user/sdl2/gles.patch
deleted file mode 100644
index c400577e1..000000000
--- a/user/sdl2/gles.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SDL2-2.0.10/src/video/SDL_video.c.old 2019-07-25 04:32:37.000000000 +0000
-+++ SDL2-2.0.10/src/video/SDL_video.c 2020-01-20 17:32:52.918453596 +0000
-@@ -37,7 +37,8 @@
- #include "SDL_opengl.h"
- #endif /* SDL_VIDEO_OPENGL */
-
--#if SDL_VIDEO_OPENGL_ES
-+/* GL and GLES headers conflict on Linux 32 bits */
-+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
- #include "SDL_opengles.h"
- #endif /* SDL_VIDEO_OPENGL_ES */
-
diff --git a/user/sdl2/sdl2-soname.patch b/user/sdl2/sdl2-soname.patch
index 8f040e30c..7ed5b14bf 100644
--- a/user/sdl2/sdl2-soname.patch
+++ b/user/sdl2/sdl2-soname.patch
@@ -2,7 +2,7 @@ The library name is SDL2-2.0, not SDL2. This fixes builds against SDL.
--- SDL2-2.0.10/CMakeLists.txt.old 2019-07-25 04:32:36.000000000 +0000
+++ SDL2-2.0.10/CMakeLists.txt 2020-01-03 17:23:42.451699149 +0000
-@@ -224,7 +224,7 @@
+@@ -233,7 +233,7 @@
# Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config,
# etc. are created correctly.
diff --git a/user/sg3_utils/APKBUILD b/user/sg3_utils/APKBUILD
index 35e1a4fb3..4d5f64c4f 100644
--- a/user/sg3_utils/APKBUILD
+++ b/user/sg3_utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sg3_utils
-pkgver=1.44
+pkgver=1.45
pkgrel=0
pkgdesc="Utilities to manipulate SCSI devices"
url="http://sg.danny.cz/sg/sg3_utils.html"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d sg3_utils-1.44.tar.xz"
+sha512sums="fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868 sg3_utils-1.45.tar.xz"
diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD
index c613828bc..fb44cc0ec 100644
--- a/user/spice-gtk/APKBUILD
+++ b/user/spice-gtk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=spice-gtk
-pkgver=0.37
+pkgver=0.38
pkgrel=0
pkgdesc="A GTK+ widget for SPICE clients"
url="https://www.spice-space.org/"
@@ -12,42 +12,45 @@ license="LGPL-2.1+ AND LGPL-2.0+ AND BSD-3-Clause AND MIT AND GPL-3.0+ AND LGPL-
depends="gst-plugins-good"
depends_dev="gobject-introspection-dev gtk+3.0-dev"
makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev
- gst-plugins-base-dev gstreamer-dev gstreamer-tools json-glib-dev
- libjpeg-turbo-dev libusb-dev libxrandr-dev lz4-dev openssl-dev
- opus-dev polkit-dev polkit-dev spice-protocol usbredir-dev
- usbutils zlib-dev"
+ gst-plugins-base-dev gstreamer-dev gstreamer-tools gtk-doc
+ json-glib-dev libjpeg-turbo-dev libucontext-dev
+ libxrandr-dev lz4-dev meson openssl-dev opus-dev polkit-dev
+ py3-pyparsing py3-six spice-protocol
+ zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang spicy
spice-glib:glib"
-source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.bz2"
+source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz
+ macro.patch
+ "
build() {
+ export CFLAGS="$CFLAGS -lucontext"
+
# Note: pulseaudio support is disabled because it's deprecated.
# Audio is still supported through gstreamer.
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ #
+ # USB redirection is disabled until there is reasonable belief
+ # that it is endian safe.
+ # https://gitlab.freedesktop.org/spice/spice-gtk/-/issues/120
+ meson \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --with-gtk=3.0 \
- --with-audio=gstreamer \
- --disable-celt051 \
- --disable-werror \
- --enable-lz4 \
- --enable-opus \
- --enable-smartcard=no \
- --enable-usbredir=yes \
- --enable-polkit=yes \
- --enable-pulse=no
- make
+ --localstatedir=/var \
+ --buildtype=release \
+ -Dcelt051=disabled \
+ -Dpulse=disabled \
+ -Dusbredir=disabled \
+ . output
+ ninja -C output
}
check() {
- make check
+ ninja -C output test
}
package() {
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C output install
}
spicy() {
@@ -66,4 +69,5 @@ glib() {
"$subpkgdir"/usr/lib/girepository-1.0/
}
-sha512sums="a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029 spice-gtk-0.37.tar.bz2"
+sha512sums="27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3 spice-gtk-0.38.tar.xz
+9bae6a1866c977d6b7e032e0fe1f8ce07ccfd8777e982453629d9dce284a6f02c68ab8b073865e3c36340e22dd2f83fbda4cabd3a5bc8a274b3a0bbf9c031ccd macro.patch"
diff --git a/user/spice-gtk/macro.patch b/user/spice-gtk/macro.patch
new file mode 100644
index 000000000..fc0787b93
--- /dev/null
+++ b/user/spice-gtk/macro.patch
@@ -0,0 +1,33 @@
+From 7363d1a0a640b6992d5967621e37c3376958d708 Mon Sep 17 00:00:00 2001
+From: Frediano Ziglio <fziglio@redhat.com>
+Date: Thu, 19 Mar 2020 15:50:45 +0000
+Subject: [PATCH] channel-main: Avoid macro side effects
+
+In big endian system GUINT32_TO_LE macro uses the parameter
+multiple time causing serial to be incremented multiple times
+instead of one.
+Avoid side effects using a temporary variable.
+
+Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
+Acked-by: Victor Toso <victortoso@redhat.com>
+---
+ src/channel-main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/channel-main.c b/src/channel-main.c
+index 0a0b9ca..d7669e8 100644
+--- a/src/channel-main.c
++++ b/src/channel-main.c
+@@ -1384,7 +1384,8 @@ static void agent_clipboard_grab(SpiceMainChannel *channel, guint selection,
+ }
+
+ if (test_agent_cap(channel, VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL)) {
+- *(uint32_t *)grab = GUINT32_TO_LE(c->clipboard_serial[selection]++);
++ uint32_t serial = c->clipboard_serial[selection]++;
++ *(uint32_t *)grab = GUINT32_TO_LE(serial);
+ grab = (void *)grab + sizeof(uint32_t);
+ }
+
+--
+2.24.1
+
diff --git a/user/spice-protocol/APKBUILD b/user/spice-protocol/APKBUILD
index e31c8544a..1fb5b5c3c 100644
--- a/user/spice-protocol/APKBUILD
+++ b/user/spice-protocol/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=spice-protocol
-pkgver=0.14.0
+pkgver=0.14.1
pkgrel=0
pkgdesc="Spice protocol header files"
url="https://www.spice-space.org/"
@@ -28,4 +28,4 @@ package() {
make pkgconfigdir=/usr/lib/pkgconfig DESTDIR="$pkgdir" install
}
-sha512sums="797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76 spice-protocol-0.14.0.tar.bz2"
+sha512sums="88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482 spice-protocol-0.14.1.tar.bz2"
diff --git a/user/spice/APKBUILD b/user/spice/APKBUILD
index ef57a810c..a78551cb6 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.2
+pkgver=0.14.3
pkgrel=0
pkgdesc="Solution for seamless access to virtual machines"
url="https://www.spice-space.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76 spice-0.14.2.tar.bz2"
+sha512sums="9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4 spice-0.14.3.tar.bz2"
diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD
index c6fe305e9..d3f1ce3f0 100644
--- a/user/sshfs/APKBUILD
+++ b/user/sshfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=sshfs
-pkgver=3.6.0
+pkgver=3.7.0
pkgrel=0
pkgdesc="FUSE client based on the SSH File Transfer Protocol"
url="https://github.com/libfuse/sshfs"
@@ -9,7 +9,7 @@ arch="all"
options="!check" # Requires fuse kernel module to be loaded and local ssh server
license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1-only"
depends="openssh-client"
-#checkdepends="py3-pytest cmd:which"
+#checkdepends="cmd:which openssh-server openssh-sftp-server py3-pytest"
makedepends="fuse3-dev glib-dev meson coreutils py3-docutils"
subpackages="$pkgname-doc"
source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
@@ -32,6 +32,16 @@ build() {
}
check() {
+ # This test requires a running SSH server on localhost, with the
+ # current user being able to login without a password. Recommended
+ # procedure:
+ #
+ # 1. Setup sshd - make sure sftp subsystem is enabled
+ # 2. Ensure current user has a SSH key configured in ~/.ssh/config and
+ # ~/.ssh/authorized_keys
+ # 3. Test `ssh localhost`
+ # 4. Run `abuild check`
+
cd "$builddir"/output
python3 -m pytest test/
}
@@ -40,4 +50,4 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="fe34d7bbb76bea6aedf96b4ce7500ad6d81230cca9a43b831302159e5926797a243b7d1675d23ba101057ef247f64ad7df18a73d20578e84b9524218d9ff97bd sshfs-3.6.0.tar.xz"
+sha512sums="bd8bcd45dd9a5e9686c6fb442e877ffdb592ba0d3424d5dab84a955bfafb17e8666abefba6857467833f5b285842bdadd5a9b6c9e8128ac2e564c36df79aa570 sshfs-3.7.0.tar.xz"
diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD
index cd8a63c40..87c2c6793 100644
--- a/user/systemsettings/APKBUILD
+++ b/user/systemsettings/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=systemsettings
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="KDE system settings configuration utility"
url="https://www.kde.org/"
@@ -15,7 +15,7 @@ makedepends="$depends_dev cmake extra-cmake-modules kactivities-stats-dev
kiconthemes-dev kitemmodels-dev kio-dev kirigami2-dev kwindowsystem-dev
kxmlgui-dev libkworkspace-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/systemsettings-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/systemsettings-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="627d88fb0dbec4faf9637353e04ed897f0c15518964fc4b902f7825d525f258f52e171b285eb7fcea7c9fa0eb6d36444eb7bb9bf78517281fa6933f8b01c3c0b systemsettings-5.18.2.tar.xz"
+sha512sums="07e3658affdf4b65967722a92906a3a017b9217ee7443e57e07d9a7a22753fdbd27840e10dfc3716bf193c155ca2fc0d916fb6320852a352b0d0dcfc07be6ae2 systemsettings-5.18.4.1.tar.xz"
diff --git a/user/telegram/APKBUILD b/user/telegram/APKBUILD
index 994ed5559..46cc4a9c1 100644
--- a/user/telegram/APKBUILD
+++ b/user/telegram/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=telegram
-pkgver=1.9.19
+pkgver=2.0.1
pkgrel=0
pkgdesc="Telegram messaging app"
url="https://telegram.org/"
@@ -59,5 +59,5 @@ package() {
done
}
-sha512sums="29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d tdesktop-1.9.19-full.tar.gz
+sha512sums="99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb tdesktop-2.0.1-full.tar.gz
c478bd59187493d60172d805ca19e9e09fa2c81b87d5dbbd5f3cd9aae0f207b463d127e06f2053f7b7b6ac00b3191d59e36ec6c5453a1da4d6535d1caad27242 endian.patch"
diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD
index 05f41f09e..f8b5b947c 100644
--- a/user/user-manager/APKBUILD
+++ b/user/user-manager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=user-manager
-pkgver=5.18.2
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Manage user accounts from KDE"
url="https://www.KDE.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kauth-dev kcmutils-dev
kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kiconthemes-dev
kio-dev kwidgetsaddons-dev libpwquality-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/user-manager-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="86d90ea0607cff32146c123468547e92d4c3bba8c5c088c232de944a07091768f27017d182d8791b5d7d69c8af359d7093fd54bedb536346d11168eafdbe4925 user-manager-5.18.2.tar.xz"
+sha512sums="fc05602587bfcd8df80bd7bd96de8160e60389aa9e829ad4666706ca5a61ae4f9e282de4fdc42f5245e51ae2ed877053379c6047f7cab7590c56cb02bcde836d user-manager-5.18.4.1.tar.xz"
diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD
index c009e1ff2..a8f216aa3 100644
--- a/user/uwsgi/APKBUILD
+++ b/user/uwsgi/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=uwsgi
pkgver=2.0.18
-pkgrel=0
+pkgrel=2
pkgdesc="Web application server"
url="https://projects.unbit.it/uwsgi"
arch="all"
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index dfa1a3277..357476211 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=weechat
-pkgver=2.7.1
+pkgver=2.8
pkgrel=0
pkgdesc="Fast, light, extensible ncurses-based chat client"
url="https://www.weechat.org"
@@ -49,8 +49,8 @@ package() {
}
_plugin() {
- local _name="${subpkgname#*-}"
- local _dir=usr/lib/weechat/plugins
+ _name="${subpkgname#*-}"
+ _dir=usr/lib/weechat/plugins
pkgdesc="WeeChat $_name plugin"
depends="weechat"
if [ "$_name" = spell ]; then
@@ -61,4 +61,4 @@ _plugin() {
mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir
}
-sha512sums="2d2f555a4c48dbfa60a97845657e041fcd37bdde01974b4a49ff2d0ef6b92f16147f84b0e60772e9f54ba3e05ae1772012d3551a5fbb8bdf8332a08ef63a352d weechat-2.7.1.tar.gz"
+sha512sums="3071fc6c5d88d4e388fc22f23242cf264b9533b389668914fc25e71e9939b739ba63a4e182445222ed0a7470dc0b1d958828b56d2c82ac47e9dfce6513c70d80 weechat-2.8.tar.gz"
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index 4088a7817..7fac2165c 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer: Luis Ressel <aranea@aixah.de>
_kver="5.4.5-mc0"
-pkgver=0.0.20200121
+pkgver=1.0.20200401
pkgrel=0
_pkgname="wireguard-module"
pkgname="$_pkgname-$_kver"
@@ -39,4 +39,4 @@ _patch() {
"$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch"
}
-sha512sums="fde9ef09032ad2e2ce69814d42cc0abb3b353d5aa95debd39122b3eb25324c8e707dd9f298f8ee276575d932b1f1bd559b3430da6b8c0a5057911937ed85c726 wireguard-linux-compat-0.0.20200121.tar.xz"
+sha512sums="894da609c7102eb1d076a4a7bdaa96c7d5f0d64b4b86fdf01068ac5f4af966652e7ad7f18b1295a7fc4447f53b55a9ec45f1b3f36f0f9df7fb08836dfdff89f0 wireguard-linux-compat-1.0.20200401.tar.xz"
diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD
index 5b41e185c..db64e132e 100644
--- a/user/wireguard-tools/APKBUILD
+++ b/user/wireguard-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=wireguard-tools
-pkgver=1.0.20200121
+pkgver=1.0.20200319
pkgrel=0
pkgdesc="Userland tools for the WireGuard VPN"
url="https://www.wireguard.com/"
@@ -29,4 +29,4 @@ bashcomp() {
mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/"
}
-sha512sums="cd22467916c59ab53440e072fee6d0b01f2f9ee06fc3b71de4e74bc3aab05caf25519e5f723d9d160c491f917b7f064ee6b491c74edb52d7d2c29a08d86e41c2 wireguard-tools-1.0.20200121.tar.xz"
+sha512sums="d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41 wireguard-tools-1.0.20200319.tar.xz"
diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD
index c4b5755fc..96e5a53bb 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.7
+pkgver=1.20.8
pkgrel=0
pkgdesc="X.Org X11 server"
url="https://www.X.Org/"
@@ -134,6 +134,6 @@ xwayland() {
mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
}
-sha512sums="c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 xorg-server-1.20.7.tar.bz2
+sha512sums="ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 xorg-server-1.20.8.tar.bz2
d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch
a5f910e72ff9abd4e4a0c6806cdbe48d1b0b6cc0586f36568da5864a8dedc46a3112fe86d7a1969033f4d5b0def4dc6e5c11b656fbcc964732b417e6c9577f22 fix-musl-arm.patch"
diff --git a/user/xxhash/APKBUILD b/user/xxhash/APKBUILD
index 91c74b4bf..6d8140994 100644
--- a/user/xxhash/APKBUILD
+++ b/user/xxhash/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xxhash
-pkgver=0.7.2
+pkgver=0.7.3
pkgrel=0
pkgdesc="Fast non-cryptographic hashing algorithm"
url="https://cyan4973.github.io/xxHash/"
@@ -31,4 +31,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="90d4e7422729441e5013928b306fd6f394ab6f97628ec88369fbb33891c9a2cfae495516d8dd0741eda9c38859132b1bd78f2c7b8dae1dce80eeca8ea5cba575 xxHash-0.7.2.tar.gz"
+sha512sums="72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664 xxHash-0.7.3.tar.gz"
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
index ed99fcb7b..424f883b1 100644
--- a/user/youtube-dl/APKBUILD
+++ b/user/youtube-dl/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=youtube-dl
-pkgver=2020.03.08
+pkgver=2020.03.24
pkgrel=0
pkgdesc="Command-line program to download videos from YouTube and many other sites"
url="https://youtube-dl.org"
@@ -66,5 +66,5 @@ fishcomp() {
"$subpkgdir/usr/share/fish/completions/"
}
-sha512sums="09636e3ec526dbcb043cf61ed4dda5c5c00fac2ecd741bf3cb338ca8de72d1395a95a6189bccced140ca1c37eb3f693332e757ff01eb1a25279b100ccdf39b65 youtube-dl-2020.03.08.tar.gz
+sha512sums="421c0ae412977cdf94d079aa7982360ffdfc4271bb7af27a598adbdb8454c2044e5c44ff3a9f339e9b0989c1264223ca83bba6a9151d01052f8f72c076d9e369 youtube-dl-2020.03.24.tar.gz
5760d06e6bbc1eee2c6be2d1f580f86b3cfa5f4bc44a62fb8145ce1cd41352ecf2f65d65d79a2d7f1ec129a34c28a7ec3d0d328c907e743bfcea54c65c71285d tumblr.patch"