Bump to v0.11.1.0

Also reinstates tests and uses in-tree service + conf files.

4 files changed, 11 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10c419b98194..e789fcfc1081 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 26 06:31:54 UTC 2017
+# Wed Oct 25 14:17:43 UTC 2017
 pkgbase = monero
 	pkgdesc = Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)
-	pkgver = 0.11.0.0
-	pkgrel = 2
+	pkgver = 0.11.1.0
+	pkgrel = 1
 	url = https://getmonero.org/
 	arch = x86_64
 	arch = i686
@@ -23,12 +23,8 @@ pkgbase = monero
 	provides = libmonero-wallet
 	conflicts = bitmonero-git
 	conflicts = libmonero-wallet-git
-	source = https://github.com/monero-project/monero/archive/v0.11.0.0.tar.gz
-	source = monerod.service
-	source = monerod.conf
-	sha256sums = 93c217cf10624d6e93cd1db5d137310be8b23393400014e2c8808d5214207c20
-	sha256sums = 59fc670cf92960832d03038968270f81beacea7d6819c71ec5bcf15c6030e3c9
-	sha256sums = 829445fe9acc00681f94f7b9ca6ce39713e377970b0a3d6f88c37991e1aa61b2
+	source = https://github.com/monero-project/monero/archive/v0.11.1.0.tar.gz
+	sha256sums = b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b
 
 pkgname = monero
 	install = monero.install
diff --git a/PKGBUILD b/PKGBUILD
index e717cd76287a..52cb35b4850b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=('monero')
 pkgname=('monero' 'libmonero-wallet')
-pkgver=0.11.0.0
-pkgrel=2
+pkgver=0.11.1.0
+pkgrel=1
 pkgdesc="Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)"
 license=('custom:Cryptonote')
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
@@ -15,21 +15,8 @@ makedepends=('git' 'cmake' 'boost' 'gtest')
 provides=('monero' 'libmonero-wallet')
 conflicts=('bitmonero-git' 'libmonero-wallet-git')
 
-# Uncomment if tests are broken/problematic upstream.
-# NOTE:
-#   Our latest issue appears makepkg related:
-#     "file not found "tests/unit_tests/../../../../tests/data/wallet_9svHk1.keys"
-#   As noted in #monero-dev:
-#     2017-02-24 anonimal        Not to defend Arch or this strange makepkg issue, but for a unit-test like that, IMHO I think the stream should be decoupled from file handling so that the unit-test can process the stream directly. Then, wallet*.keys can be put into hex form within the unit file.
-BUILDENV+=('!check')
-
-source=("https://github.com/monero-project/monero/archive/v${pkgver}.tar.gz"
-        "monerod.service"
-        "monerod.conf")
-
-sha256sums+=('93c217cf10624d6e93cd1db5d137310be8b23393400014e2c8808d5214207c20'
-         '59fc670cf92960832d03038968270f81beacea7d6819c71ec5bcf15c6030e3c9'
-         '829445fe9acc00681f94f7b9ca6ce39713e377970b0a3d6f88c37991e1aa61b2')
+source=("https://github.com/monero-project/monero/archive/v${pkgver}.tar.gz")
+sha256sums+=('b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b')
 
 _monero="${pkgbase}-${pkgver}"
 _build=build
@@ -57,13 +44,6 @@ check() {
   cd "$srcdir/$_monero"
   cd build
 
-  # Run unit_tests test separately to exclude DNS tests which often fail with
-  # DNS nameservers configured on some systems
-  EXCLUDED_UNIT_TESTS+='DNSResolver.IPv4Failure'
-  EXCLUDED_UNIT_TESTS+=':DNSResolver.DNSSECSuccess'
-  EXCLUDED_UNIT_TESTS+=':AddressFromURL.Failure'
-  tests/unit_tests/unit_tests --gtest_filter="-$EXCLUDED_UNIT_TESTS"
-
   # Temporarily disable some a tests:
   #  * coretests takes too long (~25000s)
   #  * libwallet_api_tests fail (Issue #895)
@@ -88,9 +68,8 @@ package_monero() {
 
   install -Dm644 "${srcdir}/${_monero}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  # TODO(anonimal): install from $_monero after v0.11.0.0
-  install -Dm644 "${srcdir}/monerod.conf" "${pkgdir}/etc/monerod.conf"
-  install -Dm644 "${srcdir}/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
+  install -Dm644 "${srcdir}/${_monero}/utils/conf/monerod.conf" "${pkgdir}/etc/monerod.conf"
+  install -Dm644 "${srcdir}/${_monero}/utils/systemd/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
 
 }
 
diff --git a/monerod.conf b/monerod.conf
deleted file mode 100644
index 9b391dfa1c10..000000000000
--- a/monerod.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for monerod
-# Syntax: any command line option may be specified as 'clioptionname=value'.
-# See 'monerod --help' for all available options.
-
-data-dir=/var/lib/monero
-log-file=/var/log/monero/monero.log
-log-level=0
diff --git a/monerod.service b/monerod.service
deleted file mode 100644
index 96e88a2d30b5..000000000000
--- a/monerod.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Monero Full Node
-After=network.target
-
-[Service]
-User=monero
-Group=monero
-WorkingDirectory=~
-RuntimeDirectory=monero
-
-Type=forking
-PIDFile=/run/monero/monerod.pid
-
-ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf \
-    --detach --pidfile /run/monero/monerod.pid
-
-[Install]
-WantedBy=multi-user.target