update to new fwinst.sh

3 files changed, 12 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa555a31908d..b366a126a44a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Nov 11 21:56:05 UTC 2016
 pkgbase = sixfireusb-dkms
 	pkgdesc = Kernel modules for the Terratec DMX6FireUSB soundcard, including firmware
 	pkgver = 0.6.2
-	pkgrel = 6
+	pkgrel = 7
 	url = http://sourceforge.net/projects/sixfireusb
 	arch = i686
 	arch = x86_64
@@ -18,8 +16,8 @@ pkgbase = sixfireusb-dkms
 	source = dkms.conf
 	source = blacklist-sixfireusb-dkms.conf
 	sha512sums = e79e4a62762626d966fa8c169b8666a0cfa3af8516e6f8a97e1a1d211d1deb1ed26bd2c5c8a4b563e03718c232e832686be783abbb66e5b49c8cc31858752068
-	sha512sums = 2cf369af6f8628796cbc47732335c2c00de8454f20ef06014bf11ba967dd791b3074c85f171964a77a72dd835917f84a85e073ca7194cfdd3a86e841efac0005
-	sha512sums = f4c6765a93475c48a5865179bfaaa29dddd5f942a8219a51662a16f454c03e99fad4a2b1d3f567cd7d2dd3d8c061d42b0b30a3850feffaadcc9ac276f025a797
+	sha512sums = 7e8eb7a78514f79b6ee2bb25357a233b1013884b836de5ea3784b7e5a5bdac423b7803ce92c9a31869b280f4b8edde595fdaca51aebf253eb6f6ffdee8ed1290
+	sha512sums = b74d045b0557b2de231f3698bc177a5947b0bcd538ffeb169d0753617ba94d5daea1d7572e9a5468ce54e248d8d21c7f5ca44e4c014b2832b69e98c9cf332ca8
 	sha512sums = e15302d1b589296ddc234f1836438bdfc0b864d1a6f2cf808d99dc5ed8f82b3fcdf7a097128af1f4f2e90258c9c0f9098b6d73698147ca830e08acdec64d85fb
 	sha512sums = 154150d5f6959c174a883504464e15e0c728ed71fa7f18ee3e75fa6e6810b7cdb87fae4a9df50587f7324943b5027096f9ef6b98e33bdcf147039fca1049dbd5
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e3fcdc79365..ed2167bdcf5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sixfireusb-dkms
 pkgver=0.6.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Kernel modules for the Terratec DMX6FireUSB soundcard, including firmware"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/sixfireusb"
@@ -22,8 +22,8 @@ source=(http://sourceforge.net/projects/sixfireusb/files/sixfireusb-$pkgver.tar.
 )
 sha512sums=(
     'e79e4a62762626d966fa8c169b8666a0cfa3af8516e6f8a97e1a1d211d1deb1ed26bd2c5c8a4b563e03718c232e832686be783abbb66e5b49c8cc31858752068'
-    '2cf369af6f8628796cbc47732335c2c00de8454f20ef06014bf11ba967dd791b3074c85f171964a77a72dd835917f84a85e073ca7194cfdd3a86e841efac0005'
-    'f4c6765a93475c48a5865179bfaaa29dddd5f942a8219a51662a16f454c03e99fad4a2b1d3f567cd7d2dd3d8c061d42b0b30a3850feffaadcc9ac276f025a797'
+    '7e8eb7a78514f79b6ee2bb25357a233b1013884b836de5ea3784b7e5a5bdac423b7803ce92c9a31869b280f4b8edde595fdaca51aebf253eb6f6ffdee8ed1290'
+    'b74d045b0557b2de231f3698bc177a5947b0bcd538ffeb169d0753617ba94d5daea1d7572e9a5468ce54e248d8d21c7f5ca44e4c014b2832b69e98c9cf332ca8'
     'e15302d1b589296ddc234f1836438bdfc0b864d1a6f2cf808d99dc5ed8f82b3fcdf7a097128af1f4f2e90258c9c0f9098b6d73698147ca830e08acdec64d85fb'
     '154150d5f6959c174a883504464e15e0c728ed71fa7f18ee3e75fa6e6810b7cdb87fae4a9df50587f7324943b5027096f9ef6b98e33bdcf147039fca1049dbd5'
 )
diff --git a/fwinst.patch b/fwinst.patch
index fe09b18759d8..d91e41ec872d 100644
--- a/fwinst.patch
+++ b/fwinst.patch
@@ -1,67 +1,20 @@
-diff -aur sixfireusb-0.6.2/fwinst.sh sixfireusb-0.6.2/fwinst.sh
---- sixfireusb-0.6.2/fwinst.sh	2016-01-13 12:32:46.658997492 +0100
-+++ sixfireusb-0.6.2/fwinst.sh	2016-01-13 12:59:59.438633828 +0100
+--- sixfireusb-0.6.2/fwinst.sh	2018-08-29 21:19:46.814128288 +0200
++++ sixfireusb-0.6.2/fwinst.sh	2018-08-29 21:19:19.714059624 +0200
 @@ -19,7 +19,7 @@
  # (at your option) any later version.
  #
