summaryrefslogtreecommitdiff
path: root/user/okular
diff options
context:
space:
mode:
Diffstat (limited to 'user/okular')
-rw-r--r--user/okular/APKBUILD10
-rw-r--r--user/okular/CVE-2020-9359.patch27
2 files changed, 4 insertions, 33 deletions
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index 4e9567438..bbe52bb34 100644
--- a/user/okular/APKBUILD
+++ b/user/okular/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=okular
-pkgver=19.12.3
-pkgrel=1
+pkgver=20.04.2
+pkgrel=0
pkgdesc="Universal document reader developed by KDE"
url="https://okular.kde.org/"
arch="all"
@@ -18,7 +18,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz
es-doc-fix.patch
- CVE-2020-9359.patch
"
# secfixes:
@@ -49,6 +48,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz
-de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch
-02b27bd206006dbbafbe74e60665ad5159ef6ea32b8bf1526b9c655c046cb6de08630f28d64c9935e73d5707a30d0835f2ab8cd4521740e5236cefc3d3057d29 CVE-2020-9359.patch"
+sha512sums="1f6f22a221701d25a0e0eef094cb60b8b66722ac158c0ac499010448504b507c72fedd33814b3920ba3ab5eb53a2c8b09505b7a7697bde589d89407e0cdbf961 okular-20.04.2.tar.xz
+de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch"
diff --git a/user/okular/CVE-2020-9359.patch b/user/okular/CVE-2020-9359.patch
deleted file mode 100644
index 34ff3e2ce..000000000
--- a/user/okular/CVE-2020-9359.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 10 Mar 2020 23:07:24 +0100
-Subject: [PATCH] Document::processAction: If the url points to a binary, don't
- run it
-
----
- core/document.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/document.cpp b/core/document.cpp
-index 3215a1abc..0aa5b6980 100644
---- a/core/document.cpp
-+++ b/core/document.cpp
-@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action )
- {
- const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url);
- // KRun autodeletes
-- new KRun( realUrl, d->m_widget );
-+ KRun *r = new KRun( realUrl, d->m_widget );
-+ r->setRunExecutables(false);
- }
- }
- } break;
---
-2.25.2
-