From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34632] [PATCH core-updates 2/2] gnu: curl: Build against MIT Kerberos instead of GSS. Resent-Message-ID: From: Marius Bakke Date: Sat, 23 Feb 2019 17:23:38 +0100 Message-Id: <20190223162338.18429-2-mbakke@fastmail.com> In-Reply-To: <20190223162338.18429-1-mbakke@fastmail.com> References: <20190223162338.18429-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34632@debbugs.gnu.org * 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 -- 2.20.1