summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoel Kuntze2019-07-13 01:45:45 +0200
committerNoel Kuntze2019-07-13 01:45:45 +0200
commit7d5a765b28e0d9050d646a4ace31678472428e8a (patch)
tree4079d06f7f1817a9ed2ed3531635a6e410a21fd5
parent26f3ad7aa9e0f216054462decce2e191e174a886 (diff)
downloadaur-7d5a765b28e0d9050d646a4ace31678472428e8a.tar.gz
Bump to 1.14.0 with relevant file changes
-rw-r--r--.SRCINFO19
-rw-r--r--0001-configure.ac_use_PIC.patch11
-rw-r--r--0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch524
-rw-r--r--0004-rename-RAND_egd.patch17
-rw-r--r--0005-boost-patch-by-unixbrain.patch75
-rw-r--r--PKGBUILD24
6 files changed, 10 insertions, 660 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ad6dc60259..f2504dfd1c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Feb 19 11:35:08 UTC 2018
pkgbase = dogecoin-qt
pkgdesc = Cryptocurrency
- pkgver = 1.10.0
- pkgrel = 3
+ pkgver = 1.14.0
+ pkgrel = 1
url = http://dogecoin.com/
install = dogecoin.install
arch = x86_64
@@ -24,18 +22,11 @@ pkgbase = dogecoin-qt
depends = protobuf
depends = openssl-1.0
depends = db
+ depends = libevent
provides = dogecoin-qt
- source = https://github.com/dogecoin/dogecoin/archive/v1.10.0.tar.gz
- source = 0001-configure.ac_use_PIC.patch
- source = 0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch
- source = 0004-rename-RAND_egd.patch
- source = 0005-boost-patch-by-unixbrain.patch
+ source = https://github.com/dogecoin/dogecoin/archive/v1.14.0.tar.gz
source = dogecoin.desktop
- sha256sums = e392f4142819fdab313ba921af53fdbd2cf6ee8965d237d0cb5cda8a52c97084
- sha256sums = 243ee3a86d91b408fad90f956a891c10958993ef170b4168444e09d78b8c0bac
- sha256sums = 215cab9e24d2c5583370979e4a0a9b46ccc5f4595233bb1a6a2eb4586773efbb
- sha256sums = 38e6a8cc94ab53901919c672ce1cf808c82cd2f32e6e5514fd4ecba94d0d26cc
- sha256sums = 2ed04e3807af3772c2be1a8be04e50164379526d8b07e0ee2d753a175256c6b2
+ sha256sums = e5fc22472f209a7bbafbfb462404682eabfa495a19d97bb46fdc4619be7a78a9
sha256sums = 04d41773462ad6609658e291d22b15cd8d58b8eb5e4391a80cd1dae75e7df0e6
pkgname = dogecoin-qt
diff --git a/0001-configure.ac_use_PIC.patch b/0001-configure.ac_use_PIC.patch
deleted file mode 100644
index fe9db0a2c4b..00000000000
--- a/0001-configure.ac_use_PIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -417,7 +417,7 @@
-
- if test x$TARGET_OS != xwindows; then
- # All windows code is PIC, forcing it on just adds useless compile warnings
-- AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"])
-+ AX_CHECK_COMPILE_FLAG([-fPIC],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIC"])
- AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"])
- fi
-
diff --git a/0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch b/0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch
deleted file mode 100644
index 239f829eab9..00000000000
--- a/0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-From 1a9b78f89d7999df16d5b114eea0b2645b5d19eb Mon Sep 17 00:00:00 2001
-From: Patrick Lodder <patrick.lodder@intellibiz.org>
-Date: Sat, 13 Feb 2016 12:06:49 +0100
-Subject: [PATCH] rename libbitcoinconsensus to libdogecoinconsensus
-
-Changes all consensus library name tags from bitcoinconsensus
-to dogecoinconsensus to prevent packagers from having to deal
-with our shared library and headers having the same name as
-Bitcoin's.
-
-Also changes all exported names to create incompatibility
-between the two libraries, so that one cannot accidentally link
-code for bitcoin consensus but instead get dogecoin consensus.
----
- .gitignore | 2 +-
- Makefile.am | 2 +-
- configure.ac | 2 +-
- libbitcoinconsensus.pc.in | 11 -----
- libdogecoinconsensus.pc.in | 11 +++++
- src/Makefile.am | 20 ++++-----
- src/script/bitcoinconsensus.cpp | 91 ----------------------------------------
- src/script/bitcoinconsensus.h | 68 ------------------------------
- src/script/dogecoinconsensus.cpp | 91 ++++++++++++++++++++++++++++++++++++++++
- src/script/dogecoinconsensus.h | 68 ++++++++++++++++++++++++++++++
- src/test/script_tests.cpp | 4 +-
- 11 files changed, 185 insertions(+), 185 deletions(-)
- delete mode 100644 libbitcoinconsensus.pc.in
- create mode 100644 libdogecoinconsensus.pc.in
- delete mode 100644 src/script/bitcoinconsensus.cpp
- delete mode 100644 src/script/bitcoinconsensus.h
- create mode 100644 src/script/dogecoinconsensus.cpp
- create mode 100644 src/script/dogecoinconsensus.h
-
-diff --git a/.gitignore b/.gitignore
-index a809323..a0a22be 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -112,4 +112,4 @@ qa/pull-tester/test.*/*
-
- /doc/doxygen/
-
--libbitcoinconsensus.pc
-+libdogecoinconsensus.pc
-diff --git a/Makefile.am b/Makefile.am
-index 60d7b04..e7012e3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ GZIP_ENV="-9n"
-
- if BUILD_BITCOIN_LIBS
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = libbitcoinconsensus.pc
-+pkgconfig_DATA = libdogecoinconsensus.pc
- endif
-
- BITCOIND_BIN=$(top_builddir)/src/dogecoind$(EXEEXT)
-diff --git a/configure.ac b/configure.ac
-index 5453481..1849ccf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -709,7 +709,7 @@ AC_MSG_CHECKING([whether to build libraries])
- AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
- if test x$build_bitcoin_libs = xyes; then
- AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built])
-- AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in])
-+ AC_CONFIG_FILES([libdogecoinconsensus.pc:libdogecoinconsensus.pc.in])
- fi
- AC_MSG_RESULT($build_bitcoin_libs)
-
-diff --git a/libbitcoinconsensus.pc.in b/libbitcoinconsensus.pc.in
-deleted file mode 100644
-index 3ca1696..0000000
---- a/libbitcoinconsensus.pc.in
-+++ /dev/null
-@@ -1,11 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: Bitcoin Core consensus library
--Description: Library for the Bitcoin consensus protocol.
--Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lbitcoinconsensus
--Cflags: -I${includedir}
--Requires.private: libcrypto
-diff --git a/libdogecoinconsensus.pc.in b/libdogecoinconsensus.pc.in
-new file mode 100644
-index 0000000..9b5e5d7
---- /dev/null
-+++ b/libdogecoinconsensus.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: Dogecoin Core consensus library
-+Description: Library for the Dogecoin consensus protocol.
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -ldogecoinconsensus
-+Cflags: -I${includedir}
-+Requires.private: libcrypto
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 53601a1..35f5a6d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -50,8 +50,8 @@ EXTRA_LIBRARIES += libbitcoin_wallet.a
- endif
-
- if BUILD_BITCOIN_LIBS
--lib_LTLIBRARIES = libbitcoinconsensus.la
--LIBBITCOIN_CONSENSUS=libbitcoinconsensus.la
-+lib_LTLIBRARIES = libdogecoinconsensus.la
-+LIBBITCOIN_CONSENSUS=libdogecoinconsensus.la
- else
- LIBBITCOIN_CONSENSUS=
- endif
-@@ -375,10 +375,10 @@ dogecoin_tx_LDADD = \
- dogecoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
- #
-
--# bitcoinconsensus library #
-+# dogecoinconsensus library #
- if BUILD_BITCOIN_LIBS
--include_HEADERS = script/bitcoinconsensus.h
--libbitcoinconsensus_la_SOURCES = \
-+include_HEADERS = script/dogecoinconsensus.h
-+libdogecoinconsensus_la_SOURCES = \
- crypto/hmac_sha512.cpp \
- crypto/ripemd160.cpp \
- crypto/scrypt.cpp \
-@@ -390,19 +390,19 @@ libbitcoinconsensus_la_SOURCES = \
- hash.cpp \
- primitives/transaction.cpp \
- pubkey.cpp \
-- script/bitcoinconsensus.cpp \
-+ script/dogecoinconsensus.cpp \
- script/interpreter.cpp \
- script/script.cpp \
- uint256.cpp \
- utilstrencodings.cpp
-
- if GLIBC_BACK_COMPAT
-- libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp
-+ libdogecoinconsensus_la_SOURCES += compat/glibc_compat.cpp
- endif
-
--libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
--libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
--libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
-+libdogecoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
-+libdogecoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
-+libdogecoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
-
- endif
- #
-diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
-deleted file mode 100644
-index b0d5faa..0000000
---- a/src/script/bitcoinconsensus.cpp
-+++ /dev/null
-@@ -1,91 +0,0 @@
--// Copyright (c) 2009-2010 Satoshi Nakamoto
--// Copyright (c) 2009-2014 The Bitcoin Core developers
--// Distributed under the MIT software license, see the accompanying
--// file COPYING or http://www.opensource.org/licenses/mit-license.php.
--
--#include "bitcoinconsensus.h"
--
--#include "primitives/transaction.h"
--#include "script/interpreter.h"
--#include "version.h"
--
--namespace {
--
--/** A class that deserializes a single CTransaction one time. */
--class TxInputStream
--{
--public:
-- TxInputStream(int nTypeIn, int nVersionIn, const unsigned char *txTo, size_t txToLen) :
-- m_type(nTypeIn),
-- m_version(nVersionIn),
-- m_data(txTo),
-- m_remaining(txToLen)
-- {}
--
-- TxInputStream& read(char* pch, size_t nSize)
-- {
-- if (nSize > m_remaining)
-- throw std::ios_base::failure(std::string(__func__) + ": end of data");
--
-- if (pch == NULL)
-- throw std::ios_base::failure(std::string(__func__) + ": bad destination buffer");
--
-- if (m_data == NULL)
-- throw std::ios_base::failure(std::string(__func__) + ": bad source buffer");
--
-- memcpy(pch, m_data, nSize);
-- m_remaining -= nSize;
-- m_data += nSize;
-- return *this;
-- }
--
-- template<typename T>
-- TxInputStream& operator>>(T& obj)
-- {
-- ::Unserialize(*this, obj, m_type, m_version);
-- return *this;
-- }
--
--private:
-- const int m_type;
-- const int m_version;
-- const unsigned char* m_data;
-- size_t m_remaining;
--};
--
--inline int set_error(bitcoinconsensus_error* ret, bitcoinconsensus_error serror)
--{
-- if (ret)
-- *ret = serror;
-- return 0;
--}
--
--} // anon namespace
--
--int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
-- const unsigned char *txTo , unsigned int txToLen,
-- unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err)
--{
-- try {
-- TxInputStream stream(SER_NETWORK, PROTOCOL_VERSION, txTo, txToLen);
-- CTransaction tx;
-- stream >> tx;
-- if (nIn >= tx.vin.size())
-- return set_error(err, bitcoinconsensus_ERR_TX_INDEX);
-- if (tx.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION) != txToLen)
-- return set_error(err, bitcoinconsensus_ERR_TX_SIZE_MISMATCH);
--
-- // Regardless of the verification result, the tx did not error.
-- set_error(err, bitcoinconsensus_ERR_OK);
--
-- return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), flags, TransactionSignatureChecker(&tx, nIn), NULL);
-- } catch (const std::exception&) {
-- return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
-- }
--}
--
--unsigned int bitcoinconsensus_version()
--{
-- // Just use the API version for now
-- return BITCOINCONSENSUS_API_VER;
--}
-diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h
-deleted file mode 100644
-index 0320577..0000000
---- a/src/script/bitcoinconsensus.h
-+++ /dev/null
-@@ -1,68 +0,0 @@
--// Copyright (c) 2009-2010 Satoshi Nakamoto
--// Copyright (c) 2009-2014 The Bitcoin Core developers
--// Distributed under the MIT software license, see the accompanying
--// file COPYING or http://www.opensource.org/licenses/mit-license.php.
--
--#ifndef BITCOIN_BITCOINCONSENSUS_H
--#define BITCOIN_BITCOINCONSENSUS_H
--
--#if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H)
--#include "config/bitcoin-config.h"
-- #if defined(_WIN32)
-- #if defined(DLL_EXPORT)
-- #if defined(HAVE_FUNC_ATTRIBUTE_DLLEXPORT)
-- #define EXPORT_SYMBOL __declspec(dllexport)
-- #else
-- #define EXPORT_SYMBOL
-- #endif
-- #endif
-- #elif defined(HAVE_FUNC_ATTRIBUTE_VISIBILITY)
-- #define EXPORT_SYMBOL __attribute__ ((visibility ("default")))
-- #endif
--#elif defined(MSC_VER) && !defined(STATIC_LIBBITCOINCONSENSUS)
-- #define EXPORT_SYMBOL __declspec(dllimport)
--#endif
--
--#ifndef EXPORT_SYMBOL
-- #define EXPORT_SYMBOL
--#endif
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#define BITCOINCONSENSUS_API_VER 0
--
--typedef enum bitcoinconsensus_error_t
--{
-- bitcoinconsensus_ERR_OK = 0,
-- bitcoinconsensus_ERR_TX_INDEX,
-- bitcoinconsensus_ERR_TX_SIZE_MISMATCH,
-- bitcoinconsensus_ERR_TX_DESERIALIZE,
--} bitcoinconsensus_error;
--
--/** Script verification flags */
--enum
--{
-- bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE = 0,
-- bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH = (1U << 0), // evaluate P2SH (BIP16) subscripts
-- bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG = (1U << 2), // enforce strict DER (BIP66) compliance
--};
--
--/// Returns 1 if the input nIn of the serialized transaction pointed to by
--/// txTo correctly spends the scriptPubKey pointed to by scriptPubKey under
--/// the additional constraints specified by flags.
--/// If not NULL, err will contain an error/success code for the operation
--EXPORT_SYMBOL int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
-- const unsigned char *txTo , unsigned int txToLen,
-- unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err);
--
--EXPORT_SYMBOL unsigned int bitcoinconsensus_version();
--
--#ifdef __cplusplus
--} // extern "C"
--#endif
--
--#undef EXPORT_SYMBOL
--
--#endif // BITCOIN_BITCOINCONSENSUS_H
-diff --git a/src/script/dogecoinconsensus.cpp b/src/script/dogecoinconsensus.cpp
-new file mode 100644
-index 0000000..177b3dc
---- /dev/null
-+++ b/src/script/dogecoinconsensus.cpp
-@@ -0,0 +1,91 @@
-+// Copyright (c) 2009-2010 Satoshi Nakamoto
-+// Copyright (c) 2009-2014 The Bitcoin Core developers
-+// Distributed under the MIT software license, see the accompanying
-+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-+
-+#include "dogecoinconsensus.h"
-+
-+#include "primitives/transaction.h"
-+#include "script/interpreter.h"
-+#include "version.h"
-+
-+namespace {
-+
-+/** A class that deserializes a single CTransaction one time. */
-+class TxInputStream
-+{
-+public:
-+ TxInputStream(int nTypeIn, int nVersionIn, const unsigned char *txTo, size_t txToLen) :
-+ m_type(nTypeIn),
-+ m_version(nVersionIn),
-+ m_data(txTo),
-+ m_remaining(txToLen)
-+ {}
-+
-+ TxInputStream& read(char* pch, size_t nSize)
-+ {
-+ if (nSize > m_remaining)
-+ throw std::ios_base::failure(std::string(__func__) + ": end of data");
-+
-+ if (pch == NULL)
-+ throw std::ios_base::failure(std::string(__func__) + ": bad destination buffer");
-+
-+ if (m_data == NULL)
-+ throw std::ios_base::failure(std::string(__func__) + ": bad source buffer");
-+
-+ memcpy(pch, m_data, nSize);
-+ m_remaining -= nSize;
-+ m_data += nSize;
-+ return *this;
-+ }
-+
-+ template<typename T>
-+ TxInputStream& operator>>(T& obj)
-+ {
-+ ::Unserialize(*this, obj, m_type, m_version);
-+ return *this;
-+ }
-+
-+private:
-+ const int m_type;
-+ const int m_version;
-+ const unsigned char* m_data;
-+ size_t m_remaining;
-+};
-+
-+inline int set_error(dogecoinconsensus_error* ret, dogecoinconsensus_error serror)
-+{
-+ if (ret)
-+ *ret = serror;
-+ return 0;
-+}
-+
-+} // anon namespace
-+
-+int dogecoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
-+ const unsigned char *txTo , unsigned int txToLen,
-+ unsigned int nIn, unsigned int flags, dogecoinconsensus_error* err)
-+{
-+ try {
-+ TxInputStream stream(SER_NETWORK, PROTOCOL_VERSION, txTo, txToLen);
-+ CTransaction tx;
-+ stream >> tx;
-+ if (nIn >= tx.vin.size())
-+ return set_error(err, dogecoinconsensus_ERR_TX_INDEX);
-+ if (tx.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION) != txToLen)
-+ return set_error(err, dogecoinconsensus_ERR_TX_SIZE_MISMATCH);
-+
-+ // Regardless of the verification result, the tx did not error.
-+ set_error(err, dogecoinconsensus_ERR_OK);
-+
-+ return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), flags, TransactionSignatureChecker(&tx, nIn), NULL);
-+ } catch (const std::exception&) {
-+ return set_error(err, dogecoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
-+ }
-+}
-+
-+unsigned int dogecoinconsensus_version()
-+{
-+ // Just use the API version for now
-+ return DOGECOINCONSENSUS_API_VER;
-+}
-diff --git a/src/script/dogecoinconsensus.h b/src/script/dogecoinconsensus.h
-new file mode 100644
-index 0000000..bcfdb3d
---- /dev/null
-+++ b/src/script/dogecoinconsensus.h
-@@ -0,0 +1,68 @@
-+// Copyright (c) 2009-2010 Satoshi Nakamoto
-+// Copyright (c) 2009-2014 The Bitcoin Core developers
-+// Distributed under the MIT software license, see the accompanying
-+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-+
-+#ifndef BITCOIN_BITCOINCONSENSUS_H
-+#define BITCOIN_BITCOINCONSENSUS_H
-+
-+#if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H)
-+#include "config/bitcoin-config.h"
-+ #if defined(_WIN32)
-+ #if defined(DLL_EXPORT)
-+ #if defined(HAVE_FUNC_ATTRIBUTE_DLLEXPORT)
-+ #define EXPORT_SYMBOL __declspec(dllexport)
-+ #else
-+ #define EXPORT_SYMBOL
-+ #endif
-+ #endif
-+ #elif defined(HAVE_FUNC_ATTRIBUTE_VISIBILITY)
-+ #define EXPORT_SYMBOL __attribute__ ((visibility ("default")))
-+ #endif
-+#elif defined(MSC_VER) && !defined(STATIC_LIBBITCOINCONSENSUS)
-+ #define EXPORT_SYMBOL __declspec(dllimport)
-+#endif
-+
-+#ifndef EXPORT_SYMBOL
-+ #define EXPORT_SYMBOL
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define DOGECOINCONSENSUS_API_VER 0
-+
-+typedef enum dogecoinconsensus_error_t
-+{
-+ dogecoinconsensus_ERR_OK = 0,
-+ dogecoinconsensus_ERR_TX_INDEX,
-+ dogecoinconsensus_ERR_TX_SIZE_MISMATCH,
-+ dogecoinconsensus_ERR_TX_DESERIALIZE,
-+} dogecoinconsensus_error;
-+
-+/** Script verification flags */
-+enum
-+{
-+ dogecoinconsensus_SCRIPT_FLAGS_VERIFY_NONE = 0,
-+ dogecoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH = (1U << 0), // evaluate P2SH (BIP16) subscripts
-+ dogecoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG = (1U << 2), // enforce strict DER (BIP66) compliance
-+};
-+
-+/// Returns 1 if the input nIn of the serialized transaction pointed to by
-+/// txTo correctly spends the scriptPubKey pointed to by scriptPubKey under
-+/// the additional constraints specified by flags.
-+/// If not NULL, err will contain an error/success code for the operation
-+EXPORT_SYMBOL int dogecoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
-+ const unsigned char *txTo , unsigned int txToLen,
-+ unsigned int nIn, unsigned int flags, dogecoinconsensus_error* err);
-+
-+EXPORT_SYMBOL unsigned int dogecoinconsensus_version();
-+
-+#ifdef __cplusplus
-+} // extern "C"
-+#endif
-+
-+#undef EXPORT_SYMBOL
-+
-+#endif // BITCOIN_BITCOINCONSENSUS_H
-diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
-index c0614cc..5ffa356 100644
---- a/src/test/script_tests.cpp
-+++ b/src/test/script_tests.cpp
-@@ -16,7 +16,7 @@
- #include "test/test_bitcoin.h"
-
- #if defined(HAVE_CONSENSUS_LIB)
--#include "script/bitcoinconsensus.h"
-+#include "script/dogecoinconsensus.h"
- #endif
-
- #include <fstream>
-@@ -99,7 +99,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, bo
- #if defined(HAVE_CONSENSUS_LIB)
- CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
- stream << tx2;
-- BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect,message);
-+ BOOST_CHECK_MESSAGE(dogecoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect,message);
- #endif
- }
-
---
-1.9.1
-
diff --git a/0004-rename-RAND_egd.patch b/0004-rename-RAND_egd.patch
deleted file mode 100644
index e366154ec43..00000000000
--- a/0004-rename-RAND_egd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- dogecoin-1.10.4.orig/configure.ac
-+++ dogecoin-1.10.4/configure.ac
-@@ -679,14 +679,6 @@
- fi
- fi
-
--AC_CHECK_LIB([crypto],[RAND_egd],[],[
-- AC_ARG_WITH([libressl],
-- [AS_HELP_STRING([--with-libressl],[Build with system LibreSSL (default is no; DANGEROUS; NOT SUPPORTED)])],
-- [AC_MSG_WARN([Detected LibreSSL: This is NOT supported, and may break consensus compatibility!])],
-- [AC_MSG_ERROR([Detected LibreSSL: This is NOT supported, and may break consensus compatibility!])]
-- )
--])
--
- CFLAGS_TEMP="$CFLAGS"
- LIBS_TEMP="$LIBS"
- CFLAGS="$CFLAGS $SSL_CFLAGS $CRYPTO_CFLAGS"
diff --git a/0005-boost-patch-by-unixbrain.patch b/0005-boost-patch-by-unixbrain.patch
deleted file mode 100644
index c37c193074d..00000000000
--- a/0005-boost-patch-by-unixbrain.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ura dogecoin-1.10.0/src/bitcoin-cli.cpp dogecoin-1.10.0-b/src/bitcoin-cli.cpp
---- dogecoin-1.10.0/src/bitcoin-cli.cpp 2015-10-31 10:49:41.000000000 -0400
-+++ dogecoin-1.10.0-b/src/bitcoin-cli.cpp 2018-02-06 01:23:36.244774559 -0500
-@@ -105,7 +105,7 @@
- // Connect to localhost
- bool fUseSSL = GetBoolArg("-rpcssl", false);
- boost::asio::io_service io_service;
-- boost::asio::ssl::context context(io_service, boost::asio::ssl::context::sslv23);
-+ boost::asio::ssl::context context(boost::asio::ssl::context::sslv23);
- context.set_options(boost::asio::ssl::context::no_sslv2 | boost::asio::ssl::context::no_sslv3);
- boost::asio::ssl::stream<boost::asio::ip::tcp::socket> sslStream(io_service, context);
- SSLIOStreamDevice<boost::asio::ip::tcp> d(sslStream, fUseSSL);
-diff -ura dogecoin-1.10.0/src/rpcserver.cpp dogecoin-1.10.0-b/src/rpcserver.cpp
---- dogecoin-1.10.0/src/rpcserver.cpp 2015-10-31 10:49:41.000000000 -0400
-+++ dogecoin-1.10.0-b/src/rpcserver.cpp 2018-02-06 01:04:33.034848733 -0500
-@@ -503,8 +503,8 @@
- void ServiceConnection(AcceptedConnection *conn);
-
- //! Forward declaration required for RPCListen
--template <typename Protocol, typename SocketAcceptorService>
--static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
-+template <typename Protocol>
-+static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
- ssl::context& context,
- bool fUseSSL,
- boost::shared_ptr< AcceptedConnection > conn,
-@@ -513,8 +513,8 @@
- /**
- * Sets up I/O resources to accept and handle a new connection.
- */
--template <typename Protocol, typename SocketAcceptorService>
--static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
-+template <typename Protocol>
-+static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
- ssl::context& context,
- const bool fUseSSL)
- {
-@@ -524,7 +524,7 @@
- acceptor->async_accept(
- conn->sslStream.lowest_layer(),
- conn->peer,
-- boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>,
-+ boost::bind(&RPCAcceptHandler<Protocol>,
- acceptor,
- boost::ref(context),
- fUseSSL,
-@@ -536,8 +536,8 @@
- /**
- * Accept and handle incoming connection.
- */
--template <typename Protocol, typename SocketAcceptorService>
--static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
-+template <typename Protocol>
-+static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
- ssl::context& context,
- const bool fUseSSL,
- boost::shared_ptr< AcceptedConnection > conn,
-@@ -631,7 +631,7 @@
-
- assert(rpc_io_service == NULL);
- rpc_io_service = new boost::asio::io_service();
-- rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);
-+ rpc_ssl_context = new ssl::context(ssl::context::sslv23);
-
- const bool fUseSSL = GetBoolArg("-rpcssl", false);
-
-@@ -650,7 +650,7 @@
- else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string());
-
- string strCiphers = GetArg("-rpcsslciphers", "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH");
-- SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
-+ SSL_CTX_set_cipher_list(rpc_ssl_context->native_handle(), strCiphers.c_str());
- }
-
- std::vector<ip::tcp::endpoint> vEndpoints;
diff --git a/PKGBUILD b/PKGBUILD
index c8c37025261..4ab3016bcc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,38 +4,24 @@
pkgname=dogecoin-qt
_binname=dogecoin
-pkgver=1.10.0
-pkgrel=3
+pkgver=1.14.0
+pkgrel=1
pkgdesc="Cryptocurrency"
arch=('x86_64' 'i686')
url="http://dogecoin.com/"
license=('MIT')
provides=('dogecoin-qt')
-depends=('miniupnpc' 'boost-libs' 'protobuf' 'openssl-1.0' 'db')
+depends=('miniupnpc' 'boost-libs' 'protobuf' 'openssl-1.0' 'db' 'libevent')
makedepends=('boost' 'gcc' 'make' 'git' 'qt4' 'miniupnpc' 'boost-libs' 'protobuf' 'openssl' 'db')
source=("https://github.com/dogecoin/dogecoin/archive/v${pkgver}.tar.gz"
- "0001-configure.ac_use_PIC.patch"
- "0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch"
- "0004-rename-RAND_egd.patch"
- "0005-boost-patch-by-unixbrain.patch"
"dogecoin.desktop"
)
+
install=dogecoin.install
-sha256sums=('e392f4142819fdab313ba921af53fdbd2cf6ee8965d237d0cb5cda8a52c97084'
- '243ee3a86d91b408fad90f956a891c10958993ef170b4168444e09d78b8c0bac'
- '215cab9e24d2c5583370979e4a0a9b46ccc5f4595233bb1a6a2eb4586773efbb'
- '38e6a8cc94ab53901919c672ce1cf808c82cd2f32e6e5514fd4ecba94d0d26cc'
- '2ed04e3807af3772c2be1a8be04e50164379526d8b07e0ee2d753a175256c6b2'
+sha256sums=('e5fc22472f209a7bbafbfb462404682eabfa495a19d97bb46fdc4619be7a78a9'
'04d41773462ad6609658e291d22b15cd8d58b8eb5e4391a80cd1dae75e7df0e6')
-prepare() {
- cd "${srcdir}/dogecoin-$pkgver/"
- patch -p1 <"${srcdir}/0001-configure.ac_use_PIC.patch"
- patch -p1 <"${srcdir}/0002-rename-libbitcoinconsensus-to-libdogecoinconsensus.patch"
- patch -p1 <"${srcdir}/0004-rename-RAND_egd.patch"
- patch -p1 <"${srcdir}/0005-boost-patch-by-unixbrain.patch"
-}
build() {
cd "${srcdir}/dogecoin-$pkgver/"