update to 0.2.1

9 files changed, 174 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c97885264a5d..c018b664d78d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,52 @@
+# Generated by mksrcinfo v8
+# Wed Apr 27 17:42:09 UTC 2016
 pkgbase = peerunity
-	pkgver = 0.1.1
-	pkgrel = 3
-	url = http://www.peercoin.net/download-peerunity
+	pkgdesc = Community made Peercoin client.
+	pkgver = 0.2.1
+	pkgrel = 1
+	url = https://github.com/Peerunity/Peerunity
 	arch = i686
 	arch = x86_64
+	arch = armv7h
+	arch = armv6h
 	license = MIT
 	makedepends = boost
-	makedepends = automoc4
 	makedepends = qrencode
 	makedepends = miniupnpc
-	makedepends = protobuf
+	makedepends = qt4
 	depends = boost-libs
 	depends = openssl
 	depends = miniupnpc
-	depends = db4.8
-	source = https://github.com/peerunity/peerunity/archive/v0.1.1.tar.gz
+	depends = qt4
+	source = https://github.com/peerunity/peerunity/archive/v0.2.1.tar.gz
 	source = upnp-1.9.patch
 	source = peerunityd@.service
+	source = peerunityd-tor@.service
+	source = peerunity@.service
+	source = peerunity-tor@.service
 	source = peerunity.desktop
-	source = peerunity128.png
-	sha256sums = 416ad4c36551b62e2048bcd6844004444ea52b2640c8c7c88bcbd6c0829c5499
+	sha256sums = b76ed814f19d7c2474801e4846c267a44059e09224f63ffe8686923c3d2deb31
 	sha256sums = 3060917f8e327002da842534265392a1849239ec5049f25c1ae8a81c3952e7b1
-	sha256sums = cfc0b8accef8dee3d6559cdb880e13f4ef381119f4150d15cc3f74903da80f35
+	sha256sums = 8d25b07ca8e3a7d972d584600a0083fe52b811efc0af0f98eba39c22cd173336
+	sha256sums = 5765241c7a1db1742cb034cd220cc65221f0c041299b9783ecc609aaa8ac120f
+	sha256sums = 7f8d2021ed95edb09971246e1fa578064057d7e4134c99558901d0d1960e80d9
+	sha256sums = a9919759f080d09d1604962affc9117f444903ecddd0544e42ff291a0d05000d
 	sha256sums = 250aa80695bbb95228286850856d1f1bac9336c98e884cba0b148c9b837d196c
-	sha256sums = 2d089702a9f02db640f7ae0f48b7b61f7de6ecddc3804f80484520b6c461a9b1
 
-pkgname = peerunity-daemon
-	pkgdesc = Community client for Peercoin peer-to-peer network based digital currency (daemon)
+pkgname = peerunityd
+	pkgdesc = Community client for Peercoin peer-to-peer network digital currency (daemon)
+	install = peerunityd.install
 	depends = boost-libs
 	depends = openssl
 	depends = miniupnpc
-	depends = db4.8
+	optdepends = tor
 
-pkgname = peerunity-qt
-	pkgdesc = Comunity client for Peercoin peer-to-peer network based digital currency (Qt)
+pkgname = peerunity
+	pkgdesc = Comunity client for Peercoin peer-to-peer network digital currency (Qt)
 	install = peerunity-qt.install
 	depends = boost-libs
 	depends = qt4
 	depends = qrencode
 	depends = miniupnpc
-	depends = db4.8
+	optdepends = tor
 
diff --git a/PKGBUILD b/PKGBUILD
index edf9a3f84272..cbe9ed6afe0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,84 @@
-# Maintainer: Nicolas Doualot <packages@slubman.info>
+## Maintainer: peerchemist <peerchemist@protonmail.ch>
 
-pkgname=('peerunity-daemon' 'peerunity-qt')
+pkgname=('peerunityd' 'peerunity')
 pkgbase=peerunity
-pkgver=0.1.1
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://www.peercoin.net/download-peerunity"
-makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc' 'protobuf')
+_gitname=Peerunity
+pkgdesc="Community made Peercoin client."
+pkgver=0.2.1
+pkgrel=1
+arch=('i686' 'x86_64' 'armv7h' 'armv6h')
+url="https://github.com/Peerunity/Peerunity"
+makedepends=('boost' 'qrencode' 'miniupnpc' 'qt4')
+depends=('boost-libs' 'openssl' 'miniupnpc' 'qt4')
 license=('MIT')
 source=("https://github.com/peerunity/peerunity/archive/v$pkgver.tar.gz"
 	"upnp-1.9.patch"
-        "peerunityd@.service"
+  "peerunityd@.service"
+  "peerunityd-tor@.service"
+  "peerunity@.service"
+  "peerunity-tor@.service"
 	"peerunity.desktop"
-	"peerunity128.png"
 )
-sha256sums=('416ad4c36551b62e2048bcd6844004444ea52b2640c8c7c88bcbd6c0829c5499'
+sha256sums=('b76ed814f19d7c2474801e4846c267a44059e09224f63ffe8686923c3d2deb31'
             '3060917f8e327002da842534265392a1849239ec5049f25c1ae8a81c3952e7b1'
-            'cfc0b8accef8dee3d6559cdb880e13f4ef381119f4150d15cc3f74903da80f35'
-            '250aa80695bbb95228286850856d1f1bac9336c98e884cba0b148c9b837d196c'
-            '2d089702a9f02db640f7ae0f48b7b61f7de6ecddc3804f80484520b6c461a9b1')
-depends=('boost-libs' 'openssl' 'miniupnpc' 'db4.8')
+            '8d25b07ca8e3a7d972d584600a0083fe52b811efc0af0f98eba39c22cd173336'
+            '5765241c7a1db1742cb034cd220cc65221f0c041299b9783ecc609aaa8ac120f'
+            '7f8d2021ed95edb09971246e1fa578064057d7e4134c99558901d0d1960e80d9'
+            'a9919759f080d09d1604962affc9117f444903ecddd0544e42ff291a0d05000d'
+            '250aa80695bbb95228286850856d1f1bac9336c98e884cba0b148c9b837d196c')
 
 prepare() {
-  cd "$srcdir/Peerunity-$pkgver"
+  cd "$srcdir/${_gitname}-$pkgver"
   patch -p1 -i ../upnp-1.9.patch
 }
 
 build() {
-  cd "$srcdir/Peerunity-$pkgver/src"
-  CXXFLAGS="$CXXFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1"
-  BDB_INCLUDE_PATH="/usr/include/db4.8"
-  BDB_LIB_SUFFIX="-4.8"
-  make -f makefile.unix USE_UPNP=1 CXXFLAGS="$CXXFLAGS" BDB_INCLUDE_PATH="$BDB_INCLUDE_PATH" BDB_LIB_SUFFIX="$BDB_LIB_SUFFIX"
+  cd "$srcdir/${_gitname}-${pkgver}"
 
-  cd "$srcdir/Peerunity-$pkgver"
-  qmake-qt4 "USE_UPNP=1" "USE_QRCODE=1" BDB_INCLUDE_PATH="$BDB_INCLUDE_PATH" BDB_LIB_SUFFIX="$BDB_LIB_SUFFIX" peerunity.pro
+  ## make qt gui
+  qmake-qt4 USE_QRCODE=1 USE_UPNP=1 USE_SSL=0 \
+      QMAKE_CFLAGS="${CFLAGS}"\
+      QMAKE_CXXFLAGS="${CXXFLAGS} -pie"
   make
+
+  ## make daemon
+    make -f makefile.unix USE_UPNP=1 USE_SSL=0 -e PIE=1 -C src
 }
 
