From owner-svn-ports-all@freebsd.org Sat Mar 9 19:23:06 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DDFF1533116; Sat, 9 Mar 2019 19:23:06 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E65726ECE8; Sat, 9 Mar 2019 19:23:05 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D632FFCC3; Sat, 9 Mar 2019 19:23:05 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x29JN54k039910; Sat, 9 Mar 2019 19:23:05 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x29JN5hC039909; Sat, 9 Mar 2019 19:23:05 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201903091923.x29JN5hC039909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 9 Mar 2019 19:23:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495197 - in head/archivers/ark: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/archivers/ark: . files X-SVN-Commit-Revision: 495197 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E65726ECE8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 19:23:06 -0000 Author: rakuco Date: Sat Mar 9 19:23:05 2019 New Revision: 495197 URL: https://svnweb.freebsd.org/changeset/ports/495197 Log: Backport patch to fix creation of .tar archives when ZTD support is enabled. As the patch says, when ZSTD support is present creating a regular .tar archive will end up creating a zstd file instead. In my tests, this prevented adding/remove entries from the archive at all. MFH: 2019Q1 Added: head/archivers/ark/files/patch-git_a3bcf9bec (contents, props changed) Modified: head/archivers/ark/Makefile Modified: head/archivers/ark/Makefile ============================================================================== --- head/archivers/ark/Makefile Sat Mar 9 19:16:34 2019 (r495196) +++ head/archivers/ark/Makefile Sat Mar 9 19:23:05 2019 (r495197) @@ -2,7 +2,7 @@ PORTNAME= ark DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers kde kde-applications MAINTAINER= kde@FreeBSD.org Added: head/archivers/ark/files/patch-git_a3bcf9bec ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/ark/files/patch-git_a3bcf9bec Sat Mar 9 19:23:05 2019 (r495197) @@ -0,0 +1,26 @@ +commit a3bcf9becddd5725725089add15fbae39c79757e +Author: Elvis Angelaccio +Date: Sat Mar 9 13:05:35 2019 +0100 + + Fix creation of tar archives + + Usage of QString::compare() breaks the creation of tar archives, because + `zst` is "bigger" than `tar` which means ark would use the `zstd` filter + even when creating a simple tar archive. + + BUG: 405136 + FIXED-IN: 19.03.80 + +diff --git a/plugins/libarchive/readwritelibarchiveplugin.cpp b/plugins/libarchive/readwritelibarchiveplugin.cpp +index 38f62881..e83d0087 100644 +--- plugins/libarchive/readwritelibarchiveplugin.cpp ++++ plugins/libarchive/readwritelibarchiveplugin.cpp +@@ -352,7 +352,7 @@ bool ReadWriteLibarchivePlugin::initializeNewFileWriterFilters(const Compression + qCDebug(ARK) << "Detected lz4 compression for new file"; + ret = archive_write_add_filter_lz4(m_archiveWriter.data()); + #ifdef HAVE_ZSTD_SUPPORT +- } else if (filename().rightRef(3).compare(QLatin1String("zst"), Qt::CaseInsensitive)) { ++ } else if (filename().right(3).toUpper() == QLatin1String("ZST")) { + qCDebug(ARK) << "Detected zstd compression for new file"; + ret = archive_write_add_filter_zstd(m_archiveWriter.data()); + #endif