Update to 15.05.01.00

2 files changed, 48 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a69b9be0ff0b..a814a305c737 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lsi-msm
 	pkgdesc = LSI Logic MegaRAID Storage Manager Suite
-	pkgver = 15.03.01.00
-	pkgrel = 2
+	pkgver = 15.05.01.00
+	pkgrel = 1
 	url = http://www.lsi.com
 	install = lsi-msm.install
 	arch = i686
@@ -24,9 +24,16 @@ pkgbase = lsi-msm
 	backup = etc/lsi_mrdsnmp/sas/sas_TrapDestination.conf
 	backup = etc/lsi_mrdsnmp/sas-ir/sas_ir_TrapDestination.conf
 	backup = usr/share/MegaRAID_Storage_Manager/StrongSSLEncryption.ini
+	backup = usr/share/MegaRAID_Storage_Manager/installationmode.properties
 	backup = usr/share/MegaRAID_Storage_Manager/vivaldikey.properties
+	backup = usr/share/MegaRAID_Storage_Manager/vivaldikeys
+	backup = usr/share/MegaRAID_Storage_Manager/vivaldikeys2048
 	backup = usr/share/MegaRAID_Storage_Manager/Framework/vivaldikey.properties
+	backup = usr/share/MegaRAID_Storage_Manager/Framework/vivaldikeys
+	backup = usr/share/MegaRAID_Storage_Manager/Framework/vivaldikeys2048
 	backup = usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikey.properties
+	backup = usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikeys
+	backup = usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikeys2048
 	source = https://collaboration.opengroup.org/pegasus/documents/32572/pegasus-2.14.1.tar.gz
 	source = msm_profile.sh
 	source = LSI_StorSNMP.ini
@@ -34,8 +41,8 @@ pkgbase = lsi-msm
 	source = lsi_mrdsnmpd.service
 	source = ld.so.lsi-msm.conf
 	source = http://www.lsi.com/downloads/Public/Advanced%20Software/Advanced%20Software%20Common%20Files/SLA_AdvancedSoftware.pdf
-	source = http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.9.0-no-rpath.patch
 	source = http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.7.0-PIE.patch
+	source = http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.9.0-no-rpath.patch
 	source = http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.13.0-gcc5-build.patch
 	source = http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.14.1-build-fixes.patch
 	source = http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.14.1-ssl-include.patch
@@ -46,25 +53,25 @@ pkgbase = lsi-msm
 	sha1sums = 08e484f4c1f177a81587d5e12f2b806baddcf199
 	sha1sums = 73b553200ae2ccae980701d7324681529f551fc9
 	sha1sums = 8f7da07466346443acc24df3608744a7d80a9124
-	sha1sums = 236728c6ebdcad97bec03cb99221577e086401ad
 	sha1sums = 262dd8efae4025516cc23a14c6854a49af650245
+	sha1sums = 236728c6ebdcad97bec03cb99221577e086401ad
 	sha1sums = e8c0cea2589daebcd94ec2baf726391d4cd516cd
 	sha1sums = a4d642b7be3c3400539dac5014f66463dc567221
 	sha1sums = 1eadb4d032cb7e7367317e61fee6a6e1f9f68868
-	source_i686 = 15.03.01.00_Linux-x86_MSM.gz::http://www.lsi.com/downloads/Public/Syncro%20Shared%20Storage/downloads/15.03.01.00_Linux-32_MXM.gz
+	source_i686 = 15.05.01.00_Linux-x86_MSM.tar.gz::http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/MSM_linux_installer-15.05.01-00.tar.gz
 	depends_i686 = libxi
 	depends_i686 = libxft
 	depends_i686 = libpng12
 	depends_i686 = libxinerama
 	depends_i686 = libjpeg6-turbo
-	sha1sums_i686 = 26d1693eee4f2d397b7344c36492ec3ca8888f99
-	source_x86_64 = 15.03.01.00_Linux-x64_MSM.gz::http://www.lsi.com/downloads/Public/Syncro%20Shared%20Storage/downloads/15.03.01.00_Linux-64_MSM.gz
+	sha1sums_i686 = caac4ba06e9e9e3d519f51eef4d33d9dbb0d501c
+	source_x86_64 = 15.05.01.00_Linux-x64_MSM.tar.gz::http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/MSM_linux_x64_installer-15.05.01-00.tar.gz
 	depends_x86_64 = lib32-libxi
 	depends_x86_64 = lib32-libxft
 	depends_x86_64 = lib32-libpng12
 	depends_x86_64 = lib32-libxinerama
 	depends_x86_64 = lib32-libjpeg6-turbo
-	sha1sums_x86_64 = 95e854133b338e2d7c0166095bb870ec8b6b1e33
+	sha1sums_x86_64 = ca53ea0c32ae6d041c03dab6d5d99e1f3cca088d
 
 pkgname = lsi-msm
 
diff --git a/PKGBUILD b/PKGBUILD
index 3568a880fea7..e67d9c7926e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=lsi-msm
-pkgver=15.03.01.00
-pkgrel=2
+pkgver=15.05.01.00
+pkgrel=1
 pkgdesc="LSI Logic MegaRAID Storage Manager Suite"
 arch=('i686' 'x86_64')
 url='http://www.lsi.com'
@@ -34,8 +34,8 @@ source=('https://collaboration.opengroup.org/pegasus/documents/32572/pegasus-2.1
         'http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.13.0-gcc5-build.patch'
         'http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.14.1-build-fixes.patch'
         'http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/plain/pegasus-2.14.1-ssl-include.patch')
-source_i686=("${pkgver}_Linux-x86_MSM.gz::http://www.lsi.com/downloads/Public/Syncro%20Shared%20Storage/downloads/${pkgver}_Linux-32_MXM.gz")
-source_x86_64=("${pkgver}_Linux-x64_MSM.gz::http://www.lsi.com/downloads/Public/Syncro%20Shared%20Storage/downloads/${pkgver}_Linux-64_MSM.gz")
+source_i686=("${pkgver}_Linux-x86_MSM.tar.gz::http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/MSM_linux_installer-${pkgver//.00/-00}.tar.gz")
+source_x86_64=("${pkgver}_Linux-x64_MSM.tar.gz::http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/MSM_linux_x64_installer-${pkgver//.00/-00}.tar.gz")
 sha1sums=('c832eaf240f6dfba843c4937f7a935382d48b9be'
           '0e5d7b71435760e3ef7c1e132ba05145ccbd1268'
           '79fbe24898030db50295a6254e7c4627e2b51b7c'
@@ -48,21 +48,31 @@ sha1sums=('c832eaf240f6dfba843c4937f7a935382d48b9be'
           'e8c0cea2589daebcd94ec2baf726391d4cd516cd'
           'a4d642b7be3c3400539dac5014f66463dc567221'
           '1eadb4d032cb7e7367317e61fee6a6e1f9f68868')
-sha1sums_i686=('26d1693eee4f2d397b7344c36492ec3ca8888f99')
-sha1sums_x86_64=('95e854133b338e2d7c0166095bb870ec8b6b1e33')
+sha1sums_i686=('caac4ba06e9e9e3d519f51eef4d33d9dbb0d501c')
+sha1sums_x86_64=('ca53ea0c32ae6d041c03dab6d5d99e1f3cca088d')
 install=lsi-msm.install
 backup=('etc/lsi_mrdsnmp/LSI_StorSNMP.ini'
         'etc/lsi_mrdsnmp/sas/sas_TrapDestination.conf'
         'etc/lsi_mrdsnmp/sas-ir/sas_ir_TrapDestination.conf'
         'usr/share/MegaRAID_Storage_Manager/StrongSSLEncryption.ini'
+        'usr/share/MegaRAID_Storage_Manager/installationmode.properties'
         'usr/share/MegaRAID_Storage_Manager/vivaldikey.properties'
+        'usr/share/MegaRAID_Storage_Manager/vivaldikeys'
+        'usr/share/MegaRAID_Storage_Manager/vivaldikeys2048'
         'usr/share/MegaRAID_Storage_Manager/Framework/vivaldikey.properties'
-        'usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikey.properties')
+        'usr/share/MegaRAID_Storage_Manager/Framework/vivaldikeys'
+        'usr/share/MegaRAID_Storage_Manager/Framework/vivaldikeys2048'
+        'usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikey.properties'
+        'usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikeys'
+        'usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikeys2048')
 options=('!strip')
 
-create_links() {
+_create_links() {
   # create soname links
-  for _lib in $(find "${pkgdir}/usr/lib" -name '*.so*' && find "${pkgdir}/opt/lsi/Pegasus" -name '*.so*'); do
+  for _lib in $(find "${pkgdir}/usr/lib" -name '*.so*' && \
+                find "${pkgdir}/opt/lsi/Pegasus" -name '*.so*' && \
+                find "${pkgdir}/opt/lsi/msm/lib" -name '*.so*' && \
+                find "${pkgdir}/opt/lsi/snmp/lib" -name '*.so*'); do
     _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true)
     _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/')
     [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}"
@@ -92,7 +102,7 @@ package() {
   cd "${pkgdir}"
 
   # Extract RPM's
-  for i in $(find "${srcdir}/disk" -type f -name '*.rpm'); do bsdtar -xf ${i}; done &> /dev/null
+  for i in $(find "${srcdir}/disk" -type f -name '*.rpm'); do bsdtar -xf "${i}"; done &> /dev/null
 
   # Move to correct place
   [ "${CARCH}" = "x86_64" ] && mv usr/lib64 usr/lib
@@ -104,6 +114,9 @@ package() {
   install -Dm644 usr/share/MegaRAID_Storage_Manager/MSMHelp.desktop.SuSE usr/share/applications/MSMHelp.desktop
   install -Dm644 usr/share/MegaRAID_Storage_Manager/MSMStartupUI.desktop.SuSE usr/share/applications/MSMStartupUI.desktop
 
+  # setup installation properties
+  echo INSTALLATION_MODE=0 > usr/share/MegaRAID_Storage_Manager/installationmode.properties
+
   # Set correct path in desktop launchers and fix entries
   sed -e 's|local/MegaRAID Storage Manager|share/MegaRAID_Storage_Manager|g' \
       -e 's|SystemSetup||g' \
@@ -122,7 +135,7 @@ package() {
   ln -sf /etc/lsi_mrdsnmp/lsi_mrdsnmpmain usr/bin/lsi_mrdsnmpmain
 
   # Remove RH/SuSe paths remains
-  for i in "$(find . -type f -name '*.sh' -o -name 'popup')"; do sed -e '/msm_profile/d' -i ${i}; done
+  for i in $(find . -type f -name '*.sh' -o -name 'popup'); do sed -e '/msm_profile/d' -i "${i}"; done
 
   # Standarized /usr/share/MegaRAID_Storage_Manager/start{,monitor}help.sh whit xdg-open ## Someday, I'll create a patch instead sed
   sed -e '13,20d' -e 's|mozilla|xdg-open|g' -e 's|/firefox||g' -i usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh
@@ -150,7 +163,9 @@ package() {
   rm -fr etc/init.d \
          etc/lsi_mrdsnmp/lsi_mrdsnmpd.{rh,suse} \
          etc/lsi_mrdsnmp/sas{,-ir}/{install,uninstall} \
-         usr/share/MegaRAID_Storage_Manager/{*desktop.{SuSE,redhat},{uninstaller,pwd,.__uninst}.sh,vmware{35,40},installtype} \
+         usr/share/MegaRAID_Storage_Manager/*desktop.{SuSE,redhat} \
+         usr/share/MegaRAID_Storage_Manager/{uninstaller,pwd,.__uninst}.sh \
+         usr/share/MegaRAID_Storage_Manager/vmware{35,40}
 
   # Instal compiled Pegasus framework libraries
   rm -fr opt/lsi/Pegasus
@@ -166,44 +181,19 @@ package() {
                       'libpegqueryexpression.so.1'
                       'libpegwql.so.1'
                      )
-  for i in ${_pegasus_lib[@]}; do install -Dm755 "${srcdir}/pegasus/lib/${i}" "${pkgdir}/opt/lsi/Pegasus/${i}"; done
+  for i in ${_pegasus_lib[@]}; do install -Dm755 "${srcdir}/pegasus/lib/${i}" "opt/lsi/Pegasus/${i}"; done
 
   # Create soname links
-  create_links
-
-  # Softlinking libs
-  cd "${pkgdir}/opt/lsi/msm/lib"
-  ln -s libstorelib.so.*.*         libstorelib.so.4
-  ln -s libstorelib.so.4           libstorelib.so
-
-  ln -s libstorelibir-2.so.*.*     libstorelibir-2.so.20
-  ln -s libstorelibir-2.so.20      libstorelibir-2.so
-
-  ln -s libstorelibir-3.so.*.*     libstorelibir-3.so.7
-  ln -s libstorelibir-3.so.7       libstorelibir-3.so
-
-  ln -s libstorelibir.so.*.*       libstorelibir.so.5
-  ln -s libstorelibir.so.5         libstorelibir.so
-
-  cd "${pkgdir}/opt/lsi/snmp/lib"
-  ln -s libstorelib.so.*.*         libstorelib.so.4
-  ln -s libstorelib.so.4           libstorelib.so
-
-  ln -s libstorelibir.so.*.*       libstorelibir.so.5
-  ln -s libstorelibir.so.5         libstorelibir.so
-
-  ln -s libstorelibir-2.so.*.*     libstorelibir-2.so.20
-  ln -s libstorelibir-2.so.20      libstorelibir-2.so
+  _create_links
 
-  ln -s libstorelibir-3.so.*.*     libstorelibir-3.so.7
-  ln -s libstorelibir-3.so.7       libstorelibir-3.so
+  # Softlinking needed libs
+  (cd opt/lsi/snmp/lib; ln -s libstorelibir-3.so.*.* libstorelibir-3.so.7)
 
   # Add /opt/lsi/msm/lib, /opt/lsi/Pegasus and /opt/lsi/snmp/lib to ldconf search path
-  install -d "${pkgdir}/etc/ld.so.conf.d"
-  install -Dm644 "${srcdir}/ld.so.lsi-msm.conf" "${pkgdir}/etc/ld.so.conf.d/lsi.conf"
+  install -Dm644 "${srcdir}/ld.so.lsi-msm.conf" etc/ld.so.conf.d/lsi.conf
 
   # Remove Megapopup system launcher. because eats tons of RAM
-  rm -fr "${pkgdir}/etc/X11"
+  rm -fr etc/X11
 
   # Install licenses
   install -Dm644 "${srcdir}/SLA_AdvancedSoftware.pdf" "usr/share/licenses/${pkgname}/SLA_AdvancedSoftware.pdf"