[PATCH] gnu: Add wwwoffle.

[PATCH] gnu: Add wwwoffle.

[Bake Timmons]

* gnu/packages/web.scm (wwwoffle): New variable.
---
 gnu/packages/web.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 184869200..c4e716c2b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -668,6 +668,34 @@ server).  It was primarily designed to be used by one person or a small group
 of people.")
     (license l:expat)))
 
+(define-public wwwoffle
+  (package
+    (name "wwwoffle")
+    (version "2.9j")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.gedanken.org.uk/software/"
+                                  "wwwoffle/download/wwwoffle-"
+                                  version ".tgz"))
+              (sha256
+               (base32
+                "1ihil1xq9dp21hf108khxbw6f3baq0w5c0j3af038y6lkmad4vdi"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-gnutls")
+       #:tests? #f))
+    (native-inputs `(("flex" ,flex)))
+    (inputs `(("gnutls" ,gnutls)
+              ("libcrypt", libgcrypt)))
+    (home-page "http://www.gedanken.org.uk/software/wwwoffle/")
+    (synopsis "Caching web proxy optimized for intermittent internet links")
+    (description "WWWOFFLE is a proxy web server that is especially good for
+intermittent internet links.  It can cache HTTP, HTTPS, FTP, and finger
+protocols, and supports browsing and requesting pages while offline, indexing,
+modifying pages and incoming and outgoing headers, monitoring pages for
+changes, and much more.")
+    (license l:gpl2+)))
+
 (define-public libyaml
   (package
     (name "libyaml")
-- 
2.11.0

Re: [PATCH] gnu: Add wwwoffle.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2352 bytes --]

Bake Timmons <65pandas@gmail.com> writes:

> * gnu/packages/web.scm (wwwoffle): New variable.
> ---
>  gnu/packages/web.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)

Thanks for this! The patch looks good, but does not build on master
because the "libgcrypt" variable cannot be found. It can be imported
from the "gnupg" module.

Some other trivial comments: Home page and source should use HTTPS when
available, and we try to add comments about why tests are disabled.
Could you also add a copyright line for yourself?

I can do these minor edits for you if you prefer, but would like to
confirm name and email for the copyright. Thanks!

>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 184869200..c4e716c2b 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -668,6 +668,34 @@ server).  It was primarily designed to be used by one person or a small group
>  of people.")
>      (license l:expat)))
>  
> +(define-public wwwoffle
> +  (package
> +    (name "wwwoffle")
> +    (version "2.9j")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://www.gedanken.org.uk/software/"
> +                                  "wwwoffle/download/wwwoffle-"
> +                                  version ".tgz"))
> +              (sha256
> +               (base32
> +                "1ihil1xq9dp21hf108khxbw6f3baq0w5c0j3af038y6lkmad4vdi"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:configure-flags '("--with-gnutls")
> +       #:tests? #f))
> +    (native-inputs `(("flex" ,flex)))
> +    (inputs `(("gnutls" ,gnutls)
> +              ("libcrypt", libgcrypt)))
> +    (home-page "http://www.gedanken.org.uk/software/wwwoffle/")
> +    (synopsis "Caching web proxy optimized for intermittent internet links")
> +    (description "WWWOFFLE is a proxy web server that is especially good for
> +intermittent internet links.  It can cache HTTP, HTTPS, FTP, and finger
> +protocols, and supports browsing and requesting pages while offline, indexing,
> +modifying pages and incoming and outgoing headers, monitoring pages for
> +changes, and much more.")
> +    (license l:gpl2+)))
> +
>  (define-public libyaml
>    (package
>      (name "libyaml")
> -- 
> 2.11.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH] gnu: Add wwwoffle.

[Bake Timmons]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

< snip >

> I can do these minor edits for you if you prefer, but would like to
> confirm name and email for the copyright. Thanks!
>

Thanks for your review -- I wish I responded earlier!  Attached is a
revised patch.


[-- Attachment #2: 0001-gnu-Add-wwwoffle.patch --]
[-- Type: text/x-patch, Size: 2607 bytes --]

> From 485bf8b610be2ba70c366b1d317cc1ab7acb7c61 Mon Sep 17 00:00:00 2001
From: Bake Timmons <b3timmons@speedymail.org>
Date: Wed, 21 Dec 2016 22:52:14 -0500
Subject: [PATCH] gnu: Add wwwoffle.

* gnu/packages/web.scm (wwwoffle): New variable.
---
 gnu/packages/web.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 184869200..d66b75164 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -80,7 +81,8 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages statistics))
+  #:use-module (gnu packages statistics)
+  #:use-module (gnu packages gnupg))
 
 (define-public httpd
   (package
@@ -668,6 +670,34 @@ server).  It was primarily designed to be used by one person or a small group
 of people.")
     (license l:expat)))
 
+(define-public wwwoffle
+  (package
+    (name "wwwoffle")
+    (version "2.9j")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://www.gedanken.org.uk/software/"
+                                  "wwwoffle/download/wwwoffle-"
+                                  version ".tgz"))
+              (sha256
+               (base32
+                "1ihil1xq9dp21hf108khxbw6f3baq0w5c0j3af038y6lkmad4vdi"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-gnutls")
+       #:tests? #f))                         ; no test target
+    (native-inputs `(("flex" ,flex)))
+    (inputs `(("gnutls" ,gnutls)
+              ("libcrypt", libgcrypt)))
+    (home-page "https://www.gedanken.org.uk/software/wwwoffle/")
+    (synopsis "Caching web proxy optimized for intermittent internet links")
+    (description "WWWOFFLE is a proxy web server that is especially good for
+intermittent internet links.  It can cache HTTP, HTTPS, FTP, and finger
+protocols, and supports browsing and requesting pages while offline, indexing,
+modifying pages and incoming and outgoing headers, monitoring pages for
+changes, and much more.")
+    (license l:gpl2+)))
+
 (define-public libyaml
   (package
     (name "libyaml")
-- 
2.11.0

Re: [PATCH] gnu: Add wwwoffle.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

Bake Timmons <65pandas@gmail.com> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
> < snip >
>
>> I can do these minor edits for you if you prefer, but would like to
>> confirm name and email for the copyright. Thanks!
>>
>
> Thanks for your review -- I wish I responded earlier!  Attached is a
> revised patch.

Thanks for the update. Applied! Nice work for a first package :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]