diff -Nru karchive-5.38.0/CMakeLists.txt karchive-5.42.0/CMakeLists.txt --- karchive-5.38.0/CMakeLists.txt 2017-09-02 08:50:57.000000000 +0000 +++ karchive-5.42.0/CMakeLists.txt 2018-01-05 23:41:02.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.38.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts project(KArchive VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.38.0 NO_MODULE) +find_package(ECM 5.42.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru karchive-5.38.0/debian/changelog karchive-5.42.0/debian/changelog --- karchive-5.38.0/debian/changelog 2017-09-11 12:14:01.000000000 +0000 +++ karchive-5.42.0/debian/changelog 2018-01-13 14:59:17.000000000 +0000 @@ -1,3 +1,22 @@ +karchive (5.42.0-0ubuntu1~ubuntu17.10~ppa1) artful; urgency=medium + + * New upstream release (5.42.0) + + -- Rik Mills Sat, 13 Jan 2018 14:59:17 +0000 + +karchive (5.41.0-0ubuntu1) bionic; urgency=low + + * New upstream release (5.41.0) + + -- Walter Lapchynski Sun, 10 Dec 2017 22:03:03 -0600 + +karchive (5.40.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.39.0) + * New upstream release (5.40.0) + + -- Rik Mills Fri, 24 Nov 2017 17:15:04 +0000 + karchive (5.38.0-0ubuntu1) artful; urgency=medium * Update sybmols from build logs. Remove private symbols now upstream diff -Nru karchive-5.38.0/debian/control karchive-5.42.0/debian/control --- karchive-5.38.0/debian/control 2017-09-11 12:14:01.000000000 +0000 +++ karchive-5.42.0/debian/control 2018-01-13 14:59:17.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.38.0~), + extra-cmake-modules (>= 5.42.0~), libbz2-dev, liblzma-dev, pkg-kde-tools (>= 0.15.16~), diff -Nru karchive-5.38.0/.reviewboardrc karchive-5.42.0/.reviewboardrc --- karchive-5.38.0/.reviewboardrc 2017-09-02 08:50:57.000000000 +0000 +++ karchive-5.42.0/.reviewboardrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -REPOSITORY = 'git://anongit.kde.org/karchive' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -Nru karchive-5.38.0/src/k7zip.cpp karchive-5.42.0/src/k7zip.cpp --- karchive-5.38.0/src/k7zip.cpp 2017-09-02 08:50:57.000000000 +0000 +++ karchive-5.42.0/src/k7zip.cpp 2018-01-05 23:41:02.000000000 +0000 @@ -871,9 +871,8 @@ packSizes.append(readNumber()); } - int type; for (;;) { - type = readByte(); + int type = readByte(); if (type == kEnd) { break; } @@ -1730,9 +1729,7 @@ unpackSizes.append(symLink.size()); } fileInfos.append(fileInfo); - } - - if (entry->isDirectory()) { + } else if (entry->isDirectory()) { fileInfo->attributes = FILE_ATTRIBUTE_DIRECTORY; fileInfo->attributes |= FILE_ATTRIBUTE_UNIX_EXTENSION + ((entry->permissions() & 0xFFFF) << 16); fileInfo->isDir = true; diff -Nru karchive-5.38.0/src/ktar.cpp karchive-5.42.0/src/ktar.cpp --- karchive-5.38.0/src/ktar.cpp 2017-09-02 08:50:57.000000000 +0000 +++ karchive-5.42.0/src/ktar.cpp 2018-01-05 23:41:02.000000000 +0000 @@ -501,6 +501,8 @@ Q_ASSERT(isdir); if (isdir) { setRootDir(static_cast(e)); + } else { + delete e; } } else { rootDir()->addEntry(e); diff -Nru karchive-5.38.0/src/kzip.cpp karchive-5.42.0/src/kzip.cpp --- karchive-5.38.0/src/kzip.cpp 2017-09-02 08:50:57.000000000 +0000 +++ karchive-5.42.0/src/kzip.cpp 2018-01-05 23:41:02.000000000 +0000 @@ -450,8 +450,6 @@ // KArchive::open() opened the underlying device already. quint64 offset = 0; // holds offset, where we read - int n; - // contains information gathered from the local file headers QHash pfi_map; @@ -463,7 +461,7 @@ for (;;) { // repeat until 'end of entries' signature is reached //qCDebug(KArchiveLog) << "loop starts"; //qCDebug(KArchiveLog) << "dev->pos() now : " << dev->pos(); - n = dev->read(buffer, 4); + int n = dev->read(buffer, 4); if (n < 4) { setErrorString(tr("Invalid ZIP file. Unexpected end of file. (Error code: %1)").arg(1));