[PATCH] gnu: Add Corkscrew 2.0.

[PATCH] gnu: Add Corkscrew 2.0.

[Sree Harsha Totakura]

* gnu/packages/ssh.scm (corkscrew): New variable.
---
 gnu/packages/ssh.scm |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 5d21eee..0a92138 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -238,3 +238,48 @@ programs written in GNU Guile interpreter.  It is a wrapper to the underlying
 libssh library.")
     (home-page "https://github.com/artyom-poptsov/libguile-ssh")
     (license license:gpl3+)))
+
+(define-public corkscrew
+  (package
+    (name "corkscrew")
+    (version "2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.agroman.net/corkscrew/corkscrew-"
+                           version ".tar.gz"))
+       (sha256 (base32
+                "1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; Replace configure phase as the ./configure script does not link
+     ;; CONFIG_SHELL and SHELL passed as parameters
+     '(#:phases
+       (alist-replace
+        'configure
+        (lambda* (#:key outputs inputs system target
+                        #:allow-other-keys #:rest args)
+          (let* ((configure (assoc-ref %standard-phases 'configure))
+                 (prefix (assoc-ref outputs "out"))
+                 (bash (string-append
+                        (assoc-ref inputs "bash") "/bin/bash"))
+                 ;; Set --build and --host flags as the provided config.guess
+                 ;; is not able to detect them
+                 (flags `(,(string-append "--prefix=" prefix)
+                          ,(string-append "--build=" system)
+                          ,(string-append "--host="
+                                          (or target system)))))
+            (setenv "CONFIG_SHELL" bash)
+            (zero? (apply system* bash
+                  (string-append "." "/configure")
+                  flags))))
+        %standard-phases)))
+    (home-page "http://www.agroman.net/corkscrew")
+    (synopsis "A tool for tunneling SSH through HTTP proxies")
+    (description
+     "Corkscrew allows creating TCP tunnels through HTTP proxies.  WARNING:
+At the moment only plain text authentication is supported, should you require
+to use it with your HTTP proxy.  Digest based authentication may be supported
+in future and NTLM based authentication is most likey never be supported.")
+    (license license:gpl2)))
-- 
1.7.10.4

Re: [PATCH] gnu: Add Corkscrew 2.0.

[Cyril Roelandt]

Hello,

On 01/25/2014 01:51 AM, Sree Harsha Totakura wrote:
> +                 (bash (string-append
> +                        (assoc-ref inputs "bash") "/bin/bash"))

You could use '(which "bash")' here.

Regards,
Cyril.

Re: [PATCH] gnu: Add Corkscrew 2.0.

[Ludovic Courtès]

Sree Harsha Totakura <sreeharsha@totakura.in> skribis:

> * gnu/packages/ssh.scm (corkscrew): New variable.

Applied, with (which "bash") as Cyril suggested.

Thanks!

Ludo’.

Re: [PATCH] gnu: Add Corkscrew 2.0.

[Ludovic Courtès]

Sree Harsha Totakura <sreeharsha@totakura.in> skribis:

> +    (license license:gpl2)))

I also changed this to gpl2+ because COPYING is the GPLv2 text, and
since the source file doesn’t mention anything, it falls under the
“GPL v2-or-later, at the user’s option.”

Ludo’.