From patchwork Tue Dec 11 01:14:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 416 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 D57E7168F9; Tue, 11 Dec 2018 01:29:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id 4B311168F5 for ; Tue, 11 Dec 2018 01:29:33 +0000 (GMT) Received: from localhost ([::1]:35422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWWrc-0007Pj-S1 for patchwork@mira.cbaines.net; Mon, 10 Dec 2018 20:29:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWWqz-0006dA-Nv for guix-patches@gnu.org; Mon, 10 Dec 2018 20:28:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWWdo-0001KT-IJ for guix-patches@gnu.org; Mon, 10 Dec 2018 20:15:17 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:38250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWWdo-0001KL-Do for guix-patches@gnu.org; Mon, 10 Dec 2018 20:15:16 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gWWdo-0001Si-7D for guix-patches@gnu.org; Mon, 10 Dec 2018 20:15:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33701] [PATCH staging 19/23] gnu: GnuTLS: Update to 3.6.5. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Dec 2018 01:15:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33701@debbugs.gnu.org Received: via spool by 33701-submit@debbugs.gnu.org id=B33701.15444909075457 (code B ref 33701); Tue, 11 Dec 2018 01:15:16 +0000 Received: (at 33701) by debbugs.gnu.org; 11 Dec 2018 01:15:07 +0000 Received: from localhost ([127.0.0.1]:42482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWWde-0001Pm-H8 for submit@debbugs.gnu.org; Mon, 10 Dec 2018 20:15:06 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:47985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWWdR-0001Ma-Ha for 33701@debbugs.gnu.org; Mon, 10 Dec 2018 20:14:53 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7CB9E21785 for <33701@debbugs.gnu.org>; Mon, 10 Dec 2018 20:14:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 10 Dec 2018 20:14:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=NlAZhUNOP3+11 zcpfnZOjUyR/TfjYTIbaGqSDz4ONY8=; b=nr+/P1WxOVEiH/WXsNVYoT4JGOtkE oobUnauvgCmgbWqJchrM7v1896m4UNDU+ppW168mY3JHnG2gnWkbrl8IAMVZz/mr GC55Swls9aO1HqnGMj7LLbs/YHYqMXv1sM1oAb1WCT03ScTIXpoiU4VnsAze9mX3 vQSxcYn4MynkHRIa3kodRnlSoD+ydROKqmk7slZApF1tbKuJK5R8PITTO1LMcM7a IO+UK7NLe5JJvdYaK+qljKBe+m5+gaOjezuKUYX15LWVZ56sd+vQDuytnBGx8JbT TTntCt5+daS/lCSuFiABjlJ6QURYwgGfsv+sqSXnk7lM8bb8h3omr0VuQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=NlAZhUNOP3+11zcpfnZOjUyR/TfjYTIbaGqSDz4ONY8=; b=q2B4HEg3 YK+urzLaYh+HJWW495pmy8xGDqjLZtuAbfHDIXZ/og1hvyteezki+zELfebxtiDe hKBTmGzZ0lGlrni46ZJl8X43MEpZF8+Rn5GVR9mw8FgC+AhbsmS1FAEBUfswBugs IrszuDr1fcgB9NcHKZBWNqBp2Pw+5au5a7ur83sVkSfZoObag+TX5s9qdjtPB1QL /eEMnncRzZjso+tcQxvuB86+2it94dLswzIE+csEoX9SekkrSKUf2wZKpgNVwg25 EInP32jtRm0QjnNqpagM4y7X6uNS+JgnBkQRSHOXO6oFmNHomn6D3elB179W9fA1 DEwkfwG/FMs2UA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudegiedgfedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpe forghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeen ucfkphepiedvrdduiedrvddviedrudegtdenucfrrghrrghmpehmrghilhhfrhhomhepmh gsrghkkhgvsehfrghsthhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpeek X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id E461BE462B for <33701@debbugs.gnu.org>; Mon, 10 Dec 2018 20:14:47 -0500 (EST) From: Marius Bakke Date: Tue, 11 Dec 2018 02:14:12 +0100 Message-Id: <20181211011416.15902-19-mbakke@fastmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211011416.15902-1-mbakke@fastmail.com> References: <20181211011416.15902-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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 * gnu/packages/patches/gnutls-skip-pkgconfig-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/tls.scm (gnutls): Update to 3.6.5. [source](patches): Remove obsolete. [source](snippet): Add Guile detection fix. --- gnu/local.mk | 1 - .../patches/gnutls-skip-pkgconfig-test.patch | 24 ------------------- gnu/packages/tls.scm | 17 +++++++++---- 3 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/gnutls-skip-pkgconfig-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0d279e55eb..3f2ca7a845 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -772,7 +772,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ - %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch b/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch deleted file mode 100644 index 1fad7c14e3..0000000000 --- a/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -FIXME: The static test fails with an error such as: - -/tmp/guix-build-gnutls-3.5.13.drv-0/ccOnGPmc.o: In function `main': -c.29617.tmp.c:(.text+0x5): undefined reference to `gnutls_global_init' -collect2: error: ld returned 1 exit status -FAIL pkgconfig.sh (exit status: 1) - -diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh -index 6bd4e62f9..05aab8278 100755 ---- a/tests/pkgconfig.sh -+++ b/tests/pkgconfig.sh -@@ -57,11 +57,7 @@ echo "Trying dynamic linking with:" - echo " * flags: $(${PKGCONFIG} --libs gnutls)" - echo " * common: ${COMMON}" - echo " * lib: ${CFLAGS}" --cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} -- --echo "" --echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)" --cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} -+gcc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} - - rm -f ${TMPFILE} ${TMPFILE_O} - diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d9971441c6..73be90d0d3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -162,7 +162,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.5.18") + (version "3.6.5") (source (origin (method url-fetch) (uri @@ -171,12 +171,19 @@ living in the same process.") (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) "/gnutls-" version ".tar.xz")) - (patches - (search-patches "gnutls-skip-trust-store-test.patch" - "gnutls-skip-pkgconfig-test.patch")) + (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "0d02x28fwkkx7xzn7807nww6idchizzq3plx8sfcyiw7wzclh8mf")))) + "0ddvg97dyrh8dkffv1mdc0knxx5my3qdbzv97s4a6jggmk9wwgh7")) + (modules '((guix build utils))) + (snippet + '(begin + ;; XXX: The generated configure script in GnuTLS 3.6.5 + ;; apparently does not know about Guile 2.2. + (substitute* "configure" + (("guile_versions_to_search=\"2\\.0 1\\.8\"") + "guile_versions_to_search=\"2.2 2.0 1.8\"")) + #t)))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software.