From patchwork Wed Jul 17 18:11:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Jakob L. Kreuze" X-Patchwork-Id: 14707 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 3967D17238; Wed, 17 Jul 2019 19:12:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 581AD17237 for ; Wed, 17 Jul 2019 19:12:09 +0100 (BST) Received: from localhost ([::1]:59522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnoPR-0006rk-26 for patchwork@mira.cbaines.net; Wed, 17 Jul 2019 14:12:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51623) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnoPL-0006kO-D8 for guix-patches@gnu.org; Wed, 17 Jul 2019 14:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnoPK-0006w4-47 for guix-patches@gnu.org; Wed, 17 Jul 2019 14:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44152) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnoPK-0006w0-1S for guix-patches@gnu.org; Wed, 17 Jul 2019 14:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnoPJ-0003L1-RP for guix-patches@gnu.org; Wed, 17 Jul 2019 14:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36638] [PATCH v2 1/2] gnu: Add websocketpp. Resent-From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jul 2019 18:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36638@debbugs.gnu.org Received: via spool by 36638-submit@debbugs.gnu.org id=B36638.156338709112778 (code B ref 36638); Wed, 17 Jul 2019 18:12:01 +0000 Received: (at 36638) by debbugs.gnu.org; 17 Jul 2019 18:11:31 +0000 Received: from localhost ([127.0.0.1]:52970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnoOl-0003Jz-8t for submit@debbugs.gnu.org; Wed, 17 Jul 2019 14:11:30 -0400 Received: from mx.sdf.org ([205.166.94.20]:65416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnoOg-0003Jn-5u for 36638@debbugs.gnu.org; Wed, 17 Jul 2019 14:11:25 -0400 Received: from Upsilon (mobile-166-171-185-60.mycingular.net [166.171.185.60]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x6HIBI5K028483 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO); Wed, 17 Jul 2019 18:11:20 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87o91xbz4p.fsf@sdf.lonestar.org> <87k1clbz2i.fsf@sdf.lonestar.org> <8736j7l155.fsf@gnu.org> <87r26rjm3q.fsf@gnu.org> <87y30wpm68.fsf_-_@sdf.lonestar.org> Date: Wed, 17 Jul 2019 14:11:16 -0400 In-Reply-To: <87y30wpm68.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Wed, 17 Jul 2019 14:10:07 -0400") Message-ID: <87tvbkpm4b.fsf_-_@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (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: 209.51.188.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 * gnu/packages/web.scm (websocketpp): New variable. --- gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d1f5ec2eb6..e61bbba695 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages adns) #:use-module (gnu packages apr) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages documentation) #:use-module (gnu packages docbook) @@ -854,6 +856,40 @@ for efficient socket-like bidirectional reliable communication channels.") ;; This is LGPLv2.1-only with extra exceptions specified in 'LICENSE'. (license license:lgpl2.1))) +(define-public websocketpp + (package + (name "websocketpp") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zaphoyd/websocketpp.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")))) + (build-system cmake-build-system) + (inputs `(("boost" ,boost) + ("openssl" ,openssl))) + (arguments '(#:configure-flags + '("-DBUILD_TESTS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'install 'remove-tests + (lambda* (#:key outputs + #:allow-other-keys) + (let* ((install-dir (assoc-ref outputs "out")) + (bin-dir (string-append install-dir "/bin"))) + (delete-file-recursively bin-dir))))))) + (home-page "https://www.zaphoyd.com/websocketpp/") + (synopsis "C++ library implementing the WebSocket protocol") + (description "WebSocket++ is a C++ library that can be used to implement +WebSocket functionality. The goals of the project are to provide a WebSocket +implementation that is simple, portable, flexible, lightweight, low level, and +high performance.") + (license license:bsd-3))) + (define-public libpsl (package (name "libpsl") From patchwork Wed Jul 17 18:12:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Jakob L. Kreuze" X-Patchwork-Id: 14708 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 BFABB17239; Wed, 17 Jul 2019 19:13:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5B8AD17237 for ; Wed, 17 Jul 2019 19:13:07 +0100 (BST) Received: from localhost ([::1]:59524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnoQN-0007YJ-1G for patchwork@mira.cbaines.net; Wed, 17 Jul 2019 14:13:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51868) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnoQJ-0007Wk-PQ for guix-patches@gnu.org; Wed, 17 Jul 2019 14:13:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnoQI-0007NB-3U for guix-patches@gnu.org; Wed, 17 Jul 2019 14:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44157) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnoQI-0007N5-0U for guix-patches@gnu.org; Wed, 17 Jul 2019 14:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnoQH-0003Mo-Q3 for guix-patches@gnu.org; Wed, 17 Jul 2019 14:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36638] [PATCH v2 2/2] gnu: Add i2pd. Resent-From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jul 2019 18:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36638@debbugs.gnu.org Received: via spool by 36638-submit@debbugs.gnu.org id=B36638.156338715812911 (code B ref 36638); Wed, 17 Jul 2019 18:13:01 +0000 Received: (at 36638) by debbugs.gnu.org; 17 Jul 2019 18:12:38 +0000 Received: from localhost ([127.0.0.1]:52978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnoPu-0003MB-BY for submit@debbugs.gnu.org; Wed, 17 Jul 2019 14:12:38 -0400 Received: from mx.sdf.org ([205.166.94.20]:65131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hnoPr-0003M2-IG for 36638@debbugs.gnu.org; Wed, 17 Jul 2019 14:12:36 -0400 Received: from Upsilon (mobile-166-171-185-60.mycingular.net [166.171.185.60]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x6HICUvt006967 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO); Wed, 17 Jul 2019 18:12:32 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87o91xbz4p.fsf@sdf.lonestar.org> <87k1clbz2i.fsf@sdf.lonestar.org> <8736j7l155.fsf@gnu.org> <87r26rjm3q.fsf@gnu.org> <87y30wpm68.fsf_-_@sdf.lonestar.org> <87tvbkpm4b.fsf_-_@sdf.lonestar.org> Date: Wed, 17 Jul 2019 14:12:23 -0400 In-Reply-To: <87tvbkpm4b.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Wed, 17 Jul 2019 14:11:16 -0400") Message-ID: <87pnm8pm2g.fsf_-_@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (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: 209.51.188.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 * gnu/packages/i2p.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/i2p.scm | 107 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 gnu/packages/i2p.scm diff --git a/gnu/local.mk b/gnu/local.mk index e6fca384a0..20f77c89f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -243,6 +243,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/hugs.scm \ %D%/packages/hurd.scm \ %D%/packages/hyperledger.scm \ + %D%/packages/i2p.scm \ %D%/packages/ibus.scm \ %D%/packages/icu4c.scm \ %D%/packages/idris.scm \ diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm new file mode 100644 index 0000000000..0f6aa2133a --- /dev/null +++ b/gnu/packages/i2p.scm @@ -0,0 +1,107 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Jakob L. Kreuze +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages i2p) + #:use-module (gnu packages boost) + #:use-module (gnu packages compression) + #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) + #:use-module (gnu packages web) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public i2pd + (package + (name "i2pd") + (version "2.27.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PurpleI2P/i2pd.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00y0y57z84gakwa88zzm0g3ixgc6y7zm35rjiysiajzvmdq5w1wf")))) + (build-system cmake-build-system) + (inputs `(("boost" ,boost) + ("miniupnpc" ,miniupnpc) + ("openssl" ,openssl) + ("websocketpp" ,websocketpp) + ("zlib" ,zlib))) + (arguments '(#:configure-flags + (let ((source (assoc-ref %build-inputs "source"))) + (list (string-append "-S" source "/build") + "-DWITH_PCH=OFF" + "-DWITH_STATIC=OFF" + "-DWITH_UPNP=ON" + "-DWITH_WEBSOCKETS=ON" + "-DWITH_LIBRARY=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DWITH_BINARY=ON")) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key + (make-flags '()) + (parallel-tests? #t) + #:allow-other-keys) + (let ((oldpwd (getcwd)) + (source (assoc-ref %build-inputs "source"))) + (copy-recursively (string-append source "/tests") + "./tests") + (chdir "./tests") + (substitute* "Makefile" + (("../libi2pd/") (string-append source "/libi2pd/"))) + (apply invoke "make" "all" + `(,@(if parallel-tests? + `("-j" ,(number->string + (parallel-job-count))) + '()) + ,@make-flags)) + (chdir oldpwd)))) + (add-after 'install 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let* ((install-dir (assoc-ref outputs "out")) + (src-dir (string-append install-dir "/src")) + (include-dir + (string-append install-dir "/include"))) + (mkdir-p include-dir) + ;; This is the only header file that's relevant to the + ;; public interface. + ;; + (install-file (string-append src-dir "/api.h") + include-dir) + #t))) + (add-after 'install-headers 'remove-source + (lambda* (#:key outputs #:allow-other-keys) + (let* ((install-dir (assoc-ref outputs "out")) + (src-dir (string-append install-dir "/src"))) + (delete-file-recursively src-dir) + (delete-file (string-append install-dir + "/LICENSE")) + #t)))))) + (home-page "https://i2pd.website/") + (synopsis "Router for an end-to-end encrypted and anonymous internet") + (description "i2pd is a client for the anonymous I2P network, upon which +applications for file sharing, web browsing, instant messaging, and more are +built. i2pd allows people from all around the world to communicate and share +information securely without restrictions.") + (license license:bsd-3)))