unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#44493] [PATCH 0/1] gnu: bitcoin-core: Update to 0.20.1.
@ 2020-11-06 23:06 Simon South
  2020-11-06 23:15 ` [bug#44493] [PATCH 1/1] " Simon South
  2020-11-18  8:48 ` bug#44493: [PATCH 0/1] " Christopher Baines
  0 siblings, 2 replies; 3+ messages in thread
From: Simon South @ 2020-11-06 23:06 UTC (permalink / raw)
  To: 44493; +Cc: simon

This patch updates Bitcoin Core, the reference implementation of the Bitcoin
protocol, to 0.20.1.

I've followed the instructions[0] for verifying the downloaded source bundle,
though of course you may still want to do the same.

My changes remove an obsolete patch whose contents are now part of the
distribution. They also

- Add autoconf, automake and libtool as native inputs, as this release does
  not include a pre-generated "configure" script[1].

- Remove protobuf from the inputs, as with the removal of BIP70 support in
  version 0.20.0[2] this is no longer used[3].

- Add a phase before "build" that sets an environment variable,
  "BITCOIN_GENBUILD_NO_GIT", as recommended in the release notes[4], to
  indicate the build is not being made from within a git repository. (This
  isn't really necessary, since the section of code this variable
  controls---in share/genbuild.sh---will be skipped anyway without git
  available in the container. But I've added it for certainty and
  completeness.)

I've built this successfully on x86-64 and AArch64, and am using it now on
AArch64 without issue.

[0] https://bitcoincore.org/en/download/#verify-your-download
[1] https://bitcoincore.org/en/releases/0.20.1/#known-bugs
[2] https://bitcoincore.org/en/releases/0.20.0/#build-system
[3] https://github.com/bitcoin/bitcoin/pull/19058
[4] https://bitcoincore.org/en/releases/0.20.1/#known-bugs

--
Simon South
simon@simonsouth.net


Simon South (1):
  gnu: bitcoin-core: Update to 0.20.1.

 gnu/local.mk                                  |  1 -
 gnu/packages/finance.scm                      | 18 ++++++++----
 .../patches/bitcoin-core-python-compat.patch  | 28 -------------------
 3 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 gnu/packages/patches/bitcoin-core-python-compat.patch

