From patchwork Sat Feb 23 16:23:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 1228 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 58CC116C2C; Sat, 23 Feb 2019 16:24:16 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 036CB16C11 for ; Sat, 23 Feb 2019 16:24:16 +0000 (GMT) Received: from localhost ([127.0.0.1]:40047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxa63-0005aA-Ja for patchwork@mira.cbaines.net; Sat, 23 Feb 2019 11:24:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxa5x-0005ZJ-4A for guix-patches@gnu.org; Sat, 23 Feb 2019 11:24:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxa5v-0007VA-5a for guix-patches@gnu.org; Sat, 23 Feb 2019 11:24:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxa5q-0007TK-AC for guix-patches@gnu.org; Sat, 23 Feb 2019 11:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxa5q-0000lI-6F for guix-patches@gnu.org; Sat, 23 Feb 2019 11:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34632] [PATCH core-updates 2/2] gnu: curl: Build against MIT Kerberos instead of GSS. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Feb 2019 16:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34632 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34632@debbugs.gnu.org Received: via spool by 34632-submit@debbugs.gnu.org id=B34632.15509390312904 (code B ref 34632); Sat, 23 Feb 2019 16:24:02 +0000 Received: (at 34632) by debbugs.gnu.org; 23 Feb 2019 16:23:51 +0000 Received: from localhost ([127.0.0.1]:49542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxa5f-0000km-Ip for submit@debbugs.gnu.org; Sat, 23 Feb 2019 11:23:51 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:56135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxa5b-0000kL-KW for 34632@debbugs.gnu.org; Sat, 23 Feb 2019 11:23:48 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 24C3834F5 for <34632@debbugs.gnu.org>; Sat, 23 Feb 2019 11:23:42 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 23 Feb 2019 11:23:42 -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=fm2; bh=iAxPCQXz63O5u XhY6EwrUUQ1gWtskfjC4kBCn+e5YPM=; b=fNZK/cqaPaquut68p6AH20zABe8Vl jBgpp0fJjkyjpMgZDCkAPNWELeVM0hxwyo0BVZSHPexsQgmWQ1k6cTnwA3wPKO1K xSG4ZC2c19q19MyM6jT+LOS1B6xguKQ5GKYdb5EwZ7cRb2NxJvNrZDBqN8BP4U3v 1oSbEqaqmeBZdjxENhAWL7tRnuY8eiV84kuro6ct81w5EesMLn1ZtdLfVOW2vGau s3BOi8ciapYcJK79RGG/q7zT+bCC2IY/VxlR+4eBo+1BX6wBd+BPTGXWjKylwHo/ AwK5tIfCaUYIqDnVAGdIAsEwcDC+n6gP5kVQBou1gRUcel2JhZnKWdzeA== 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= fm2; bh=iAxPCQXz63O5uXhY6EwrUUQ1gWtskfjC4kBCn+e5YPM=; b=GMQwqbJO rltJ3FlaGFofCaqtEzlhvC98YerXJJ9hTFEL6HKA8zt0FX6fU62FpxMAsgoRLgB7 L31hDFBfce4EDFeDDA8vFIfmnaHKD8NM+jrhK+LtQhFrVuKPAkQZoWsqFvYi+JVO huCKXKWR4Svvb8oM92gMCzW71JJQE1IC9dd6MDelkilXXtoGmeTylUVCjMM3jZ8K +TJ66Iu97vxWUyi54gwu0tsS+O55yzGcDJX/cXhSeiMbDtRlrt0+lUjo2PqHScIU 3DZyBpynbfuQGAwR3Ij02TMOQWmoJnvrbEufiT+sGtCFrHkGTDdrrnIOHzTxZNTj LXveed4NULhhGg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddruddvgdekkeculddtuddrgedtledrtddtmd cutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhs thgvrhfuihiivgeptd 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 3C6A5100E5 for <34632@debbugs.gnu.org>; Sat, 23 Feb 2019 11:23:41 -0500 (EST) From: Marius Bakke Date: Sat, 23 Feb 2019 17:23:38 +0100 Message-Id: <20190223162338.18429-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190223162338.18429-1-mbakke@fastmail.com> References: <20190223162338.18429-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: 209.51.188.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/curl.scm (curl)[inputs]: Change from GSS to MIT-KRB5. [arguments]: Adjust accordingly. --- gnu/packages/curl.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b1b2b999a2..88abc6aabd 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -37,8 +37,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages golang) #:use-module (gnu packages groff) - #:use-module (gnu packages gsasl) #:use-module (gnu packages guile) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libidn) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -63,10 +63,10 @@ (outputs '("out" "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) - ("gss" ,gss) ("libidn" ,libidn) ("libssh2" ,libssh2) ("openldap" ,openldap) + ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") ("zlib" ,zlib))) (native-inputs @@ -85,8 +85,10 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi" - "--disable-static") + `(#:configure-flags (list "--with-gnutls" + (string-append "--with-gssapi=" + (assoc-ref %build-inputs "mit-krb5")) + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases