From patchwork Wed Dec 26 03:10:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Meiyo Peng X-Patchwork-Id: 545 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 248201696A; Wed, 26 Dec 2018 03:12:23 +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 A62171694A for ; Wed, 26 Dec 2018 03:12:22 +0000 (GMT) Received: from localhost ([127.0.0.1]:44206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbzcM-0007gT-3R for patchwork@mira.cbaines.net; Tue, 25 Dec 2018 22:12:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbzcC-0007gK-Mu for guix-patches@gnu.org; Tue, 25 Dec 2018 22:12:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbzc4-0006cB-4f for guix-patches@gnu.org; Tue, 25 Dec 2018 22:12:10 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45863) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbzc2-0006bC-K3 for guix-patches@gnu.org; Tue, 25 Dec 2018 22:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gbzc2-0004B6-C4 for guix-patches@gnu.org; Tue, 25 Dec 2018 22:12: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 03:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33874 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33874@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154579387915965 (code B ref -1); Wed, 26 Dec 2018 03:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Dec 2018 03:11:19 +0000 Received: from localhost ([127.0.0.1]:36542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbzbH-00049J-FG for submit@debbugs.gnu.org; Tue, 25 Dec 2018 22:11:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbzbB-00048n-MH for submit@debbugs.gnu.org; Tue, 25 Dec 2018 22:11:13 -0500 Received: from lists.gnu.org ([208.118.235.17]:48309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gbzb6-0005y3-Cs for submit@debbugs.gnu.org; Tue, 25 Dec 2018 22:11:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbzb1-0007dg-MQ for guix-patches@gnu.org; Tue, 25 Dec 2018 22:11:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbzaw-0005tH-Pj for guix-patches@gnu.org; Tue, 25 Dec 2018 22:10:59 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:34708) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbzaw-0005t4-J3 for guix-patches@gnu.org; Tue, 25 Dec 2018 22:10:54 -0500 Received: by mail-pf1-x42b.google.com with SMTP id h3so7326394pfg.1 for ; Tue, 25 Dec 2018 19:10:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=2VcQfaav4dy0avE9ROMnjapV/E7i+immoqA2/uo5N7A=; b=kUXLxddbFkZUJBoylAsQAC/dvsoSkp4kCxyA+XiA8TEU0xlqCQuBzSXAmV6wvOxMcQ OoPPpwm0jvLJC6ZL+kkgzuKd9qxanTFSHFobEBmARg8N/3kCyMRv73IpRqpfmAQ++KiB eFX/TjoGBmdYNYcRdYPBVR18/eKRKcPqqNOG8bF8r8qF81ujZn5Bk3wmL3YlTFtLsF+l SED+japRCPlkLqk0En2V2F0W868ftkp8JR8lru5qUb2Mf8tPwF0ah3djbJFxeQLRqfKb Q1JX6OE3UcIgCkrE+zhv8BY/Qbem2VOArdhO6wAOBnDRrO21D0BdMxkjV2zqzhykbwnW yw8A== 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:date:message-id:mime-version; bh=2VcQfaav4dy0avE9ROMnjapV/E7i+immoqA2/uo5N7A=; b=Amq4znhoIAvrQ1ltxcS+C15YROXDFTOC82+nPp9lMge9UUxyOZhzQeVOdaZI01zGHh 506fQuEpyjmfJXGNU4eYijTAQBcm+Sr5u26xA3hXkifJA+PY32B9NI5NgW9H9khCCNtQ P08C5vn8JFzRAdSUE5XDCU09atc8iaEcBQv5VIBQGlCUQ4WoBxj2fCbcPlczYO7LN1va 1BsAbcJXp4BzKkEsJ79qKIsSqu0RB1nkUHqWxsdOnAa+jcVSdwcG1f3MjwvxRZg/AwnU hYjq4Y/6kfNJ20VQJ4GW9sr+V+xkT7vwMJ9ycDejZiknM75nnsc2FTWQ+cuP5QXtkusD AnLQ== X-Gm-Message-State: AA+aEWbHbcobAVcq66yVuFT0LmQdz9X0N7xUuYDW8zz+6lzcvgAggKgr InZO8ETeEnudK0dkJuh/I0V44b+K X-Google-Smtp-Source: AFSGD/V3jsGx4w8WvOwRJKzMXRnNkGtFALl1gET1eiU5FI6DpU8MePC10OlDi5DA6xOFFeidTRlIjw== X-Received: by 2002:a62:6b8a:: with SMTP id g132mr18144893pfc.201.1545793853125; Tue, 25 Dec 2018 19:10:53 -0800 (PST) Received: from dinosaur (144.34.217.65.16clouds.com. [144.34.217.65]) by smtp.gmail.com with ESMTPSA id k129sm43346574pgk.29.2018.12.25.19.10.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 19:10:52 -0800 (PST) From: Meiyo Peng Date: Wed, 26 Dec 2018 11:10:39 +0800 Message-ID: <87pntpgez4.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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, 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. --- Meiyo Peng https://www.pengmeiyu.com/ From 011c6c86a2b89ea636499687ed7b316e26df384f 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 | 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