From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 06 14:22:40 2020 Received: (at 40475) by debbugs.gnu.org; 6 Apr 2020 18:22:40 +0000 Received: from localhost ([127.0.0.1]:49203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLWOO-0005DB-0l for submit@debbugs.gnu.org; Mon, 06 Apr 2020 14:22:40 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLWOM-0005Cg-0k for 40475@debbugs.gnu.org; Mon, 06 Apr 2020 14:22:38 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id D54FF5C00CE; Mon, 6 Apr 2020 14:22:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 06 Apr 2020 14:22:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=orGsdFKRBKVgbVystCEJ+mv GNQIw/r+4j1kMQVPnM64=; b=L7PKkjzvEHWtvJLCVXbdElNCd7uMiY9cgOZT00v d1mMZX4mA9KtZd0qphNsKvHszRF/IHBG3TYUtEcBjhIFhxhq2RAblgI/Y8S1jC8o X7RywMarG4Ax92ijR0nbxSPxXfzoYu0y5oa00/cXs0F8CHGkiksuxCkrlZVqPrH/ qqHw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=orGsdFKRBKVgbVyst CEJ+mvGNQIw/r+4j1kMQVPnM64=; b=yTyPm2x9klRRGkWyTgxcP5MP1wkv8WCN4 MKjWglcUFv1H7ttwoqnptQozRldlrEymdQiFcvMtvexrdCzjRP+lU+MRtztQ6eCm 2PzwF+m/ktHZKMQsLCapWpAkeaULCK59y+bPaOCYScQ28lmV4G6mGYkhaAgcibVk /CAKKdafdBSv/mqdJXhqiY0zWXIv0Ygk1vG/Cg9S9Qa92F2PtVcXC3FLhMF+MohT 6qezah1hxhZSPfoijID9U74Fre4cDpjfjiJhhyXmSsmTFiuJ2w12JLbsmASZM5Im oAYTPJdAfBLdyTgxOdaKP7+J+LaLpQwHIUkNXXnzKooUAaT105YpQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudefgdduudeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuffhomhgrihhnpehgnhhuthhlshdrohhrghenucfkphepjeeirdduvd egrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from jasmine.lan (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 78F43306D48D for <40475@debbugs.gnu.org>; Mon, 6 Apr 2020 14:22:32 -0400 (EDT) From: Leo Famulari To: 40475@debbugs.gnu.org. Subject: [v2] gnu: GnuTLS: Fix CVE-2020-11501. Date: Mon, 6 Apr 2020 14:22:21 -0400 Message-Id: X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40475 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/tls.scm (gnutls)[replacement]: New field. (gnutls-3.6.13): New variable. (gnutls/guile-2.0, gnutls/dane, gnutls-3.6.10, gnutls3.0-gnutls): Use PACKAGE/INHERIT. --- gnu/packages/tls.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bb80d86ba4..e8b3d88944 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -162,6 +162,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") + (replacement gnutls-3.6.13) (version "3.6.9") (source (origin (method url-fetch) @@ -244,10 +245,23 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls/guile-2.0 - ;; GnuTLS for Guile 2.0. +(define gnutls-3.6.13 (package (inherit gnutls) + (version "3.6.A") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-3.6.13.tar.xz")) + (patches (search-patches "gnutls-skip-trust-store-test.patch")) + (sha256 + (base32 + "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))))) + +(define-public gnutls/guile-2.0 + ;; GnuTLS for Guile 2.0. + (package/inherit gnutls (name "guile2.0-gnutls") (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs gnutls)))))) @@ -257,8 +271,7 @@ required structures.") ;; Authentication of Named Entities. This is required for GNS functionality ;; by GNUnet and gnURL. This is done in an extra package definition ;; to have the choice between GnuTLS with Dane and without Dane. - (package - (inherit gnutls) + (package/inherit gnutls (name "gnutls-dane") (inputs `(("unbound" ,unbound) ,@(package-inputs gnutls))))) @@ -266,8 +279,7 @@ required structures.") (define gnutls-3.6.10 ;; This is for 'guile3.0-gnutls', below. Version 3.6.10 is the first to ;; introduce Guile 2.9/3.0 support. - (package - (inherit gnutls) + (package/inherit gnutls (version "3.6.10") (source (origin (inherit (package-source gnutls)) @@ -286,8 +298,7 @@ required structures.") ("util-linux" ,util-linux))))) (define-public guile3.0-gnutls - (package - (inherit gnutls-3.6.10) + (package/inherit gnutls-3.6.10 (name "guile3.0-gnutls") (arguments (substitute-keyword-arguments (package-arguments gnutls-3.6.10) -- 2.26.0