diff mbox

gnu: lynx: Fix GnuTLS support.

Message ID 87oa2tjn0z.fsf@openmailbox.org
State New
Headers show

Commit Message

Kei Yamashita Oct. 9, 2016, 8:16 p.m. UTC
Leo Famulari <leo@famulari.name> writes:

> On Sun, Oct 09, 2016 at 01:55:10PM -0400, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > On Fri, Oct 07, 2016 at 10:42:38AM -0400, Kei Kebreau wrote:
>> >> I get the same problem here. Lynx does mention that GnuTLS support is
>> >> experimental. Your and Tobias' page work using OpenSSL instead. Try the
>> >> new patch attached.
>> >
>> >> From ee3a889e6902686de4d7c949afcb8cd4a810bd0f Mon Sep 17 00:00:00 2001
>> >> From: Kei Kebreau <kei@openmailbox.org>
>> >> Date: Fri, 7 Oct 2016 10:36:11 -0400
>> >> Subject: [PATCH] gnu: lynx: Support HTTPS (SSL) connections
>> >> 
>> >> * gnu/packages/lynx.scm (lynx)[inputs]: Add 'openssl' and remove 'gnutls'.
>> >> [arguments]: Add configure flags for OpenSSL support; remove
>> >> configure flags
>> >> for GnuTLS support.
>> >
>> > Thanks, this works for me.
>> >
>> > I think it's fine to use the "dev" releases with GnuTLS too. Debian and
>> > Fedora both use them.
>> 
>> I can confirm that lynx 2.8.9dev.9 works properly with GnuTLS. Should we
>> use the current stable release with OpenSSL or the development release
>> with GnuTLS? And if we use the development release, should I submit the
>> patches as a single version bump with the necessary small adjustments?
>
> I would do it all in one: update to 2.8.9dev.9 and correct the configure
> flags so it works correctly. I think that "update" and "make the updated
> version work correctly" belong in the same commit since one change
> doesn't make sense without the other.

Alright. Does this commit message look good to you?
From c08ba395fe1c1df29d8509350ee287c0832a1970 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Sun, 9 Oct 2016 16:10:09 -0400
Subject: [PATCH] gnu: lynx: Update to 2.8.9dev.9 and fix GnuTLS support.

* gnu/packages/lynx.scm (lynx): Update to 2.8.9dev.9.
[arguments]: Append the path to the GnuTLS to "--with-gnutls=".
---
 gnu/packages/lynx.scm | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

Comments

Leo Famulari Oct. 9, 2016, 8:36 p.m. UTC | #1
On Sun, Oct 09, 2016 at 04:16:44PM -0400, Kei Kebreau wrote:
> Alright. Does this commit message look good to you?

> From c08ba395fe1c1df29d8509350ee287c0832a1970 Mon Sep 17 00:00:00 2001
> From: Kei Kebreau <kei@openmailbox.org>
> Date: Sun, 9 Oct 2016 16:10:09 -0400
> Subject: [PATCH] gnu: lynx: Update to 2.8.9dev.9 and fix GnuTLS support.
> 
> * gnu/packages/lynx.scm (lynx): Update to 2.8.9dev.9.
> [arguments]: Append the path to the GnuTLS to "--with-gnutls=".

Sure, looks good to me!

I didn't test this patch, but I assume that you have :)
Kei Yamashita Oct. 9, 2016, 9 p.m. UTC | #2
Leo Famulari <leo@famulari.name> writes:

> On Sun, Oct 09, 2016 at 04:16:44PM -0400, Kei Kebreau wrote:
>> Alright. Does this commit message look good to you?
>
>> From c08ba395fe1c1df29d8509350ee287c0832a1970 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau <kei@openmailbox.org>
>> Date: Sun, 9 Oct 2016 16:10:09 -0400
>> Subject: [PATCH] gnu: lynx: Update to 2.8.9dev.9 and fix GnuTLS support.
>> 
>> * gnu/packages/lynx.scm (lynx): Update to 2.8.9dev.9.
>> [arguments]: Append the path to the GnuTLS to "--with-gnutls=".
>
> Sure, looks good to me!
>
> I didn't test this patch, but I assume that you have :)
Indeed I have! Pushed as fedcb99d840265824ebf7c5631c609b86560fc44.

Thanks for your help, Leo and Tobias!
diff mbox

Patch

diff --git a/gnu/packages/lynx.scm b/gnu/packages/lynx.scm
index 3182b3e..6e4ed6c 100644
--- a/gnu/packages/lynx.scm
+++ b/gnu/packages/lynx.scm
@@ -1,5 +1,6 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,14 +34,15 @@ 
 (define-public lynx
   (package
     (name "lynx")
-    (version "2.8.8rel.2")
+    (version "2.8.9dev.9")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "http://invisible-mirror.net/archives/lynx/tarballs"
                     "/lynx" version ".tar.bz2"))
               (sha256
-               (base32 "1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039"))))
+               (base32
+                "1m72ga89hywm097kazcm8w6sqrfjnl83gh31pkbhk4zhzhfpzxgh"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("perl" ,perl)))
@@ -53,19 +55,21 @@ 
               ("gzip" ,gzip)
               ("bzip2" ,bzip2)))
     (arguments
-     `(#:configure-flags '("--with-pkg-config"
-                           "--with-screen=ncurses"
-                           "--with-zlib"
-                           "--with-bzlib"
-                           "--with-gnutls"
-                           ;; "--with-socks5"    ; XXX TODO
-                           "--enable-widec"
-                           "--enable-ascii-ctypes"
-                           "--enable-local-docs"
-                           "--enable-htmlized-cfg"
-                           "--enable-gzip-help"
-                           "--enable-nls"
-                           "--enable-ipv6")
+     `(#:configure-flags
+       (let ((gnutls (assoc-ref %build-inputs "gnutls")))
+         `("--with-pkg-config"
+           "--with-screen=ncurses"
+           "--with-zlib"
+           "--with-bzlib"
+           ,(string-append "--with-gnutls=" gnutls)
+           ;; "--with-socks5"    ; XXX TODO
+           "--enable-widec"
+           "--enable-ascii-ctypes"
+           "--enable-local-docs"
+           "--enable-htmlized-cfg"
+           "--enable-gzip-help"
+           "--enable-nls"
+           "--enable-ipv6"))
        #:tests? #f  ; no check target
        #:phases (alist-replace
                  'install