-package_peerunity-daemon() {
-  depends=('boost-libs' 'openssl' 'miniupnpc' 'db4.8')
-  pkgdesc="Community client for Peercoin peer-to-peer network based digital currency (daemon)"
+package_peerunityd() {
+  depends=('boost-libs' 'openssl' 'miniupnpc')
+  optdepends=('tor')
+  install=peerunityd.install
+  pkgdesc="Community client for Peercoin peer-to-peer network digital currency (daemon)"
 
-  install -Dm644 peerunityd@.service "$pkgdir/usr/lib/systemd/system/peerunity@.service"
+  install -Dm644 $pkgname@.service "$pkgdir/usr/lib/systemd/system/${pkgname}@.service"
+  install -Dm644 $pkgname-tor@.service "$pkgdir/usr/lib/systemd/system/${pkgname}@.service"
   cd "$srcdir/Peerunity-$pkgver"
-  install -Dm755 src/peerunityd "$pkgdir"/usr/bin/peerunityd
-  install -Dm644 contrib/debian/examples/bitcoin.conf "$pkgdir/usr/share/doc/$pkgname/examples/peerunity.conf"
-  install -Dm644 contrib/debian/manpages/bitcoind.1 "$pkgdir"/usr/share/man/man1/peerunityd.1
-  install -Dm644 contrib/debian/manpages/bitcoin.conf.5 "$pkgdir"/usr/share/man/man5/peerunity.conf.5
+  install -Dm755 src/$pkgname "$pkgdir"/usr/bin/$pkgname
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-package_peerunity-qt() {
-  depends=('boost-libs' 'qt4' 'qrencode' 'miniupnpc' 'db4.8')
+package_peerunity() {
+  depends=('boost-libs' 'qt4' 'qrencode' 'miniupnpc')
+  optdepends=('tor')
   install=peerunity-qt.install
-  pkgdesc="Comunity client for Peercoin peer-to-peer network based digital currency (Qt)"
+  pkgdesc="Comunity client for Peercoin peer-to-peer network digital currency (Qt)"
+
+  install -Dm644 peerunity@.service "$pkgdir/usr/lib/systemd/system/${pkgname}@.service"
+  install -Dm644 peerunity-tor@.service "$pkgdir/usr/lib/systemd/system/${pkgname}@.service"
+
+  install -Dm644 peerunity.desktop "$pkgdir"/usr/share/applications/{$pkgbase}.desktop
 
-  install -Dm644 peerunity.desktop "$pkgdir"/usr/share/applications/peerunity.desktop
-  install -Dm644 peerunity128.png "$pkgdir"/usr/share/pixmaps/peerunity128.png
   cd "$srcdir/Peerunity-$pkgver"
+
+  install -Dm644 share/pixmaps/$pkgbase.ico "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  install -Dm644 share/pixmaps/${pkgbase}64.png "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  install -Dm644 share/pixmaps/${pkgbase}64.xpm "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  install -Dm644 share/pixmaps/${pkgbase}128.png "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  install -Dm644 share/pixmaps/${pkgbase}128.xpm "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  install -Dm644 share/pixmaps/${pkgbase}256.png "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  install -Dm644 share/pixmaps/${pkgbase}256.xpm "${pkgdir}/usr/share/pixmaps/$pkgbase.ico"
+  
   install -Dm755 peerunity "$pkgdir"/usr/bin/peerunity
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/peerunity-qt.install b/peerunity-qt.install
index f98ba7338938..6dc4404191c2 100644
--- a/peerunity-qt.install
+++ b/peerunity-qt.install
@@ -1,5 +1,9 @@
 post_install() {
     update-desktop-database -q
+    systemctl daemon-reload
+    
+    echo ""
+    echo "If you are having troubles with blockchain download, just backup wallet.dat, remove .ppcoin directory and start over. This is caused by incompatibility of libdb++ versions."
 }
 
 post_upgrade() {
diff --git a/peerunity-tor@.service b/peerunity-tor@.service
new file mode 100644
index 000000000000..285b3e27d328
--- /dev/null
+++ b/peerunity-tor@.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Peerunity
+After=network.target
+After=graphical.target
+Requires=tor.service
+
+[Service]
+User=%i
+Group=users
+Type=simple
+Restart=on-failure
+RestartSec=15
+Environment=DISPLAY=:0
+Environment=XAUTHORITY=%h/.Xauthority
+ExecStart=/usr/bin/peerunity -proxy=127.0.0.1:9050
+## security
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+NoNewPrivileges=true
+
+[Install]
+WantedBy=default.target
diff --git a/peerunity128.png b/peerunity128.png
deleted file mode 100644
index 73fbb09e48be..000000000000
--- a/peerunity128.png
+++ /dev/null
diff --git a/peerunity@.service b/peerunity@.service
new file mode 100644
index 000000000000..ee6414786bd8
--- /dev/null
+++ b/peerunity@.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Peerunity
+After=network.target
+After=graphical.target
+
+[Service]
+User=%i
+Group=users
+Type=simple
+Restart=on-failure
+RestartSec=15
+Environment=DISPLAY=:0
+Environment=XAUTHORITY=%h/.Xauthority
+ExecStart=/usr/bin/peerunity
+## security
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+NoNewPrivileges=true
+
+[Install]
+WantedBy=default.target
diff --git a/peerunityd-tor@.service b/peerunityd-tor@.service
new file mode 100644
index 000000000000..4b2089568468
--- /dev/null
+++ b/peerunityd-tor@.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Peerunity daemon - Tor
+After=network.target
+Requires=tor.service
+Conflicts=peerunityd@%i.service
+Conflicts=peerunityd-tor@%i.service
+Conflicts=peerunity@$%i.service
+
+[Service]
+User=%i
+Group=users
+Type=simple
+Restart=on-failure
+RestartSec=15
+ExecStart=/usr/bin/peerunityd -proxy=127.0.0.1:9050
+## security
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+NoNewPrivileges=true
+
+[Install]
+WantedBy=default.target
\ No newline at end of file
diff --git a/peerunityd.install b/peerunityd.install
new file mode 100644
index 000000000000..ed4e1a3fed5c
--- /dev/null
+++ b/peerunityd.install
@@ -0,0 +1,14 @@
+post_install() {
+    systemctl daemon-reload
+    
+    echo ""
+    echo "If you are having troubles with blockchain download, just backup wallet.dat, remove .ppcoin directory and start over. This is caused by incompatibility of libdb++ versions."
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/peerunityd@.service b/peerunityd@.service
index 1b05e88ecef0..9990797183a1 100644
--- a/peerunityd@.service
+++ b/peerunityd@.service
@@ -6,7 +6,14 @@ After=network.target
 User=%i
 Group=users
 Type=simple
+RestartSec=15
+Restart=on-failure
 ExecStart=/usr/bin/peerunityd
+## security
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+NoNewPrivileges=true
 
 [Install]
 WantedBy=multi-user.target