--
2.28.0





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [bug#44493] [PATCH 1/1] gnu: bitcoin-core: Update to 0.20.1.
  2020-11-06 23:06 [bug#44493] [PATCH 0/1] gnu: bitcoin-core: Update to 0.20.1 Simon South
@ 2020-11-06 23:15 ` Simon South
  2020-11-18  8:48 ` bug#44493: [PATCH 0/1] " Christopher Baines
  1 sibling, 0 replies; 3+ messages in thread
From: Simon South @ 2020-11-06 23:15 UTC (permalink / raw)
  To: 44493; +Cc: simon

* gnu/packages/finance.scm (bitcoin-core): Update to 0.20.1.
[source]: Remove obsolete patch.
[native-inputs]: Add autoconf, automake and libtool.
[inputs]: Remove protobuf.
[arguments]: Add "set-no-git-flag" phase to indicate the build is not taking
place within a git repository.
* gnu/packages/patches/bitcoin-core-python-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/finance.scm                      | 18 ++++++++----
 .../patches/bitcoin-core-python-compat.patch  | 28 -------------------
 3 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 gnu/packages/patches/bitcoin-core-python-compat.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2a994bd3b9..a72a30ecb1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -844,7 +844,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/binutils-loongson-workaround.patch	\
   %D%/packages/patches/binutils-mingw-w64-timestamp.patch	\
   %D%/packages/patches/binutils-mingw-w64-deterministic.patch	\
-  %D%/packages/patches/bitcoin-core-python-compat.patch		\
   %D%/packages/patches/blender-2.79-gcc8.patch			\
   %D%/packages/patches/blender-2.79-gcc9.patch			\
   %D%/packages/patches/blender-2.79-newer-ffmpeg.patch		\
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ffbf3b218d..0479560810 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -108,7 +108,7 @@
 (define-public bitcoin-core
   (package
     (name "bitcoin-core")
-    (version "0.19.1")
+    (version "0.20.1")
     (source (origin
               (method url-fetch)
               (uri
@@ -116,11 +116,13 @@
                               version "/bitcoin-" version ".tar.gz"))
               (sha256
                (base32
-                "1h3w7brc18145np920vy7j5ms5hym59hvr40swdjx34fbdaisngj"))
-              (patches (search-patches "bitcoin-core-python-compat.patch"))))
+                "0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
        ("python" ,python)               ; for the tests
        ("util-linux" ,util-linux)       ; provides the hexdump command for tests
        ("qttools" ,qttools)))
@@ -130,7 +132,6 @@
        ("libevent" ,libevent)
        ("miniupnpc" ,miniupnpc)
        ("openssl" ,openssl)
-       ("protobuf" ,protobuf)
        ("qtbase" ,qtbase)))
     (arguments
      `(#:configure-flags
@@ -154,6 +155,13 @@
              ;; Make Qt deterministic.
              (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
              #t))
+         (add-before 'build 'set-no-git-flag
+           (lambda _
+             ;; Make it clear we are not building from within a git repository
+             ;; (and thus no information regarding this build is available
+             ;; from git).
+             (setenv "BITCOIN_GENBUILD_NO_GIT" "1")
+             #t))
          (add-before 'check 'set-home
            (lambda _
              (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME
diff --git a/gnu/packages/patches/bitcoin-core-python-compat.patch b/gnu/packages/patches/bitcoin-core-python-compat.patch
deleted file mode 100644
index 6bf744124d..0000000000
--- a/gnu/packages/patches/bitcoin-core-python-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Get rid of deprecation warning emitted by Python 3.8, which causes a test failure(!).
-
-https://github.com/bitcoin/bitcoin/pull/17931
-
-Taken from upstream:
-
-https://github.com/bitcoin/bitcoin/commit/f117fb00da747147cddfb071c1427a2754c278cd
-
-diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
-index 20864881c165..07eacf410d88 100755
---- a/test/functional/p2p_invalid_messages.py
-+++ b/test/functional/p2p_invalid_messages.py
-@@ -145,13 +145,13 @@ def run_test(self):
-     def test_magic_bytes(self):
-         conn = self.nodes[0].add_p2p_connection(P2PDataStore())
- 
--        def swap_magic_bytes():
-+        async def swap_magic_bytes():
-             conn._on_data = lambda: None  # Need to ignore all incoming messages from now, since they come with "invalid" magic bytes
-             conn.magic_bytes = b'\x00\x11\x22\x32'
- 
-         # Call .result() to block until the atomic swap is complete, otherwise
-         # we might run into races later on
--        asyncio.run_coroutine_threadsafe(asyncio.coroutine(swap_magic_bytes)(), NetworkThread.network_event_loop).result()
-+        asyncio.run_coroutine_threadsafe(swap_magic_bytes(), NetworkThread.network_event_loop).result()
- 
-         with self.nodes[0].assert_debug_log(['PROCESSMESSAGE: INVALID MESSAGESTART ping']):
-             conn.send_message(messages.msg_ping(nonce=0xff))
-- 
2.28.0





^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#44493: [PATCH 0/1] gnu: bitcoin-core: Update to 0.20.1.
  2020-11-06 23:06 [bug#44493] [PATCH 0/1] gnu: bitcoin-core: Update to 0.20.1 Simon South
  2020-11-06 23:15 ` [bug#44493] [PATCH 1/1] " Simon South
@ 2020-11-18  8:48 ` Christopher Baines
  1 sibling, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2020-11-18  8:48 UTC (permalink / raw)
  To: Simon South; +Cc: 44493-done

[-- Attachment #1: Type: text/plain, Size: 2159 bytes --]


Simon South <simon@simonsouth.net> writes:

> This patch updates Bitcoin Core, the reference implementation of the Bitcoin
> protocol, to 0.20.1.
>
> I've followed the instructions[0] for verifying the downloaded source bundle,
> though of course you may still want to do the same.

So, I downloaded sha256 file with the GPG signature, and checked against
this, which was fine.

> My changes remove an obsolete patch whose contents are now part of the
> distribution. They also
>
> - Add autoconf, automake and libtool as native inputs, as this release does
>   not include a pre-generated "configure" script[1].
>
> - Remove protobuf from the inputs, as with the removal of BIP70 support in
>   version 0.20.0[2] this is no longer used[3].
>
> - Add a phase before "build" that sets an environment variable,
>   "BITCOIN_GENBUILD_NO_GIT", as recommended in the release notes[4], to
>   indicate the build is not being made from within a git repository. (This
>   isn't really necessary, since the section of code this variable
>   controls---in share/genbuild.sh---will be skipped anyway without git
>   available in the container. But I've added it for certainty and
>   completeness.)
>
> I've built this successfully on x86-64 and AArch64, and am using it now on
> AArch64 without issue.
>
> [0] https://bitcoincore.org/en/download/#verify-your-download
> [1] https://bitcoincore.org/en/releases/0.20.1/#known-bugs
> [2] https://bitcoincore.org/en/releases/0.20.0/#build-system
> [3] https://github.com/bitcoin/bitcoin/pull/19058
> [4] https://bitcoincore.org/en/releases/0.20.1/#known-bugs
>
> --
> Simon South
> simon@simonsouth.net
>
>
> Simon South (1):
>   gnu: bitcoin-core: Update to 0.20.1.
>
>  gnu/local.mk                                  |  1 -
>  gnu/packages/finance.scm                      | 18 ++++++++----
>  .../patches/bitcoin-core-python-compat.patch  | 28 -------------------
>  3 files changed, 13 insertions(+), 34 deletions(-)
>  delete mode 100644 gnu/packages/patches/bitcoin-core-python-compat.patch

Thanks Simon, this all looks great. I've pushed to master as
fa268b28e1ccc392c85846810d836034c96df3c0.

Thanks again,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-18  9:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-06 23:06 [bug#44493] [PATCH 0/1] gnu: bitcoin-core: Update to 0.20.1 Simon South
2020-11-06 23:15 ` [bug#44493] [PATCH 1/1] " Simon South
2020-11-18  8:48 ` bug#44493: [PATCH 0/1] " Christopher Baines

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git