* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/
@ 2017-01-07 22:28 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2017-01-07 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 69c6499d67dfa1dd749573997d6b618c2b3bf623
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan 7 16:46:44 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 22:27:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c6499d
net-p2p/bitcoind: remove unused patches/files
net-p2p/bitcoind/files/0.8-openssl-101k.patch | 31 ---
net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch | 185 ---------------
net-p2p/bitcoind/files/0.9-openssl-101k.patch | 31 ---
net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch | 34 ---
net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch | 12 -
net-p2p/bitcoind/files/9999-syslibs.patch | 253 ---------------------
net-p2p/bitcoind/files/bitcoin.confd | 10 -
net-p2p/bitcoind/files/bitcoin.initd-r1 | 29 ---
8 files changed, 585 deletions(-)
diff --git a/net-p2p/bitcoind/files/0.8-openssl-101k.patch b/net-p2p/bitcoind/files/0.8-openssl-101k.patch
deleted file mode 100644
index 5eaaba9..00000000
--- a/net-p2p/bitcoind/files/0.8-openssl-101k.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/key.cpp b/src/key.cpp
-index 75114c6..7fcb17d 100644
---- a/src/key.cpp
-+++ b/src/key.cpp
-@@ -376,11 +376,23 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& v
-
- bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSig)
- {
-- // -1 = error, 0 = bad sig, 1 = good
-- if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1)
-+ if (vchSig.empty())
- return false;
-
-- return true;
-+ // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first.
-+ unsigned char *norm_der = NULL;
-+ ECDSA_SIG *norm_sig = ECDSA_SIG_new();
-+ const unsigned char* sigptr = &vchSig[0];
-+ d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size());
-+ int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der);
-+ ECDSA_SIG_free(norm_sig);
-+ if (derlen <= 0)
-+ return false;
-+
-+ // -1 = error, 0 = bad sig, 1 = good
-+ bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1;
-+ OPENSSL_free(norm_der);
-+ return ret;
- }
-
- bool CKey::VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig)
diff --git a/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch b/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch
deleted file mode 100644
index 2b9ab1a..00000000
--- a/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
-index cf80986..520b5df 100644
---- a/bitcoin-qt.pro
-+++ b/bitcoin-qt.pro
-@@ -4,7 +4,7 @@ macx:TARGET = "Bitcoin-Qt"
- VERSION = 0.8.0
- INCLUDEPATH += src src/json src/qt
- QT += network
--DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
-+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV
- CONFIG += no_include_pwd
- CONFIG += thread
-
-@@ -98,25 +98,29 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
- QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
- }
-
-+contains(USE_SYSTEM_LEVELDB, 1) {
-+ LIBS += -lleveldb
-+} else {
- INCLUDEPATH += src/leveldb/include src/leveldb/helpers
--LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
-+LIBS += $$PWD/src/leveldb/libleveldb.a
- !win32 {
- # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
-- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
-+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a
- } else {
- # make an educated guess about what the ranlib command is called
- isEmpty(QMAKE_RANLIB) {
- QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
- }
- LIBS += -lshlwapi
-- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
-+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a
- }
- genleveldb.target = $$PWD/src/leveldb/libleveldb.a
- genleveldb.depends = FORCE
- PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
- QMAKE_EXTRA_TARGETS += genleveldb
-+}
- # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
--QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
-+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true
-
- # regenerate src/build.h
- !win32|contains(USE_BUILD_INFO, 1) {
-diff --git a/src/leveldb.cpp b/src/leveldb.cpp
-index b41764f..30c524d 100644
---- a/src/leveldb.cpp
-+++ b/src/leveldb.cpp
-@@ -8,7 +8,9 @@
- #include <leveldb/env.h>
- #include <leveldb/cache.h>
- #include <leveldb/filter_policy.h>
--#include <memenv/memenv.h>
-+#ifndef LEVELDB_WITHOUT_MEMENV
-+#include <memenv.h>
-+#endif
-
- #include <boost/filesystem.hpp>
-
-@@ -42,8 +44,12 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path, size_t nCacheSize, bool
- options = GetOptions(nCacheSize);
- options.create_if_missing = true;
- if (fMemory) {
-+#ifndef LEVELDB_WITHOUT_MEMENV
- penv = leveldb::NewMemEnv(leveldb::Env::Default());
- options.env = penv;
-+#else
-+ throw std::runtime_error("CLevelDB(): compiled without memenv support");
-+#endif
- } else {
- if (fWipe) {
- printf("Wiping LevelDB in %s\n", path.string().c_str());
-diff --git a/src/makefile.unix b/src/makefile.unix
-index 081edaf..27f2199 100644
---- a/src/makefile.unix
-+++ b/src/makefile.unix
-@@ -104,8 +104,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para
- # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
- xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
-
--OBJS= \
-- leveldb/libleveldb.a \
-+BASEOBJS := \
- obj/alert.o \
- obj/version.o \
- obj/checkpoints.o \
-@@ -114,7 +113,6 @@ OBJS= \
- obj/crypter.o \
- obj/key.o \
- obj/db.o \
-- obj/init.o \
- obj/keystore.o \
- obj/main.o \
- obj/net.o \
-@@ -134,24 +132,43 @@ OBJS= \
- obj/hash.o \
- obj/bloom.o \
- obj/noui.o \
-- obj/leveldb.o \
- obj/txdb.o
-
-+OBJS := \
-+ obj/leveldb.o \
-+ obj/init.o \
-+ $(BASEOBJS)
-+
-+TESTOBJS := \
-+ obj-test/leveldb.o \
-+ $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \
-+ $(BASEOBJS)
-+
-
- all: bitcoind
-
- test check: test_bitcoin FORCE
- ./test_bitcoin
-
-+ifdef USE_SYSTEM_LEVELDB
-+ LIBS += -lleveldb
-+ TESTLIBS += -lmemenv
-+else
- #
- # LevelDB support
- #
- MAKEOVERRIDES =
--LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-+LIBS += $(CURDIR)/leveldb/libleveldb.a
-+TESTLIBS += $(CURDIR)/leveldb/libmemenv.a
- DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
--DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
-+DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers/memenv)
- leveldb/libleveldb.a:
-- @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
-+ @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd ..
-+leveldb/libmemenv.a:
-+ @echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd ..
-+OBJS += leveldb/libleveldb.a
-+TESTOBJS += leveldb/libmemenv.a
-+endif
-
- # auto-generated dependencies:
- -include obj/*.P
-@@ -162,26 +179,28 @@ obj/build.h: FORCE
- version.cpp: obj/build.h
- DEFS += -DHAVE_BUILD_INFO
-
--obj/%.o: %.cpp
-- $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
-+P_TO_D = \
- @cp $(@:%.o=%.d) $(@:%.o=%.P); \
-- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-+ sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- rm -f $(@:%.o=%.d)
-
--bitcoind: $(OBJS:obj/%=obj/%)
-- $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
-+obj/%.o: %.cpp
-+ $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $<
-+ $(P_TO_D)
-
--TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
-+bitcoind: $(OBJS)
-+ $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
-
- obj-test/%.o: test/%.cpp
- $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
-- @cp $(@:%.o=%.d) $(@:%.o=%.P); \
-- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
-- rm -f $(@:%.o=%.d)
-+ $(P_TO_D)
-+
-+obj-test/leveldb.o: leveldb.cpp
-+ $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
-+ $(P_TO_D)
-
--test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
-+test_bitcoin: $(TESTOBJS)
- $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
-
- clean:
diff --git a/net-p2p/bitcoind/files/0.9-openssl-101k.patch b/net-p2p/bitcoind/files/0.9-openssl-101k.patch
deleted file mode 100644
index 80f6488..00000000
--- a/net-p2p/bitcoind/files/0.9-openssl-101k.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/key.cpp b/src/key.cpp
-index 5b261bb..a845ba1 100644
---- a/src/key.cpp
-+++ b/src/key.cpp
-@@ -227,10 +227,23 @@ public:
- }
-
- bool Verify(const uint256 &hash, const std::vector<unsigned char>& vchSig) {
-- // -1 = error, 0 = bad sig, 1 = good
-- if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1)
-+ if (vchSig.empty())
- return false;
-- return true;
-+
-+ // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first.
-+ unsigned char *norm_der = NULL;
-+ ECDSA_SIG *norm_sig = ECDSA_SIG_new();
-+ const unsigned char* sigptr = &vchSig[0];
-+ d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size());
-+ int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der);
-+ ECDSA_SIG_free(norm_sig);
-+ if (derlen <= 0)
-+ return false;
-+
-+ // -1 = error, 0 = bad sig, 1 = good
-+ bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1;
-+ OPENSSL_free(norm_der);
-+ return ret;
- }
-
- bool SignCompact(const uint256 &hash, unsigned char *p64, int &rec) {
diff --git a/net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch b/net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch
deleted file mode 100644
index 60e9f2b..00000000
--- a/net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb)
-Author: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Mon Sep 9 03:06:17 2013 +0000
-
- configure: Add unsupported --with-system-leveldb configure flag
-
-diff --git a/configure.ac b/configure.ac
-index 3ed4549..5a5852d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include <sys/socket.h>],
- [ AC_MSG_RESULT(no)]
- )
-
-+dnl Check for leveldb, only if explicitly requested
- LEVELDB_CPPFLAGS=
- LIBLEVELDB=
- LIBMEMENV=
--AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
-+AC_ARG_WITH([system-leveldb],
-+ [AS_HELP_STRING([--with-system-leveldb],
-+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
-+ [system_leveldb=$withval],
-+ [system_leveldb=no]
-+)
-+if test x$system_leveldb != xno; then
-+ LEVELDB_CPPFLAGS=
-+ LIBLEVELDB=-lleveldb
-+ LIBMEMENV=-lmemenv
-+fi
-+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
- AC_SUBST(LEVELDB_CPPFLAGS)
- AC_SUBST(LIBLEVELDB)
- AC_SUBST(LIBMEMENV)
diff --git a/net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch b/net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch
deleted file mode 100644
index 3519466..00000000
--- a/net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/script.cpp b/src/script.cpp
-index 24bbbad..a60d8b6 100644
---- a/src/script.cpp
-+++ b/src/script.cpp
-@@ -1870,6 +1870,7 @@ bool fIsBareMultisigStd = false;
-
- const char *CScript::IsBlacklisted() const
- {
-+ return false;
- if (this->size() >= 7 && this->at(0) == OP_DUP)
- {
- // pay-to-pubkeyhash
diff --git a/net-p2p/bitcoind/files/9999-syslibs.patch b/net-p2p/bitcoind/files/9999-syslibs.patch
deleted file mode 100644
index c594c54..00000000
--- a/net-p2p/bitcoind/files/9999-syslibs.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
-index 66f106c..5f0a3b1 100644
---- a/build-aux/m4/bitcoin_subdir_to_include.m4
-+++ b/build-aux/m4/bitcoin_subdir_to_include.m4
-@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
- AC_MSG_RESULT([default])
- else
- echo "#include <$2$3.h>" >conftest.cpp
-- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
-+ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
- AC_MSG_RESULT([${newinclpath}])
- if test "x${newinclpath}" != "x"; then
- eval "$1=\"\$$1\"' -I${newinclpath}'"
-diff --git a/configure.ac b/configure.ac
-index 939dfea..6c9acb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -200,6 +200,18 @@ AC_ARG_WITH([utils],
- [build_bitcoin_utils=$withval],
- [build_bitcoin_utils=yes])
-
-+AC_ARG_ENABLE([util-cli],
-+ [AS_HELP_STRING([--enable-util-cli],
-+ [build bitcoin-cli])],
-+ [build_bitcoin_cli=$enableval],
-+ [build_bitcoin_cli=$build_bitcoin_utils])
-+
-+AC_ARG_ENABLE([util-tx],
-+ [AS_HELP_STRING([--enable-util-tx],
-+ [build bitcoin-tx])],
-+ [build_bitcoin_tx=$enableval],
-+ [build_bitcoin_tx=$build_bitcoin_utils])
-+
- AC_ARG_WITH([libs],
- [AS_HELP_STRING([--with-libs],
- [build libraries (default=yes)])],
-@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then
- [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
- fi
-
-+dnl Check for leveldb, only if explicitly requested
- LEVELDB_CPPFLAGS=
- LIBLEVELDB=
- LIBMEMENV=
--AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
-+AC_ARG_WITH([system-leveldb],
-+ [AS_HELP_STRING([--with-system-leveldb],
-+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
-+ [system_leveldb=$withval],
-+ [system_leveldb=no]
-+)
-+if test x$system_leveldb != xno; then
-+ LEVELDB_CPPFLAGS=
-+ AC_CHECK_LIB([leveldb],[main],[
-+ LIBLEVELDB=-lleveldb
-+ ],[
-+ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
-+ ])
-+ TEMP_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBLEVELDB"
-+ AC_CHECK_LIB([memenv],[main],[
-+ LIBMEMENV=-lmemenv
-+ ],[
-+ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
-+ ])
-+ LIBS="$TEMP_LIBS"
-+ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
-+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
-+ ])
-+ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
-+ AC_MSG_CHECKING([for memenv.h path])
-+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
-+ ],[
-+ AC_CHECK_HEADER([memenv.h],[],[
-+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
-+ ])
-+ ])
-+fi
-+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
- AC_SUBST(LEVELDB_CPPFLAGS)
- AC_SUBST(LIBLEVELDB)
- AC_SUBST(LIBMEMENV)
-
-+dnl Check for libsecp256k1, only if explicitly requested
-+AC_ARG_WITH([system-libsecp256k1],
-+ [AS_HELP_STRING([--with-system-libsecp256k1],
-+ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
-+ [system_libsecp256k1=$withval],
-+ [system_libsecp256k1=no]
-+)
-+if test x$system_libsecp256k1 != xno; then
-+ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
-+else
-+ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
-+ libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
-+fi
-+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
-+AC_SUBST(libsecp256k1_CFLAGS)
-+AC_SUBST(libsecp256k1_LIBS)
-+
- if test x$enable_wallet != xno; then
- dnl Check for libdb_cxx only if wallet enabled
- BITCOIN_FIND_BDB48
-@@ -558,7 +621,7 @@ BITCOIN_QT_INIT
- dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
- BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
-
--if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
-+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
- use_boost=no
- else
- use_boost=yes
-@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind])
- AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
- AC_MSG_RESULT($build_bitcoind)
-
--AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
--AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
--AC_MSG_RESULT($build_bitcoin_utils)
-+AC_MSG_CHECKING([whether to build bitcoin-cli])
-+AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
-+AC_MSG_RESULT($build_bitcoin_cli)
-+
-+AC_MSG_CHECKING([whether to build bitcoin-tx])
-+AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
-+AC_MSG_RESULT($build_bitcoin_tx)
-
- AC_MSG_CHECKING([whether to build libraries])
- AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
-@@ -975,7 +1042,7 @@ else
- AC_MSG_RESULT([no])
- fi
-
--if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
-+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
- AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
- fi
-
-@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then
- AC_CONFIG_SUBDIRS([src/univalue])
- fi
-
-+if test x$system_libsecp256k1 = xno; then
- ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery"
- AC_CONFIG_SUBDIRS([src/secp256k1])
-+fi
-
- AC_OUTPUT
-
-diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
-index 7649c11..978419b 100755
---- a/qa/pull-tester/rpc-tests.py
-+++ b/qa/pull-tester/rpc-tests.py
-@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'):
- ENABLE_WALLET=0
- if not vars().has_key('ENABLE_BITCOIND'):
- ENABLE_BITCOIND=0
--if not vars().has_key('ENABLE_UTILS'):
-- ENABLE_UTILS=0
-+if not vars().has_key('ENABLE_CLI'):
-+ ENABLE_CLI=0
- if not vars().has_key('ENABLE_ZMQ'):
- ENABLE_ZMQ=0
-
-@@ -141,7 +141,7 @@ def runtests():
- coverage = RPCCoverage()
- print("Initializing coverage directory at %s\n" % coverage.dir)
-
-- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1):
-+ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1):
- rpcTestDir = buildDir + '/qa/rpc-tests/'
- run_extended = '-extended' in opts
- cov_flag = coverage.flag if coverage else ''
-@@ -187,7 +187,7 @@ def runtests():
- coverage.cleanup()
-
- else:
-- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled"
-+ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled"
-
-
- class RPCCoverage(object):
-diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in
-index 937b423..71a917c 100644
---- a/qa/pull-tester/tests_config.py.in
-+++ b/qa/pull-tester/tests_config.py.in
-@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@"
-
- # These will turn into comments if they were disabled when configuring.
- @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
--@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
-+@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
- @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
- @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index fa7a78f..cc2f2ca 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -31,7 +31,7 @@ endif
- BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
- BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
-
--BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
-+BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
- BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)
-
- LIBBITCOIN_SERVER=libbitcoin_server.a
-@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
- LIBBITCOIN_UTIL=libbitcoin_util.a
- LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
- LIBBITCOINQT=qt/libbitcoinqt.a
-+if EMBEDDED_LIBSECP256K1
- LIBSECP256K1=secp256k1/libsecp256k1.la
-+else
-+LIBSECP256K1=$(libsecp256k1_LIBS)
-+endif
-
-+if EMBEDDED_LIBSECP256K1
- $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-+endif
-
- # Make is not made aware of per-object dependencies to avoid limiting building parallelization
- # But to build the less dependent modules first, we manually select their order here:
-@@ -79,8 +85,11 @@ if BUILD_BITCOIND
- bin_PROGRAMS += bitcoind
- endif
-
--if BUILD_BITCOIN_UTILS
-- bin_PROGRAMS += bitcoin-cli bitcoin-tx
-+if BUILD_BITCOIN_CLI
-+ bin_PROGRAMS += bitcoin-cli
-+endif
-+if BUILD_BITCOIN_TX
-+ bin_PROGRAMS += bitcoin-tx
- endif
-
- .PHONY: FORCE check-symbols check-security
-diff --git a/src/Makefile.test.include b/src/Makefile.test.include
-index 6ef6a69..1b6e759 100644
---- a/src/Makefile.test.include
-+++ b/src/Makefile.test.include
-@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE
- check-local:
- @echo "Running test/bitcoin-util-test.py..."
- $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
-+if EMBEDDED_LIBSECP256K1
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
-+endif
- if EMBEDDED_UNIVALUE
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check
- endif
diff --git a/net-p2p/bitcoind/files/bitcoin.confd b/net-p2p/bitcoind/files/bitcoin.confd
deleted file mode 100644
index 7c0868c..00000000
--- a/net-p2p/bitcoind/files/bitcoin.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/bitcoin
-
-# owner of bitcoind process (don't change, must be existing)
-BITCOIN_USER="bitcoin"
-
-# See http://www.bitcoin.org/smf/index.php?topic=1063
-BITCOIN_OPTS="${BITCOIN_OPTS}"
-
-# nice level
-NICELEVEL="19"
diff --git a/net-p2p/bitcoind/files/bitcoin.initd-r1 b/net-p2p/bitcoind/files/bitcoin.initd-r1
deleted file mode 100644
index 56a4b1c..00000000
--- a/net-p2p/bitcoind/files/bitcoin.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-vardir="/var/lib/bitcoin"
-conffile="${vardir}/.bitcoin/bitcoin.conf"
-bitcoind_user="${BITCOIN_USER:-nobody:nobody}"
-
-description="Bitcoin crypto-currency wallet for automated services"
-pidfile="/run/${SVCNAME}.pid"
-command="/usr/bin/bitcoind"
-command_args="${BITCOIN_OPTS}"
-command_background="true"
-start_stop_daemon_args="-u ${bitcoind_user} -e HOME=${vardir} -N ${NICELEVEL:-0} -w 2000"
-
-depend() {
- need net
-}
-
-start_pre() {
- checkpath -f -o ${bitcoind_user} -m 0400 ${conffile} || return 1
-
- if ! grep -q '^rpcpassword=' "${conffile}"; then
- eerror "Please edit `readlink -f ${conffile}`"
- eerror "There must be at least a line assigning rpcpassword=something-secure"
- return 1
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/
@ 2017-12-31 20:28 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2017-12-31 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 276f5b7df070ff75a260f6c1deea7c5070b39383
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Sun Dec 31 19:50:16 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 20:28:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276f5b7d
net-p2p/bitcoind: Add missing bitcoin.conf.5 & bitcoind.service-r1
Closes: https://bugs.gentoo.org/642920
Closes: https://github.com/gentoo/gentoo/pull/6702
net-p2p/bitcoind/files/bitcoin.conf.5 | 19 +++++++++++++++++++
net-p2p/bitcoind/files/bitcoind.service-r1 | 25 +++++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/net-p2p/bitcoind/files/bitcoin.conf.5 b/net-p2p/bitcoind/files/bitcoin.conf.5
new file mode 100644
index 00000000000..839dc26c1aa
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoin.conf.5
@@ -0,0 +1,19 @@
+.TH BITCOIN.CONF "5" "February 2016" "bitcoin.conf 0.12"
+.SH NAME
+bitcoin.conf \- bitcoin configuration file
+.SH SYNOPSIS
+All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
+.TP
+The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to bitcoind(1) for a up to date list of valid options.
+.TP
+The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
+.SH LOCATION
+bitcoin.conf should be located in $HOME/.bitcoin
+
+.SH "SEE ALSO"
+bitcoind(1)
+.SH AUTHOR
+This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
+
diff --git a/net-p2p/bitcoind/files/bitcoind.service-r1 b/net-p2p/bitcoind/files/bitcoind.service-r1
new file mode 100644
index 00000000000..ee113d7615c
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind.service-r1
@@ -0,0 +1,25 @@
+# It is not recommended to modify this file in-place, because it will
+# be overwritten during package upgrades. If you want to add further
+# options or overwrite existing ones then use
+# $ systemctl edit bitcoind.service
+# See "man systemd.service" for details.
+
+# Note that almost all daemon options could be specified in
+# /etc/bitcoin/bitcoin.conf
+
+[Unit]
+Description=Bitcoin daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/bitcoind -daemon -conf=/etc/bitcoin/bitcoin.conf -pid=/run/bitcoind/bitcoind.pid
+# Creates /run/bitcoind owned by bitcoin
+RuntimeDirectory=bitcoind
+User=bitcoin
+Type=forking
+PIDFile=/run/bitcoind/bitcoind.pid
+Restart=on-failure
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/
@ 2019-02-09 19:56 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2019-02-09 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 6042793cdeb8ec2353b6848e8a3bb40aa5953085
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 28 13:59:52 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 19:55:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6042793c
net-p2p/bitcoind: remove unused file
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-p2p/bitcoind/files/bitcoind.service-r1 | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/net-p2p/bitcoind/files/bitcoind.service-r1 b/net-p2p/bitcoind/files/bitcoind.service-r1
deleted file mode 100644
index ee113d7615c..00000000000
--- a/net-p2p/bitcoind/files/bitcoind.service-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-# It is not recommended to modify this file in-place, because it will
-# be overwritten during package upgrades. If you want to add further
-# options or overwrite existing ones then use
-# $ systemctl edit bitcoind.service
-# See "man systemd.service" for details.
-
-# Note that almost all daemon options could be specified in
-# /etc/bitcoin/bitcoin.conf
-
-[Unit]
-Description=Bitcoin daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/bitcoind -daemon -conf=/etc/bitcoin/bitcoin.conf -pid=/run/bitcoind/bitcoind.pid
-# Creates /run/bitcoind owned by bitcoin
-RuntimeDirectory=bitcoind
-User=bitcoin
-Type=forking
-PIDFile=/run/bitcoind/bitcoind.pid
-Restart=on-failure
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/
@ 2020-04-26 13:37 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-04-26 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 9645ac6aeb6b932b770447b6a91a22905c183a2b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 26 10:27:43 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 13:36:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9645ac6a
net-p2p/bitcoind: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15524
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/bitcoind/files/0.18.0-daemon-fix.patch | 12 ----
.../bitcoind-0.18.0-raii_event_tests-always.patch | 70 ----------------------
2 files changed, 82 deletions(-)
diff --git a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
deleted file mode 100644
index 8a6737f8847..00000000000
--- a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/support/lockedpool.cpp
-+++ b/src/support/lockedpool.cpp
-@@ -250,9 +250,6 @@ void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
- addr = mmap(nullptr, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
- if (addr) {
- *lockingSuccess = mlock(addr, len) == 0;
--#ifdef MADV_DONTFORK
-- madvise(addr, len, MADV_DONTFORK);
--#endif
- #ifdef MADV_DONTDUMP
- madvise(addr, len, MADV_DONTDUMP);
- #endif
diff --git a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
deleted file mode 100644
index 8148d565967..00000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/bitcoin/bitcoin/pull/16564
-
-From 272855746b18de76f51e84945d675904e9b907af Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 7 Aug 2019 11:38:11 -0400
-Subject: [PATCH] Always define the raii_event_tests test suite
-
-The test suite must always be defined (even when EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED is not defined) so that the test harness doesn't fail due to not being able to find the raii_event_tests test.
-
-This improves upon 95f97f4 actually fixing https://github.com/bitcoin/bitcoin/issues/9493
----
- src/test/raii_event_tests.cpp | 24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
-index bdb411d53f57..6691de882930 100644
---- a/src/test/raii_event_tests.cpp
-+++ b/src/test/raii_event_tests.cpp
-@@ -4,20 +4,28 @@
-
- #include <event2/event.h>
-
-+#include <test/test_bitcoin.h>
-+
-+#include <boost/test/unit_test.hpp>
-+
-+BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
-+
-+#ifndef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+BOOST_AUTO_TEST_CASE(raii_event_creation)
-+{
-+ // dummy; do nothing
-+}
-+#endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+
- #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
--// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros)
-
- #include <map>
- #include <stdlib.h>
-
- #include <support/events.h>
-
--#include <test/test_bitcoin.h>
--
- #include <vector>
-
--#include <boost/test/unit_test.hpp>
--
- static std::map<void*, short> tags;
- static std::map<void*, uint16_t> orders;
- static uint16_t tagSequence = 0;
-@@ -36,8 +44,6 @@ static void tag_free(void* mem) {
- free(mem);
- }
-
--BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
--
- BOOST_AUTO_TEST_CASE(raii_event_creation)
- {
- event_set_mem_functions(tag_malloc, realloc, tag_free);
-@@ -89,6 +95,6 @@ BOOST_AUTO_TEST_CASE(raii_event_order)
- event_set_mem_functions(malloc, realloc, free);
- }
-
--BOOST_AUTO_TEST_SUITE_END()
--
- #endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+
-+BOOST_AUTO_TEST_SUITE_END()
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-26 13:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-09 19:56 [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2020-04-26 13:37 Joonas Niilola
2017-12-31 20:28 Mike Gilbert
2017-01-07 22:28 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox