hyperledger-indy: 1.3.307

3 files changed, 37 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cec19ede7e98..9faca373020f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hyperledger-indy-node
 	pkgdesc = A self-sovereign identity ecosystem on top of a distributed ledger. It is the core project for Indy
-	pkgver = 1.2.289
+	pkgver = 1.3.307
 	pkgrel = 1
 	url = https://github.com/hyperledger/indy-node
 	arch = i686
@@ -13,20 +13,20 @@ pkgbase = hyperledger-indy-node
 	depends = hyperledger-indy-anoncreds
 	depends = hyperledger-indy-plenum
 	depends = python-timeout-decorator
-	source = https://github.com/hyperledger/indy-node/archive/1.2.289-master.tar.gz
+	source = https://github.com/hyperledger/indy-node/archive/1.3.307-master.tar.gz
 	source = indy-node.conf
 	source = indy-node-control.service
 	source = indy-node.service
 	source = init_indy_node
 	source = node_control.conf
 	source = patch
-	md5sums = d4dae2a46cfed11d3a1279eed64c01a8
+	md5sums = d2123e6f07dd4fb040deaaca98fda3b1
 	md5sums = 800c812d8a6bfb1cbc9a2361413746db
 	md5sums = 02486863bad2eab23a40510a3d6f0747
 	md5sums = 6d0ef3bcbfe3dead0a875768f8d133eb
 	md5sums = 1882142ad925365e0aa4ce269ce6b7ed
 	md5sums = ae156c4380f773d48f51650932d2b518
-	md5sums = 0d28567fd81dabdf178a2f8bc7c6dfc8
+	md5sums = 6fe531a34a82941de372e1d15b776b37
 
 pkgname = hyperledger-indy-node
 
diff --git a/PKGBUILD b/PKGBUILD
index e41563f4ead6..b3d324971209 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=indy-node
 pkgname=hyperledger-${_pkgname}
-pkgver=1.2.289
+pkgver=1.3.307
 pkgrel=1
 pkgdesc="A self-sovereign identity ecosystem on top of a distributed ledger. It is the core project for Indy"
 arch=(i686 x86_64)
@@ -14,27 +14,27 @@ makedepends=('python')
 source=("https://github.com/hyperledger/${_pkgname}/archive/$pkgver-master.tar.gz"
 	indy-node.conf
 	indy-node-control.service
-	indy-node.service  
-	init_indy_node  
+	indy-node.service
+	init_indy_node
 	node_control.conf
 	patch
 )
 
 package() {
-  cd $srcdir/${_pkgname}-$pkgver-master
-  patch -Np1 -i ../patch
-  python setup.py install -O1 --root="$pkgdir"
+	cd $srcdir/${_pkgname}-$pkgver-master
+	patch -Np1 -i ../patch
+	python setup.py install -O1 --root="$pkgdir"
 
-# dirs to be created
-  node_dirs="/etc/indy /var/log/indy /usr/lib/systemd/system /usr/lib/sysusers.d"
+	# dirs to be created
+	node_dirs="/etc/indy /var/log/indy /usr/lib/systemd/system /usr/lib/sysusers.d"
 
-# create dirs
-  for dr in $node_dirs
-  do
-      mkdir -p $pkgdir$dr
-  done
+	# create dirs
+	for dr in $node_dirs
+	do
+		mkdir -p $pkgdir$dr
+	done
 
-cat << EOF > $pkgdir/etc/indy/indy_config.py
+	cat << EOF > $pkgdir/etc/indy/indy_config.py
 NETWORK_NAME = 'sandbox'
 LEDGER_DIR = '/var/lib/indy'
 LOG_DIR = '/var/log/indy'
@@ -47,23 +47,23 @@ CLI_BASE_DIR = '~/.indy-cli/'
 CLI_NETWORK_DIR = '~/.indy-cli/networks'
 EOF
 
-install -Dm755 ../init_indy_node $pkgdir/usr/bin/init_indy_node
-cp ../*.service $pkgdir/usr/lib/systemd/system
-cp ../node_control.conf $pkgdir/etc/indy/
+	install -Dm755 ../init_indy_node $pkgdir/usr/bin/init_indy_node
+	cp ../*.service $pkgdir/usr/lib/systemd/system
+	cp ../node_control.conf $pkgdir/etc/indy/
 
-# cleaning
-  rm -rf $pkgdir/home
-  rm -rf $pkgdir/usr/bin/{create_dirs.sh,get_keys,init_bls_keys,*.bat}
-  rm -rf $pkgdir/usr/lib/python3.6/site-packages/data/{__init__.py,__pycache__}
+	# cleaning
+	rm -rf $pkgdir/home
+	rm -rf $pkgdir/usr/bin/{create_dirs.sh,get_keys,init_bls_keys,*.bat}
+	rm -rf $pkgdir/usr/lib/python3.6/site-packages/data/{__init__.py,__pycache__}
 
-# creating user indy
-  cp ../indy-node.conf $pkgdir/usr/lib/sysusers.d
+	# creating user indy
+	cp ../indy-node.conf $pkgdir/usr/lib/sysusers.d
 }
 
-md5sums=('d4dae2a46cfed11d3a1279eed64c01a8'
-         '800c812d8a6bfb1cbc9a2361413746db'
-         '02486863bad2eab23a40510a3d6f0747'
-         '6d0ef3bcbfe3dead0a875768f8d133eb'
-         '1882142ad925365e0aa4ce269ce6b7ed'
-         'ae156c4380f773d48f51650932d2b518'
-         '0d28567fd81dabdf178a2f8bc7c6dfc8')
+md5sums=('d2123e6f07dd4fb040deaaca98fda3b1'
+	'800c812d8a6bfb1cbc9a2361413746db'
+	'02486863bad2eab23a40510a3d6f0747'
+	'6d0ef3bcbfe3dead0a875768f8d133eb'
+	'1882142ad925365e0aa4ce269ce6b7ed'
+	'ae156c4380f773d48f51650932d2b518'
+'6fe531a34a82941de372e1d15b776b37')
diff --git a/patch b/patch
index f80915729531..1bb7d47be848 100644
--- a/patch
+++ b/patch
@@ -1,18 +1,12 @@
 --- a/indy_node/utils/node_control_tool.py	2018-01-30 16:28:34.000000000 +0100
 +++ b/indy_node/utils/node_control_tool.py	2018-01-30 17:39:24.603319237 +0100
-@@ -1,4 +1,5 @@
- import os
-+import platform
- import re
- import select
- import shutil
-@@ -272,7 +273,8 @@
+@@ -272,7 +271,8 @@ class NodeControlTool:
                                timeout=timeout)
  
      def start(self):
 -        self._hold_packages()
-+    	if 'ubuntu' in platform.platform().lower():
-+	self._hold_packages()
++        if shutil.which("apt-mark"):
++            self._hold_packages()
  
          # Sockets from which we expect to read
          readers = [self.server]