From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aJmfLOiMVGBPOQAA0tVLHw (envelope-from ) for ; Fri, 19 Mar 2021 11:37:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id AGWLKOiMVGDuNAAAB5/wlQ (envelope-from ) for ; Fri, 19 Mar 2021 11:37:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 36A5B186D8 for ; Fri, 19 Mar 2021 12:37:12 +0100 (CET) Received: from localhost ([::1]:33278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNDRH-0001nX-9B for larch@yhetil.org; Fri, 19 Mar 2021 07:37:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNDR8-0001l5-Ad for bug-guix@gnu.org; Fri, 19 Mar 2021 07:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNDR8-00086x-32 for bug-guix@gnu.org; Fri, 19 Mar 2021 07:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lNDR7-0004dJ-Vg for bug-guix@gnu.org; Fri, 19 Mar 2021 07:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#47257: [PATCH 1/1] gnu: mariadb: Update to 10.5.9 [fixes CVE-2021-27928]. Resent-From: =?UTF-8?Q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 19 Mar 2021 11:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47257 X-GNU-PR-Package: guix X-GNU-PR-Keywords: security To: 47257@debbugs.gnu.org Cc: =?UTF-8?Q?L=C3=A9o?= Le Bouter Received: via spool by 47257-submit@debbugs.gnu.org id=B47257.161615376417726 (code B ref 47257); Fri, 19 Mar 2021 11:37:01 +0000 Received: (at 47257) by debbugs.gnu.org; 19 Mar 2021 11:36:04 +0000 Received: from localhost ([127.0.0.1]:48948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNDQB-0004bp-B3 for submit@debbugs.gnu.org; Fri, 19 Mar 2021 07:36:04 -0400 Received: from mail.zaclys.net ([178.33.93.72]:44217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNDQ8-0004bE-AG for 47257@debbugs.gnu.org; Fri, 19 Mar 2021 07:36:01 -0400 Received: from localhost.localdomain (lsl43-1_migr-78-195-19-20.fbx.proxad.net [78.195.19.20] (may be forged)) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 12JBZp2Q030120 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Fri, 19 Mar 2021 12:35:54 +0100 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 12JBZp2Q030120 Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1616153754; bh=qWUp8GnQdIYHEw/DSf/GhUJTwLiKfItHRgUVGPS+JQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OGVJcTNrMS2z2na9UAaHybGAIzd8UQji21CmDBNMcyhycyHgs8luJ3FtX1DvsOpXP griXXVhRKuD1JxOE2nrfBtSnL8ObCEaQTKla62mty2DuVmJOru7LT9Nj3yTPl2mcNB tiC9yGMyq5Zi7dWvgB/buj5xMiFabdos4TB0n/XU= Date: Fri, 19 Mar 2021 12:35:37 +0100 Message-Id: <20210319113537.18290-2-lle-bout@zaclys.net> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210319113537.18290-1-lle-bout@zaclys.net> References: <20210319113537.18290-1-lle-bout@zaclys.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: =?UTF-8?Q?L=C3=A9o?= Le Bouter From: =?UTF-8?Q?L=C3=A9o?= Le Bouter via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616153832; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=qWUp8GnQdIYHEw/DSf/GhUJTwLiKfItHRgUVGPS+JQ8=; b=tUQ1jJCGkZ0IzPdS1g45ccexATCooJKVo/0kpa4AIsY0KZVZ35LBeRuHEv1LcNk425SChe tfIRJ5vhJkARyoUIE2hs8qXtZXBckDAxi4WIv3uEjyYoDYACreivVPA4NbSUOqKtqTKU8x 6pTLeiLP+CcFMZltY77orXTC7ZdnO13mQqk0joDVafICgsH5r16EDsms2ZssOnhbytgIZZ mijmXdFy+SsNjCN5fYcYVdVKWH5uu6+6Z5XC3uq4BR16CTAFAAE5WdsPeDIlmsYH6xytt1 zc6g0ECD4rcYa5K4BKhFLQhnTy8HXB5zGSOjJoHuepQkfFvLsaUc1bJaRyVL5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616153832; a=rsa-sha256; cv=none; b=Zmhaq+leTHOf9GQc9sYZy0EZIgQqHS2SHMONC46RjLN1THB3I1u47thHeSRmMOE6L5MpWz MGKOnI7tw28qxJ5RkAE+Q7ky8Uh3pNwM7ZxQBUABb+Td9SKxpZdp8p5gUb60KlRpRLDEut dmGdHU0sXRQnonXNGMqXKbbQe8XSY32KkDtzQTvvd+tqxfroM1grBjpg2sBymhDx8+f2Q3 x76BRjK9a85Y3t6AQiU8ttkJaGOGj+qeDsntrn+BCYSHBXChlJHtCWPsg2WAa5B1DFDLx7 lsnG47nFlB6uLzEcU7lAOV9fIB4y4+tU+eALoFyKjdyKgcXGIfddDForxTg0PA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=zaclys.net header.s=default header.b=OGVJcTNr; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 0.55 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=zaclys.net header.s=default header.b=OGVJcTNr; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 36A5B186D8 X-Spam-Score: 0.55 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2CplhAFaK5b9 * gnu/packages/databases.scm (mariadb/fixed): New variable. (mariadb)[replacement]: Graft. --- gnu/packages/databases.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8be83f5cbe..6fdb22d7fb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -734,6 +734,7 @@ Language.") (append (find-files "extra/wolfssl") (find-files "zlib"))) #t)))) + (replacement mariadb/fixed) (build-system cmake-build-system) (outputs '("out" "lib" "dev")) (arguments @@ -969,6 +970,38 @@ Language.") as a drop-in replacement of MySQL.") (license license:gpl2))) +(define mariadb/fixed + (package/inherit mariadb + (version "10.5.9") + (source (origin + (method url-fetch) + (uri (string-append "https://downloads.mariadb.com/MariaDB" + "/mariadb-" version "/source/mariadb-" + version ".tar.gz")) + (sha256 + (base32 + "1kv8226ydyh4nyfx432dxqdkbry92c92bwlc33f1y56yp2p1kas0")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled snappy and xz. + (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. + (("^include\\(TokuThirdParty\\)") "")) + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Don't attempt to use the procedures we just removed. + ((" build_lzma build_snappy") "")) + + ;; Preserve CMakeLists.txt for these. + (for-each (lambda (file) + (unless (string-suffix? "CMakeLists.txt" file) + (delete-file file))) + (append (find-files "extra/wolfssl") + (find-files "zlib"))) + #t)))))) + (define-public mariadb-connector-c (package (name "mariadb-connector-c") -- 2.31.0