targetcli-fb: upstream fb11, targetcli sessions

git-svn-id: http://svn.kraehen.org/aur@113 04e22907-73ef-438a-a52f-a971dc6d3b47

3 files changed, 11 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d75502941189..c4c55536c2a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = targetcli-fb
 	pkgdesc = free branch of the targetcli LIO administration shell (iSCSI + Co)
-	pkgver = 2.0rc1.fb10
+	pkgver = 2.0rc1.fb11
 	pkgrel = 1
 	url = https://github.com/agrover/targetcli-fb
 	arch = any
 	license = AGPL3
-	depends = python2-rtslib-fb>=2.1.fb2
+	depends = python2-rtslib-fb>=2.1.fb13
 	depends = python2-configshell
 	provides = targetcli
 	conflicts = lio-utils
 	replaces = rtsadmin
-	source = targetcli-fb-2.0rc1.fb10.tar.gz::https://github.com/agrover/targetcli-fb/tarball/v2.0rc1.fb10
-	source = https://raw.github.com/JonnyJD/targetcli-fb/189705fd1cef3947d4b8106a360a33c41a27ab43/scripts/targetstatus
+	source = targetcli-fb-2.0rc1.fb11.tar.gz::https://github.com/agrover/targetcli-fb/tarball/v2.0rc1.fb11
 	source = target
-	md5sums = 127000dcb187fc3316fa943be281918f
-	md5sums = 1ee54b6c6e8bf17283b84a16bbb57346
-	md5sums = 474d2697f982ee76337fd67d18126501
+	md5sums = 2e4200ec9a723157985cfc88553b8989
+	md5sums = f23bd6d5d4021c29b4519e40b3b9e042
 
 pkgname = targetcli-fb
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a418320a98c..793623c7521d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=2.0rc1.fb10
+pkgver=2.0rc1.fb11
 pkgrel=1
 epoch=
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
@@ -8,7 +8,7 @@ arch=('any')
 url="https://github.com/agrover/targetcli-fb"
 license=('AGPL3')
 groups=()
-depends=('python2-rtslib-fb>=2.1.fb2' 'python2-configshell')
+depends=('python2-rtslib-fb>=2.1.fb13' 'python2-configshell')
 optdepends=()
 conflicts=('lio-utils')
 provides=('targetcli')
@@ -17,14 +17,12 @@ backup=()
 options=()
 install=
 source=($pkgname-$pkgver.tar.gz::https://github.com/agrover/$pkgname/tarball/v$pkgver
-https://raw.github.com/JonnyJD/targetcli-fb/189705fd1cef3947d4b8106a360a33c41a27ab43/scripts/targetstatus
 target)
-md5sums=('127000dcb187fc3316fa943be281918f'
-         '1ee54b6c6e8bf17283b84a16bbb57346'
-         '474d2697f982ee76337fd67d18126501')
+md5sums=('2e4200ec9a723157985cfc88553b8989'
+         'f23bd6d5d4021c29b4519e40b3b9e042')
 
 _githubname=agrover-targetcli-fb
-_gitversion=8022276
+_gitversion=b3d5dcc
 
 build() {
   cd "$srcdir/$_githubname-$_gitversion"
@@ -42,8 +40,6 @@ package() {
   cd "$srcdir"
   install -D -m 755 target "$pkgdir/etc/rc.d/target"
   install -d "$pkgdir/etc/target"
-  sed -i '1s/python/python2/' targetstatus
-  install -m 755 targetstatus "$pkgdir/usr/bin/targetstatus"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/target b/target
index eba85169bef6..b4d06acd7001 100644
--- a/target
+++ b/target
@@ -50,7 +50,7 @@ case "$1" in
 	status)
 		stat_busy "Checking status of lio targets";
 		ck_status $daemon_name
-		ck_daemon $daemon_name || /usr/bin/targetstatus
+		ck_daemon $daemon_name || /usr/bin/targetcli sessions
 		;;
 
 	*)