From debbugs-submit-bounces@debbugs.gnu.org Sat May 19 14:50:57 2018 Received: (at submit) by debbugs.gnu.org; 19 May 2018 18:50:57 +0000 Received: from localhost ([127.0.0.1]:41276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK6wS-0006ix-VF for submit@debbugs.gnu.org; Sat, 19 May 2018 14:50:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK6wP-0006ii-5L for submit@debbugs.gnu.org; Sat, 19 May 2018 14:50:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fK6wJ-0007XF-5G for submit@debbugs.gnu.org; Sat, 19 May 2018 14:50:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57610) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fK6wJ-0007X0-1t for submit@debbugs.gnu.org; Sat, 19 May 2018 14:50:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fK6wH-000886-Vt for guix-patches@gnu.org; Sat, 19 May 2018 14:50:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fK6wE-0007VA-CU for guix-patches@gnu.org; Sat, 19 May 2018 14:50:45 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:13052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fK6wE-0007UL-53 for guix-patches@gnu.org; Sat, 19 May 2018 14:50:42 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 34D9641004 for ; Sat, 19 May 2018 20:50:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id 6QornbUOcidz for ; Sat, 19 May 2018 20:50:39 +0200 (CEST) From: Theodoros Foradis To: guix-patches@gnu.org Subject: Update monero to 0.12.0.0. Date: Sat, 19 May 2018 21:50:34 +0300 Message-ID: <87bmdbtr7p.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) This patch series updates monero and monero-core to 0.12.0.0 and adds cppzmq package. gnu/local.mk | 1 + gnu/packages/finance.scm | 35 ++++++++++++++++++++++------------- gnu/packages/networking.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/patches/monero-fix-version.patch | 16 ++++++++++++++++ 4 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/monero-fix-version.patch gnu: monero-core: Update to 0.12.0.0. gnu: monero: Update to 0.12.0.0. gnu: Add cppzmq. -- Theodoros Foradis From debbugs-submit-bounces@debbugs.gnu.org Sat May 19 14:55:03 2018 Received: (at 31531) by debbugs.gnu.org; 19 May 2018 18:55:03 +0000 Received: from localhost ([127.0.0.1]:41293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK70L-0006pB-Qc for submit@debbugs.gnu.org; Sat, 19 May 2018 14:55:01 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:27654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK70K-0006ow-NY for 31531@debbugs.gnu.org; Sat, 19 May 2018 14:54:57 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 16152477F4; Sat, 19 May 2018 20:54:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id Y1E3i2beXVdV; Sat, 19 May 2018 20:54:49 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Add cppzmq. Date: Sat, 19 May 2018 21:54:35 +0300 Message-Id: <20180519185437.23665-1-theodoros@foradis.org> In-Reply-To: <87bmdbtr7p.fsf@foradis.org> References: <87bmdbtr7p.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/networking.scm (cppzmq): New variable. --- gnu/packages/networking.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index eda2984d1..24cd31310 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Adam Van Ymeren ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Theodoros Foradis ;;; ;;; This file is part of GNU Guix. ;;; @@ -312,6 +313,33 @@ more.") between different versions of ØMQ.") (license license:mpl2.0))) +(define-public cppzmq + (package + (name "cppzmq") + (version "4.2.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/zeromq/" name + "/archive/v" version ".tar.gz")) + (sha256 + (base32 + "0zbk3726pvcl088qzl5z3cc0w0k5hh192l5jddnc0xsqmiq01x9y")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ;; No tests. + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("zeromq" ,zeromq))) + (home-page "http://zeromq.org") + (synopsis "C++ bindings for ØMQ") + (description + "Header-only C++ bindings for ØMQ. Contains direct mappings of the +abstractions provided by the ØMQ C API.") + (license license:expat))) + (define-public librdkafka (package (name "librdkafka") -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 19 14:55:09 2018 Received: (at 31531) by debbugs.gnu.org; 19 May 2018 18:55:09 +0000 Received: from localhost ([127.0.0.1]:41297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK70R-0006po-L5 for submit@debbugs.gnu.org; Sat, 19 May 2018 14:55:09 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:27672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK70M-0006oz-Cm for 31531@debbugs.gnu.org; Sat, 19 May 2018 14:55:00 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id BA8B54784A; Sat, 19 May 2018 20:54:52 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id XIVElhVKc4lU; Sat, 19 May 2018 20:54:51 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH 2/3] gnu: monero: Update to 0.12.0.0. Date: Sat, 19 May 2018 21:54:36 +0300 Message-Id: <20180519185437.23665-2-theodoros@foradis.org> In-Reply-To: <20180519185437.23665-1-theodoros@foradis.org> References: <87bmdbtr7p.fsf@foradis.org> <20180519185437.23665-1-theodoros@foradis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/patches/monero-fix-version.patch: New file. * gnu/local.mk: Add it. * gnu/packages/finance.scm: Update to 0.12.0.0. [source]: Add patch. [inputs]: Add zeromq, cppzmq, libsodium. [arguments]: Change build-type to "release". Add argument on unit-tests phase. Substitute system* with invoke. --- gnu/local.mk | 1 + gnu/packages/finance.scm | 29 ++++++++++++++++++--------- gnu/packages/patches/monero-fix-version.patch | 16 +++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/monero-fix-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbdb30989..e9e1fe9f4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -924,6 +924,7 @@ dist_patch_DATA = \ %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ + %D%/packages/patches/monero-fix-version.patch \ %D%/packages/patches/mongodb-support-unknown-linux-distributions.patch \ %D%/packages/patches/mozjs17-aarch64-support.patch \ %D%/packages/patches/mozjs24-aarch64-support.patch \ diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c93f64193..9f18d79ac 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Carlo Zancanaro -;;; Copyright © 2017 Theodoros Foradis +;;; Copyright © 2017,2018 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier @@ -36,6 +36,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages dns) @@ -48,6 +49,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -328,7 +330,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.11.1.0") + (version "0.12.0.0") (source (origin (method url-fetch) @@ -344,9 +346,11 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") '("external/miniupnpc" "external/rapidjson" "external/unbound")) #t)) + ;; Patch should be upstream by next update. TODO: Delete it. + (patches (search-patches "monero-fix-version.patch")) (sha256 (base32 - "16shd834025jyzy68h3gag1sz8vbk875hy4j97hrki8pacz8vd5m")))) + "1ywgvkpd9jx9hagh9q84ay8lxq4ymdbxjhdaxg29dqir1a8070sy")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -356,7 +360,10 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (inputs `(("bind" ,isc-bind) ("boost" ,boost) + ("zeromq" ,zeromq) + ("cppzmq" ,cppzmq) ("expat" ,expat) + ("libsodium" ,libsodium) ("libunwind" ,libunwind) ("lmdb" ,lmdb) ("miniupnpc" ,miniupnpc) @@ -365,6 +372,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ("unbound" ,unbound))) (arguments `(#:out-of-source? #t + #:build-type "release" #:configure-flags '("-DBUILD_TESTS=ON" ,@(if (string=? "aarch64-linux" (%current-system)) '("-DARCH=armv8-a") @@ -392,9 +400,8 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") #t)) (replace 'check (lambda _ - (zero? - (system* "make" "ARGS=-E 'unit_tests|libwallet_api_tests'" - "test")))) + (invoke "make" "ARGS=-E 'unit_tests|libwallet_api_tests'" + "test"))) ;; The excluded unit tests need network access (add-after 'check 'unit-tests (lambda _ @@ -407,10 +414,12 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") "DNSResolver.DNSSECFailure" "DNSResolver.GetTXTRecord") ":"))) - (zero? - (system* "tests/unit_tests/unit_tests" - (string-append "--gtest_filter=-" - excluded-unit-tests)))))) + (invoke "tests/unit_tests/unit_tests" + (string-append "--gtest_filter=-" + excluded-unit-tests) + ;; Fix for data dir should be upstream by next update. + ;; TODO: Delete next command line argument. + (string-append "--data-dir=tests/data"))))) (add-after 'install 'install-blockchain-import-export (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/patches/monero-fix-version.patch b/gnu/packages/patches/monero-fix-version.patch new file mode 100644 index 000000000..694e0aaf9 --- /dev/null +++ b/gnu/packages/patches/monero-fix-version.patch @@ -0,0 +1,16 @@ +Fixes error during configure. +Will be upstream in monero-0.12.1.0. + +diff --git a/cmake/Version.cmake b/cmake/Version.cmake +index 439c4c5..3677e80 100644 +--- a/cmake/Version.cmake ++++ b/cmake/Version.cmake +@@ -28,7 +28,7 @@ + + function (write_static_version_header hash) + set(VERSIONTAG "${hash}") +- configure_file("src/version.cpp.in" "version.cpp") ++ configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") + endfunction () + + find_package(Git QUIET) -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 19 14:55:09 2018 Received: (at 31531) by debbugs.gnu.org; 19 May 2018 18:55:09 +0000 Received: from localhost ([127.0.0.1]:41299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK70X-0006q0-Bg for submit@debbugs.gnu.org; Sat, 19 May 2018 14:55:09 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:34428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fK70N-0006p0-4j for 31531@debbugs.gnu.org; Sat, 19 May 2018 14:55:01 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 7A81941015; Sat, 19 May 2018 20:54:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id ZU0kla1CNApO; Sat, 19 May 2018 20:54:52 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH 3/3] gnu: monero-core: Update to 0.12.0.0. Date: Sat, 19 May 2018 21:54:37 +0300 Message-Id: <20180519185437.23665-3-theodoros@foradis.org> In-Reply-To: <20180519185437.23665-1-theodoros@foradis.org> References: <87bmdbtr7p.fsf@foradis.org> <20180519185437.23665-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero-core): Update to 0.12.0.0. [arguments]: Substitute system* with invoke. --- gnu/packages/finance.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9f18d79ac..2980d58b0 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -436,7 +436,7 @@ Monero command line client and daemon.") (define-public monero-core (package (name "monero-core") - (version "0.11.1.0") + (version "0.12.0.0") (source (origin (method url-fetch) @@ -445,7 +445,7 @@ Monero command line client and daemon.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q7a9kpcjgp74fbplzs2iszdld6gwbfrydyd9in9izhwp100p1rr")))) + "0hrpimmb0chml2cjznalxwv3xajni7md7prx0dqm5rs9vsdbw5dr")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -492,7 +492,7 @@ Monero command line client and daemon.") #t)) (replace 'build (lambda _ - (zero? (system* "./build.sh")))) + (invoke "./build.sh"))) (add-after 'build 'fix-install-path (lambda* (#:key outputs #:allow-other-keys) (substitute* "build/Makefile" -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Mon May 21 16:32:22 2018 Received: (at 31531) by debbugs.gnu.org; 21 May 2018 20:32:22 +0000 Received: from localhost ([127.0.0.1]:43262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKrTi-0000Jb-AN for submit@debbugs.gnu.org; Mon, 21 May 2018 16:32:22 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKrTg-0000JU-QF for 31531@debbugs.gnu.org; Mon, 21 May 2018 16:32:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1526934711; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=1332; bh=oal35VmNz0h8xEDzzGuL/P9lIHQXTqGwDGwzOG844zA=; b=E/TEbA7MXJKmWkIkCOyBvfNrUiF88iGNHqhDOvhDBMdPna+AN/sSgrZ97V4JEXA6 Qw7VOUshSdtIvD+YtfeCorXFTjir/N/CpEBz5RGniACSLVPWuNuKQ7grQu/MnX2YsPo vLmM05G8hAChxXTedKgQq9WE6pFh7dQF01dpzIG4= Received: from localhost (port-92-200-15-58.dynamic.qsc.de [92.200.15.58]) by mx.zohomail.com with SMTPS id 1526934711361874.4543157751951; Mon, 21 May 2018 13:31:51 -0700 (PDT) References: <87bmdbtr7p.fsf@foradis.org> <20180519185437.23665-1-theodoros@foradis.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Ricardo Wurmus To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH 1/3] gnu: Add cppzmq. In-reply-to: <20180519185437.23665-1-theodoros@foradis.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 21 May 2018 22:31:48 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <87vabgoimj.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Theodoros, > * gnu/packages/networking.scm (cppzmq): New variable. Thanks for the patch! > +(define-public cppzmq > + (package > + (name "cppzmq") > + (version "4.2.2") > + (source (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/zeromq/" name > + "/archive/v" version ".tar.gz")) > + (sha256 > + (base32 > + "0zbk3726pvcl088qzl5z3cc0w0k5hh192l5jddnc0xsqmiq01x9y")) > + (file-name (string-append name "-" version > ".tar.gz")))) Please use =E2=80=9Cgit-fetch=E2=80=9D here and let the file name end on = =E2=80=9C-checkout=E2=80=9D. These automatically generated tarballs on GitHub are not stable; they change over time. > + (build-system cmake-build-system) > + (arguments > + '(#:tests? #f)) ;; No tests. Please just use a single semicolon for end of line comments. You can move this expression on the previous line, because it is short. > + (native-inputs > + `(("pkg-config" ,pkg-config))) > + (inputs > + `(("zeromq" ,zeromq))) > + (home-page "http://zeromq.org") > + (synopsis "C++ bindings for =C3=98MQ") > + (description > + "Header-only C++ bindings for =C3=98MQ. Contains direct mappings o= f the > +abstractions provided by the =C3=98MQ C API.") Please use complete sentences. Could you please send a new patch? --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Mon May 21 16:35:49 2018 Received: (at 31531) by debbugs.gnu.org; 21 May 2018 20:35:49 +0000 Received: from localhost ([127.0.0.1]:43271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKrX3-0000Oc-AA for submit@debbugs.gnu.org; Mon, 21 May 2018 16:35:49 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKrX2-0000OV-5J for 31531@debbugs.gnu.org; Mon, 21 May 2018 16:35:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1526934941; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=1536; bh=VGARfR8IJ6F8Rtl7LNKtIqN+ZbgUnnjJnZj75m990hg=; b=J6uIbrF7X67iqvOmbxUR+wDWlKz/FWlwxRbOuVo3kVh9WaryrG0k6bDYhQtvLska cPIFf+tzc5R0uyljxgzdq2T+wX+blK5QC5I/WQDB0uqJelIJcRo5IjRg4snu0EOhbgs LcIhxRTRLGrB/ZUB6H47x3+E5OUwGgAbmsZgJM/I= Received: from localhost (port-92-200-15-58.dynamic.qsc.de [92.200.15.58]) by mx.zohomail.com with SMTPS id 152693494120592.71099796809165; Mon, 21 May 2018 13:35:41 -0700 (PDT) References: <87bmdbtr7p.fsf@foradis.org> <20180519185437.23665-1-theodoros@foradis.org> <20180519185437.23665-2-theodoros@foradis.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Ricardo Wurmus To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH 2/3] gnu: monero: Update to 0.12.0.0. In-reply-to: <20180519185437.23665-2-theodoros@foradis.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 21 May 2018 22:35:38 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <87tvr0oig5.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Hi Theodoros, > * gnu/packages/patches/monero-fix-version.patch: New file. > * gnu/local.mk: Add it. I think that this patch is better implemented using =E2=80=9Csubstitute*=E2= =80=9D in a build phase. > * gnu/packages/finance.scm: Update to 0.12.0.0. > [source]: Add patch. > [inputs]: Add zeromq, cppzmq, libsodium. > [arguments]: Change build-type to "release". > Add argument on unit-tests phase. > Substitute system* with invoke. The last step (using =E2=80=9Cinvoke=E2=80=9D) is better done in a separate= patch. > -;;; Copyright =C2=A9 2017 Theodoros Foradis > +;;; Copyright =C2=A9 2017,2018 Theodoros Foradis Please add a space after the comma. > - (zero? > - (system* "tests/unit_tests/unit_tests" > - (string-append "--gtest_filter=3D-" > - excluded-unit-tests)))))) > + (invoke "tests/unit_tests/unit_tests" > + (string-append "--gtest_filter=3D-" > + excluded-unit-tests) > + ;; Fix for data dir should be upstream by next up= date. > + ;; TODO: Delete next command line argument. > + (string-append "--data-dir=3Dtests/data"))))) Wha does the TODO comment mean? > + function (write_static_version_header hash) > + set(VERSIONTAG "${hash}") > +- configure_file("src/version.cpp.in" "version.cpp") > ++ configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINA= RY_DIR}/version.cpp") > + endfunction () I=E2=80=99d prefer this to be a short substitute* snippet instead of a patc= h file. -- Ricardo From debbugs-submit-bounces@debbugs.gnu.org Mon May 21 16:36:45 2018 Received: (at 31531) by debbugs.gnu.org; 21 May 2018 20:36:45 +0000 Received: from localhost ([127.0.0.1]:43275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKrXx-0000Q9-KG for submit@debbugs.gnu.org; Mon, 21 May 2018 16:36:45 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKrXw-0000Q2-Pk for 31531@debbugs.gnu.org; Mon, 21 May 2018 16:36:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1526935001; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=257; bh=XsVfwz6I/SRRQuhkzZpK/Vee4Ov8PFg1Ykfd9bFlVr8=; b=On3ZeZo6PJ/iL4ggUHdurit4tB15jArnFTvl4i3h8Nt0xOdM1IqWdwVrOge2u0D7 R37/ZLVHdKwucGWscBesn4ciIrwW0bsGsNY9FREllgi8Em9049YG4zI3k/WQft7an0J feznTCPSD4sxz5kAfByZxdMKcwsehvtHRTKx8f8k= Received: from localhost (port-92-200-15-58.dynamic.qsc.de [92.200.15.58]) by mx.zohomail.com with SMTPS id 1526935001865223.34997380361335; Mon, 21 May 2018 13:36:41 -0700 (PDT) References: <87bmdbtr7p.fsf@foradis.org> <20180519185437.23665-1-theodoros@foradis.org> <20180519185437.23665-3-theodoros@foradis.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Ricardo Wurmus To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH 3/3] gnu: monero-core: Update to 0.12.0.0. In-reply-to: <20180519185437.23665-3-theodoros@foradis.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 21 May 2018 22:36:39 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <87sh6koieg.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Theodoros, > * gnu/packages/finance.scm (monero-core): Update to 0.12.0.0. > [arguments]: Substitute system* with invoke. It=E2=80=99s better to separate these two changes. The changes themselves look good though. Thanks! --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 14 16:21:32 2018 Received: (at 31531) by debbugs.gnu.org; 14 Jun 2018 20:21:32 +0000 Received: from localhost ([127.0.0.1]:48507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fTYkO-0002xp-23 for submit@debbugs.gnu.org; Thu, 14 Jun 2018 16:21:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fTYkM-0002xc-Ee for 31531@debbugs.gnu.org; Thu, 14 Jun 2018 16:21:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTYkG-00033p-LU for 31531@debbugs.gnu.org; Thu, 14 Jun 2018 16:21:25 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTYk9-0002yA-2G; Thu, 14 Jun 2018 16:21:17 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57050 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fTYk8-00079G-Lm; Thu, 14 Jun 2018 16:21:16 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Theodoros Foradis Subject: Re: [bug#31531] Update monero to 0.12.0.0. References: <87bmdbtr7p.fsf@foradis.org> Date: Thu, 14 Jun 2018 22:21:15 +0200 In-Reply-To: <87bmdbtr7p.fsf@foradis.org> (Theodoros Foradis's message of "Sat, 19 May 2018 21:50:34 +0300") Message-ID: <877en1yv9g.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31531 Cc: Ricardo Wurmus , 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello Theodoros, Theodoros Foradis skribis: > This patch series updates monero and monero-core to 0.12.0.0 and adds > cppzmq package. Did you have a chance to look at Ricardo=E2=80=99s comments? It looks like= very little is missing. Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 21 09:24:01 2018 Received: (at control) by debbugs.gnu.org; 21 Jun 2018 13:24:01 +0000 Received: from localhost ([127.0.0.1]:58375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fVzZB-00026n-5B for submit@debbugs.gnu.org; Thu, 21 Jun 2018 09:24:01 -0400 Received: from sinope02.bbbm.mdc-berlin.de ([141.80.25.24]:59116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fVzZA-00026g-Bo for control@debbugs.gnu.org; Thu, 21 Jun 2018 09:24:00 -0400 Received: from localhost (localhost [127.0.0.1]) by sinope02.bbbm.mdc-berlin.de (Postfix) with ESMTP id CDEFC11A171B for ; Thu, 21 Jun 2018 15:23:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mdc-berlin.de; h= message-id:content-type:content-type:mime-version:subject :subject:from:from:date:date:received:received:received :received; s=mdc; t=1529587434; x=1531401835; bh=a4ss5E85+yLGy/T Ror9U3Ctc0TT+lBN0IYDK5cv/pj4=; b=IhtHOCMxVEi4QiaNfv3kWuv2NrbBcdL RfVNWD/WyU1kZStXdCJNkj2bpDUlehzkqtg4V19aT2vBOpWeWFi2s7cDa2b0QaV5 3YHmQHVQlVv0ic5UyBYZyyrG0R06geFXqL/BImPbyHGn1HPbUAS2aqdgVIzM5tYO cBQPdHfeFQ4w= X-Virus-Scanned: amavisd-new at mdc-berlin.de Received: from sinope02.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (sinope02.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q2nTzEoQ6UIY for ; Thu, 21 Jun 2018 15:23:54 +0200 (CEST) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sinope02.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Thu, 21 Jun 2018 15:23:54 +0200 (CEST) Received: from SW-IT-P-CAS4.mdc-berlin.net (141.80.113.59) by HTCATWO.mdc-berlin.net (141.80.180.190) with Microsoft SMTP Server (TLS) id 14.3.399.0; Thu, 21 Jun 2018 15:23:54 +0200 Received: from localhost (141.80.113.51) by SW-IT-P-CAS4.mdc-berlin.net (141.80.113.59) with Microsoft SMTP Server id 14.3.399.0; Thu, 21 Jun 2018 15:23:53 +0200 Date: Thu, 21 Jun 2018 15:23:43 +0200 To: From: Ricardo Wurmus Subject: control message for bug #31531 MIME-Version: 1.0 Content-Type: text/plain Message-ID: <5d65d770-c17d-4322-85cf-3095d4245cc1@SW-IT-P-CAS4.mdc-berlin.net> X-Originating-IP: [141.80.113.51] X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.2.1013-23920.006 X-TM-AS-Result: No-6.344000-8.000000-10 X-TMASE-MatchedRID: JF2LdsBN2LqR9GF2J2xqMxRFJJyf5BJePTjRLcJ7r4H5M14iD8jFXi+4 bGm53b9r6h+ZI4NPtvP6C0ePs7A07SAJgyd9wrc88dVWt3OwLIKbayeBAQvY5B0iowKmwcloYio P6sC8FmaHETQu/3jQKTDqKvfQGpbb7f26Xu5TPkLZfZGgGONnSCkM+79xDx4l X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--6.344000-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.2.1013-23920.006 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 31531 moreinfo From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 04 12:36:56 2018 Received: (at 31531) by debbugs.gnu.org; 4 Jul 2018 16:36:56 +0000 Received: from localhost ([127.0.0.1]:46900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fakm0-0001sc-1j for submit@debbugs.gnu.org; Wed, 04 Jul 2018 12:36:56 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:43730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fakly-0001sQ-JK for 31531@debbugs.gnu.org; Wed, 04 Jul 2018 12:36:55 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 2B4E641166; Wed, 4 Jul 2018 18:36:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id Vlz12Y_21FEK; Wed, 4 Jul 2018 18:36:46 +0200 (CEST) References: <87bmdbtr7p.fsf@foradis.org> <877en1yv9g.fsf@gnu.org> From: Theodoros Foradis To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#31531] Update monero to 0.12.0.0. In-reply-to: <877en1yv9g.fsf@gnu.org> Date: Wed, 04 Jul 2018 19:36:10 +0300 Message-ID: <87a7r7t0ud.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Ricardo Wurmus , Theodoros Foradis , 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello Ludovic, Ludovic Courtès writes: > Did you have a chance to look at Ricardo’s comments? It looks like very > little is missing. Sorry for taking so long to reply, I had been busy over the last weeks. I looked at Ricardo's comments, and I will prepare an updated patch series. Thanks for your patience. -- Theodoros Foradis From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:36:30 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:36:30 +0000 Received: from localhost ([127.0.0.1]:51345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDbq-00042J-KX for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:36:30 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:57336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDbp-000426-Md for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:36:30 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 5393A41346; Sun, 8 Jul 2018 19:36:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id dOT2jCPkHs6q; Sun, 8 Jul 2018 19:36:22 +0200 (CEST) References: <87bmdbtr7p.fsf@foradis.org> <20180519185437.23665-1-theodoros@foradis.org> <87vabgoimj.fsf@elephly.net> From: Theodoros Foradis To: Ricardo Wurmus Subject: Re: [bug#31531] [PATCH 1/3] gnu: Add cppzmq. In-reply-to: <87vabgoimj.fsf@elephly.net> Date: Sun, 08 Jul 2018 20:35:46 +0300 Message-ID: <87d0vxy6j1.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis , 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello Ricardo, > Could you please send a new patch? Sorry for taking so long to send the new patch. In the meantime, monero was updated to 0.12.3.0 with a major difference, that using the system's miniupnpc was disabled, and the project's own version of it (due to security issues upstream) was added as a git submodule. So, there were 3 options for us. Either build from git and use the git submodule, disregard the security issue (that the folks at #monero-dev on freenode advised against) and use our own miniupnpc, or use monero's miniupnpc. I opted for the third option, introducing a patch that reverts the git commit that does not allow to use external miniupnpc, as well as packaging monero-project's miniupnpc as a non-public package in finance.scm. Is this the correct way to do this? Also, I included a commit renaming monero-core to monero-gui, as the official project was renamed. Is this appropriate? The old url (using monero-core) still worked as it's an alias for monero-gui now, but I figured it would be better to rename nonetheless. Lastly, I changed both packages to use git-fetch, as the github auto-generated tarballs would change. What do you think? I reply to this mail with the updated patch series. -- Theodoros Foradis From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:05 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:05 +0000 Received: from localhost ([127.0.0.1]:51358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfE-00047m-Ni for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:04 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:29836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfD-00047P-8R for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:39:59 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 6CD8E47843; Sun, 8 Jul 2018 19:39:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id jJR1GQE6M9iF; Sun, 8 Jul 2018 19:39:52 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 1/9] gnu: Add cppzmq. Date: Sun, 8 Jul 2018 20:39:24 +0300 Message-Id: <20180708173932.14807-1-theodoros@foradis.org> In-Reply-To: <87d0vxy6j1.fsf@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/networking.scm (cppzmq): New variable. --- gnu/packages/networking.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b72a4734d..342f54c79 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Theodoros Foradis ;;; ;;; This file is part of GNU Guix. ;;; @@ -315,6 +316,35 @@ more.") between different versions of ØMQ.") (license license:mpl2.0))) +(define-public cppzmq + (let ((revision "0") + (commit "d9f0f016c07046742738c65e1eb84722ae32d7d4")) + (package + (name "cppzmq") + (version (string-append "4.2.2-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zeromq/cppzmq") + (commit commit))) + (sha256 + (base32 + "1gmqlm00y6xpa5m6d4ajq3ww63n2w7h4sy997wj81vcqmqx45b1f")) + (file-name (string-append name "-" version "-checkout")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; No tests. + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("zeromq" ,zeromq))) + (home-page "http://zeromq.org") + (synopsis "C++ bindings for ØMQ") + (description + "Header-only C++ bindings for ØMQ. The header files contain direct mappings of +the abstractions provided by the ØMQ C API.") + (license license:expat)))) + (define-public librdkafka (package (name "librdkafka") -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:14 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:14 +0000 Received: from localhost ([127.0.0.1]:51367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfL-000490-35 for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:13 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfE-00047S-FF for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:04 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id E72C04187C; Sun, 8 Jul 2018 19:39:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id vG6nWfoMIyjJ; Sun, 8 Jul 2018 19:39:53 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 2/9] gnu: Add monero-miniupnpc. Date: Sun, 8 Jul 2018 20:39:25 +0300 Message-Id: <20180708173932.14807-2-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero-miniupnpc): New variable. --- gnu/packages/finance.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 55afa6217..26f4488ab 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Carlo Zancanaro -;;; Copyright © 2017 Theodoros Foradis +;;; Copyright © 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier @@ -35,6 +35,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages boost) @@ -329,6 +330,46 @@ generation from a seed. Your secret keys are encrypted and are never sent to other machines/servers. Electrum does not download the Bitcoin blockchain.") (license license:expat))) +(define monero-miniupnpc + ;; This package is the bundled version of miniupnpc used with monero. Monero-project has + ;; been maintaining its own version of the package since release 0.12.2.0. It includes + ;; security fixes not included in upstream releases. + (let ((revision "0") + (commit "6a63f9954959119568fbc4af57d7b491b9428d87")) + (package + (inherit miniupnpc) + (name "monero-miniupnpc") + (version (string-append "2.1-monero-0.12.3.0-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/monero-project/miniupnp/") + (commit commit))) + (sha256 + (base32 + "0s67zcz978iapjlq30yy9dl8qda9xhrl3jdi5f99cnbglh5gy16a")) + (file-name (string-append name "-" version "-checkout")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete miniupnp subprojects except for miniupnpc. + (for-each + delete-file-recursively + '("minissdpd" "miniupnpc-async" "miniupnpc-libevent" + "miniupnpd" )) + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments miniupnpc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'change-directory + (lambda _ + (chdir "miniupnpc"))) + (add-after 'change-directory 'chmod-header-file + (lambda _ + (chmod "miniupnpc.h" #o644)))))))))) + (define-public monero ;; This package bundles easylogging++ and lmdb. ;; The bundled easylogging++ is modified, and the changes will not be upstreamed. -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:14 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:14 +0000 Received: from localhost ([127.0.0.1]:51369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfS-00049D-8Q for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:14 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:29864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfH-00047a-5B for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:04 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id A08FA466E3; Sun, 8 Jul 2018 19:39:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id n-WB69rs3Mff; Sun, 8 Jul 2018 19:39:55 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 5/9] gnu: monero-core: Update to 0.12.2.0. Date: Sun, 8 Jul 2018 20:39:28 +0300 Message-Id: <20180708173932.14807-5-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero-core): Update to 0.12.2.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3d89490a5..8a80eb136 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -472,7 +472,7 @@ Monero command line client and daemon.") (define-public monero-core (package (name "monero-core") - (version "0.11.1.0") + (version "0.12.2.0") (source (origin (method url-fetch) @@ -481,7 +481,7 @@ Monero command line client and daemon.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q7a9kpcjgp74fbplzs2iszdld6gwbfrydyd9in9izhwp100p1rr")))) + "0lhq8ki91qmq3mll2hc96g6wm9b1biw1dalqw116b3yn78plvy7w")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:16 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:16 +0000 Received: from localhost ([127.0.0.1]:51371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfS-00049N-Kz for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:16 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfG-00047W-PC for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:04 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 49C1A41517; Sun, 8 Jul 2018 19:39:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id KqQPnFpZzffv; Sun, 8 Jul 2018 19:39:56 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 6/9] gnu: monero-core: Return #t from phases. Date: Sun, 8 Jul 2018 20:39:29 +0300 Message-Id: <20180708173932.14807-6-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/engineering.scm (monero)[arguments]: Substitute invoke for system*. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 8a80eb136..a02d8ee69 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -528,7 +528,7 @@ Monero command line client and daemon.") #t)) (replace 'build (lambda _ - (zero? (system* "./build.sh")))) + (invoke "./build.sh"))) (add-after 'build 'fix-install-path (lambda* (#:key outputs #:allow-other-keys) (substitute* "build/Makefile" -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:16 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:16 +0000 Received: from localhost ([127.0.0.1]:51373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfU-00049U-Hi for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:16 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:29874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfH-00047d-Rw for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:05 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 59BA74816D; Sun, 8 Jul 2018 19:39:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id S7p8Wg4y1waQ; Sun, 8 Jul 2018 19:39:54 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 4/9] gnu: monero: Return #t from phases. Date: Sun, 8 Jul 2018 20:39:27 +0300 Message-Id: <20180708173932.14807-4-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero)[arguments]: Substitute invoke for system*. --- gnu/packages/finance.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index eaafd1523..3d89490a5 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -439,9 +439,8 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") #t)) (replace 'check (lambda _ - (zero? - (system* "make" "ARGS=-E 'unit_tests|libwallet_api_tests'" - "test")))) + (invoke "make" "ARGS=-E 'unit_tests|libwallet_api_tests'" + "test"))) ;; The excluded unit tests need network access (add-after 'check 'unit-tests (lambda _ @@ -454,10 +453,9 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") "DNSResolver.DNSSECFailure" "DNSResolver.GetTXTRecord") ":"))) - (zero? - (system* "tests/unit_tests/unit_tests" - (string-append "--gtest_filter=-" - excluded-unit-tests)))))) + (invoke "tests/unit_tests/unit_tests" + (string-append "--gtest_filter=-" + excluded-unit-tests))))) (add-after 'install 'install-blockchain-import-export (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:17 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:17 +0000 Received: from localhost ([127.0.0.1]:51375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfU-00049g-R2 for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:17 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfI-00047g-AD for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:05 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id C9683418C6; Sun, 8 Jul 2018 19:39:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id yIIu7PPuDKQL; Sun, 8 Jul 2018 19:39:57 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 8/9] gnu: monero-core: Use git-fetch. Date: Sun, 8 Jul 2018 20:39:31 +0300 Message-Id: <20180708173932.14807-8-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero-core)[source]: Use git-fetch for deterministic hash. --- gnu/packages/finance.scm | 149 ++++++++++++++++++++++++----------------------- 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 94e7756e6..85d95c140 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -473,80 +473,83 @@ Monero command line client and daemon.") (license license:bsd-3)))) (define-public monero-core - (package - (name "monero-core") - (version "0.12.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/monero-project/monero-core/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0lhq8ki91qmq3mll2hc96g6wm9b1biw1dalqw116b3yn78plvy7w")))) - (build-system gnu-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config))) - (inputs - `(("boost" ,boost) - ("libunwind" ,libunwind) - ("openssl" ,openssl) - ("qt" ,qt) - ("readline" ,readline) - ("unbound" ,unbound))) - (propagated-inputs - `(("monero" ,monero))) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (add-before 'build 'fix-makefile-vars - (lambda _ - (substitute* "src/zxcvbn-c/makefile" - (("\\?=") "=")) - #t)) - (add-after 'fix-makefile-vars 'fix-library-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "monero-wallet-gui.pro" - (("-L/usr/local/lib") "") - (("-L/usr/local/opt/openssl/lib") - (string-append "-L" - (assoc-ref inputs "openssl") - "/lib")) - (("-L/usr/local/opt/boost/lib") - (string-append "-L" - (assoc-ref inputs "boost") - "/lib"))) - #t)) - (add-after 'fix-library-paths 'fix-monerod-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/daemon/DaemonManager.cpp" - (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod") - (string-append "\""(assoc-ref inputs "monero") - "/bin/monerod"))) - #t)) - (replace 'build - (lambda _ - (invoke "./build.sh"))) - (add-after 'build 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "build/Makefile" - (("/opt/monero-wallet-gui") - (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'change-dir - (lambda _ - (chdir "build")))))) - (home-page "https://getmonero.org/") - (synopsis "Graphical user interface for the Monero currency") - (description - "Monero is a secure, private, untraceable currency. This package provides the + (let ((revision "0") + (commit "d85f3eae7cefad70affb83c56a532feb8e6db151")) + (package + (name "monero-core") + (version (string-append "0.12.2.0-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/monero-project/monero-core") + (commit commit))) + (sha256 + (base32 + "1cnrkwh7kp64lnzz1xfmkf1mhsgm5gls292gpqai3jr8jydpkahl")) + (file-name (string-append name "-" version "-checkout")))) + (build-system gnu-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("libunwind" ,libunwind) + ("openssl" ,openssl) + ("qt" ,qt) + ("readline" ,readline) + ("unbound" ,unbound))) + (propagated-inputs + `(("monero" ,monero))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-before 'build 'fix-makefile-vars + (lambda _ + (substitute* "src/zxcvbn-c/makefile" + (("\\?=") "=")) + #t)) + (add-after 'fix-makefile-vars 'fix-library-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "monero-wallet-gui.pro" + (("-L/usr/local/lib") "") + (("-L/usr/local/opt/openssl/lib") + (string-append "-L" + (assoc-ref inputs "openssl") + "/lib")) + (("-L/usr/local/opt/boost/lib") + (string-append "-L" + (assoc-ref inputs "boost") + "/lib"))) + #t)) + (add-after 'fix-library-paths 'fix-monerod-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/daemon/DaemonManager.cpp" + (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod") + (string-append "\""(assoc-ref inputs "monero") + "/bin/monerod"))) + #t)) + (replace 'build + (lambda _ + (invoke "./build.sh"))) + (add-after 'build 'fix-install-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "build/Makefile" + (("/opt/monero-wallet-gui") + (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'change-dir + (lambda _ + (chdir "build")))))) + (home-page "https://getmonero.org/") + (synopsis "Graphical user interface for the Monero currency") + (description + "Monero is a secure, private, untraceable currency. This package provides the Monero GUI client.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python-trezor-agent (package -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:17 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:17 +0000 Received: from localhost ([127.0.0.1]:51377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfV-00049j-6t for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:17 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfI-00047e-8V for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:05 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id C1321418C5; Sun, 8 Jul 2018 19:39:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id BN9gpgsjeJDn; Sun, 8 Jul 2018 19:39:57 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 9/9] gnu: monero-core: Rename package to "monero-gui". Date: Sun, 8 Jul 2018 20:39:32 +0300 Message-Id: <20180708173932.14807-9-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero-core) [name]: Rename package to "monero-gui". [source]: Change url to the actual one. --- gnu/packages/finance.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 85d95c140..59e12999a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -472,17 +472,17 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") Monero command line client and daemon.") (license license:bsd-3)))) -(define-public monero-core +(define-public monero-gui (let ((revision "0") (commit "d85f3eae7cefad70affb83c56a532feb8e6db151")) (package - (name "monero-core") + (name "monero-gui") (version (string-append "0.12.2.0-" revision "." (string-take commit 7))) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/monero-project/monero-core") + (url "https://github.com/monero-project/monero-gui") (commit commit))) (sha256 (base32 -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:17 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:18 +0000 Received: from localhost ([127.0.0.1]:51379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfV-00049q-EZ for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:17 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:29880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfI-00047f-8f for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:06 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id C07644818D; Sun, 8 Jul 2018 19:39:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id dB61qnh7nDG6; Sun, 8 Jul 2018 19:39:56 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 7/9] gnu: monero: Use git-fetch. Date: Sun, 8 Jul 2018 20:39:30 +0300 Message-Id: <20180708173932.14807-7-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/finance.scm (monero)[source]: Use git-fetch for deterministic hash. --- gnu/packages/finance.scm | 183 ++++++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 90 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a02d8ee69..94e7756e6 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -377,97 +377,100 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ;; The bundled easylogging++ is modified, and the changes will not be upstreamed. ;; The devs deem the lmdb driver too critical a consenus component, to use ;; the system's dynamically linked library. - (package - (name "monero") - (version "0.12.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/monero-project/monero/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (patches (search-patches "monero-use-system-miniupnpc.patch")) - (sha256 - (base32 - "0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw")))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("googletest" ,googletest) - ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config))) - (inputs - `(("bind" ,isc-bind) - ("boost" ,boost) - ("zeromq" ,zeromq) - ("cppzmq" ,cppzmq) - ("expat" ,expat) - ("libsodium" ,libsodium) - ("libunwind" ,libunwind) - ("lmdb" ,lmdb) - ("miniupnpc" ,monero-miniupnpc) - ("openssl" ,openssl) - ("rapidjson" ,rapidjson) - ("unbound" ,unbound))) - (arguments - `(#:out-of-source? #t - #:build-type "release" - #:configure-flags '("-DBUILD_TESTS=ON" - ,@(if (string=? "aarch64-linux" (%current-system)) - '("-DARCH=armv8-a") - '()) - "-DBUILD_GUI_DEPS=ON") - #:phases - (modify-phases %standard-phases - ;; tests/core_tests need a valid HOME - (add-before 'configure 'set-home - (lambda _ - (setenv "HOME" (getcwd)) - #t)) - (add-after 'set-home 'fix-wallet-path-for-unit-tests - (lambda _ - (substitute* "tests/unit_tests/serialization.cpp" - (("\\.\\./\\.\\./\\.\\./\\.\\./") "../../")) - #t)) - (add-after 'fix-wallet-path-for-unit-tests 'change-log-path - (lambda _ - (substitute* "contrib/epee/src/mlog.cpp" - (("epee::string_tools::get_current_module_folder\\(\\)") - "\".bitmonero\"")) - (substitute* "contrib/epee/src/mlog.cpp" - (("return \\(") "return ((std::string(getenv(\"HOME\"))) / ")) - #t)) - (replace 'check - (lambda _ - (invoke "make" "ARGS=-E 'unit_tests|libwallet_api_tests'" - "test"))) - ;; The excluded unit tests need network access - (add-after 'check 'unit-tests - (lambda _ - (let ((excluded-unit-tests - (string-join - '("AddressFromURL.Success" - "AddressFromURL.Failure" - "DNSResolver.IPv4Success" - "DNSResolver.DNSSECSuccess" - "DNSResolver.DNSSECFailure" - "DNSResolver.GetTXTRecord") - ":"))) - (invoke "tests/unit_tests/unit_tests" - (string-append "--gtest_filter=-" - excluded-unit-tests))))) - (add-after 'install 'install-blockchain-import-export - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "bin/monero-blockchain-import" bin) - (install-file "bin/monero-blockchain-export" bin))))))) - (home-page "https://getmonero.org/") - (synopsis "Command-line interface to the Monero currency") - (description - "Monero is a secure, private, untraceable currency. This package provides the + (let ((revision "0") + (commit "40530b294e6074dffb0d3de25d0442d3b85467b8")) + (package + (name "monero") + (version (string-append "0.12.3.0-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/monero-project/monero") + (commit commit))) + (sha256 + (base32 + "01rksnlqy46nnc2zjqs1r0vzfn2n2ag25lar7c7iwhnmivbays61")) + (patches (search-patches "monero-use-system-miniupnpc.patch")) + (file-name (string-append name "-" version "-checkout")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("googletest" ,googletest) + ("graphviz" ,graphviz) + ("pkg-config" ,pkg-config))) + (inputs + `(("bind" ,isc-bind) + ("boost" ,boost) + ("zeromq" ,zeromq) + ("cppzmq" ,cppzmq) + ("expat" ,expat) + ("libsodium" ,libsodium) + ("libunwind" ,libunwind) + ("lmdb" ,lmdb) + ("miniupnpc" ,monero-miniupnpc) + ("openssl" ,openssl) + ("rapidjson" ,rapidjson) + ("unbound" ,unbound))) + (arguments + `(#:out-of-source? #t + #:build-type "release" + #:configure-flags '("-DBUILD_TESTS=ON" + ,@(if (string=? "aarch64-linux" (%current-system)) + '("-DARCH=armv8-a") + '()) + "-DBUILD_GUI_DEPS=ON") + #:phases + (modify-phases %standard-phases + ;; tests/core_tests need a valid HOME + (add-before 'configure 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t)) + (add-after 'set-home 'fix-wallet-path-for-unit-tests + (lambda _ + (substitute* "tests/unit_tests/serialization.cpp" + (("\\.\\./\\.\\./\\.\\./\\.\\./") "../../")) + #t)) + (add-after 'fix-wallet-path-for-unit-tests 'change-log-path + (lambda _ + (substitute* "contrib/epee/src/mlog.cpp" + (("epee::string_tools::get_current_module_folder\\(\\)") + "\".bitmonero\"")) + (substitute* "contrib/epee/src/mlog.cpp" + (("return \\(") "return ((std::string(getenv(\"HOME\"))) / ")) + #t)) + (replace 'check + (lambda _ + (invoke "make" "ARGS=-E 'unit_tests|libwallet_api_tests'" + "test"))) + ;; The excluded unit tests need network access + (add-after 'check 'unit-tests + (lambda _ + (let ((excluded-unit-tests + (string-join + '("AddressFromURL.Success" + "AddressFromURL.Failure" + "DNSResolver.IPv4Success" + "DNSResolver.DNSSECSuccess" + "DNSResolver.DNSSECFailure" + "DNSResolver.GetTXTRecord") + ":"))) + (invoke "tests/unit_tests/unit_tests" + (string-append "--gtest_filter=-" + excluded-unit-tests))))) + (add-after 'install 'install-blockchain-import-export + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "bin/monero-blockchain-import" bin) + (install-file "bin/monero-blockchain-export" bin))))))) + (home-page "https://getmonero.org/") + (synopsis "Command-line interface to the Monero currency") + (description + "Monero is a secure, private, untraceable currency. This package provides the Monero command line client and daemon.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public monero-core (package -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 13:40:21 2018 Received: (at 31531) by debbugs.gnu.org; 8 Jul 2018 17:40:21 +0000 Received: from localhost ([127.0.0.1]:51381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfV-00049z-Ts for submit@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:20 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcDfG-00047V-Am for 31531@debbugs.gnu.org; Sun, 08 Jul 2018 13:40:07 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id D43E141434; Sun, 8 Jul 2018 19:39:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id g9bb7dfllsER; Sun, 8 Jul 2018 19:39:54 +0200 (CEST) From: Theodoros Foradis To: 31531@debbugs.gnu.org Subject: [PATCH v2 3/9] gnu: monero: Update to 0.12.3.0. Date: Sun, 8 Jul 2018 20:39:26 +0300 Message-Id: <20180708173932.14807-3-theodoros@foradis.org> In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/monero-use-system-miniupnpc.patch: New file. * gnu/local.mk: Add it. * gnu/packages/finance.scm (monero): Update to 0.12.3.0. [source]: Add patch. Remove snippet because miniupnpc, rapidjson and unbound are no longer bundled in-tree. [inputs]: Add zeromq, cppzmq, libsodium. Use monero-miniupnpc. [arguments]: Change build-type to "release". --- gnu/local.mk | 1 + gnu/packages/finance.scm | 22 ++-- .../patches/monero-use-system-miniupnpc.patch | 111 +++++++++++++++++++++ 3 files changed, 122 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/monero-use-system-miniupnpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index dad664ca1..03e852f4c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,6 +943,7 @@ dist_patch_DATA = \ %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ + %D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/mongodb-support-unknown-linux-distributions.patch \ %D%/packages/patches/mozjs17-aarch64-support.patch \ %D%/packages/patches/mozjs24-aarch64-support.patch \ diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 26f4488ab..eaafd1523 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages dns) @@ -52,6 +53,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -377,25 +379,17 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.11.1.0") + (version "0.12.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/monero-project/monero/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled dependencies. - (for-each - delete-file-recursively - '("external/miniupnpc" "external/rapidjson" - "external/unbound")) - #t)) + (patches (search-patches "monero-use-system-miniupnpc.patch")) (sha256 (base32 - "16shd834025jyzy68h3gag1sz8vbk875hy4j97hrki8pacz8vd5m")))) + "0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -405,15 +399,19 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (inputs `(("bind" ,isc-bind) ("boost" ,boost) + ("zeromq" ,zeromq) + ("cppzmq" ,cppzmq) ("expat" ,expat) + ("libsodium" ,libsodium) ("libunwind" ,libunwind) ("lmdb" ,lmdb) - ("miniupnpc" ,miniupnpc) + ("miniupnpc" ,monero-miniupnpc) ("openssl" ,openssl) ("rapidjson" ,rapidjson) ("unbound" ,unbound))) (arguments `(#:out-of-source? #t + #:build-type "release" #:configure-flags '("-DBUILD_TESTS=ON" ,@(if (string=? "aarch64-linux" (%current-system)) '("-DARCH=armv8-a") diff --git a/gnu/packages/patches/monero-use-system-miniupnpc.patch b/gnu/packages/patches/monero-use-system-miniupnpc.patch new file mode 100644 index 000000000..6bc825d12 --- /dev/null +++ b/gnu/packages/patches/monero-use-system-miniupnpc.patch @@ -0,0 +1,111 @@ +This reverts commit 1e20d705e7c64d2b17c031f345057d1e8850fafa, so that it's possible to use our own +miniupnpc, instead of a git submodule. +--- + CMakeLists.txt | 8 ++++++++ + external/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++---------- + src/p2p/net_node.inl | 13 ++++++++++--- + 3 files changed, 49 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3b93988e..ef948885 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -430,6 +430,14 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") + + add_subdirectory(external) + ++# Final setup for miniupnpc ++if(UPNP_STATIC OR IOS) ++ add_definitions("-DUPNP_STATIC") ++else() ++ add_definitions("-DUPNP_DYNAMIC") ++ include_directories(${UPNP_INCLUDE}) ++endif() ++ + # Final setup for libunbound + include_directories(${UNBOUND_INCLUDE}) + link_directories(${UNBOUND_LIBRARY_DIRS}) +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 1fc4d64c..b4f712ee 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -34,21 +34,42 @@ + # We always compile if we are building statically to reduce static dependency issues... + # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with + # others. ++if(NOT IOS) ++ find_package(Miniupnpc QUIET) ++endif() + +-find_package(Miniupnpc REQUIRED) ++# If we have the correct shared version and we're not building static, use it ++if(STATIC OR IOS) ++ set(USE_SHARED_MINIUPNPC false) ++elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ set(USE_SHARED_MINIUPNPC true) ++endif() + +-message(STATUS "Using in-tree miniupnpc") ++if(USE_SHARED_MINIUPNPC) ++ message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") + +-add_subdirectory(miniupnp/miniupnpc) ++ set(UPNP_STATIC false PARENT_SCOPE) ++ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) ++else() ++ if(STATIC) ++ message(STATUS "Using miniupnpc from local source tree for static build") ++ else() ++ message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)") ++ endif() + +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() ++ add_subdirectory(miniupnp/miniupnpc) ++ ++ set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") ++ if(MSVC) ++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") ++ elseif(NOT MSVC) ++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") ++ endif() + +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++ set(UPNP_STATIC true PARENT_SCOPE) ++ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++endif() + + find_package(Unbound) + +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index 9b21705e..76340a22 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -49,9 +49,16 @@ + #include "storages/levin_abstract_invoke2.h" + #include "cryptonote_core/cryptonote_core.h" + +-#include +-#include +-#include ++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external ++#ifdef UPNP_STATIC ++ #include ++ #include ++ #include ++#else ++ #include "miniupnpc.h" ++ #include "upnpcommands.h" ++ #include "upnperrors.h" ++#endif + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" +-- +2.16.2 + -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 11:29:34 2018 Received: (at 31531) by debbugs.gnu.org; 13 Jul 2018 15:29:34 +0000 Received: from localhost ([127.0.0.1]:59121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fe00k-0007AB-G8 for submit@debbugs.gnu.org; Fri, 13 Jul 2018 11:29:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fe00i-00079t-Rw for 31531@debbugs.gnu.org; Fri, 13 Jul 2018 11:29:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fe00a-00006g-OI for 31531@debbugs.gnu.org; Fri, 13 Jul 2018 11:29:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe00a-00006T-KO; Fri, 13 Jul 2018 11:29:24 -0400 Received: from [193.50.110.117] (port=55602 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fe00a-0004Sw-5d; Fri, 13 Jul 2018 11:29:24 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH v2 1/9] gnu: Add cppzmq. References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> Date: Fri, 13 Jul 2018 17:29:21 +0200 In-Reply-To: <20180708173932.14807-1-theodoros@foradis.org> (Theodoros Foradis's message of "Sun, 8 Jul 2018 20:39:24 +0300") Message-ID: <87a7qvf92m.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Theodoros Foradis skribis: > * gnu/packages/networking.scm (cppzmq): New variable. I tweaked the synopsis and applied, thanks! From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 11:30:30 2018 Received: (at 31531) by debbugs.gnu.org; 13 Jul 2018 15:30:30 +0000 Received: from localhost ([127.0.0.1]:59125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fe01d-0007D4-Or for submit@debbugs.gnu.org; Fri, 13 Jul 2018 11:30:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fe01b-0007Cr-Tg for 31531@debbugs.gnu.org; Fri, 13 Jul 2018 11:30:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fe01T-0000U3-PA for 31531@debbugs.gnu.org; Fri, 13 Jul 2018 11:30:22 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe01T-0000Tr-9S; Fri, 13 Jul 2018 11:30:19 -0400 Received: from [193.50.110.117] (port=55604 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fe01S-0006Ea-QV; Fri, 13 Jul 2018 11:30:19 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH v2 2/9] gnu: Add monero-miniupnpc. References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> <20180708173932.14807-2-theodoros@foradis.org> Date: Fri, 13 Jul 2018 17:30:17 +0200 In-Reply-To: <20180708173932.14807-2-theodoros@foradis.org> (Theodoros Foradis's message of "Sun, 8 Jul 2018 20:39:25 +0300") Message-ID: <87601jf912.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Theodoros Foradis skribis: > * gnu/packages/finance.scm (monero-miniupnpc): New variable. I applied this one but moved it to upnp.scm, to avoid cross-module top-level references (roughly, since monero-miniupnpc inherits miniupnpc, it should be in the same file.) Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 11:31:14 2018 Received: (at 31531) by debbugs.gnu.org; 13 Jul 2018 15:31:14 +0000 Received: from localhost ([127.0.0.1]:59129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fe02M-0007EZ-2I for submit@debbugs.gnu.org; Fri, 13 Jul 2018 11:31:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fe02K-0007EK-2V for 31531@debbugs.gnu.org; Fri, 13 Jul 2018 11:31:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fe02E-0000qO-2F for 31531@debbugs.gnu.org; Fri, 13 Jul 2018 11:31:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe02D-0000qI-U5; Fri, 13 Jul 2018 11:31:05 -0400 Received: from [193.50.110.117] (port=55606 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fe02D-0006fj-9k; Fri, 13 Jul 2018 11:31:05 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH v2 3/9] gnu: monero: Update to 0.12.3.0. References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> <20180708173932.14807-3-theodoros@foradis.org> Date: Fri, 13 Jul 2018 17:31:03 +0200 In-Reply-To: <20180708173932.14807-3-theodoros@foradis.org> (Theodoros Foradis's message of "Sun, 8 Jul 2018 20:39:26 +0300") Message-ID: <871sc7f8zs.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi, Theodoros Foradis skribis: > * gnu/packages/patches/monero-use-system-miniupnpc.patch: New file. > * gnu/local.mk: Add it. > * gnu/packages/finance.scm (monero): Update to 0.12.3.0. > [source]: Add patch. Remove snippet because miniupnpc, rapidjson > and unbound are no longer bundled in-tree. > [inputs]: Add zeromq, cppzmq, libsodium. Use monero-miniupnpc. > [arguments]: Change build-type to "release". I get a hash mismatch for this one: --8<---------------cut here---------------start------------->8--- Starting download of /gnu/store/38bbddhym990lywra0j53iggic53qndd-monero-0.1= 2.3.0.tar.gz >From https://github.com/monero-project/monero/archive/v0.12.3.0.tar.gz... following redirection to `https://codeload.github.com/monero-project/monero= /tar.gz/v0.12.3.0'... v0.12.3.0.tar.gz 5.2MiB/s 00:02 | 8.0MiB transf= erred sha256 hash mismatch for output path `/gnu/store/38bbddhym990lywra0j53iggic= 53qndd-monero-0.12.3.0.tar.gz' expected: 0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw actual: 05a85k1vphizm111np86arpd0rnvr6qdwq37awsll24myr7s7aq6 @ build-failed /gnu/store/nm8hl473pvd0agrrwj2rj724wv7z66pf-monero-0.12.3.0.= tar.gz.drv - 1 sha256 hash mismatch for output path `/gnu/store/38bbddhym99= 0lywra0j53iggic53qndd-monero-0.12.3.0.tar.gz' expected: 0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw actual: 05a85k1vphizm111np86arpd0rnvr6qdwq37awsll24myr7s7aq6 cannot build derivation `/gnu/store/51pdrvrawv6ad41gw05q99pclnc1dnk8-monero= -0.12.3.0.tar.xz.drv': 1 dependencies couldn't be built --8<---------------cut here---------------end--------------->8--- Could you check if anything=E2=80=99s wrong? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 15 12:21:32 2018 Received: (at 31531) by debbugs.gnu.org; 15 Jul 2018 16:21:32 +0000 Received: from localhost ([127.0.0.1]:41982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fejm8-0001Bc-Be for submit@debbugs.gnu.org; Sun, 15 Jul 2018 12:21:32 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:25062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fejm6-0001BP-GA for 31531@debbugs.gnu.org; Sun, 15 Jul 2018 12:21:31 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id EB55741395; Sun, 15 Jul 2018 13:35:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id XAL6-DO5kUIu; Sun, 15 Jul 2018 13:35:18 +0200 (CEST) References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> <20180708173932.14807-3-theodoros@foradis.org> <871sc7f8zs.fsf@gnu.org> From: Theodoros Foradis To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#31531] [PATCH v2 3/9] gnu: monero: Update to 0.12.3.0. In-reply-to: <871sc7f8zs.fsf@gnu.org> Date: Sun, 15 Jul 2018 14:34:31 +0300 Message-ID: <87bmb8ybp4.fsf@foradis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31531 Cc: Theodoros Foradis , 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Ludovic Courtès writes: > Hi, > > Theodoros Foradis skribis: > >> * gnu/packages/patches/monero-use-system-miniupnpc.patch: New file. >> * gnu/local.mk: Add it. >> * gnu/packages/finance.scm (monero): Update to 0.12.3.0. >> [source]: Add patch. Remove snippet because miniupnpc, rapidjson >> and unbound are no longer bundled in-tree. >> [inputs]: Add zeromq, cppzmq, libsodium. Use monero-miniupnpc. >> [arguments]: Change build-type to "release". > > I get a hash mismatch for this one: > > --8<---------------cut here---------------start------------->8--- > Starting download of /gnu/store/38bbddhym990lywra0j53iggic53qndd-monero-0.12.3.0.tar.gz > From https://github.com/monero-project/monero/archive/v0.12.3.0.tar.gz... > following redirection to `https://codeload.github.com/monero-project/monero/tar.gz/v0.12.3.0'... > v0.12.3.0.tar.gz 5.2MiB/s 00:02 | 8.0MiB transferred > sha256 hash mismatch for output path `/gnu/store/38bbddhym990lywra0j53iggic53qndd-monero-0.12.3.0.tar.gz' > expected: 0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw > actual: 05a85k1vphizm111np86arpd0rnvr6qdwq37awsll24myr7s7aq6 > @ build-failed /gnu/store/nm8hl473pvd0agrrwj2rj724wv7z66pf-monero-0.12.3.0.tar.gz.drv - 1 sha256 hash mismatch for output path `/gnu/store/38bbddhym990lywra0j53iggic53qndd-monero-0.12.3.0.tar.gz' > expected: 0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw > actual: 05a85k1vphizm111np86arpd0rnvr6qdwq37awsll24myr7s7aq6 > cannot build derivation `/gnu/store/51pdrvrawv6ad41gw05q99pclnc1dnk8-monero-0.12.3.0.tar.xz.drv': 1 dependencies couldn't be built > --8<---------------cut here---------------end--------------->8--- > > Could you check if anything’s wrong? The auto-generated tarball changed, and this is why I added the later patch to use git-fetch. I forgot to update the hash prior to using git-fetch, because I only tested with all patches applied. So, the actual hash shown here is correct, we can either fix it in this patch, or ignore it because it gets fixed in patch 7/9 anyway. -- Theodoros Foradis From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 16 10:40:28 2018 Received: (at 31531) by debbugs.gnu.org; 16 Jul 2018 14:40:28 +0000 Received: from localhost ([127.0.0.1]:43902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ff4fs-0007WW-4A for submit@debbugs.gnu.org; Mon, 16 Jul 2018 10:40:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ff4fq-0007WJ-8z for 31531@debbugs.gnu.org; Mon, 16 Jul 2018 10:40:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ff4fg-0008Er-0d for 31531@debbugs.gnu.org; Mon, 16 Jul 2018 10:40:20 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ff4ff-0008Ej-PG; Mon, 16 Jul 2018 10:40:15 -0400 Received: from [193.50.110.117] (port=45824 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ff4ff-0007TM-7Q; Mon, 16 Jul 2018 10:40:15 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH v2 3/9] gnu: monero: Update to 0.12.3.0. References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> <20180708173932.14807-3-theodoros@foradis.org> <871sc7f8zs.fsf@gnu.org> <87bmb8ybp4.fsf@foradis.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 16 Jul 2018 16:40:12 +0200 In-Reply-To: <87bmb8ybp4.fsf@foradis.org> (Theodoros Foradis's message of "Sun, 15 Jul 2018 14:34:31 +0300") Message-ID: <87bmb7utv7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31531 Cc: 31531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Theodoros, Theodoros Foradis skribis: > Ludovic Court=C3=A8s writes: [...] >> I get a hash mismatch for this one: >> >> --8<---------------cut here---------------start------------->8--- >> Starting download of /gnu/store/38bbddhym990lywra0j53iggic53qndd-monero-= 0.12.3.0.tar.gz >> From https://github.com/monero-project/monero/archive/v0.12.3.0.tar.gz... >> following redirection to `https://codeload.github.com/monero-project/mon= ero/tar.gz/v0.12.3.0'... >> v0.12.3.0.tar.gz 5.2MiB/s 00:02 | 8.0MiB tra= nsferred >> sha256 hash mismatch for output path `/gnu/store/38bbddhym990lywra0j53ig= gic53qndd-monero-0.12.3.0.tar.gz' >> expected: 0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw >> actual: 05a85k1vphizm111np86arpd0rnvr6qdwq37awsll24myr7s7aq6 >> @ build-failed /gnu/store/nm8hl473pvd0agrrwj2rj724wv7z66pf-monero-0.12.3= .0.tar.gz.drv - 1 sha256 hash mismatch for output path `/gnu/store/38bbddhy= m990lywra0j53iggic53qndd-monero-0.12.3.0.tar.gz' >> expected: 0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw >> actual: 05a85k1vphizm111np86arpd0rnvr6qdwq37awsll24myr7s7aq6 >> cannot build derivation `/gnu/store/51pdrvrawv6ad41gw05q99pclnc1dnk8-mon= ero-0.12.3.0.tar.xz.drv': 1 dependencies couldn't be built >> --8<---------------cut here---------------end--------------->8--- >> >> Could you check if anything=E2=80=99s wrong? > > The auto-generated tarball changed, and this is why I added the later > patch to use git-fetch. I forgot to update the hash prior to using > git-fetch, because I only tested with all patches applied. > > So, the actual hash shown here is correct, we can either fix it in this > patch, or ignore it because it gets fixed in patch 7/9 anyway. Indeed. I sort-of merged both patches by applying this one: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3d4185578..333fe6531 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -372,14 +372,15 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch (version "0.12.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/monero-project/monero/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/monero-project/monero") + (commit (string-append "v" version)))) (file-name (string-append name "-" version ".tar.gz")) (patches (search-patches "monero-use-system-miniupnpc.patch")) (sha256 (base32 - "0wmz7g48cay0irmny5k87x4z834w07bpyvsbs9chygk9ch9kp8sw")))) + "14db9kgjm2ha93c2x5fjdw01xaqshn756qr3x2cnzyyjh7caz5qd")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Note that in general we should arrange for each commit to produce a working state. Thanks, Ludo=E2=80=99. --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 16 10:52:57 2018 Received: (at 31531-done) by debbugs.gnu.org; 16 Jul 2018 14:52:57 +0000 Received: from localhost ([127.0.0.1]:43911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ff4rx-0007o9-MB for submit@debbugs.gnu.org; Mon, 16 Jul 2018 10:52:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ff4rw-0007ny-VZ for 31531-done@debbugs.gnu.org; Mon, 16 Jul 2018 10:52:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ff4ro-0005Ov-RL for 31531-done@debbugs.gnu.org; Mon, 16 Jul 2018 10:52:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ff4ro-0005Or-Ls; Mon, 16 Jul 2018 10:52:48 -0400 Received: from [193.50.110.117] (port=46030 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ff4ro-0008Lm-6c; Mon, 16 Jul 2018 10:52:48 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Theodoros Foradis Subject: Re: [bug#31531] [PATCH v2 9/9] gnu: monero-core: Rename package to "monero-gui". References: <87d0vxy6j1.fsf@foradis.org> <20180708173932.14807-1-theodoros@foradis.org> <20180708173932.14807-9-theodoros@foradis.org> Date: Mon, 16 Jul 2018 16:52:46 +0200 In-Reply-To: <20180708173932.14807-9-theodoros@foradis.org> (Theodoros Foradis's message of "Sun, 8 Jul 2018 20:39:32 +0300") Message-ID: <877elvuta9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31531-done Cc: 31531-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello, I merged the remained of the patch series. I merged the =E2=80=98git-fetch= =E2=80=99 patch of =E2=80=98monero-core=E2=80=99 with the updated, and I declared =E2= =80=9Cmonero-core=E2=80=9D a deprecated package name for =E2=80=9Cmonero-gui=E2=80=9D. We=E2=80=99re done now. Thank you! Ludo=E2=80=99. From unknown Sat Sep 20 20:12:11 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 14 Aug 2018 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator