Update to 17.05.02-01

1 files changed, 49 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c93fe4669e0b..3d6fedb0f89f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgbase=lsi-msm
-pkgname=('lsi-msm' 'lsi-msm-snmp')
-_pkgver=17.05.00-02
+pkgname=('lsi-msm'
+         'lsi-msm-snmp'
+         )
+_pkgver=17.05.02-01
 pkgver="${_pkgver//-/.}"
-pkgrel=3
+pkgrel=1
 pkgdesc="LSI Logic MegaRAID Storage Manager and SNMP providers"
 arch=('x86_64')
 url='https://www.broadcom.com/products/storage'
@@ -18,7 +20,7 @@ source=('msm_profile.sh'
         'ld.so.lsi-msm-snmp.conf'
         'https://docs.broadcom.com/docs-and-downloads/advanced-software/advanced-software-common-files/SLA_AdvancedSoftware.pdf'
         'MegaRAID_SAS_SW_UserGd.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/51530-00_RevP_MegaRAID_SAS_SW_UserGd.zip'
-        "${pkgver}_Linux-x64_MSM.gz::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_Linux-64_MSM.gz"
+        "${pkgver}_Linux-x64_MSM.zip::https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/${_pkgver}_MSM_Linux-x64.zip"
         )
 sha256sums=('aff9c7ed8e55eb3441911183db1b0912cf74f24ce3027b3aebe3560db69d3a1d'
             '605adcb662fb457609e81fb8916da7e88541e81dd0c112a8bb569d84df189bff'
@@ -28,7 +30,7 @@ sha256sums=('aff9c7ed8e55eb3441911183db1b0912cf74f24ce3027b3aebe3560db69d3a1d'
             '9b1065325731a1711d6dce3ecbf2cccc6fbe524b60e0eb5c0f1fdba315222c95'
             '9be6a8818ea1dccec65d48b86dd0cc62009dc3886229e3dce41192a241bd55c3'
             'bb25efb9894cc16961d0a982d1ccc51f4bfa173d3049af2a4277aa38dbb95110'
-            '63f0d87feba33a7602cdd7488317519edc33442037e1bbaef9f55ce9bd5ea3dd'
+            '8f9e7c1a9468cfb95159e27d4df0978faf7e0e1303bf0ae6999a897d33a21414'
             )
 options=('!strip')
 
@@ -42,37 +44,38 @@ _create_links() {
   done
 }
 
+prepare() {
+  bsdtar -xf "MSM_linux_x64_installer-${_pkgver}.tar.gz"
+}
+
 package_lsi-msm() {
-pkgdesc="LSI Logic MegaRAID Storage Manager"
-depends=('lsi-openpegasus'
-         'unixodbc'
-         'xdg-utils'
-         'java-environment=8'
-         'lib32-libxi'
-         'lib32-libxft'
-         'lib32-libpng12'
-         'lib32-libxinerama'
-         'lib32-libjpeg6-turbo'
-         'lib32-libxxf86vm'
-         # 'lib32-xerces-c'
+  pkgdesc="LSI Logic MegaRAID Storage Manager"
+  depends=('lsi-openpegasus'
+           'unixodbc'
+           'xdg-utils'
+           'java-environment=8'
+           'lib32-libxi'
+           'lib32-libxft'
+           'lib32-libpng12'
+           'lib32-libxinerama'
+           'lib32-libjpeg6-turbo'
+           'lib32-libxxf86vm'
+           'lib32-gcc-libs'
+           # 'lib32-xerces-c'
          )
-backup=('usr/share/MegaRAID_Storage_Manager/debugschema.xsd'
-        'usr/share/MegaRAID_Storage_Manager/debugcfg.xml'
-        'usr/share/MegaRAID_Storage_Manager/msm.properties'
-        'usr/share/MegaRAID_Storage_Manager/StrongSSLEncryption.ini'
-        'usr/share/MegaRAID_Storage_Manager/vivaldikey.properties'
-        'usr/share/MegaRAID_Storage_Manager/configurators/CIMOMMonitorConfigurator.class'
-        'usr/share/MegaRAID_Storage_Manager/configurators/Configurator.class'
-        'usr/share/MegaRAID_Storage_Manager/configurators/MonitorConfigurator.class'
-        'usr/share/MegaRAID_Storage_Manager/DebugLog/TraceManager.class'
-        'usr/share/MegaRAID_Storage_Manager/Framework/eventnotificationchoice.properties'
-        'usr/share/MegaRAID_Storage_Manager/Framework/framework.properties'
-        'usr/share/MegaRAID_Storage_Manager/Framework/vivaldikey.properties'
-        'usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikey.properties'
-        'usr/share/MegaRAID_Storage_Manager/MegaMonitor/config-current.xml'
-        'usr/share/MegaRAID_Storage_Manager/MegaMonitor/config-default.xml'
-        )
-install=lsi-msm.install
+  backup=('usr/share/MegaRAID_Storage_Manager/debugschema.xsd'
+          'usr/share/MegaRAID_Storage_Manager/debugcfg.xml'
+          'usr/share/MegaRAID_Storage_Manager/msm.properties'
+          'usr/share/MegaRAID_Storage_Manager/StrongSSLEncryption.ini'
+          'usr/share/MegaRAID_Storage_Manager/vivaldikey.properties'
+          'usr/share/MegaRAID_Storage_Manager/Framework/eventnotificationchoice.properties'
+          'usr/share/MegaRAID_Storage_Manager/Framework/framework.properties'
+          'usr/share/MegaRAID_Storage_Manager/Framework/vivaldikey.properties'
+          'usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikey.properties'
+          'usr/share/MegaRAID_Storage_Manager/MegaMonitor/config-current.xml'
+          'usr/share/MegaRAID_Storage_Manager/MegaMonitor/config-default.xml'
+          )
+  install=lsi-msm.install
 
   cd "${pkgdir}"
 
@@ -123,15 +126,13 @@ install=lsi-msm.install
       -i usr/share/MegaRAID_Storage_Manager/starthelp.sh
 
   # Fix Java (use system java)
-  sed -e 's|../jre/bin|/usr/bin|g' \
-      -e 's|../jre/lib|/usr/lib/jvm/default/jre/lib|g' \
-      -e 's|/usr/lib/jvm/default/jre/lib/rt.jar:/usr/lib/jvm/default/jre/lib/jsse.jar:/usr/lib/jvm/default/jre/lib/jce.jar:||g' \
+  sed -e 's|../jre/bin|/usr/lib/jvm/java-8-openjdk/jre/bin|g' \
+      -e 's|../jre/lib|/usr/lib/jvm/java-8-openjdk/jre/lib|g' \
       -i usr/share/MegaRAID_Storage_Manager/MegaPopup/popup \
       -i usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh \
       -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh \
       -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
-  sed -e 's|./jre/bin|/usr/bin|g' \
-      -e 's|../jre/lib|/usr/lib/jvm/default/jre/lib|g' \
+  sed -e 's|./jre/bin|/usr/lib/jvm/java-8-openjdk/jre/bin|g' \
       -i usr/share/MegaRAID_Storage_Manager/startupui.sh
 
   # Add missing #! in scripts
@@ -163,6 +164,15 @@ install=lsi-msm.install
       -e 's|     |  |g' \
       -i usr/share/MegaRAID_Storage_Manager/start*.sh
 
+  # Set java home
+  mkdir -p  usr/share/MegaRAID_Storage_Manager/jre/.{userPrefs,systemPrefs}
+  sed -e 's|-classpath|-Djava.util.prefs.systemRoot="${MSM_HOME}"/jre -Djava.util.prefs.userRoot="${MSM_HOME}"/jre/.userPrefs -classpath|g' \
+      -i usr/share/MegaRAID_Storage_Manager/startupui.sh \
+      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/popup \
+      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh \
+      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh \
+      -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh \
+
   # Install services and other files
   install -Dm644 "${srcdir}/lsi_msm.service" usr/lib/systemd/system/lsi_msm.service
   install -Dm644 "${srcdir}/msm_profile.sh" etc/profile.d/msm.sh