[Pkg-bitcoin-commits] [litecoin] 01/04: New upstream release [0.13.2.1] + changelog summary.

Dmitry Smirnov onlyjob at moszumanska.debian.org
Sun Feb 26 12:32:25 UTC 2017


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

onlyjob pushed a commit to branch master
in repository litecoin.

commit 7f2585b
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun Feb 26 11:59:10 2017

    New upstream release [0.13.2.1] + changelog summary.
---
 debian/changelog                    |  12 ++++
 debian/control                      |   1 +
 debian/copyright                    |   2 +-
 debian/patches/gcc6.patch           | 111 ------------------------------------
 debian/patches/series               |   1 -
 debian/patches/system-leveldb.patch | 111 +++++++++++++-----------------------
 6 files changed, 53 insertions(+), 185 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c486074..ddc49bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+litecoin (0.13.2.1-1) unstable; urgency=medium
+
+  * New upstream release [January 2017]:
+    + Fixed FTBFS with openssl 1.1.0 (Closes: #828425).
+    + Fixed FTBFS with GCC 6 (Closes: #811917).
+    + Fixed segmentation fault (Closes: #854157).
+  * Removed obsolete "gcc6.patch".
+  * Updated "system-leveldb.patch".
+  * Build-Depends += "libevent-dev".
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Sun, 26 Feb 2017 22:57:35 +1100
+
 litecoin (0.10.4.0-1) unstable; urgency=medium
 
   * New upstream release [December 2015].
diff --git a/debian/control b/debian/control
index b0c4997..7d49472 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), imagemagick, dh-autoreconf
 #   ,bash-completion
     ,libboost-all-dev
     ,libdb++-dev
+    ,libevent-dev
     ,libleveldb-dev (>= 1.18-2.1)
     ,libminiupnpc-dev [!hurd-any]
     ,libprotobuf-dev
diff --git a/debian/copyright b/debian/copyright
index d046587..af907e7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -155,7 +155,7 @@ License: LGPL-2.1+
  can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 Files: debian/*
-Copyright: 2012-2016 Dmitry Smirnov <onlyjob at debian.org>
+Copyright: 2012-2017 Dmitry Smirnov <onlyjob at debian.org>
            2010-2011 Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
deleted file mode 100644
index 68be4b3..0000000
--- a/debian/patches/gcc6.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Description: build: fix newer boost build with c++11
-Origin: upstream, https://github.com/litecoin-project/litecoin/commit/b513bc41337c9c983acdc199ce9b42382c23b658
-Bug-Debian: https://bugs.debian.org/811917
-From: Adrian Bunk <bunk at stusta.de>
-
---- a/src/chainparams.cpp
-+++ b/src/chainparams.cpp
-@@ -105,9 +105,9 @@
- public:
-     CMainParams() {
-         networkID = CBaseChainParams::MAIN;
-         strNetworkID = "main";
--        /** 
-+        /**
-          * The message start string is designed to be unlikely to occur in normal data.
-          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
-          * a large 4-byte int at any alignment.
-          */
-@@ -129,9 +129,9 @@
- 
-         /**
-          * Build the genesis block. Note that the output of the genesis coinbase cannot
-          * be spent as it did not originally exist in the database.
--         * 
-+         *
-          * CBlock(hash=000000000019d6, ver=1, hashPrevBlock=00000000000000, hashMerkleRoot=4a5e1e, nTime=1231006505, nBits=1d00ffff, nNonce=2083236893, vtx=1)
-          *   CTransaction(hash=4a5e1e, ver=1, vin.size=1, vout.size=1, nLockTime=0)
-          *     CTxIn(COutPoint(000000, -1), coinbase 04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73)
-          *     CTxOut(nValue=50.00000000, scriptPubKey=0x5F1DF16B2B704C8A578D0B)
-@@ -161,13 +161,13 @@
-         vSeeds.push_back(CDNSSeedData("xurious.com", "dnsseed.ltc.xurious.com"));
-         vSeeds.push_back(CDNSSeedData("koin-project.com", "dnsseed.koin-project.com"));
-         vSeeds.push_back(CDNSSeedData("weminemnc.com", "dnsseed.weminemnc.com"));
- 
--        base58Prefixes[PUBKEY_ADDRESS] = list_of(48);
--        base58Prefixes[SCRIPT_ADDRESS] = list_of(5);
--        base58Prefixes[SECRET_KEY] =     list_of(176);
--        base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E);
--        base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4);
-+        base58Prefixes[PUBKEY_ADDRESS] = {48};
-+        base58Prefixes[SCRIPT_ADDRESS] = {5};
-+        base58Prefixes[SECRET_KEY] = {176};
-+        base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x88, 0xb2, 0x1e};
-+        base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x88, 0xad, 0xe4};
- 
-         convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));
- 
-         fRequireRPCPassword = true;
-@@ -182,9 +182,9 @@
-         // Litecoin: Mainnet v2 enforced as of block 710k
-         nEnforceV2AfterHeight = 710000;
-     }
- 
--    const Checkpoints::CCheckpointData& Checkpoints() const 
-+    const Checkpoints::CCheckpointData& Checkpoints() const
-     {
-         return data;
-     }
- };
-@@ -223,13 +223,13 @@
-         vSeeds.push_back(CDNSSeedData("litecointools.com", "testnet-seed.litecointools.com"));
-         vSeeds.push_back(CDNSSeedData("xurious.com", "testnet-seed.ltc.xurious.com"));
-         vSeeds.push_back(CDNSSeedData("wemine-testnet.com", "dnsseed.wemine-testnet.com"));
- 
--        base58Prefixes[PUBKEY_ADDRESS] = list_of(111);
--        base58Prefixes[SCRIPT_ADDRESS] = list_of(196);
--        base58Prefixes[SECRET_KEY]     = list_of(239);
--        base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);
--        base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94);
-+        base58Prefixes[PUBKEY_ADDRESS] = {111};
-+        base58Prefixes[SCRIPT_ADDRESS] = {196};
-+        base58Prefixes[SECRET_KEY] = {239};
-+        base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xcf};
-+        base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94};
- 
-         convertSeed6(vFixedSeeds, pnSeed6_test, ARRAYLEN(pnSeed6_test));
- 
-         fRequireRPCPassword = true;
-@@ -242,9 +242,9 @@
- 
-         // Litecoin: Testnet v2 enforced as of block 400k
-         nEnforceV2AfterHeight = 400000;
-     }
--    const Checkpoints::CCheckpointData& Checkpoints() const 
-+    const Checkpoints::CCheckpointData& Checkpoints() const
-     {
-         return dataTestnet;
-     }
- };
-@@ -291,9 +291,9 @@
- 
-         // Litecoin: v2 enforced using Bitcoin's supermajority rule
-         nEnforceV2AfterHeight = -1;
-     }
--    const Checkpoints::CCheckpointData& Checkpoints() const 
-+    const Checkpoints::CCheckpointData& Checkpoints() const
-     {
-         return dataRegtest;
-     }
- };
-@@ -320,9 +320,9 @@
-         // Litecoin: v2 enforced using Bitcoin's supermajority rule
-         nEnforceV2AfterHeight = -1;
-     }
- 
--    const Checkpoints::CCheckpointData& Checkpoints() const 
-+    const Checkpoints::CCheckpointData& Checkpoints() const
-     {
-         // UnitTest share the same checkpoints as MAIN
-         return data;
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 08ff4c4..a9f7bd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 ## disabled due to local modifications:
 #system-json-spirit.patch
 
-gcc6.patch
 system-leveldb.patch
diff --git a/debian/patches/system-leveldb.patch b/debian/patches/system-leveldb.patch
index 2c27822..a545b3c 100644
--- a/debian/patches/system-leveldb.patch
+++ b/debian/patches/system-leveldb.patch
@@ -1,89 +1,28 @@
-Last-Update: 2015-07-04
+Last-Update: 2017-02-26
 Author: Dmitry Smirnov <onlyjob at member.fsf.org>
 Forwarded: not-needed
 Description: use system libleveldb-dev instead of a bundled one.
 
---- a/src/leveldbwrapper.cpp
-+++ b/src/leveldbwrapper.cpp
-@@ -10,9 +10,9 @@
- 
- #include <leveldb/cache.h>
- #include <leveldb/env.h>
- #include <leveldb/filter_policy.h>
--#include <memenv.h>
-+#include <leveldb/helpers/memenv.h>
- 
- void HandleError(const leveldb::Status& status) throw(leveldb_error)
- {
-     if (status.ok())
 --- a/configure.ac
 +++ b/configure.ac
-@@ -498,9 +498,9 @@
+@@ -580,11 +580,11 @@
+   [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
+ fi
  
  LEVELDB_CPPFLAGS=
- LIBLEVELDB=
- LIBMEMENV=
+-LIBLEVELDB=
+-LIBMEMENV=
 -AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++LIBLEVELDB=-lleveldb
++LIBMEMENV=-lmemenv
 +AM_CONDITIONAL([EMBEDDED_LEVELDB],[false])
  AC_SUBST(LEVELDB_CPPFLAGS)
  AC_SUBST(LIBLEVELDB)
  AC_SUBST(LIBMEMENV)
  
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,8 +15,10 @@
- 	@echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \
- 	  CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
-           OPT="$(CXXFLAGS) $(CPPFLAGS)"
- endif
-+LIBLEVELDB += -lleveldb
-+LIBMEMENV  += -lmemenv
- 
- BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
- BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
- 
-@@ -383,18 +385,16 @@
- libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
- endif
- endif
- 
--CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno
-+CLEANFILES = *.gcda *.gcno
- 
- DISTCLEANFILES = obj/build.h
- 
--EXTRA_DIST = leveldb
-+EXTRA_DIST = 
- 
- clean-local:
--	-$(MAKE) -C leveldb clean
- 	-$(MAKE) -C secp256k1 clean
--	rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno
- 	-rm -f config.h
- 
- .rc.o:
- 	@test -f $(WINDRES)
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -35,16 +35,13 @@
-   baseline_filtered.info block_test_filtered.info \
-   leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
- 
- dist-hook:
--	-$(MAKE) -C $(top_distdir)/src/leveldb clean
- 	-$(MAKE) -C $(top_distdir)/src/secp256k1 distclean
- 	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
- 
- distcheck-hook:
--	$(MKDIR_P) $(top_distdir)/_build/src/leveldb
--	cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
--	-$(MAKE) -C $(top_distdir)/_build/src/leveldb clean
-+	@:
- 
- distcleancheck:
- 	@:
- 
-@@ -150,9 +147,8 @@
+@@ -173,9 +173,8 @@
  test_bitcoin.info: baseline_filtered_combined.info
  	$(MAKE) -C src/ check
  	$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
@@ -93,9 +32,9 @@ Description: use system libleveldb-dev instead of a bundled one.
  test_bitcoin_filtered.info: test_bitcoin.info
  	$(LCOV) -r $< "/usr/include/*" -o $@
  
-@@ -160,9 +156,8 @@
+@@ -183,9 +182,8 @@
  	$(MKDIR_P) qa/tmp
- 	- at TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
+ 	- at TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
  	$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
  	$(LCOV) -z -d $(abs_builddir)/src
 -	$(LCOV) -z -d $(abs_builddir)/src/leveldb
@@ -103,3 +42,31 @@ Description: use system libleveldb-dev instead of a bundled one.
  block_test_filtered.info: block_test.info
  	$(LCOV) -r $< "/usr/include/*" -o $@
  
+--- a/src/dbwrapper.cpp
++++ b/src/dbwrapper.cpp
+@@ -11,9 +11,9 @@
+ 
+ #include <leveldb/cache.h>
+ #include <leveldb/env.h>
+ #include <leveldb/filter_policy.h>
+-#include <memenv.h>
++#include <leveldb/helpers/memenv/memenv.h>
+ #include <stdint.h>
+ 
+ static leveldb::Options GetOptions(size_t nCacheSize)
+ {
+--- a/src/Makefile.leveldb.include
++++ b/src/Makefile.leveldb.include
+@@ -1,10 +1,10 @@
+ # Copyright (c) 2016 The Bitcoin Core developers
+ # Distributed under the MIT software license, see the accompanying
+ # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+ 
+-LIBLEVELDB_INT = leveldb/libleveldb.a
+-LIBMEMENV_INT  = leveldb/libmemenv.a
++LIBLEVELDB_INT = libleveldb.a
++LIBMEMENV_INT  = libmemenv.a
+ 
+ EXTRA_LIBRARIES += $(LIBLEVELDB_INT)
+ EXTRA_LIBRARIES += $(LIBMEMENV_INT)
+ 

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



More information about the Pkg-bitcoin-commits mailing list