Skip to content

Commit 8f95f79

Browse files
committed
Merge pull request #360 from braydonf/bitcoin-0.11.2
Bindings: Adjust patch to bitcoin for the 0.11.2 release
2 parents f148106 + 2e2bd70 commit 8f95f79

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

PATCH_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.11.1
1+
v0.11.2

etc/bitcoin.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ index 0000000..19e9a1b
66
@@ -0,0 +1 @@
77
+./configure --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --enable-debug --disable-wallet --without-utils
88
diff --git a/configure.ac b/configure.ac
9-
index fd74aef..9c79637 100644
9+
index 5debd21..3bfc59e 100644
1010
--- a/configure.ac
1111
+++ b/configure.ac
1212
@@ -119,6 +119,12 @@ AC_ARG_ENABLE([reduce-exports],
@@ -163,7 +163,7 @@ index e7aa48d..df0f7ae 100644
163163
endef
164164

165165
diff --git a/src/Makefile.am b/src/Makefile.am
166-
index 8de216c..2db76bf 100644
166+
index 2461f82..7be6d6e 100644
167167
--- a/src/Makefile.am
168168
+++ b/src/Makefile.am
169169
@@ -1,6 +1,12 @@
@@ -269,7 +269,7 @@ index 8de216c..2db76bf 100644
269269
# bitcoin-cli binary #
270270
bitcoin_cli_SOURCES = bitcoin-cli.cpp
271271
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
272-
index cce687a..0f162ff 100644
272+
index 6e2758a..0352a9d 100644
273273
--- a/src/bitcoind.cpp
274274
+++ b/src/bitcoind.cpp
275275
@@ -33,6 +33,10 @@
@@ -297,7 +297,7 @@ index cce687a..0f162ff 100644
297297
}
298298
+#endif
299299
diff --git a/src/init.cpp b/src/init.cpp
300-
index e352d58..e1179a3 100644
300+
index a04e4e0..33d0bc7 100644
301301
--- a/src/init.cpp
302302
+++ b/src/init.cpp
303303
@@ -638,21 +638,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
@@ -339,10 +339,10 @@ index dcb2b29..5ce68ba 100644
339339
bool ShutdownRequested();
340340
void Shutdown();
341341
diff --git a/src/main.cpp b/src/main.cpp
342-
index f6deaa2..4251721 100644
342+
index fe072ec..9f677cf 100644
343343
--- a/src/main.cpp
344344
+++ b/src/main.cpp
345-
@@ -1081,6 +1081,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
345+
@@ -1105,6 +1105,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
346346

347347
// Store transaction in memory
348348
pool.addUnchecked(hash, entry, !IsInitialBlockDownload());
@@ -351,7 +351,7 @@ index f6deaa2..4251721 100644
351351

352352
SyncWithWallets(tx, NULL);
353353
diff --git a/src/net.cpp b/src/net.cpp
354-
index f94771a..72ee00e 100644
354+
index e4b22f9..33fe6f9 100644
355355
--- a/src/net.cpp
356356
+++ b/src/net.cpp
357357
@@ -432,8 +432,10 @@ void CNode::PushVersion()

0 commit comments

Comments
 (0)