[Pkg-bitcoin-commits] [bitcoin] 124/126: Refresh and unfuzz patches.

Jonas Smedegaard dr at jones.dk
Mon Nov 13 20:03:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.15.1_dfsg-1
in repository bitcoin.

commit b909c9567b7125c871f1b873e649db96eb7ff19f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 13 19:16:08 2017 +0100

    Refresh and unfuzz patches.
---
 debian/patches/1002_use_system_secp256k1.patch | 6 +++---
 debian/patches/2001_avoid_embedded_libs.patch  | 2 +-
 debian/patches/2002_avoid_network_tests.patch  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/1002_use_system_secp256k1.patch b/debian/patches/1002_use_system_secp256k1.patch
index 590c4bf..16ef411 100644
--- a/debian/patches/1002_use_system_secp256k1.patch
+++ b/debian/patches/1002_use_system_secp256k1.patch
@@ -64,7 +64,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
  
  AC_MSG_CHECKING([whether to build bitcoind])
-@@ -1281,7 +1325,10 @@
+@@ -1282,7 +1326,10 @@
  fi
  
  ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery --disable-jni"
@@ -132,10 +132,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  endif
 --- a/src/Makefile.test.include
 +++ b/src/Makefile.test.include
-@@ -149,7 +149,9 @@
+@@ -148,7 +148,9 @@
  check-local:
  	@echo "Running test/util/bitcoin-util-test.py..."
- 	$(top_builddir)/test/util/bitcoin-util-test.py
+ 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
 +if EMBEDDED_SECP256K1
  	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
 +endif
diff --git a/debian/patches/2001_avoid_embedded_libs.patch b/debian/patches/2001_avoid_embedded_libs.patch
index 938e5f2..a70d5b9 100644
--- a/debian/patches/2001_avoid_embedded_libs.patch
+++ b/debian/patches/2001_avoid_embedded_libs.patch
@@ -6,7 +6,7 @@ Last-Update: 2017-07-09
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -166,7 +166,16 @@
+@@ -169,7 +169,16 @@
  	$(MAKE) -C src $(@F)
  
  if USE_LCOV
diff --git a/debian/patches/2002_avoid_network_tests.patch b/debian/patches/2002_avoid_network_tests.patch
index db428a9..0121b78 100644
--- a/debian/patches/2002_avoid_network_tests.patch
+++ b/debian/patches/2002_avoid_network_tests.patch
@@ -6,7 +6,7 @@ Last-Update: 2017-11-02
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/qt/test/test_main.cpp
 +++ b/src/qt/test/test_main.cpp
-@@ -77,10 +77,10 @@
+@@ -81,10 +81,10 @@
          fInvalid = true;
      }
  #ifdef ENABLE_WALLET

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/bitcoin.git



More information about the Pkg-bitcoin-commits mailing list