diff options
Diffstat (limited to 'user')
47 files changed, 603 insertions, 123 deletions
diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index b4be30ab5..3b55131e2 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@adelielinux.org> pkgname=breeze-gtk -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59c4f9433011a6699a2e9b8eef4053aa3c7b25d1cb8668a14fcba42c513d232501988ca5c4cedc00375cde917dd7cd1f8e8948c2d3447083f51fdfc4bd061adb breeze-gtk-5.12.6.tar.xz" +sha512sums="5be51fc6a884e4f3338b3ad3044b918f7267205c5234b2053edd4773be42b90fb8f665e339a40c1d49d6eea16e90e1e51f58f149002568e2e7ce0be69ee412d9 breeze-gtk-5.12.7.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index 26e22d9d1..e36e44a62 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8353ff97a4a85e5c21bb2e5b234f60a272679d0ec204a30a9afe808fdd3ccf92df10dc8fd04bb87ff8f885460813bbac08f5a92d592d002a2f3a44539f00d4bf breeze-5.12.6.tar.xz" +sha512sums="c0e564fa6df64c225ea7754271c138d4b4304068c5fcf2e0502f109af3478f37d2781ac13d068b0818c819c8f60d6c4a333ff8940334c3ee5030607f80080b99 breeze-5.12.7.tar.xz" diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index d9ced3064..12c8c21c6 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="http://www.exiv2.org" arch="all" @@ -14,9 +14,14 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://www.exiv2.org/builds/exiv2-$pkgver-trunk.tar.gz 0000-pthread-init-fix.patch 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch + CVE-2018-19535.patch " builddir="$srcdir"/exiv2-trunk +# secfixes: +# 0.26-r2: +# - CVE-2018-19535 + prepare() { cd "$builddir" default_prepare @@ -38,4 +43,5 @@ package() { sha512sums="d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86 exiv2-0.26-trunk.tar.gz 9721d359708c385be7c86a8f8a63de43b05b2578a29b4339861e82873aa81a98a7ee7252847b6c55529341187d40f552c488589b416fd9d1e27418925929c018 0000-pthread-init-fix.patch -485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch" +485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch +ac145a9b4df21e7f5fdd3099e6ae4c1e12ae2cdccc455d0262c5d38b8e07ce6437036a19264bd04b1cb1fffd01d89672044ca82fddd5e71dcd0d84d48356ab12 CVE-2018-19535.patch" diff --git a/user/exiv2/CVE-2018-19535.patch b/user/exiv2/CVE-2018-19535.patch new file mode 100644 index 000000000..ba9355012 --- /dev/null +++ b/user/exiv2/CVE-2018-19535.patch @@ -0,0 +1,239 @@ +From 03173751b4d7053d6ddf52a15904e8f751f78f56 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> +Date: Sun, 2 Sep 2018 14:39:52 +0200 +Subject: [PATCH 2/5] Fix bug in PngChunk::readRawProfile + +- Now it takes into account text.size_ when searching for a newline +char. +--- + src/pngchunk.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp +index 58281b3ff..755872c94 100644 +--- a/src/pngchunk.cpp ++++ b/src/pngchunk.cpp +@@ -629,11 +629,19 @@ namespace Exiv2 { + + + sp = (char*)text.pData_+1; ++ int pointerPos = 1; + + // Look for newline +- +- while (*sp != '\n') ++ while (*sp != '\n' && pointerPos < (text.size_ - 1)) ++ { + sp++; ++ pointerPos++; ++ } ++ ++ if (pointerPos == (text.size_ - 1)) ++ { ++ return DataBuf(); ++ } + + // Look for length + + +From cf3ba049a2792ec2a4a877e343f5dd9654da53dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> +Date: Mon, 3 Sep 2018 08:51:08 +0200 +Subject: [PATCH 3/5] Fix more issues in PngChunk::readRawProfile + +--- + src/pngchunk.cpp | 36 +++++++++++++----------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp +index 755872c94..9b3faf1aa 100644 +--- a/src/pngchunk.cpp ++++ b/src/pngchunk.cpp +@@ -606,11 +606,6 @@ namespace Exiv2 { + DataBuf PngChunk::readRawProfile(const DataBuf& text,bool iTXt) + { + DataBuf info; +- register long i; +- register unsigned char *dp; +- const char *sp; +- unsigned int nibbles; +- long length; + unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, +@@ -627,8 +622,7 @@ namespace Exiv2 { + return info; + } + +- +- sp = (char*)text.pData_+1; ++ const char *sp = (char*)text.pData_+1; + int pointerPos = 1; + + // Look for newline +@@ -638,20 +632,30 @@ namespace Exiv2 { + pointerPos++; + } + ++ // Look for length ++ while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) ++ { ++ sp++; ++ pointerPos++; ++ } ++ + if (pointerPos == (text.size_ - 1)) + { + return DataBuf(); + } + +- // Look for length ++ long length = (long) atol(sp); + +- while (*sp == '\0' || *sp == ' ' || *sp == '\n') ++ while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) ++ { + sp++; ++ pointerPos++; ++ } + +- length = (long) atol(sp); +- +- while (*sp != ' ' && *sp != '\n') +- sp++; ++ if (pointerPos == (text.size_ - 1)) ++ { ++ return DataBuf(); ++ } + + // Allocate space + +@@ -674,10 +678,10 @@ namespace Exiv2 { + + // Copy profile, skipping white space and column 1 "=" signs + +- dp = (unsigned char*)info.pData_; +- nibbles = length * 2; ++ unsigned char *dp = (unsigned char*)info.pData_; ++ unsigned int nibbles = length * 2; + +- for (i = 0; i < (long) nibbles; i++) ++ for (long i = 0; i < (long) nibbles; i++) + { + while (*sp < '0' || (*sp > '9' && *sp < 'a') || *sp > 'f') + { + +From 8b480bc5b2cc2abb8cf6fe4e16c24e58916464d2 Mon Sep 17 00:00:00 2001 +From: Robin Mills <robin@clanmills.com> +Date: Mon, 10 Sep 2018 20:54:53 +0200 +Subject: [PATCH 4/5] Fixes in PngChunk::readRawProfile + +--- + src/pngchunk.cpp | 55 ++++++++++++++++++++++---------------------- + 1 file changed, 27 insertions(+), 28 deletions(-) + +diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp +index 9b3faf1aa..f81b560aa 100644 +--- a/src/pngchunk.cpp ++++ b/src/pngchunk.cpp +@@ -607,11 +607,11 @@ namespace Exiv2 { + { + DataBuf info; + unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, +- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, +- 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, +- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, +- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, +- 13,14,15}; ++ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, ++ 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, ++ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, ++ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, ++ 13,14,15}; + if (text.size_ == 0) { + return DataBuf(); + } +@@ -622,52 +622,51 @@ namespace Exiv2 { + return info; + } + +- const char *sp = (char*)text.pData_+1; +- int pointerPos = 1; ++ const char *sp = (char*) text.pData_+1; // current byte (space pointer) ++ const char *eot = (char*) text.pData_+text.size_; // end of text + + // Look for newline +- while (*sp != '\n' && pointerPos < (text.size_ - 1)) ++ while (*sp != '\n' && sp < eot ) + { + sp++; +- pointerPos++; ++ if ( sp == eot ) ++ { ++ return DataBuf(); ++ } + } ++ sp++ ; // step over '\n' + + // Look for length +- while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) ++ while ( (*sp == '\0' || *sp == ' ' || *sp == '\n') && sp < eot ) + { + sp++; +- pointerPos++; +- } +- +- if (pointerPos == (text.size_ - 1)) +- { +- return DataBuf(); ++ if (sp == eot ) ++ { ++ return DataBuf(); ++ } + } + +- long length = (long) atol(sp); +- +- while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) ++ const char* startOfLength = sp; ++ while ( ('0' <= *sp && *sp <= '9') && sp < eot) + { + sp++; +- pointerPos++; ++ if (sp == eot ) ++ { ++ return DataBuf(); ++ } + } ++ sp++ ; // step over '\n' + +- if (pointerPos == (text.size_ - 1)) +- { +- return DataBuf(); +- } ++ long length = (long) atol(startOfLength); + + // Allocate space +- + if (length == 0) + { + #ifdef DEBUG + std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: invalid profile length\n"; + #endif + } +- + info.alloc(length); +- + if (info.size_ != length) + { + #ifdef DEBUG +@@ -678,7 +677,7 @@ namespace Exiv2 { + + // Copy profile, skipping white space and column 1 "=" signs + +- unsigned char *dp = (unsigned char*)info.pData_; ++ unsigned char *dp = (unsigned char*)info.pData_; // decode pointer + unsigned int nibbles = length * 2; + + for (long i = 0; i < (long) nibbles; i++) + diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index b6bea08a8..0cc1627dc 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ddd088b7d947e589e173eeefc005d6ab6c58f6588a851d21b5c27e9d106881c4950045b74592dd56749465ca46c10762fd704a86a97588b1c34cdc6fd9d72d2 kactivitymanagerd-5.12.6.tar.xz" +sha512sums="3825a79e9f1092af177606d8eb4acaeb0a7022eecc09a5066d6f8f404319e313bc16c7d5f8c22e34f19cbfbfd1dfabd1e01c8df954f8cbdd147c06492ce67245 kactivitymanagerd-5.12.7.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index bc87f1d58..1bc604c64 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@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f45a0781660609bbbfa3a7b1cf3fe16cc8a29797061f0ddaeab1182d3065442c167a5fdfa43fab84d5dcc382a6b393138d63ea68e5615fbd93c5cd76b121872d kde-cli-tools-5.12.6.tar.xz" +sha512sums="44dd8a9b999dd0f4fb9f5953da7b9af805ba0508b18bbcb8420418049318b095d9553b1723e1ddab8b7d3d48ed42ca75fb0ede17043c2a82c95769938130ad77 kde-cli-tools-5.12.7.tar.xz" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index b7f88f151..cf0ef1c81 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@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05682cf2acef5532aef62b68ca4c3602df1a0141fe791cc0ad3b7ea7893e00327b3b98d515c95db4333e4e6a7c19b3b98f7d9a47e551c571d5492591f7225882 kde-gtk-config-5.12.6.tar.xz" +sha512sums="b6698fba63f5a9d3d58112ecd2c198e9edb9b0ad9d6c8a670bef3f0e836fcf0c5f2c5444d6cbdf7370f2bfcfe5ad8a770b513ebb7a693c19624bf52bf9d02056 kde-gtk-config-5.12.7.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index 913d98e0b..31d3b27db 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdecoration -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1d31414f8d2bd8b82c1c09aca1b76f5efb60200411f1606d543f5b27ed470df4dcb891481cf58d80d2f411ccccf2f6eb4dae6064d5e3a7a2a7c51d354b562691 kdecoration-5.12.6.tar.xz" +sha512sums="acebb17f42e46dfcb57b5f94e2612e0c4f773ad15e911543281c578de4a409b8f65a028b458afd01f578abb69906316b3c6f2b6d6edd4918b302a8a26227ad95 kdecoration-5.12.7.tar.xz" diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index ab283e343..0c929b5f6 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@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -49,4 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5bf0834d204b4ec1dfeb80ca52d4babd067768e77f5937280573608b59099f535065c2804bf2359651f9d8d78e310fec598de55bbcb0089a54e3c8d52c00daf9 kdeplasma-addons-5.12.6.tar.xz" +sha512sums="7af90cee5605dd1b3548c033216b57128e3ef99043168a165b75d3a97fd54794182ffb97846bac91cf806ba4e1a82365a5d61c58f8537de43364c626de392bc7 kdeplasma-addons-5.12.7.tar.xz" diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index 81e5c3807..ad9169bfc 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinfocenter -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Information about the running computer" url="https://www.kde.org/applications/system/kinfocenter/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="521d588d73bb32fa2020b8c4faacbdaa86e65fca421829566fb9a21a15750f6d9c912c2d948f8a11ffcd304d51d5f062c79147fc8703c345fd4a1153dc937ff6 kinfocenter-5.12.6.tar.xz" +sha512sums="440e1d9c6be280fee95681148f6f9c069529431f3367fd5938663afa840cd191c85fd995b9a0a4fb6ae143d2c74415cafcfc99e4a7d7e25dc99fdd3820608f9b kinfocenter-5.12.7.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 1760cb88e..5157a19ff 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kscreenlocker -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" @@ -48,6 +48,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="4d9320027b8c3150f75bb2afeb4c708f0230a9cfe239c28edf5db1c90e247a391a7643f876b3d9afd9e6afadb830f962b05c05125d11253f5542aac2b48f8956 kscreenlocker-5.12.6.tar.xz +sha512sums="76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6 kscreenlocker-5.12.7.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 45feb6a49..33810d40e 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksysguard -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca0d21e6ed8fc8b042c6a0fbbfd0fa57811bf0e90da323df32c7905f8ce96155b67916d3038f8a993ab8e12383c1a3131d5d3bfb028cc374ea46129046f5ad81 ksysguard-5.12.6.tar.xz +sha512sums="745958c74914d9b21373919b0e54cf7d1dd0621769aa8a480bac924862c494c68c86fa36c019fb13d71d8d86c8d923161290ef9a967b98c1182df88da63bbb35 ksysguard-5.12.7.tar.xz 13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index 28dc12821..e25ff42ac 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwin -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -52,4 +52,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee9edab9d63d86e95c7853ecfb60e440c6cfcb49252040a36fb9bd61b78ee90290fe276be4cc504acf2a31abdafd8693f23b6165432fd9aa23f5cdb08d3706ee kwin-5.12.6.tar.xz" +sha512sums="acb58cd5681727aa2ebcfb75d2abc3ea636811b490d8b15a4b89e55cfb81ce8aeed9568a52d4d1c3274852f26823ec5301a6721d9be64ba9a2b65e04f6029760 kwin-5.12.7.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index ac7096323..f5d322a6f 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkscreen -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="71c600e0a5d310fe075c9a82360ee176c575b7860e15372882126847e9b7a103ed088a5d616a0168139c7b36f81312ad1f5fd6371894e56d7a900db81c8e2316 libkscreen-5.12.6.tar.xz" +sha512sums="fb24d0f4f79468d4246e912f4b7e814df398911cdbd475e18263e89502ecca35c9e4974b7f0af92afa8cba3081056f8f27b0f051eb287c682dd37b35568b3c5c libkscreen-5.12.7.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index 3af4475cc..f74519692 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksysguard -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3dc937f43f03352df6f503eb0b2d493a8f7b9ab9f017e06ce5f8d111ca10690f98736b0f7c6b8942e99f192e9c9ba98b1c0fd2d8515e0ce416c775e000a13d9e libksysguard-5.12.6.tar.xz" +sha512sums="78a063606567632c19a7f1c9d2e7d69634432f3e49bb08a3162805aeb94e0930f2d43e9372207512558b785b8c7e20fdca801de35c055e456ac3cb812bd96efa libksysguard-5.12.7.tar.xz" diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index eedc7df4c..fe9b06d4a 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=milou -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3feb387c9698117a7646132d43f0ae5dfb42341b2725a3bbeb6cd8653fb1e6a2fe79aa538aa532b1b808140376f665a7c746b923fc8fcc2fa4ef5015757da6ff milou-5.12.6.tar.xz" +sha512sums="e46395992fd53ec9f230790d4e0eccfb91f925729088f0c8d602524828ce4ff2a55bbcab843daa66c57eff20393c291f9e0f860a4b4b11fc834374b386fcfdbd milou-5.12.7.tar.xz" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index 6a5bef177..6933df4d5 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7f558f92dc218a8218c6b87fd432985ef446d88e7a73911bc557481bd7d0ccdda7a9ebb350c6f71547f3c35cda1f844cda8aa735e0fcbdb413aedb25b9d0d8de oxygen-5.12.6.tar.xz" +sha512sums="20e448f223c13f60b929d3fe0be4070868ddf9189a1108b2a798ce08ca654db082798c6389e6dbd06dcc72fff061e3178c805c9f1fb595b1649235e0ec5231ff oxygen-5.12.7.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index ff190ce4d..4b06e92d6 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@adelielinux.org> pkgname=plasma-desktop -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/info/plasma-desktop" @@ -54,4 +54,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76 plasma-desktop-5.12.6.tar.xz" +sha512sums="671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d plasma-desktop-5.12.7.tar.xz" diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index a00124a5f..2b3981303 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@adelielinux.org> pkgname=plasma-integration -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df231e8041fb94f01b0950890f784d118ca0aa1a34e7e483f78351de237cc2ba46a05be9c7addc5a2c5d319be7e17b6e2c5f171da28aa7cfd9b34b585a3c8155 plasma-integration-5.12.6.tar.xz" +sha512sums="b33b1b2d044f36b3dad8bf854acb9a1f94be527c9c9b84d18a58323ab249a63276ee91553b6d92fd77b347a52d6dc4c10c080e0333dd31d4ef1f6058cb557fe0 plasma-integration-5.12.7.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index fdc9f4906..3d60e96e2 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@adelielinux.org> pkgname=plasma-workspace -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -58,4 +58,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efa67214814a0193c3359bc7599174eab29f93826dcad61310f0fc7ce946ac779f35f2e8d0b231360dfd2ddeda398b8b12bf4a155ad6746e60e56a388f446488 plasma-workspace-5.12.6.tar.xz" +sha512sums="e9d4a85b11264eebbce0845eefa5d01818e944c2179d5cbc3e23b720118894d88fbfe96467c68849a3fa89728cecff248cd7f9dfc0ab133e50dad28ecc957623 plasma-workspace-5.12.7.tar.xz" diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD index ea5cb0c02..05976199d 100644 --- a/user/polkit/APKBUILD +++ b/user/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit pkgver=0.115 -pkgrel=1 +pkgrel=2 pkgdesc="Toolkit for controlling system-wide privileges" url="https://www.freedesktop.org/wiki/Software/polkit/" arch="all" @@ -17,10 +17,15 @@ pkggroups="polkitd" install="$pkgname.pre-install" source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz 0001-make-netgroup-support-optional.patch + CVE-2018-19788.patch fix-consolekit-db-stat.patch fix-test-fgetpwent.patch " +# secfixes: +# 0.115-r2: +# - CVE-2018-19788 + prepare() { cd "$builddir" default_prepare @@ -63,5 +68,6 @@ package() { sha512sums="1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc polkit-0.115.tar.gz 6d68d90e6dc9594175631c99699d4d949fba6d2d1ad66680897f9a17e9dc3c17b44f2bc06ed4f6149931e17a96baaf481981fb0698aace7c81a67c06c2806c29 0001-make-netgroup-support-optional.patch +4a2a11c1de8ef11def9c32b4b595fd45066aeaeb0cb42665846e3c7b8c6f5b7d3a782d722a25889afdb6a4414abed0837a359692342baaeb770d0e9712818ce1 CVE-2018-19788.patch 95493ef842b46ce9e724933a5d86083589075fb452435057b8f629643cac7c7eff67a24fd188087987e98057f0130757fad546d0c090767da3d71ebaf8485a24 fix-consolekit-db-stat.patch 966825aded565432f4fda9e54113a773b514ebf7ee7faa83bcb8b97d218ae84a8707d6747bbc3cb8a828638d692fdef34c05038f150ad38e02a29f2c782aba5b fix-test-fgetpwent.patch" diff --git a/user/polkit/CVE-2018-19788.patch b/user/polkit/CVE-2018-19788.patch new file mode 100644 index 000000000..6a2845aca --- /dev/null +++ b/user/polkit/CVE-2018-19788.patch @@ -0,0 +1,183 @@ +From 35af308b530f36c1a0a912387106a59b3ab92027 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 3 Dec 2018 10:28:58 +0100 +Subject: [PATCH 1/2] Use default of -1 for uid/gid in class initialization + +This doesn't seem to change anything in polkitd behaviour, but it +seems cleaner to default to -1 which here means "unset". +--- + src/polkit/polkitunixgroup.c | 4 ++-- + src/polkit/polkitunixuser.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c +index c57a1aa..095cca0 100644 +--- a/src/polkit/polkitunixgroup.c ++++ b/src/polkit/polkitunixgroup.c +@@ -131,9 +131,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass) + g_param_spec_int ("gid", + "Group ID", + "The UNIX group ID", +- 0, ++ -1, + G_MAXINT, +- 0, ++ -1, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | +diff --git a/src/polkit/polkitunixuser.c b/src/polkit/polkitunixuser.c +index 8bfd3a1..a5285f4 100644 +--- a/src/polkit/polkitunixuser.c ++++ b/src/polkit/polkitunixuser.c +@@ -144,9 +144,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass) + g_param_spec_int ("uid", + "User ID", + "The UNIX user ID", +- 0, ++ -1, + G_MAXINT, +- 0, ++ -1, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | +-- +2.18.1 + + +From fbaab32cb4ed9ed5f1e3eea6cd317d443aa427dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 3 Dec 2018 12:51:26 +0100 +Subject: [PATCH 2/2] Check gid and uid initalization in PolkitUnixUser and + Group objects + +When a user or group above INT32_MAX is created, the numeric uid or +gid wraps around to negative when the value is assigned to gint, and +polkit gets confused. Let's refuse such uids and gids. + +This patch just refuses to initialize uid and gid values to negative. +A nicer fix is to change the underlying type to e.g. gint64 to allow +the full range of values in uid_t and gid_t to be represented. But +this cannot be done without breaking the API, so likely new functions +will have to be added (a polkit_unix_user_new variant that takes a +gint64, and the same for _group_new, _set_uid, _get_uid, _set_gid, +_get_gid, etc.). This will require a bigger patch. + +Fixes https://gitlab.freedesktop.org/polkit/polkit/issues/74. + +Example sessions from uid=4000000000: + +Dec 03 14:35:08 krowka polkitd[21432]: system-bus-name::1.41869 is inquiring whether system-bus-name::1.79432 is authorized for org.freedesktop.systemd1.manage-units +Dec 03 14:35:08 krowka polkitd[21432]: user of caller is unix-user:root +Dec 03 14:35:08 krowka polkitd[21432]: polkit_unix_user_new: assertion 'uid >= 0' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_identity_to_string: assertion 'POLKIT_IS_IDENTITY (identity)' failed +Dec 03 14:35:08 krowka polkitd[21432]: user of subject is (null) +Dec 03 14:35:08 krowka polkitd[21432]: polkit_identity_equal: assertion 'POLKIT_IS_IDENTITY (b)' failed +Dec 03 14:35:08 krowka polkitd[21432]: checking whether system-bus-name::1.79432 is authorized for org.freedesktop.systemd1.manage-units +Dec 03 14:35:08 krowka polkitd[21432]: polkit_unix_user_new: assertion 'uid >= 0' failed +Dec 03 14:35:08 krowka polkitd[21432]: +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_is_challenge: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_ref: assertion 'G_IS_OBJECT (object)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_ref: assertion 'G_IS_OBJECT (object)' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_details: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_is_challenge: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_is_authorized: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_unref: assertion 'G_IS_OBJECT (object)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_unref: assertion 'G_IS_OBJECT (object)' failed +--- + src/polkit/polkitunixgroup.c | 9 ++++++++- + src/polkit/polkitunixuser.c | 7 +++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c +index 095cca0..53db862 100644 +--- a/src/polkit/polkitunixgroup.c ++++ b/src/polkit/polkitunixgroup.c +@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT, + static void + polkit_unix_group_init (PolkitUnixGroup *unix_group) + { ++ unix_group->gid = -1; + } + + static void +@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object, + GParamSpec *pspec) + { + PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object); ++ gint val; + + switch (prop_id) + { + case PROP_GID: +- unix_group->gid = g_value_get_int (value); ++ val = g_value_get_int (value); ++ g_return_if_fail (val >= 0); ++ unix_group->gid = val; + break; + + default: +@@ -169,6 +173,7 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, + gint gid) + { + g_return_if_fail (POLKIT_IS_UNIX_GROUP (group)); ++ g_return_if_fail (gid >= 0); + group->gid = gid; + } + +@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, + PolkitIdentity * + polkit_unix_group_new (gint gid) + { ++ g_return_val_if_fail (gid >= 0, NULL); ++ + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP, + "gid", gid, + NULL)); +diff --git a/src/polkit/polkitunixuser.c b/src/polkit/polkitunixuser.c +index a5285f4..ef6403e 100644 +--- a/src/polkit/polkitunixuser.c ++++ b/src/polkit/polkitunixuser.c +@@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT, + static void + polkit_unix_user_init (PolkitUnixUser *unix_user) + { ++ unix_user->uid = -1; + unix_user->name = NULL; + } + +@@ -112,10 +113,13 @@ polkit_unix_user_set_property (GObject *object, + GParamSpec *pspec) + { + PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object); ++ gint val; + + switch (prop_id) + { + case PROP_UID: ++ val = g_value_get_int (value); ++ g_return_if_fail (val >= 0); + unix_user->uid = g_value_get_int (value); + break; + +@@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, + gint uid) + { + g_return_if_fail (POLKIT_IS_UNIX_USER (user)); ++ g_return_if_fail (uid >= 0); + user->uid = uid; + } + +@@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, + PolkitIdentity * + polkit_unix_user_new (gint uid) + { ++ g_return_val_if_fail (uid >= 0, NULL); ++ + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER, + "uid", uid, + NULL)); +-- +2.18.1 + diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index 0a741eff9..91da76bb6 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=powerdevil -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b77e1990e59bae684d19fd796789aa0216d111952941642c354fc760e862cd5008c923aa5f1783c8699818fdfd36333a2ad56832834e3ce2232905ec399e0846 powerdevil-5.12.6.tar.xz" +sha512sums="e85f93f494d2ce86676269c1bfe49d59a855bbcd5f260bc3205e3b2ef38de5dd17ee47397eca3280e9dcb484c80b79c670a1b2e089891d5090e9ee935504d4c9 powerdevil-5.12.7.tar.xz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 84f7f2cb7..46b61e3c8 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator -pkgver=4.7.2 +pkgver=4.8.0 pkgrel=0 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" @@ -29,4 +29,4 @@ package() { make install INSTALL_ROOT="$pkgdir"/usr } -sha512sums="b7278a7882747acc9be0484e10426becd942746e9b7b9cea7d57e3af72c261c02431c8682e1f9d6e61c5884d5aa06e503716d22157e61d3787327c3c00a452bc qt-creator-opensource-src-4.7.2.tar.gz" +sha512sums="ab107f798dd269a4b487f7838f053c27f20195800db7cbb0e1225282a2b241887102e30c69763b815f0a061d73565c6a358f815647755843e8417b66bebee81c qt-creator-opensource-src-4.8.0.tar.gz" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index bc81a6442..08e623af5 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -1,51 +1,28 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtbase _pkgname=qtbase-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5.9 base components" url="https://www.qt.io/" arch="all" license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-tds $pkgname-x11" -depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev - openssl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev - sqlite-dev dbus-dev perl $_sub" +depends_dev="dbus-dev fontconfig-dev freetype-dev glib-dev libice-dev + libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev openssl-dev perl + sqlite-dev zlib-dev $_sub" makedepends="$depends_dev - at-spi2-core-dev - bison - cups-dev - eudev-dev - flex - freetds-dev - freetype-dev - gperf - gtk+2.0-dev - harfbuzz-dev - hicolor-icon-theme - icu-dev - libinput-dev - libjpeg-turbo-dev - libxkbcommon-dev - libxi-dev - libxrandr-dev - libxrender-dev - libxslt-dev - libxv-dev - mtdev-dev - pcre2-dev - postgresql-dev - unixodbc-dev - xcb-util-dev - xcb-util-image-dev - xcb-util-keysyms-dev - xcb-util-wm-dev - xcb-util-renderutil-dev - cmd:which + at-spi2-core-dev bison cups-dev eudev-dev flex freetds-dev freetype-dev + gperf gtk+2.0-dev harfbuzz-dev hicolor-icon-theme icu-dev + libexecinfo-dev libinput-dev libjpeg-turbo-dev libxkbcommon-dev + libxi-dev libxrandr-dev libxrender-dev libxslt-dev libxv-dev mtdev-dev + pcre2-dev postgresql-dev unixodbc-dev xcb-util-dev xcb-util-image-dev + xcb-util-keysyms-dev xcb-util-wm-dev xcb-util-renderutil-dev cmd:which " subpackages="$pkgname-dev $pkgname-doc $_sub" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz + link-to-execinfo.patch qt-musl-iconv-no-bom.patch " @@ -59,7 +36,7 @@ prepare() { sed -i -e "s|-O2|$CXXFLAGS|" \ -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ - mkspecs/common/*.conf + mkspecs/common/linux.conf } build() { @@ -70,7 +47,7 @@ build() { ./configure -confirm-license -opensource \ -archdatadir "$_qt5_prefix" \ - -bindir "$_qt5_prefix"/bin \ + -bindir "$_qt5_prefix"/bin \ -datadir "$_qt5_datadir" \ -dbus-linked \ -docdir /usr/share/doc/qt5 \ @@ -79,8 +56,8 @@ build() { -icu \ -importdir "$_qt5_prefix"/imports \ -libexecdir "$_qt5_prefix"/libexec \ - -no-rpath \ -no-pch \ + -no-rpath \ -nomake examples \ -opengl \ -openssl-linked \ @@ -195,5 +172,6 @@ x11() { return 0 } -sha512sums="e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb qtbase-opensource-src-5.9.6.tar.xz +sha512sums="7121837501b810f31863fbb3a6ea7189d3e38789ff25eb49b639a69b73913761c8cba18b65046519693d2f5c8755c2197feff1df1ec3d88676d00c649a326e1e qtbase-opensource-src-5.9.7.tar.xz +ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444 qt-musl-iconv-no-bom.patch" diff --git a/user/qt5-qtbase/link-to-execinfo.patch b/user/qt5-qtbase/link-to-execinfo.patch new file mode 100644 index 000000000..e7cb6ea18 --- /dev/null +++ b/user/qt5-qtbase/link-to-execinfo.patch @@ -0,0 +1,10 @@ +--- qtbase-opensource-src-5.9.7/mkspecs/common/linux.conf.old 2018-12-06 18:58:21.200000000 +0000 ++++ qtbase-opensource-src-5.9.7/mkspecs/common/linux.conf 2018-12-06 19:08:00.980000000 +0000 +@@ -28,6 +28,7 @@ + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl ++QMAKE_LIBS_EXECINFO = -lexecinfo + QMAKE_LIBS_X11 = -lXext -lX11 -lm + QMAKE_LIBS_EGL = -lEGL + QMAKE_LIBS_OPENGL = -lGL diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index f1b687ec6..2db5a1d17 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtdeclarative _pkgname=${pkgname/qt5-/}-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2" url="https://www.qt.io/" arch="all" @@ -35,5 +35,5 @@ package() { done } -sha512sums="1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39 qtdeclarative-opensource-src-5.9.6.tar.xz +sha512sums="bccddeca26c317083fcebc182dd3221dcbe9af665c502bfb636907f2c17a6edd8874a964910423c9eaa6e5c68bf5a13520193ba77f915be08ba1982348d2a9ee qtdeclarative-opensource-src-5.9.7.tar.xz 065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch" diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD index 0e7de1aaa..c4a476b9f 100644 --- a/user/qt5-qtgraphicaleffects/APKBUILD +++ b/user/qt5-qtgraphicaleffects/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtgraphicaleffects _pkgname=qtgraphicaleffects-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Pre-made visual effects for QML" url="https://www.qt.io/" @@ -29,4 +29,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a319dd594bd9048242512cefddf8db0474677d48a03c7616633d7e3b7dd6637ff2c7cce206d25d3938a6b3f3cc7ffc037630e5923caea0bfa7612e99522e36ea qtgraphicaleffects-opensource-src-5.9.6.tar.xz" +sha512sums="914e70403b9529071f13b3f7af596f4b06f1988d59e0ea5915cc6f5b8b2e1b38eaab50e2cbe5a895d0f5be4f99c3ec62b32d629083ff3dc1fce413acb2615c0f qtgraphicaleffects-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD index cf71e6071..9b677708a 100644 --- a/user/qt5-qtmultimedia/APKBUILD +++ b/user/qt5-qtmultimedia/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtmultimedia _pkgname=qtmultimedia-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Audio, video, radio, and camera libraries" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207 qtmultimedia-opensource-src-5.9.6.tar.xz" +sha512sums="a5c947cb8764e63e81187db01caefa588bab77705b03ed0dff09433b0831f55f2461c64f2ce99085c7bfcac795ae67dd69ac7a992ef8d04c043d237e2c95e4c6 qtmultimedia-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index e10d6b170..5bb8daf6f 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtpositioning _pkgname=qtlocation-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5 - Geolocation services" url="https://www.qt.io/" arch="all" @@ -33,5 +33,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a qtlocation-opensource-src-5.9.6.tar.xz +sha512sums="a0ee0d699ecf568eb9371ff0743f9ec65f568e235e8964a2e3187a3135fc943795101c8922fbe560779f7878f44a630383234a65ed67aea35d084ce04eeb7a96 qtlocation-opensource-src-5.9.7.tar.xz 8590335ae90ade1c685ff99fb4319d1b7448d2ae15ba999e3dc9a29e62eda3db587d8ee366dc68fad6eb9e0872532d50f0bdc74f4689a554ca095ad24967418c no-getting-thread-names.patch" diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD index 466046164..7666875ce 100644 --- a/user/qt5-qtquickcontrols/APKBUILD +++ b/user/qt5-qtquickcontrols/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols _pkgname=qtquickcontrols-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - controls for use with Qt Quick" url="https://www.qt.io/" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="1a48ede02a0a0ddca6475ec952684045638a61a0db9f545b8ad8b2115f93f3a5586655a24138545d168196a3990f2c6dbef18530af546c60026e1eac91ca832e qtquickcontrols-opensource-src-5.9.6.tar.xz" +sha512sums="87b8af09035f77bf02e6995a173d381536c50896604dcd884f7adede4d70464d5ee28161fda7b449ad851a728254cee00b7984099c4c9f024623a16157c0a656 qtquickcontrols-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD index 3d1ca5113..274ff17bf 100644 --- a/user/qt5-qtquickcontrols2/APKBUILD +++ b/user/qt5-qtquickcontrols2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols2 _pkgname=qtquickcontrols2-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Quick Controls 2.0" url="https://www.qt.io/" @@ -10,7 +10,8 @@ arch="all" options="!check" # Impossible to test with accelerated X desktop license="LGPLv2 with exceptions OR GPLv3 with exceptions" depends="" -makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" +depends_dev="qt5-qtdeclarative-dev" +makedepends="$depends_dev qt5-qtbase-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver @@ -26,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="46817c31a62de3cce4179869c3080e12d2dcb3859af9020fc476baddc184ef7a7b8dfb0ccd2501c72e689c5d64c3d9135eeb1f7dfc821f06aa124addc4dc4d7d qtquickcontrols2-opensource-src-5.9.6.tar.xz" +sha512sums="591a3b5ee53f681d1c9906451db76c89c12e9ccdc0cdbbb18937550612149505ba415f85d3acf2c01ab6c6b9aab279388fb2e6b501daf9ac49095b20eaeac032 qtquickcontrols2-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD index 940d23e5a..16237b5c6 100644 --- a/user/qt5-qtscript/APKBUILD +++ b/user/qt5-qtscript/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtscript _pkgname=qtscript-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Deprecated scripting framework for Qt applications" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46 qtscript-opensource-src-5.9.6.tar.xz" +sha512sums="e019d2e7aa29e1183636503822db960d97f1787fa7517f286acbe42645f2c5daa099cc251ac6640e3243dedb4ef64e509f2e22bca798a7e583063e0ac7635662 qtscript-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD index 152d9eabe..bc363c58b 100644 --- a/user/qt5-qtsensors/APKBUILD +++ b/user/qt5-qtsensors/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsensors _pkgname=qtsensors-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Library for interfacing with sensors" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="1c82b0e02bc45c914fbc620049b2f4e33bdd0ff858c2f3946d134e4e5dc5927358ff53db0b6d9fcbb6811e36d2a816aacf7f852f377ecff47280ca592eaa92c3 qtsensors-opensource-src-5.9.6.tar.xz" +sha512sums="b07c5a79e9f1db5d64bef6fb92954c7467858d5f00f9bc96f8f7c8651121c1c57de7d21b273827830814919b5fa19720515d3a2dab77bf87876e60fdaedae788 qtsensors-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD index 78ce5b969..afbf09362 100644 --- a/user/qt5-qtserialport/APKBUILD +++ b/user/qt5-qtserialport/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtserialport _pkgname=qtserialport-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Connect Qt applications to serial ports" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847 qtserialport-opensource-src-5.9.6.tar.xz" +sha512sums="a90cfec383f2c1e8240bbcb0fe18c99773833d0749499e3b379d669b6053eaceea7813665068b2512cdc5c57cef5dafbdd9928e8f3d133405fb02c4c0c44e80b qtserialport-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD index f3d5b3b94..d0c96bdc6 100644 --- a/user/qt5-qtsvg/APKBUILD +++ b/user/qt5-qtsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsvg _pkgname=qtsvg-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - SVG rendering library" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4 qtsvg-opensource-src-5.9.6.tar.xz" +sha512sums="d2e58ff0321fd40031dbbc0d0b0a8bb321cae2dc64bb4afec3c72ed9b5a25d67b156971d7a5ea4f74d966a3e8cda779474ee932ab129fa0b26f12978feebcd84 qtsvg-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD index 05a6b8652..da0fd89c1 100644 --- a/user/qt5-qttools/APKBUILD +++ b/user/qt5-qttools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qttools _pkgname=qttools-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Tools for Qt development" url="https://www.qt.io/" @@ -119,7 +119,7 @@ _dbusviewer() { usr/share/icons/hicolor/*/apps/qdbusviewer* } -sha512sums="2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 qttools-opensource-src-5.9.6.tar.xz +sha512sums="0240881adf23d3b5841882e107969ed298ee05b82c125a7577b568b29d4402259d459e534408f8768ce419c61a8c974c35454cb94c9387e160fd308209188b8a qttools-opensource-src-5.9.7.tar.xz d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD index 2306ceeaf..95a4371fd 100644 --- a/user/qt5-qtwebchannel/APKBUILD +++ b/user/qt5-qtwebchannel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebchannel _pkgname=qtwebchannel-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Connect Qt applications to WebSockets" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="f2c4ceb7efba18ffbb2b3bf11b04c158c601ce82eadfcadeccbb81405db0ff2275fe4a5706872adaa6faa6ab2c1f1f6b6fdeeeb09e127e3b9dbfeac5a4eb7ab5 qtwebchannel-opensource-src-5.9.6.tar.xz" +sha512sums="0109f11dd9c83e8dbf50921abb642a5e185fda98ead87973bd1b24c1f490268f2a9c7d264da659f7eac1f98942aecc839d7418abce0e7d2a66093b9b89eb4bca qtwebchannel-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD index 2d7914eb3..70f2ce8f0 100644 --- a/user/qt5-qtwebsockets/APKBUILD +++ b/user/qt5-qtwebsockets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebsockets _pkgname=qtwebsockets-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Pure Qt implementation of WebSockets" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd qtwebsockets-opensource-src-5.9.6.tar.xz" +sha512sums="ee5d1eab254a55791ca7414066c1661614605d6a193305d687aa3321bb69fb59fe6c877153cee1ea4321a91721e42b8fafcaa4cda418c6edc057dc3683c73756 qtwebsockets-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD index d3d895012..ed049fe33 100644 --- a/user/qt5-qtx11extras/APKBUILD +++ b/user/qt5-qtx11extras/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtx11extras _pkgname=qtx11extras-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Extra libraries for X11 support" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="22bb33a40e242f54caca075ef53e1401ed82f094f87526bb24e8c85227ef56364c78b0c8287a173c38aabc7ca3be833d13d5156f3b3553a57bf74ceab1831be1 qtx11extras-opensource-src-5.9.6.tar.xz" +sha512sums="04803755cabc449dd35c20a5ec7f4836fec5e9f4e28daf8a577e66385e9698139a1ae23a29ade8f0c5a766665a137497eaff3c55746879b9c2fe85c38710d37f qtx11extras-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD index 3ec06d9db..7885359f2 100644 --- a/user/qt5-qtxmlpatterns/APKBUILD +++ b/user/qt5-qtxmlpatterns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtxmlpatterns _pkgname=qtxmlpatterns-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Support for XPath, XQuery, XSLT, and XML schema validation" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788 qtxmlpatterns-opensource-src-5.9.6.tar.xz" +sha512sums="d24f983eaf0414b5b5dbbd8e60cfc87d4d742aae82b457e5d77c01a0534620f30f4507e1c71ce4bbe2a16eeafd6dde566c8d11bccea04c5668189936cc44aca3 qtxmlpatterns-opensource-src-5.9.7.tar.xz" diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index fec6e443e..19d4af447 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@adelielinux.org> pkgname=sddm-kcm -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f9b43d4dba83c80b6cac1a55f8a7e99c500a01578a67354d8c54d049ff42ffb1a7b0ba2912e089a382b960397b4031b46e49882ba272d9ebd5c60dde843077fd sddm-kcm-5.12.6.tar.xz" +sha512sums="29d7b03378a6d5a3d58a0c2b85f6dbe4d0114785456072f16872cd09e7ce355f4e59149e31cb69fe7fbb35678c6fc075c788a091c3b638661a64a856aa4a145b sddm-kcm-5.12.7.tar.xz" diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 03ac76c89..58d109aed 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=systemsettings -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a34cf8277751f956d9d7369c99d9999d8315f34b1d0975dbed375a12b35727dcaefd78582ba627f2c649fdf3371fa99acddcfe7fe262545795b4a7f10c4f53b3 systemsettings-5.12.6.tar.xz" +sha512sums="cc8f5cdd2275816f1e7c6af2b5d06a018a35646460a71ce6ec7ab7dda7d286139836b3625239cb45316f2f7dd1f12d260ffdb44064b349948d93929654363735 systemsettings-5.12.7.tar.xz" diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD index c5f4203e7..7adeefa35 100644 --- a/user/tcpdump/APKBUILD +++ b/user/tcpdump/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcpdump pkgver=4.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -10,7 +10,13 @@ license="BSD-3-Clause" depends="" makedepends="libpcap-dev openssl-dev perl" subpackages="$pkgname-doc" -source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz" +source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz + CVE-2018-19519.patch + " + +# secfixes: +# 4.9.2-r1: +# - CVE-2018-19519 build () { cd "$builddir" @@ -35,4 +41,5 @@ package() { rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz" +sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz +eb4232e434064ec59b07840aa394cfcc05c89e817f2d4ebeb4da1dbb1c910fe1805857356d6304ebdb16e32aa6476ce90f164aabc60501b493fd5601b380af7e CVE-2018-19519.patch" diff --git a/user/tcpdump/CVE-2018-19519.patch b/user/tcpdump/CVE-2018-19519.patch new file mode 100644 index 000000000..ac3293927 --- /dev/null +++ b/user/tcpdump/CVE-2018-19519.patch @@ -0,0 +1,10 @@ +--- tcpdump-4.9.2/print-hncp.c.old 2017-09-03 23:17:14.000000000 +0000 ++++ tcpdump-4.9.2/print-hncp.c 2018-12-07 19:31:24.360000000 +0000 +@@ -228,6 +228,7 @@ + snprintf(buf, sizeof(buf), "%s/%d", ipaddr_string(ndo, &addr), plen); + plenbytes += 1 + IPV4_MAPPED_HEADING_LEN; + } else { ++ buf[0] = '\0'; + plenbytes = decode_prefix6(ndo, prefix, max_length, buf, sizeof(buf)); + } + diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 7db6632a1..1d8f2de92 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -61,6 +61,7 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev " source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz check-headless.patch + CVE-2018-19857.patch disable-sub-autodetect-fuzzy-1-test.patch endian-fix.patch fix-testing.patch @@ -71,6 +72,10 @@ source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz vlc-libs.trigger " +# secfixes: +# 3.0.4-r2: +# - CVE-2018-19857 + prepare() { default_prepare NOCONFIGURE=1 ./bootstrap @@ -295,6 +300,7 @@ plugins_visualization() { _mv_plugins visualization; } sha512sums="55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 vlc-3.0.4.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch +57a2b843b4b80d3887ca0141b9ea1a00752473861846a6c988553faa58650eb42cc2cd011503dce075c8a5dcabf834e449397c3cdbfdcb291ae7a41d218512da CVE-2018-19857.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch diff --git a/user/vlc/CVE-2018-19857.patch b/user/vlc/CVE-2018-19857.patch new file mode 100644 index 000000000..a65dcef20 --- /dev/null +++ b/user/vlc/CVE-2018-19857.patch @@ -0,0 +1,34 @@ +From 0cc5ea748ee5ff7705dde61ab15dff8f58be39d0 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sat, 1 Dec 2018 23:32:18 +0200 +Subject: [PATCH] caf: fix integer underflow + +Pointed-out-by: Hans Jerry Illikainen <hji@dyntopia.com> +--- + modules/demux/caf.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/modules/demux/caf.c b/modules/demux/caf.c +index cc312a5a30..39b381f963 100644 +--- a/modules/demux/caf.c ++++ b/modules/demux/caf.c +@@ -691,14 +691,13 @@ static int ReadKukiChunk( demux_t *p_demux, uint64_t i_size ) + demux_sys_t *p_sys = p_demux->p_sys; + const uint8_t *p_peek; + +- /* vlc_stream_Peek can't handle sizes bigger than INT32_MAX, and also p_sys->fmt.i_extra is of type 'int'*/ +- if( i_size > INT32_MAX ) ++ if( i_size > SSIZE_MAX ) + { + msg_Err( p_demux, "Magic Cookie chunk too big" ); + return VLC_EGENERIC; + } + +- if( (unsigned int)vlc_stream_Peek( p_demux->s, &p_peek, (int)i_size ) < i_size ) ++ if( vlc_stream_Peek( p_demux->s, &p_peek, i_size ) < (ssize_t)i_size ) + { + msg_Err( p_demux, "Couldn't peek extra data" ); + return VLC_EGENERIC; +-- +2.11.0 + |