update pkgver to 0.12.0

- rm openssl from depends (ssl support removed upstream)
- make miniupnpc optional
- add zeromq to depends
- add m4 to makedepends
- change default rpcthreads to 4 in bitcoin.conf

4 files changed, 17 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4d05f301384..f055aa8424ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Dec 24 06:24:06 UTC 2015
+# Thu Feb 18 17:35:55 UTC 2016
 pkgbase = bitcoin-core
 	pkgdesc = Bitcoin Core headless P2P node
-	pkgver = 0.11.2
-	pkgrel = 3
+	pkgver = 0.12.0
+	pkgrel = 1
 	url = https://bitcoin.org
 	install = bitcoin.install
 	arch = i686
@@ -12,15 +12,15 @@ pkgbase = bitcoin-core
 	makedepends = autoconf
 	makedepends = automake
 	makedepends = binutils
-	makedepends = expect
 	makedepends = gcc
 	makedepends = libtool
+	makedepends = m4
 	makedepends = make
 	makedepends = pkg-config
 	depends = boost
 	depends = boost-libs
-	depends = miniupnpc
-	depends = openssl
+	depends = zeromq
+	optdepends = miniupnpc: build with support for UPnP
 	provides = bitcoin-cli
 	provides = bitcoin-daemon
 	provides = bitcoin-tx
@@ -30,13 +30,13 @@ pkgbase = bitcoin-core
 	conflicts = bitcoin-tx
 	backup = etc/bitcoin/bitcoin.conf
 	backup = etc/logrotate.d/bitcoin
-	source = bitcoin-0.11.2.tar.gz::https://codeload.github.com/bitcoin/bitcoin/tar.gz/v0.11.2
+	source = bitcoin-0.12.0.tar.gz::https://codeload.github.com/bitcoin/bitcoin/tar.gz/v0.12.0
 	source = bitcoin.conf
 	source = bitcoin.logrotate
 	source = bitcoin.service
 	source = bitcoin-reindex.service
-	sha256sums = aab2cd0c4f045970d259cf9fcee5785b43180d20ccbbedc1f90480e697696b25
-	sha256sums = 67c464e4314ab5f7234a091098a05706989394086e4ee21e1d9155b9d1421796
+	sha256sums = 92b1b6e1f49e74c914ff3dd43e97bb1859bcd3239310b5fe54db326aba1fd0a5
+	sha256sums = f581e8b24cb2b5d848b6a5e14b3f00f7b9efb5df66aaea8df05bbfb21665959a
 	sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f
 	sha256sums = 5e45f2ceaeb7bfa60aeb66ca4167068191eb4358af03f95ac70fd96d9b006349
 	sha256sums = 10ad0b8c356559886634eaf658992004045853ec26cddee143d16125cb75e8f1
diff --git a/PKGBUILD b/PKGBUILD
index 602759a6a40e..01648763e9a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,31 @@
 # Maintainer: Andy Weidenbaum <archbaum@gmail.com>
 
 pkgname=bitcoin-core
-pkgver=0.11.2
-pkgrel=3
+pkgver=0.12.0
+pkgrel=1
 pkgdesc="Bitcoin Core headless P2P node"
 arch=('i686' 'x86_64')
 url="https://bitcoin.org"
 depends=('boost'
          'boost-libs'
-         'miniupnpc'
-         'openssl')
+         'zeromq')
 makedepends=('autoconf'
              'automake'
              'binutils'
-             'expect'
              'gcc'
              'libtool'
+             'm4'
              'make'
              'pkg-config')
+optdepends=('miniupnpc: build with support for UPnP')
 license=('MIT')
 source=(${pkgname%-core}-$pkgver.tar.gz::https://codeload.github.com/bitcoin/bitcoin/tar.gz/v$pkgver
         bitcoin.conf
         bitcoin.logrotate
         bitcoin.service
         bitcoin-reindex.service)
-sha256sums=('aab2cd0c4f045970d259cf9fcee5785b43180d20ccbbedc1f90480e697696b25'
-            '67c464e4314ab5f7234a091098a05706989394086e4ee21e1d9155b9d1421796'
+sha256sums=('92b1b6e1f49e74c914ff3dd43e97bb1859bcd3239310b5fe54db326aba1fd0a5'
+            'f581e8b24cb2b5d848b6a5e14b3f00f7b9efb5df66aaea8df05bbfb21665959a'
             '8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f'
             '5e45f2ceaeb7bfa60aeb66ca4167068191eb4358af03f95ac70fd96d9b006349'
             '10ad0b8c356559886634eaf658992004045853ec26cddee143d16125cb75e8f1')
diff --git a/bitcoin.conf b/bitcoin.conf
index b88ecf527886..02d0d4be220b 100644
--- a/bitcoin.conf
+++ b/bitcoin.conf
@@ -2,12 +2,8 @@ rpcconnect=127.0.0.1
 rpcport=8332
 rpcuser=bitcoin
 rpcpassword=secret
-rpcssl=1
 rpcallowip=127.0.0.1
-rpcsslcertificatechainfile=/etc/bitcoin/server.cert
-rpcsslprivatekeyfile=/etc/bitcoin/server.pem
-rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH
-rpcthreads=1000
+rpcthreads=4
 rpctimeout=300
 txindex=1
 server=1
diff --git a/bitcoin.install b/bitcoin.install
index 42e996acd883..4b0d2851e397 100644
--- a/bitcoin.install
+++ b/bitcoin.install
@@ -3,7 +3,6 @@ _bc_group=bitcoin
 
 post_install() {
   _mkuser
-  _mkssl
   # disable Copy-On-Write (btrfs directories only)
   for _dir in /srv/bitcoin; do
     _is_btrfs "$_dir" && _disable_cow "$_dir"
@@ -45,43 +44,6 @@ _rmuser() {
 
 
 # ------------------------------------------------------------------------------
-# helper function for enabling SSL in bitcoin-core
-# ------------------------------------------------------------------------------
-
-_mkssl() {
-  echo -n "Enabling SSL..." # https://en.bitcoin.it/wiki/Enabling_SSL_on_original_client_daemon
-  mkdir -p /{etc,srv}/bitcoin
-  openssl genrsa -out /etc/bitcoin/server.pem 2048
-  expect <<EOF | perl -ne 'print if /-----BEGIN\sCERTIFICATE-----/../-----END\sCERTIFICATE-----/' > /etc/bitcoin/server.cert
-    spawn openssl req -new -x509 -nodes -sha1 -days 3650 -key /etc/bitcoin/server.pem
-    expect "Country*" {
-      send "\r"
-    }
-    expect "State*" {
-      send "\r"
-    }
-    expect "Locality*" {
-      send "\r"
-    }
-    expect "Organization*" {
-      send "\r"
-    }
-    expect "Organizational*" {
-      send "\r"
-    }
-    expect "Common*" {
-      send "\r"
-    }
-    expect "Email*" {
-      send "\r"
-    }
-    expect eof
-EOF
-  echo "done"
-}
-
-
-# ------------------------------------------------------------------------------
 # helper functions for disabling btrfs Copy-On-Write (CoW)
 # https://wiki.archlinux.org/index.php/Btrfs#Copy-On-Write_.28CoW.29
 # ------------------------------------------------------------------------------
@@ -147,7 +109,6 @@ read -d '' bitcoin <<'EOF'
 ##      rpcport=8332                                                  ##
 ##      rpcuser=bitcoin                                               ##
 ##      rpcpassword=secret                                            ##
-##      rpcssl=1                                                      ##
 ##      EOF                                                           ##
 ##                                                                    ##
 ##      $ bitcoin-cli getmininginfo                                   ##