[PATCH] Add VPN client ike.

[PATCH] Add VPN client ike.

[Ricardo Wurmus]

[-- Attachment #1: 0001-gnu-Add-libedit.patch --]
[-- Type: text/x-patch, Size: 1839 bytes --]

From 0fbe28707573fdc9a7587143d10587b93b313d48 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Mon, 3 Aug 2015 15:35:55 +0200
Subject: [PATCH 1/2] gnu: Add libedit.

* gnu/packages/readline.scm (libedit): New variable.
---
 gnu/packages/readline.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index 13ce916..9c50373 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -85,3 +86,24 @@ comfortable for anyone.")
               (sha256
                (base32
                 "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr"))))))
+
+(define-public libedit
+  (package
+    (name "libedit")
+    (version "20150325-3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://thrysoee.dk/editline/libedit-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1if8zi9h52m80ck796an28rrqfljk2n8cn25m3fl0prwz155x2n8"))))
+    (build-system gnu-build-system)
+    (arguments `(#:configure-flags (list "--enable-widec")))
+    (inputs `(("ncurses" ,ncurses)))
+    (home-page "http://thrysoee.dk/editline/")
+    (synopsis "Port of the NetBSD Editline command line editor library")
+    (description
+     "Libedit is a command line editor library providing generic line editing,
+history, and tokenization functions, similar to those found in GNU Readline.")
+    (license bsd-3)))
-- 
2.1.0


[-- Attachment #2: 0002-gnu-Add-ike.patch --]
[-- Type: text/x-patch, Size: 3943 bytes --]

From 32275922df016b32fe69c9a75078d4c549509871 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Mon, 3 Aug 2015 15:37:29 +0200
Subject: [PATCH 2/2] gnu: Add ike.

* gnu/packages/vpn.scm (ike): New variable.
---
 gnu/packages/vpn.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index d866214..44a9bef 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,14 +23,18 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
 
@@ -155,3 +160,48 @@ bridged configurations and remote access facilities.  It uses a custom
 security protocol that utilizes SSL/TLS for key exchange.  It is capable of
 traversing network address translators (NATs) and firewalls.")
     (license license:gpl2)))
+
+(define-public ike
+  (package
+    (name "ike")
+    (version "2.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.shrew.net/download/ike/ike-"
+                    version "-release.tbz2"))
+              (sha256
+               (base32
+                "0mvvmfc7ldgq48x75khr98d52jvg24zzlyinmzsihy2ly4g2ziq5"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; no "check" target
+       #:out-of-source? #f
+       #:configure-flags (list (string-append "-DSBINDIR="
+                                              (assoc-ref %outputs "out")
+                                              "/sbin")
+                               (string-append "-DBINDIR="
+                                              (assoc-ref %outputs "out")
+                                              "/bin")
+                               (string-append "-DETCDIR="
+                                              (assoc-ref %outputs "out")
+                                              "/etc")
+                               (string-append "-DLIBDIR="
+                                              (assoc-ref %outputs "out")
+                                              "/lib")
+                               (string-append "-DMANDIR="
+                                              (assoc-ref %outputs "out")
+                                              "/man/man1/")
+                               "-DNATT=YES")))
+    (inputs `(("openssl" ,openssl)
+              ("libedit" ,libedit)
+              ("bison" ,bison)
+              ("flex" ,flex)))
+    (home-page "https://www.shrew.net/download/ike")
+    (synopsis "Shrew Soft VPN client")
+    (description "ike is a VPN client.  It implements the IPsec Protocol
+standard and uses ISAKMP version 1.0 to negotiate security parameters with a
+VPN Gateway.  In addition, it includes support for the XAuth protocol
+extension for user authentication and the Configuration Exchange extension for
+automatic client configuration.")
+    (license license:sleepycat)))
-- 
2.1.0

Re: [PATCH] Add VPN client ike.

[Alex Kost]

Ricardo Wurmus (2015-08-03 16:41 +0300) wrote:

> +(define-public ike
> +  (package
> +    (name "ike")
> +    (version "2.2.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://www.shrew.net/download/ike/ike-"
> +                    version "-release.tbz2"))
> +              (sha256
> +               (base32
> +                "0mvvmfc7ldgq48x75khr98d52jvg24zzlyinmzsihy2ly4g2ziq5"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f ; no "check" target
> +       #:out-of-source? #f
> +       #:configure-flags (list (string-append "-DSBINDIR="
> +                                              (assoc-ref %outputs "out")
> +                                              "/sbin")
> +                               (string-append "-DBINDIR="
> +                                              (assoc-ref %outputs "out")
> +                                              "/bin")
> +                               (string-append "-DETCDIR="
> +                                              (assoc-ref %outputs "out")
> +                                              "/etc")
> +                               (string-append "-DLIBDIR="
> +                                              (assoc-ref %outputs "out")
> +                                              "/lib")
> +                               (string-append "-DMANDIR="
> +                                              (assoc-ref %outputs "out")
> +                                              "/man/man1/")
> +                               "-DNATT=YES")))

It seems redundant to reevaluate (assoc-ref %outputs "out") every time.
What about wrap it into 'let'?, or maybe just to use following form:

(list (string-append "-DSBINDIR=" %output "/sbin")
      (string-append "-DBINDIR="  %output "/bin")
      (string-append "-DETCDIR="  %output "/etc")
      (string-append "-DLIBDIR="  %output "/lib")
      (string-append "-DMANDIR="  %output "/man/man1/")
      "-DNATT=YES")

-- 
Alex

Re: [PATCH] Add VPN client ike.

[Ricardo Wurmus]

After trying to use this programme with the institute’s VPN server I
found that it doesn’t work well (or: at all).  Unless someone else has a
VPN server to test this package I’d like to withdraw the patch
submission, since a patched vpnc works fine for me.

~~ Ricardo

Re: [PATCH] Add VPN client ike.

[Ludovic Courtès]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> * gnu/packages/readline.scm (libedit): New variable.

FYI this package is already available elsewhere.

Ludo’.

Re: [PATCH] Add VPN client ike.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:
>
>> * gnu/packages/readline.scm (libedit): New variable.
>
> FYI this package is already available elsewhere.

D’oh!  How could I have missed that?

~~ Ricardo