testing/scstadmin: remove svn name and update to latest 2.0.0 svn r3161

3 files changed, 74 insertions, 31 deletions

diff --git a/testing/scstadmin-svn/APKBUILD b/testing/scstadmin-svn/APKBUILD
deleted file mode 100644
index e92ae2ccd2..0000000000
--- a/testing/scstadmin-svn/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=scstadmin-svn
-pkgver=1713
-pkgrel=0
-pkgdesc="SCST administration tool written in perl"
-url="http://scst.sourceforge.net"
-arch="x86 x86_64"
-license="GPL-2"
-depends="perl"
-makedepends="perl-dev"
-install=
-subpackages="$pkgname-doc"
-source="http://alpine.nethq.org/clandmeter/src/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/scstadmin
-
-prepare() {
-	cd "$_builddir"/scst-0.9.00
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-}
-
-package() {
-	cd "$_builddir"/scst-0.9.00
-	make DESTDIR="$pkgdir" install || return 1
-	cd "$_builddir"
-	install -Dm755 scstadmin.sysfs "$pkgdir"/usr/sbin/scstadmin || return 1
-	install -Dm755 init.d/scst.gentoo "$pkgdir"/etc/init.d/scstadmin
-}
-
-md5sums="5c78c6d4d4079a8d2c2b55f3e3119105  scstadmin-svn-1713.tar.gz"
diff --git a/testing/scstadmin/APKBUILD b/testing/scstadmin/APKBUILD
new file mode 100644
index 0000000000..85350e0675
--- /dev/null
+++ b/testing/scstadmin/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Carlo Landmeter
+# Maintainer: 
+pkgname=scstadmin
+pkgver=2.0.0
+pkgrel=0
+pkgdesc="SCST administration tool written in perl"
+url="http://scst.sourceforge.net"
+arch="x86_64"
+license="GPL-2"
+depends="perl"
+makedepends="perl-dev"
+install=
+subpackages="$pkgname-doc"
+# increase pkgrel when updating svn rev
+_svn="3161"
+source="http://alpine.nethq.org/distfiles/$pkgname-$pkgver-svn-$_svn.tar.gz
+	scst-init-ash-comapt.patch
+	"
+
+_builddir="$srcdir"/$pkgname
+
+prepare() {
+        cd "$_builddir"/scstadmin.sysfs/scst-0.9.00
+        PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	cd "$_builddir"
+	patch -p1 < "$srcdir"/scst-init-ash-comapt.patch
+}
+
+package() {
+	cd "$_builddir"/scstadmin.sysfs/scst-0.9.00	
+	make DESTDIR="$pkgdir" install || return 1
+	
+        cd "$_builddir"
+	install -Dm755 scstadmin.sysfs/scstadmin "$pkgdir"/usr/sbin/scstadmin || return 1
+	install -Dm755 init.d/scst.gentoo "$pkgdir"/etc/init.d/scstadmin || return 1
+}
+
+md5sums="8f60857b6545dd60d7d26342aba038f1  scstadmin-2.0.0-svn-3161.tar.gz
+061580b8ec84b5f7da0b1332601f505a  scst-init-ash-comapt.patch"
diff --git a/testing/scstadmin/scst-init-ash-comapt.patch b/testing/scstadmin/scst-init-ash-comapt.patch
new file mode 100644
index 0000000000..67cd7adf17
--- /dev/null
+++ b/testing/scstadmin/scst-init-ash-comapt.patch
@@ -0,0 +1,35 @@
+--- scstadmin/init.d/scst.gentoo
++++ scstadmin/init.d/scst.gentoo
+@@ -12,13 +12,11 @@
+ # Note: on most Linux distributions /bin/sh is a soft link to /bin/bash, while
+ # on a default Ubuntu setup /bin/sh is a soft link to /bin/dash !
+ 
+-opts="${opts} try-restart reload force-reload"
++opts="${opts} try_restart reload force_reload"
+ depend() {
+ 	use logger
+ }
+ 
+-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin
+-
+ DEFAULTFILE="/etc/conf.d/scst"
+ SCST_CFG=/etc/scst.conf
+ MODPROBE="/sbin/modprobe"
+@@ -121,7 +119,7 @@
+         start
+ }
+ 
+-try-restart() {
++try_restart() {
+         ## Restart the service if the service is already running.
+         status >/dev/null 2>&1 && restart
+ }
+@@ -140,7 +138,7 @@
+         fi
+ }
+ 
+-force-reload() {
++force_reload() {
+         ## Cause the configuration to be reloaded if the service supports this,
+         ## otherwise restart the service if it is running.
+         einfo "Reloading SCST configuration"