--- Begin Message ---
|
Subject: |
[PATCH] gnu: Add badvpn. |
|
Date: |
Wed, 26 Dec 2018 11:10:39 +0800 |
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.
>From 011c6c86a2b89ea636499687ed7b316e26df384f Mon Sep 17 00:00:00 2001
From: Meiyo Peng <address@hidden>
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:
+
address@hidden
address@hidden 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.
address@hidden 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.
address@hidden Peer-to-peer VPN.\n
+The Peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
+(VPN nodes).
address@hidden enumerate")
+ ;; This project contains a bundled lwIP. lwIP is also released under the
+ ;; 3-clause BSD license.
+ (license license:bsd-3)))
--
2.20.0
--
Meiyo Peng
https://www.pengmeiyu.com/
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#33874] [PATCH] gnu: Add badvpn. |
|
Date: |
Wed, 26 Dec 2018 18:37:28 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Hi,
Meiyo Peng <address@hidden> skribis:
>>From 00cfd4bd699a5863431504018725693257f6423f Mon Sep 17 00:00:00 2001
> From: Meiyo Peng <address@hidden>
> 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’.
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
--- End Message ---