From patchwork Wed Dec 26 13:02:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Meiyo Peng X-Patchwork-Id: 549 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 342661699A; Wed, 26 Dec 2018 13:04:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 9886C16993 for ; Wed, 26 Dec 2018 13:04:17 +0000 (GMT) Received: from localhost ([127.0.0.1]:46280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc8r8-00088v-4s for patchwork@mira.cbaines.net; Wed, 26 Dec 2018 08:04:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gc8r1-00088c-LY for guix-patches@gnu.org; Wed, 26 Dec 2018 08:04:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gc8qx-0007Hq-UA for guix-patches@gnu.org; Wed, 26 Dec 2018 08:04:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52757) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gc8qw-0007Gx-QQ for guix-patches@gnu.org; Wed, 26 Dec 2018 08:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gc8qw-0004c1-EE for guix-patches@gnu.org; Wed, 26 Dec 2018 08:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33874] [PATCH] gnu: Add badvpn. Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Dec 2018 13:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33874 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33874@debbugs.gnu.org Received: via spool by 33874-submit@debbugs.gnu.org id=B33874.154582938417647 (code B ref 33874); Wed, 26 Dec 2018 13:04:02 +0000 Received: (at 33874) by debbugs.gnu.org; 26 Dec 2018 13:03:04 +0000 Received: from localhost ([127.0.0.1]:36619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gc8q0-0004aY-AV for submit@debbugs.gnu.org; Wed, 26 Dec 2018 08:03:04 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:33228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gc8py-0004a1-0G for 33874@debbugs.gnu.org; Wed, 26 Dec 2018 08:03:03 -0500 Received: by mail-pl1-f195.google.com with SMTP id z23so7542425plo.0 for <33874@debbugs.gnu.org>; Wed, 26 Dec 2018 05:03:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=a2TMKr4vH9jQibJody1tuksawuufDgtewMwLORKraXo=; b=iS5t83uBgrVGFzdQp3StOWpoLBqOgNJrl7GANTE8h29+ca1IcnCA1vIb5DJwo1OQ0M Cg8gZqbNCAYg9n9SKc33nDzq3mPwwKJRiwSCSF1v0ZlNM8cZszt5b9slbxpXmO6ag22a RkjabM7qlthpLndsOAsOU+nBMFb5pl1milHRdPNKW0WqZ31F8JKAFKrn06KjnfC6b+xD UMt9RQmO4oxbM45SUXYi4nEAucRg7XP4U0wk6aGswTb7VQM6YxIS8LQauT2hs13xpTrB vTX1CWYIjq1uX24uyHZaBO5SpHQJt7CFnEGUFyWjudOAjZqWHku2s8kBmyWHrMsxvY0B sOzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=a2TMKr4vH9jQibJody1tuksawuufDgtewMwLORKraXo=; b=lYbSKzMXaWpbHqbVX6eHGc02OJdxX55HFmJGyn+aV5puruNSXvGgy5Mt4U515i9bD1 HDgb4HJRr8tf6x7iSesQfUIvSDkeqwxoZQ0Xbiny1GbVJOfbHn4CKx2liDeHRXUOR+bb JXkWwSzY5hR9PCABS57a19mlLrz4Y2Lw7QZh3y5mKJP3xyVS9MHFS04YqL6+plui4HEe h2jb7IPxTfEPb2PjgodTxJQhzTI4a2lxkvkZv+mNaToAfU2CnwYMc1Pq3s3LBiAz2EuV pKQO0NGP4B+R3l9o16iN2Oh+K6k+pL7JAHMNdiTes4Eqmu3JdzoDFlb7RHyorDKC129I WY0g== X-Gm-Message-State: AJcUukc9Cll4VY95uAEoNtlFMFLjP6xK7gZE9l9cSLY8dfiOHEewvgRx zhHfyiEec55XeyxTy/ae64ZpVdBA X-Google-Smtp-Source: ALg8bN5ojW5W0xTSVzom56ABiTXdEfdIL5WyRhJlUU3xLB1rhyCtgLY9Uc9sJRc46KB8DDD/S6+iuQ== X-Received: by 2002:a17:902:2c03:: with SMTP id m3mr20432572plb.125.1545829375811; Wed, 26 Dec 2018 05:02:55 -0800 (PST) Received: from captain (144.34.217.65.16clouds.com. [144.34.217.65]) by smtp.gmail.com with ESMTPSA id u29sm47643871pgn.23.2018.12.26.05.02.53 for <33874@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Dec 2018 05:02:54 -0800 (PST) From: Meiyo Peng References: <87pntpgez4.fsf@gmail.com> Date: Wed, 26 Dec 2018 21:02:44 +0800 In-Reply-To: <87pntpgez4.fsf@gmail.com> (Meiyo Peng's message of "Wed, 26 Dec 2018 11:10:39 +0800") Message-ID: <87bm58e8zv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, I forgot to add a copyright notice for myself. Here is the new patch. --- Meiyo Peng https://www.pengmeiyu.com/ From 00cfd4bd699a5863431504018725693257f6423f Mon Sep 17 00:00:00 2001 From: Meiyo Peng 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 | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 1edd1ac56..8cc6a41d7 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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 +39,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 +403,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.1