diff options
| author | Bart Ribbers <bribbers@disroot.org> | 2020-04-24 13:45:31 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-04-29 12:14:48 +0000 |
| commit | 864c859e9deeda2c68e8310550ca3c6d70a28dd7 (patch) | |
| tree | 563a4f34e066ef22550ad61b1a57ef73b73a01e7 /community/okular | |
| parent | 8299de333bd41be1fe498d779f960ae216b9b5d7 (diff) | |
| download | aports-864c859e9deeda2c68e8310550ca3c6d70a28dd7.tar.bz2 aports-864c859e9deeda2c68e8310550ca3c6d70a28dd7.tar.xz | |
community/kde-applications: upgrade to 20.04.0
Diffstat (limited to 'community/okular')
| -rw-r--r-- | community/okular/APKBUILD | 19 | ||||
| -rw-r--r-- | community/okular/CVE-2020-9359.patch | 27 |
2 files changed, 5 insertions, 41 deletions
diff --git a/community/okular/APKBUILD b/community/okular/APKBUILD index fb9125458a..532e98e42c 100644 --- a/community/okular/APKBUILD +++ b/community/okular/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=okular -pkgver=19.12.3 -pkgrel=1 +pkgver=20.04.0 +pkgrel=0 arch="all !armhf" # armhf blocked by kirigami2 -> qt5-qtdeclarative url="https://kde.org/applications/office/org.kde.okular" pkgdesc="A universal document viewer" @@ -15,23 +15,15 @@ makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtspeech-dev karchive-dev kactivities-dev phonon-dev purpose-dev zlib-dev poppler-qt5-dev kirigami2-dev qca-dev kpty-dev" checkdepends="xvfb-run" -source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz - CVE-2020-9359.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-common $pkgname-mobile" -# secfixes: -# 19.12.3-r0: -# - CVE-2020-9359 - build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_OKULARKIRIGAMI=ON \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" + -DOKULAR_UI=both make -C build } @@ -73,5 +65,4 @@ mobile() { mv "$pkgdir"/usr/share/applications/org.kde.mobile* "$subpkgdir"/usr/share/applications/ } -sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz -2d8870f1aa63defcf2ecfd42c0dfb0d474af6885c2448566704795d7caa2e9c20e5ede284db58139ea5736d5d0074d23c023a89f359d09fd6051d1f03f561903 CVE-2020-9359.patch" +sha512sums="97d999618cb6042108a420963154cccbc67e2cf96c0afef4ffb46c7c2cfbf976a316cc277cd78e7e67af7f405b4426cb6edb6cd51c736a1a5071fdb428d3b55d okular-20.04.0.tar.xz" diff --git a/community/okular/CVE-2020-9359.patch b/community/okular/CVE-2020-9359.patch deleted file mode 100644 index e7d7248762..0000000000 --- a/community/okular/CVE-2020-9359.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Tue, 10 Mar 2020 23:07:24 +0100 -Subject: [PATCH] Document::processAction: If the url points to a binary, don't - run it - ---- - core/document.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/core/document.cpp b/core/document.cpp -index 3215a1abc..0aa5b6980 100644 ---- a/core/document.cpp -+++ b/core/document.cpp -@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action ) - { - const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url); - // KRun autodeletes -- new KRun( realUrl, d->m_widget ); -+ KRun *r = new KRun( realUrl, d->m_widget ); -+ r->setRunExecutables(false); - } - } - } break; --- -2.24.1 - |