mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 09:37:15 +08:00
Remove patch, add provides
This commit is contained in:
Manuel
parent
740a02f752
commit
63b512db4a
@ -37,10 +37,8 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}"
|
||||
'system-config-printer-common' 'libarchive' 'qimageblitz'
|
||||
'p7zip' 'zip' 'unzip' 'unrar' "kdepim-runtime>=${_kdever}" 'docbook-xsl')
|
||||
|
||||
source=("$_mirror/${pkgbase}-$_kdever.tar.bz2"
|
||||
"fix-ark-security.diff")
|
||||
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
'01f4244af8af3a09c955ed13daba75cc')
|
||||
source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
|
||||
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
|
||||
|
||||
|
||||
#
|
||||
@ -49,9 +47,7 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
build()
|
||||
{
|
||||
# fixes
|
||||
msg "applying fixes ..."
|
||||
cd "${srcdir}"/${pkgbase}-${pkgver}/ark
|
||||
patch -p1 -i ${srcdir}/fix-ark-security.diff || return 1
|
||||
# msg "applying fixes ..."
|
||||
|
||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
||||
|
||||
@ -78,6 +74,7 @@ package_kdeutils-ark()
|
||||
optdepends=('p7zip' 'zip' 'unzip' 'unrar')
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('ark')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="ark"
|
||||
@ -93,6 +90,7 @@ package_kdeutils-kcalc()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kcalc')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kcalc"
|
||||
@ -108,6 +106,7 @@ package_kdeutils-kcharselect()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kcharselect')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kcharselect"
|
||||
@ -123,6 +122,7 @@ package_kdeutils-kdelirc()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kdelirc')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kdelirc"
|
||||
@ -142,6 +142,7 @@ package_kdeutils-kdessh()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kdessh')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kdessh"
|
||||
@ -157,6 +158,7 @@ package_kdeutils-kdf()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kdf')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kdf"
|
||||
@ -172,6 +174,7 @@ package_kdeutils-kfloppy()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kfloppy')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kfloppy"
|
||||
@ -187,6 +190,7 @@ package_kdeutils-kgpg()
|
||||
depends=("kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}" 'kde-agent') # "kdepim-runtime>=${_kdever}"
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kgpg')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kgpg"
|
||||
@ -202,6 +206,7 @@ package_kdeutils-ktimer()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('ktimer')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="ktimer"
|
||||
@ -217,6 +222,7 @@ package_kdeutils-kwallet()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('kwallet')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="kwallet"
|
||||
@ -247,6 +253,7 @@ package_kdeutils-superkaramba()
|
||||
depends=('qimageblitz')
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('superkaramba')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="superkaramba"
|
||||
@ -262,6 +269,7 @@ package_kdeutils-sweeper()
|
||||
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
|
||||
conflicts=("kdeutils-common" "kdeutils-doc")
|
||||
groups=("kde" "kdeutils" "kde-uninstall")
|
||||
provides=('sweeper')
|
||||
install=${pkgbase}.install
|
||||
|
||||
splitdirs="sweeper"
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/part/part.cpp
|
||||
+++ b/part/part.cpp
|
||||
@@ -558,8 +558,15 @@ void Part::slotPreviewExtracted(KJob *jo
|
||||
if (!job->error()) {
|
||||
const ArchiveEntry& entry =
|
||||
m_model->entryForIndex(m_view->selectionModel()->currentIndex());
|
||||
- const QString fullName =
|
||||
- m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString();
|
||||
+
|
||||
+ QString fullName =
|
||||
+ m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString();
|
||||
+
|
||||
+ // Make sure a maliciously crafted archive with parent folders named ".." do
|
||||
+ // not cause the previewed file path to be located outside the temporary
|
||||
+ // directory, resulting in a directory traversal issue.
|
||||
+ fullName.remove(QLatin1String("../"));
|
||||
+
|
||||
ArkViewer::view(fullName, widget());
|
||||
} else {
|
||||
KMessageBox::error(widget(), job->errorString());
|
||||
Loading…
Reference in New Issue
Block a user