From patchwork Sun Aug 16 15:48:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 23637 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F9AB27BBE6; Sun, 16 Aug 2020 16:49:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CD52727BBE5 for ; Sun, 16 Aug 2020 16:49:28 +0100 (BST) Received: from localhost ([::1]:60514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7KuW-0000Gx-3k for patchwork@mira.cbaines.net; Sun, 16 Aug 2020 11:49:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Ku6-0000Gq-NG for guix-patches@gnu.org; Sun, 16 Aug 2020 11:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Ku6-00052I-EI for guix-patches@gnu.org; Sun, 16 Aug 2020 11:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7Ku6-0001oS-DE for guix-patches@gnu.org; Sun, 16 Aug 2020 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42890] [PATCH] gnu: taglib: Include patch to prevent OGG corruption. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Aug 2020 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42890 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42890@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.15975929196936 (code B ref -1); Sun, 16 Aug 2020 15:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Aug 2020 15:48:39 +0000 Received: from localhost ([127.0.0.1]:58231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Ktd-0001nj-CT for submit@debbugs.gnu.org; Sun, 16 Aug 2020 11:48:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:34750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7KtX-0001nX-N6 for submit@debbugs.gnu.org; Sun, 16 Aug 2020 11:48:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7KtX-0000Ey-Eg for guix-patches@gnu.org; Sun, 16 Aug 2020 11:48:27 -0400 Received: from mout.gmx.net ([212.227.17.22]:43743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7KtR-0004zU-Oo for guix-patches@gnu.org; Sun, 16 Aug 2020 11:48:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1597592899; bh=Ny9CIiiOB+0TSVyUdkYEHEJbl5X7+XvUI9EWhGcckNQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=WbHcnGEpYtuqz0aoHQl+NCiJEJL0Q1pRV5++mSjZ595cWcDN8vocGaTq+gWLh+ssu EcVOFMf+eXzIHZU/KR5Kqtf65HCKtXmAl/DqzTaG681WnRLn30rt/qQNLnCRyl88VA maHqy3sQfHOFDS5H5b20uI1zNUJ7bglSv3MASNP4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N7zBb-1klIPI2poR-0151QP for ; Sun, 16 Aug 2020 17:48:19 +0200 User-agent: mu4e 1.4.13; emacs 26.3 From: Pierre Langlois Date: Sun, 16 Aug 2020 16:48:19 +0100 Message-ID: <87r1s6oam4.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:IOgvtrf8DQlBujPVHi7iEtuPF+1Z2G64iBzAFSIFePKr6HLpeVV ezpXQBcPrSmJpuHmOkCP4ZifmCpM6qCnDWiUr5WhQnmaAn+PMQ0LnYns/QY3G2KwQGfFhFy A9pZ7rswf5jD7pwLfZFMa3Z8kfWqOb2E31rRnabrLRPDIS/tsOT/hKh4cmqGkLhtGHWqEOu 8CO0sBQDHvAkf2B0c8MAQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:l0vCvZqhSiI=:nnI7N7Gh+V2z0jOfnQ0h7G AyNhycfbGOAqnf/mmW/17sv+t+wUZWftMvZ2Ys1M1nJ3LYKxqgF0XWoDuuM3dx6hE95wZ+obq gQDt1HzyYraFAhUUccs3B1rXd+J9p3Y+XVi8yJQlm+zIWUu1WIahJRJfOLF8g6cbtNicsGtRU biC1Jry/+yD2HIIhRXNMiv4tLUsdX5lJ7DFl0VtC1gZWwTcr75djGrBmWrGVh7VL/3dvrApHz tAhH5D/70rF1zK9C081f3nLPN/WhFvCs2ZlAjMoLl6L3NSIomLrIII4q68M/WbEEYHNQCS0+v c9rI8DHL8yH79wwlqN4R1pf3y4UccJ5i/6iyMV/dVx3kWS1DzWFg1KAD9AXxlE0rrl7pNc3UB JmEeFZ5qhbtRf5J5R0XDsmU+mfC5kqFF5nNQfPoUN6jht3ss6dOX4alUe7BguZ8SYizRvWOjf vif2BNzkHSK5RiN++ot7h7pYcimd7feNVfRiuXQbkAJ4mZJSKDUI1qfTt/KEVI/45jiY671Vd 5FDRZ+DDQlCz9jmodGr5zCwnAjuCBlRzgpkOyo2B1gnZ+3XLkaysevHi3o0wgQxZZZho3zAD/ YQQY614w1/ScxteiMy/LP1oHFoLTKyZZBqeczY4b90a038IMMPfTPu0vHTusOsjWuPl+c/pry QUbxiao6tb3ieaaOxpsYPAc9eUBUze7DjqRKo4vjb+CB9uhsLIpIV+fiE8ki9RRrpf0q9fTv+ KsWAocBRBswLnPFPb5nYlL+o8xPZ5h0GI9BHKo9cHJBBX5fLMUMAXb/ESn/ZZ5Urh+BQM5T3U CUpI4ZyBUGxssnMnWFNT94bh+iZu7o+nDePbkw1igx/RxvQdxwyVwbP1elEJI4wGgvYb4w8kU Vpc2iYhUVzF8Mg+WIYkyw6lesAKiXfpoVH7GiGNFP+wHVkHR8TsZ0oEQnys2pZLiD3ZCdnZt8 Wa6+wWRvmlgNrb76T7DY4w67XTS1Tb2xUnfbC+8xrZyUsBovuGogyWwenuVIR1AH06GeD+TN4 5gJY+jQ1tpvhQCAUTHn1nUUcclXJGUHARiKP1utvgq5xKA6iwxR/NwPx5juRltf62ZIPBe0nu Eb7vLtbxbEEiFb1d6RRiu6uzkMGlYHpZp0+gkqiPcZF5/3uHOd/gKUeyIm8AhY1w9cwKF4q/8 F3nokeF25PUsexvP3yXDB5z4mevEABFkypTK0q0D2hp1anqu2rvAaFiNLEnozT/Qp5fOzjDle FhTtsuG7kGmjgJHSlq2owv4wxIwmCpFZMY7FoIw== Received-SPF: pass client-ip=212.227.17.22; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/16 10:12:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello Guix! As I was looking into updating clementine, I noticed it would refuse to build with the system's taglib saying it may have a bug that corrupts OGG files. I haven't personally encountered this bug, but I think we should patch it anyway to be safe. It should be included in the next release but it's unclear when this is going happen :-/ See https://github.com/taglib/taglib/issues/864 for more details. It seems other distributions such as Archlinux also apply this fix. Thanks! Pierre From fb029863097e216111b40c410167ea7e36c3bf3d Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 16 Aug 2020 16:28:54 +0100 Subject: [PATCH] gnu: taglib: Include patch to prevent OGG corruption. * gnu/packages/mp3.scm (taglib)[source]: Add patch. * gnu/packages/patches/taglib-fix-possible-ogg-packet-loss.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/mp3.scm | 8 +++++-- .../taglib-fix-possible-ogg-packet-loss.patch | 24 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/taglib-fix-possible-ogg-packet-loss.patch diff --git a/gnu/local.mk b/gnu/local.mk index db0f73d881..dc6df1af66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1574,6 +1574,7 @@ dist_patch_DATA = \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ %D%/packages/patches/t4k-common-libpng16.patch \ + %D%/packages/patches/taglib-fix-possible-ogg-packet-loss.patch \ %D%/packages/patches/tao-add-missing-headers.patch \ %D%/packages/patches/tao-fix-parser-types.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 92e3d5d5f8..b6d174f7d4 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2019 Pierre Langlois +;;; Copyright © 2017, 2019, 2020 Pierre Langlois ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Michael Rohleder @@ -167,7 +167,11 @@ a highly stable and efficient implementation.") version ".tar.gz")) (sha256 (base32 - "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn")))) + "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn")) + ;; Fix https://github.com/taglib/taglib/issues/864, which will + ;; be included in the next 1.12 release. + (patches + (search-patches "taglib-fix-possible-ogg-packet-loss.patch")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on. diff --git a/gnu/packages/patches/taglib-fix-possible-ogg-packet-loss.patch b/gnu/packages/patches/taglib-fix-possible-ogg-packet-loss.patch new file mode 100644 index 0000000000..665732888f --- /dev/null +++ b/gnu/packages/patches/taglib-fix-possible-ogg-packet-loss.patch @@ -0,0 +1,24 @@ +From 9336c82da3a04552168f208cd7a5fa4646701ea4 Mon Sep 17 00:00:00 2001 +From: Tsuda Kageyu +Date: Thu, 1 Dec 2016 11:32:01 +0900 +Subject: [PATCH] Fix possible Ogg packet losses. + +See https://github.com/taglib/taglib/issues/864 for details. + +--- + taglib/ogg/oggfile.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp +index 86b0b0764..c36e4d46c 100644 +--- a/taglib/ogg/oggfile.cpp ++++ b/taglib/ogg/oggfile.cpp +@@ -253,7 +253,7 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet) + ByteVectorList packets = firstPage->packets(); + packets[i - firstPage->firstPacketIndex()] = packet; + +- if(firstPage != lastPage && lastPage->packetCount() > 2) { ++ if(firstPage != lastPage && lastPage->packetCount() > 1) { + ByteVectorList lastPagePackets = lastPage->packets(); + lastPagePackets.erase(lastPagePackets.begin()); + packets.append(lastPagePackets); -- 2.28.0