From patchwork Tue Sep 15 15:15:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 24153 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 D95D127BBE8; Tue, 15 Sep 2020 16:17:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4BF8427BBE7 for ; Tue, 15 Sep 2020 16:17:18 +0100 (BST) Received: from localhost ([::1]:48100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIChm-0001IX-I3 for patchwork@mira.cbaines.net; Tue, 15 Sep 2020 11:17:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kICha-0001Ez-JA for guix-patches@gnu.org; Tue, 15 Sep 2020 11:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kICha-0001VD-94 for guix-patches@gnu.org; Tue, 15 Sep 2020 11:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kICha-0000SZ-2O for guix-patches@gnu.org; Tue, 15 Sep 2020 11:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH 8/9] gnu: obfs4 Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Sep 2020 15:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.160018297131724 (code B ref 42380); Tue, 15 Sep 2020 15:17:01 +0000 Received: (at 42380) by debbugs.gnu.org; 15 Sep 2020 15:16:11 +0000 Received: from localhost ([127.0.0.1]:60202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kICgk-0008FC-9y for submit@debbugs.gnu.org; Tue, 15 Sep 2020 11:16:10 -0400 Received: from mx1.riseup.net ([198.252.153.129]:41762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kICgi-0008DT-NV for 42380@debbugs.gnu.org; Tue, 15 Sep 2020 11:16:09 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4BrRdN27y8zFqGm for <42380@debbugs.gnu.org>; Tue, 15 Sep 2020 08:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1600182968; bh=YMgHVSZod2ilAZHAbCdyl3cJ7n2AQv5HUQ8aE5hcg7Q=; h=Date:From:To:Subject:References:In-Reply-To:From; b=RbdQhpl8wsr1Y6JYnnxrZCbaN/oAweMxBMgribzvTdgNItk4oRmyuzKxmhX61W20G iMi8DsneeUfekzPI2Iu/BiicfzmTm6hTzu0KJBknGYfUS7vhZQXBYYTwf335BHcq1y IskMErn2zaHEcDnZBFR4kY/iVK0rXplEKNhsxN3Y= X-Riseup-User-ID: EFF7FF43AF4854D1EB860C9D7E9DC5706133713DB44E001B7FD2DF04206E791A Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id 4BrRdL706lz8t5D for <42380@debbugs.gnu.org>; Tue, 15 Sep 2020 08:16:06 -0700 (PDT) Date: Tue, 15 Sep 2020 12:15:25 -0300 From: =?utf-8?b?QW5kcsOp?= Batista Message-ID: <20200915151525.GH13296@andel> References: <20200715211547.GA17146@andel> <20200725144930.GA13751@andel> <20200803125556.GA18868@andel> <87blihhdz6.fsf@gnu.org> <20200909022429.GA24930@andel> <878sdjo1qv.fsf@gnu.org> <20200915142128.GA12025@andel> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915142128.GA12025@andel> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 From 6e228ba965d65963456f3232cb8bd7fcc25bf822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Batista?= Date: Mon, 14 Sep 2020 19:05:45 -0300 Subject: [PATCH] gnu: Add obfs4. To: 42380@debbugs.gnu.org * gnu/packages/tor.scm (obfs4): New variable. * Alphabetically order module imports. --- gnu/packages/tor.scm | 80 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index c852c54a5b..dd362d3af8 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -33,13 +33,16 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) - #:use-module (gnu packages libevent) - #:use-module (gnu packages linux) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages golang) + #:use-module (gnu packages libevent) + #:use-module (gnu packages linux) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -47,7 +50,6 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) - #:use-module (gnu packages autotools) #:use-module (gnu packages tls) #:use-module (gnu packages w3m)) @@ -324,3 +326,75 @@ statistics and status reports on: Potential client and exit connections are scrubbed of sensitive information.") (license license:gpl3+))) + +(define-public obfs4 + (package + (name "obfs4") + (version "0.0.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.torproject.org/pluggable-transports/obfs4.git") + (commit (string-append "obfs4proxy-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y2kjwrk64l1h8b87m4iqsanib5rn68gzkdri1vd132qrlypycjn")))) + (build-system go-build-system) + (arguments + '(#:import-path "git.torproject.org/pluggable-transports/obfs4.git" + #:tests? #f ;; No test files + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs configure-flags #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively + "src/git.torproject.org/pluggable-transports/obfs4.git" + "src/gitlab.com/yawning/obfs4.git" + #:log (%make-void-port "w")) + (with-directory-excursion + "src/git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy" + (invoke "go" "build" "-ldflags" "-s")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (src "src/git.torproject.org/pluggable-transports/obfs4.git") + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (doc (string-append share "/doc")) + (man (string-append share "/man/man1"))) + (mkdir-p man) + (mkdir bin) + (mkdir doc) + (with-directory-excursion + (string-append src "/obfs4proxy") + (copy-file "obfs4proxy" + (string-append bin "/obfs4proxy"))) + (with-directory-excursion + (string-append src "/doc") + (copy-file "obfs4proxy.1" + (string-append man "/obfs4proxy.1")) + (copy-file "obfs4-spec.txt" + (string-append doc "/obfs4-spec.txt"))) + #t)))))) + (propagated-inputs + `(("go-torproject-org-ptlib" ,go-torproject-org-ptlib) + ("go-github-com-agl-ed25519" ,go-github-com-agl-ed25519) + ("go-github-com-dchest-siphash" ,go-github-com-dchest-siphash) + ("go-github-com-dchest-uniuri" ,go-github-com-dchest-uniuri) + ("go-github-com-dsnet-compress" ,go-github-com-dsnet-compress) + ("go-schwanenlied-me-yawning-bsaes" ,go-schwanenlied-me-yawning-bsaes) + ("go-gitlab-com-yawning-utls" ,go-gitlab-com-yawning-utls) + ("go-golang-org-x-net" ,go-golang-org-x-net) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("go-golang-org-x-text" ,go-golang-org-x-text))) + (home-page "https://git.torproject.org/pluggable-transports/obfs4.git") + (synopsis "Obfs4 implements an obfuscation protocol") + (description "This is a look-like nothing obfuscation protocol that +incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol. +The obfs naming was chosen primarily because it was shorter, in terms of +protocol ancestery obfs4 is much closer to ScrambleSuit than obfs2/obfs3.") + (license license:gpl3+)))