-
+ 
 -export FW_PATH=/lib/firmware
 +export FW_PATH=$1/usr/lib/firmware
  export FW_6FIRE_PATH=$FW_PATH/6fire
  cleanup() {
    rm -Rf /tmp/dmx
-@@ -63,8 +63,8 @@
+@@ -106,7 +106,7 @@
  fi
- step_success
-
--step_begin "Checking MD-5 checksum of windows driver"
--if ! echo "86049155f9326a77329d87f7b027a8b9  /tmp/dmx.exe" | md5sum -c >/dev/null 2>&1 ; then
-+step_begin "Checking SHA512 checksum of windows driver"
-+if ! echo "4a71d2cbf092b0c13afc4ec475e9b6eca48f68e3ca47cff96ffb71bc51dea09c0b19a0e90150ac40cbcf231bc3570e187dc9cb447c2a309472c1e237d501c5b1  /tmp/dmx.exe" | sha512sum -c >/dev/null 2>&1 ; then
-   step_error "Downloaded windows driver has wrong MD-5 checksum."
- fi
- step_success
-@@ -80,35 +80,35 @@
- step_success
-
- step_begin "Extracting firmware files"
--if ! cp '/tmp/dmx/$[153]/$[153]/$[154]_17' /tmp/dmx6fireap.ihx ; then
-+if ! cp '/tmp/dmx/$_121_/$_122__17' /tmp/dmx6fireap.ihx ; then
-   step_error "Extraction of file 'dmx6fireap.ihx' failed."
- fi
-
--if ! cp '/tmp/dmx/$[153]/$[153]/$[154]_18' /tmp/dmx6firecf.bin >/dev/null 2>&1 ; then
-+if ! cp '/tmp/dmx/$_121_/$_122__18' /tmp/dmx6firecf.bin >/dev/null 2>&1 ; then
-   step_error "Extraction of file 'dmx6firecf.bin' failed."
- fi
-
--if ! cp '/tmp/dmx/$[153]/$[153]/$[154]_16' /tmp/dmx6firel2.ihx >/dev/null 2>&1 ; then
-+if ! cp '/tmp/dmx/$_121_/$_122__16' /tmp/dmx6firel2.ihx >/dev/null 2>&1 ; then
-   step_error "Extraction of file 'dmx6firel2.ihx' failed."
- fi
- step_success
-
--step_begin "Checking MD-5 checksums of firmware files"
--if ! echo "fa80973cb8c02097712933bd1d1c23b2  /tmp/dmx6firel2.ihx" | md5sum -c >/dev/null 2>&1 ; then
-+step_begin "Checking SHA512 checksums of firmware files"
-+if ! echo "6c90f63df6b6a536d5895ac30fcf58ef613ad731d9652f2269f74bae36741527d1ef275d2e50711b0782dfd5e64b0fafcb6c50dcaf5d4910c4200c77ef41ca78  /tmp/dmx6firel2.ihx" | sha512sum -c >/dev/null 2>&1 ; then
-   step_error "File 'dmx6firel2.ihx' has wrong MD-5 checksum."
- fi
-
--if ! echo "7497b6b80d43e68f13b6929934ab60f4  /tmp/dmx6fireap.ihx" | md5sum -c >/dev/null 2>&1; then
-+if ! echo "2b10c9348cf7ad4296141dd16db0e1b6298020ee5467cc80836f597d5f8d6b01a8276c44a446462de554cf562a11b98de63ae4852dd7ca04408dca5f5cc227c5  /tmp/dmx6fireap.ihx" | sha512sum -c >/dev/null 2>&1; then
-   step_error "File 'dmx6fireap.ihx' has wrong MD-5 checksum."
- fi
-
--if ! echo "a65eecc11adc87af7307f5266ad31d65  /tmp/dmx6firecf.bin" | md5sum -c >/dev/null 2>&1 ; then
-+if ! echo "ddef0fbeff9e15e0bdcbfff8767c49adb3a0f08b68c0bcf1e38e666b03a2bafef672a2bec0918a75780ebaa477627ef639443d0adeaeacea3d56af1b66acb85f  /tmp/dmx6firecf.bin" | sha512sum -c >/dev/null 2>&1 ; then
-   step_error "File 'dmx6firecf.bin' has wrong MD-5 checksum."
- fi
- step_success
-
+ 
  step_begin "Installing firmware files"
 -if ! mkdir -p $FW_6FIRE_PATH >/dev/null 2>&1 ; then
 +if ! install -dm755 $FW_6FIRE_PATH >/dev/null 2>&1 ; then
    step_error "Creation of firmware path failed. Are you root?"
  fi
-
+