updating to 1.19.04. what a mess. upstream sucks.

7 files changed, 50 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48e87e8ca342..837d5a6251a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,20 @@
 # Generated by mksrcinfo v8
-# Thu Apr  7 04:52:25 UTC 2016
+# Thu Apr 28 23:05:54 UTC 2016
 pkgbase = storcli
 	pkgdesc = CLI program for LSI MegaRAID cards, also works with some Dell PERC RAID cards (successor to megaraid-cli)
-	pkgver = 1.15.12
-	pkgrel = 5
+	pkgver = 1.19.04
+	pkgrel = 1
 	url = https://www.thomas-krenn.com/en/wiki/StorCLI
+	install = storcli.install
 	arch = i686
 	arch = x86_64
-	license = unknown
-	provides = storcli
+	license = custom
+	makedepends = rpmextract
 	conflicts = megaraid-cli
-	source_i686 = http://archive.thomas-krenn.com/packages/pool/optional/s/storcli/storcli_1.15.12_i386.deb
-	source_i686 = storcli_1.15.12_i386.deb.sig
-	md5sums_i686 = 031e910733b7861749d27968a7d452de
-	md5sums_i686 = SKIP
-	source_x86_64 = http://archive.thomas-krenn.com/packages/pool/optional/s/storcli/storcli_1.15.12_amd64.deb
-	source_x86_64 = storcli_1.15.12_amd64.deb.sig
-	md5sums_x86_64 = a899d70f8f8d106db70c7188a9edeae7
-	md5sums_x86_64 = SKIP
+	source = https://square-r00t.net/files/arch/storcli/1.19.04_StorCLI.zip
+	source = 1.19.04_StorCLI.zip.sig
+	sha512sums = 3086360a4c40755cdcaa8faa7192adccae5555cf3aaa741be583fa3559a7dedc14652489d8248a69465040871710917d09461644df3d1d2d31fe6d6e0957196b
+	sha512sums = SKIP
 
 pkgname = storcli
 
diff --git a/.gitignore b/.gitignore
index 1ce1f8045cc2..159bff93d4c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,8 @@ pkg/
 *.txz
 *.tbz
 *.tbz2
-*.zip
 *.run
+*.zip
 *.7z
 *.rar
 *.deb
diff --git a/1.19.04_StorCLI.zip.sig b/1.19.04_StorCLI.zip.sig
new file mode 100644
index 000000000000..0498ec1d1bf8
--- /dev/null
+++ b/1.19.04_StorCLI.zip.sig
diff --git a/PKGBUILD b/PKGBUILD
index 9b09433382d0..687e790cefe0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,16 @@
 validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 
 pkgname=storcli
-pkgver=1.15.12
-pkgrel=5
+_pkgname=StorCLI
+pkgver=1.19.04
+pkgrel=1
+_pkgrel=1
 pkgdesc="CLI program for LSI MegaRAID cards, also works with some Dell PERC RAID cards (successor to megaraid-cli)"
 arch=('i686' 'x86_64')
 url="https://www.thomas-krenn.com/en/wiki/StorCLI"
-license=('unknown')
+license=('custom')
+makedepends=('rpmextract')
+install=${pkgname}.install
 if [[ "${CARCH}" == 'x86_64' ]];
 then
   _arch='amd64'
@@ -17,26 +21,32 @@ then
   _arch='i386'
   _bits=''
 fi
-source_x86_64=("http://archive.thomas-krenn.com/packages/pool/optional/s/${pkgname}/${pkgname}_${pkgver}_amd64.deb"
-		"${pkgname}_${pkgver}_amd64.deb.sig")
-source_i686=("http://archive.thomas-krenn.com/packages/pool/optional/s/${pkgname}/${pkgname}_${pkgver}_i386.deb"
-		"${pkgname}_${pkgver}_i386.deb.sig")
+#source_x86_64=("http://archive.thomas-krenn.com/packages/pool/optional/s/${pkgname}/${pkgname}_${pkgver}_amd64.deb"
+#		"${pkgname}_${pkgver}_amd64.deb.sig")
+#source_i686=("http://archive.thomas-krenn.com/packages/pool/optional/s/${pkgname}/${pkgname}_${pkgver}_i386.deb"
+#		"${pkgname}_${pkgver}_i386.deb.sig")
 
