summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoel Kuntze2018-02-18 23:58:45 +0100
committerNoel Kuntze2018-02-19 00:11:53 +0100
commit37f8040af99fe849fa0a3593f23377f1f0b16b15 (patch)
tree161f96c4873180bc228b74831909094ab7b01761
parent384ce85445d78c53b08d84f5daf4063eb147cbb3 (diff)
downloadaur-37f8040af99fe849fa0a3593f23377f1f0b16b15.tar.gz
Use patch by unixbrain, bump PKGREL to 3.
-rw-r--r--.SRCINFO5
-rw-r--r--0005-boost-patch-by-unixbrain.patch75
-rw-r--r--PKGBUILD5
3 files changed, 81 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dcdf577b62a..f9ea5e1d75c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Jun 20 10:25:17 UTC 2017
+# Sun Feb 18 23:10:58 UTC 2018
pkgbase = dogecoin-qt
pkgdesc = Cryptocurrency
pkgver = 1.10.0
- pkgrel = 2
+ pkgrel = 3
url = http://dogecoin.com/
install = dogecoin.install
arch = x86_64
@@ -29,6 +29,7 @@ pkgbase = dogecoin-qt
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 = dogecoin.desktop
sha256sums = e392f4142819fdab313ba921af53fdbd2cf6ee8965d237d0cb5cda8a52c97084
sha256sums = 243ee3a86d91b408fad90f956a891c10958993ef170b4168444e09d78b8c0bac
diff --git a/0005-boost-patch-by-unixbrain.patch b/0005-boost-patch-by-unixbrain.patch
new file mode 100644
index 00000000000..c37c193074d
--- /dev/null
+++ b/0005-boost-patch-by-unixbrain.patch
@@ -0,0 +1,75 @@
+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 0f36acf6a12..b811789f80e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=dogecoin-qt
_binname=dogecoin
pkgver=1.10.0
-pkgrel=2
+pkgrel=3
pkgdesc="Cryptocurrency"
arch=('x86_64' 'i686')
url="http://dogecoin.com/"
@@ -13,11 +13,11 @@ license=('MIT')
provides=('dogecoin-qt')
depends=('miniupnpc' 'boost-libs' 'protobuf' 'openssl-1.0' 'db')
makedepends=('boost' 'gcc' 'make' 'git' 'qt4' 'miniupnpc' 'boost-libs' 'protobuf' 'openssl' 'db')
-# Patches are from https://sources.debian.net/data/main/d/dogecoin/1.10.0-5/debian/patches/
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
@@ -33,6 +33,7 @@ prepare() {
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/"