diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-09-03 14:48:14 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-09-03 14:48:14 +0000 |
| commit | a2cb94c52a1bdab2d5419c23333c4fba9867c067 (patch) | |
| tree | e14fdcbd1bcaa2cd0cacc1eb9739433b5270afd9 /archivers/ark | |
| parent | 87064b991117c491ea59292a4263146dbb3ac7eb (diff) | |
| download | freebsd-ports-a2cb94c52a1bdab2d5419c23333c4fba9867c067.zip | |
Update KDE Applications (release-service) to 20.08.1
Diffstat (limited to 'archivers/ark')
| -rw-r--r-- | archivers/ark/Makefile | 3 | ||||
| -rw-r--r-- | archivers/ark/distinfo | 6 | ||||
| -rw-r--r-- | archivers/ark/files/patch-cve_2020-24654 | 54 |
3 files changed, 4 insertions, 59 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 5a46737b0d7f..d676eb0ab1ab 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -2,7 +2,6 @@ PORTNAME= ark DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 CATEGORIES= archivers kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -42,6 +41,6 @@ ZIP_LIB_DEPENDS= libzip.so:archivers/libzip ZIP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_LibZip # Override shared library version -KDE_APPLICATIONS_SHLIB_VER=20.8.0 +KDE_APPLICATIONS_SHLIB_VER=20.8.1 .include <bsd.port.mk> diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index 6353108cde90..48e665a5e57a 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596814078 -SHA256 (KDE/release-service/20.08.0/ark-20.08.0.tar.xz) = 7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098 -SIZE (KDE/release-service/20.08.0/ark-20.08.0.tar.xz) = 2708180 +TIMESTAMP = 1598945351 +SHA256 (KDE/release-service/20.08.1/ark-20.08.1.tar.xz) = 32e8546b186b88efc9d4688e02def0b6225d921f9b92cfcd328417f09ec0f725 +SIZE (KDE/release-service/20.08.1/ark-20.08.1.tar.xz) = 2709500 diff --git a/archivers/ark/files/patch-cve_2020-24654 b/archivers/ark/files/patch-cve_2020-24654 deleted file mode 100644 index e1f8f3d7c50f..000000000000 --- a/archivers/ark/files/patch-cve_2020-24654 +++ /dev/null @@ -1,54 +0,0 @@ -From 8bf8c5ef07b0ac5e914d752681e470dea403a5bd Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Tue, 25 Aug 2020 22:14:37 +0200 -Subject: [PATCH] Pass the ARCHIVE_EXTRACT_SECURE_SYMLINKS flag to libarchive - -There are archive types which allow to first create a symlink and then -later on dereference it. If the symlink points outside of the archive, -this results in writing outside of the destination directory. - -With the ARCHIVE_EXTRACT_SECURE_SYMLINKS option set, libarchive avoids -this situation by verifying that none of the target path components are -symlinks before writing. - -Remove the commented out code in the method, which would actually -misbehave if enabled again. - -Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de> ---- - plugins/libarchive/libarchiveplugin.cpp | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp -index 50e81da1..8a0fed21 100644 ---- plugins/libarchive/libarchiveplugin.cpp -+++ plugins/libarchive/libarchiveplugin.cpp -@@ -509,21 +509,9 @@ void LibarchivePlugin::emitEntryFromArchiveEntry(struct archive_entry *aentry) - - int LibarchivePlugin::extractionFlags() const - { -- int result = ARCHIVE_EXTRACT_TIME; -- result |= ARCHIVE_EXTRACT_SECURE_NODOTDOT; -- -- // TODO: Don't use arksettings here -- /*if ( ArkSettings::preservePerms() ) -- { -- result &= ARCHIVE_EXTRACT_PERM; -- } -- -- if ( !ArkSettings::extractOverwrite() ) -- { -- result &= ARCHIVE_EXTRACT_NO_OVERWRITE; -- }*/ -- -- return result; -+ return ARCHIVE_EXTRACT_TIME -+ | ARCHIVE_EXTRACT_SECURE_NODOTDOT -+ | ARCHIVE_EXTRACT_SECURE_SYMLINKS; - } - - void LibarchivePlugin::copyData(const QString& filename, struct archive *dest, bool partialprogress) --- -GitLab - - |