GNU bug report logs - #33874
[PATCH] gnu: Add badvpn.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#33874: closed ([PATCH] gnu: Add badvpn.)
Date: Wed, 26 Dec 2018 17:38:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Wed, 26 Dec 2018 18:37:28 +0100
with message-id <874lb0chpj.fsf <at> gnu.org>
and subject line Re: [bug#33874] [PATCH] gnu: Add badvpn.
has caused the debbugs.gnu.org bug report #33874,
regarding [PATCH] gnu: Add badvpn.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
33874: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33874
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Meiyo Peng <meiyo.peng <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add badvpn.
Date: Wed, 26 Dec 2018 11:10:39 +0800

[Message part 3 (text/plain, inline)]

Hi,

This patch adds BadVPN.

BadVPN contains a bundled lwIP. I tried to unbundle the lwIP, but it
seems lwIP is designed to be bundled in other projects. lwIP does not
officially have a working CMakeLists or Makefile. So I gave up.

[0001-gnu-Add-badvpn.patch (text/x-patch, inline)]

From 011c6c86a2b89ea636499687ed7b316e26df384f Mon Sep 17 00:00:00 2001
From: Meiyo Peng <meiyo.peng <at> gmail.com>
Date: Mon, 24 Dec 2018 22:35:26 +0800
Subject: [PATCH] gnu: Add badvpn.

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

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 1edd1ac56..e5389fa37 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -28,6 +28,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
@@ -37,6 +38,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
@@ -400,3 +402,47 @@ DNS domain name queries.")
 @command{sshuttle} virtual private networks.  It supports flexible profiles
 with configuration options for most of @command{sshuttle}’s features.")
     (license license:gpl3+)))
+
+(define-public badvpn
+  (package
+    (name "badvpn")
+    (version "1.999.130")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ambrop72/badvpn.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rm67xhi7bh3yph1vh07imv5y1pwyldvw3wa5bz471g8mnkc7d3c"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f))                    ; no tests
+    (inputs
+     `(("nspr" ,nspr)
+       ("nss" ,nss)
+       ("openssl" ,openssl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/ambrop72/badvpn")
+    (synopsis "NCD scripting language, tun2socks proxifier, P2P VPN")
+    (description "@code{BadVPN} is a collection of VPN-related tools.  It
+includes:
+
+@enumerate
+@item NCD programming language.\n
+NCD (Network Configuration Daemon) is a daemon and programming/scripting
+language for configuration of network interfaces and other aspects of the
+operating system.
+@item Tun2socks network-layer proxifier.\n
+The tun2socks program socksifes TCP connections at the network layer.  It
+implements a TUN device which accepts all incoming TCP connections (regardless
+of destination IP), and forwards the connections through a SOCKS server.
+@item Peer-to-peer VPN.\n
+The Peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
+(VPN nodes).
+@end enumerate")
+    ;; This project contains a bundled lwIP. lwIP is also released under the
+    ;; 3-clause BSD license.
+    (license license:bsd-3)))
-- 
2.20.0

[Message part 5 (text/plain, inline)]

--
Meiyo Peng
https://www.pengmeiyu.com/

[Message part 6 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Meiyo Peng <meiyo.peng <at> gmail.com>
Cc: 33874-done <at> debbugs.gnu.org
Subject: Re: [bug#33874] [PATCH] gnu: Add badvpn.
Date: Wed, 26 Dec 2018 18:37:28 +0100

[Message part 7 (text/plain, inline)]

Hi,

Meiyo Peng <meiyo.peng <at> gmail.com> skribis:

>>From 00cfd4bd699a5863431504018725693257f6423f Mon Sep 17 00:00:00 2001
> From: Meiyo Peng <meiyo.peng <at> gmail.com>
> Date: Mon, 24 Dec 2018 22:35:26 +0800
> Subject: [PATCH] gnu: Add badvpn.
>
> * gnu/packages/vpn.scm (badvpn): New variable.

Applied with the minor changes below to make the synopsis hopefully
clearer.

Thanks!

Ludo’.

[Message part 8 (text/x-patch, inline)]

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 8cc6a41d77..dabf84a947 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -427,9 +427,9 @@ with configuration options for most of @command{sshuttle}’s features.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://github.com/ambrop72/badvpn")
-    (synopsis "NCD scripting language, tun2socks proxifier, P2P VPN")
-    (description "@code{BadVPN} is a collection of VPN-related tools.  It
-includes:
+    (synopsis "Peer-to-peer virtual private network (VPN)")
+    (description "@code{BadVPN} is a collection of virtual private
+network (VPN) tools.  It includes:
 
 @enumerate
 @item NCD programming language.\n
@@ -441,7 +441,7 @@ The tun2socks program socksifes TCP connections at the network layer.  It
 implements a TUN device which accepts all incoming TCP connections (regardless
 of destination IP), and forwards the connections through a SOCKS server.
 @item Peer-to-peer VPN.\n
-The Peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
+The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
 (VPN nodes).
 @end enumerate")
     ;; This project contains a bundled lwIP. lwIP is also released under the

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.