+# got from http://www.avagotech.com/products/server-storage/raid-controllers/megaraid-sas-9361-8i#downloads but they don't allow direct downloading. welp.
+source=("https://square-r00t.net/files/arch/${pkgname}/${pkgver}_${_pkgname}.zip"
+	"${pkgver}_${_pkgname}.zip.sig")
+sha512sums=('3086360a4c40755cdcaa8faa7192adccae5555cf3aaa741be583fa3559a7dedc14652489d8248a69465040871710917d09461644df3d1d2d31fe6d6e0957196b'
+            'SKIP')
 
-md5sums_i686=('031e910733b7861749d27968a7d452de'
-              'SKIP')
-md5sums_x86_64=('a899d70f8f8d106db70c7188a9edeae7'
-                'SKIP')
-
-provides=('storcli')
 conflicts=('megaraid-cli')
 
 package() {
-	cd ${srcdir}
-	ar x ${pkgname}_${pkgver}_${_arch}.deb
-	tar -zxf data.tar.gz
-
-	install -D -m755 "${srcdir}/usr/sbin/storcli${_bits}" "${pkgdir}/usr/bin/storcli"
-
+	cd ${srcdir}/${pkgname}_all_os/Linux
+	#ar x ${pkgname}_${pkgver}_${_arch}.deb
+	#tar -zxf data.tar.gz
+	#install -D -m755 "${srcdir}/usr/sbin/storcli${_bits}" "${pkgdir}/usr/bin/storcli"
+
+	# Ugh. Avago doesn't distribute binaries, only RPMs. Lame.
+        rpmextract.sh ${pkgname}-${pkgver}-${_pkgrel}.noarch.rpm
+	install -d -m 0755 ${pkgdir}/usr/bin
+	install -d -m 0755 ${pkgdir}/usr/share/${pkgname}
+	install -d -m 0755 ${pkgdir}/usr/share/licenses/${pkgname}
+	install -m 0755 "${srcdir}/${pkgname}_all_os/Linux/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -m 0755 "${srcdir}/${pkgname}_all_os/Linux/opt/MegaRAID/${pkgname}/${pkgname}${_bits}" "${pkgdir}/usr/bin/${pkgname}"
+	install -m 0644 "${srcdir}/${pkgname}_all_os/EFI/UDK/storcli.efi" "${pkgdir}/usr/share/${pkgname}/${pkgname}.efi"
 }
 
diff --git a/storcli.install b/storcli.install
new file mode 100644
index 000000000000..1b43f8064d3c
--- /dev/null
+++ b/storcli.install
@@ -0,0 +1,10 @@
+post_install() {
+  echo ">>>"
+  echo ">>> See https://www.thomas-krenn.com/en/wiki/StorCLI for usage."
+  echo ">>> (NEW in 1.19.04-1) See /usr/share/storcli/storcli.efi for a UEFI binary."
+  echo ">>>"
+}
+
+post_upgrade() {
+  post_install $1
+}
diff --git a/storcli_1.15.12_amd64.deb.sig b/storcli_1.15.12_amd64.deb.sig
deleted file mode 100644
index 2c0b3f6af600..000000000000
--- a/storcli_1.15.12_amd64.deb.sig
+++ /dev/null
diff --git a/storcli_1.15.12_i386.deb.sig b/storcli_1.15.12_i386.deb.sig
deleted file mode 100644
index 2fb69746ca76..000000000000
--- a/storcli_1.15.12_i386.deb.sig
+++ /dev/null