Update to 15.11.00.13

3 files changed, 38 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1a3b982cbdb..04005c28782a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Jan 11 10:58:39 UTC 2016
 pkgbase = lsi-msm
 	pkgdesc = LSI Logic MegaRAID Storage Manager Suite
-	pkgver = 15.05.01.00
-	pkgrel = 2
+	pkgver = 15.11.00.13
+	pkgrel = 1
 	url = http://www.avagotech.com/products/server-storage
 	install = lsi-msm.install
 	arch = i686
@@ -14,6 +16,8 @@ pkgbase = lsi-msm
 	depends = libxtst
 	depends = alsa-lib
 	depends = libnet
+	depends = libxslt
+	depends = gtk2
 	depends = unixodbc
 	depends = net-snmp
 	depends = perl-net-snmp
@@ -58,20 +62,20 @@ pkgbase = lsi-msm
 	sha1sums = e8c0cea2589daebcd94ec2baf726391d4cd516cd
 	sha1sums = a4d642b7be3c3400539dac5014f66463dc567221
 	sha1sums = 1eadb4d032cb7e7367317e61fee6a6e1f9f68868
-	source_i686 = 15.05.01.00_Linux-x86_MSM.tar.gz::http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_installer-15-05-01-00-tar.gz
+	source_i686 = 15.11.00.13_Linux-x86_MSM.tar.gz::http://docs.avagotech.com/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_x86_installer-15.11.00-13.tar.gz
 	depends_i686 = libxi
 	depends_i686 = libxft
 	depends_i686 = libpng12
 	depends_i686 = libxinerama
 	depends_i686 = libjpeg6-turbo
-	sha1sums_i686 = caac4ba06e9e9e3d519f51eef4d33d9dbb0d501c
-	source_x86_64 = 15.05.01.00_Linux-x64_MSM.tar.gz::http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_x64_installer-15-05-01-00-tar.gz
+	sha1sums_i686 = 74b03ef3ca8c9ceb8ae3a60adc3d22303d239798
+	source_x86_64 = 15.11.00.13_Linux-x64_MSM.tar.gz::http://docs.avagotech.com/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_x64_installer-15.11.00-13.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 = ca53ea0c32ae6d041c03dab6d5d99e1f3cca088d
+	sha1sums_x86_64 = 7c687b8a18955053580849c68512d0bef4b5dba1
 
 pkgname = lsi-msm
 
diff --git a/PKGBUILD b/PKGBUILD
index 74875e09a986..40a649b2ed8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=lsi-msm
-pkgver=15.05.01.00
-pkgrel=2
+pkgver=15.11.00.13
+_pkgver="$(echo "${pkgver}" | sed 's/\./-/3')"
+pkgrel=1
 pkgdesc="LSI Logic MegaRAID Storage Manager Suite"
 arch=('i686' 'x86_64')
 url='http://www.avagotech.com/products/server-storage'
@@ -10,6 +11,7 @@ license=('custom:LSI' 'Custom:TOG')
 depends=('libxtst'
          'alsa-lib'
          'libnet'
+         'libxslt'
          'unixodbc'
          'net-snmp'
          'perl-net-snmp'
@@ -21,13 +23,15 @@ depends_i686=('libxi'
               'libpng12'
               'libxinerama'
               'libjpeg6-turbo'
-              ) # 'xerces-c'
+              # 'xerces-c'
+              )
 depends_x86_64=('lib32-libxi'
                 'lib32-libxft'
                 'lib32-libpng12'
                 'lib32-libxinerama'
                 'lib32-libjpeg6-turbo'
-                ) # 'lib32-xerces-c'
+                # 'lib32-xerces-c'
+                )
 makedepends=('icu'
              'openslp'
              'sqlite'
@@ -48,8 +52,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.tar.gz::http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_installer-${pkgver//./-}-tar.gz")
-source_x86_64=("${pkgver}_Linux-x64_MSM.tar.gz::http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_x64_installer-${pkgver//./-}-tar.gz")
+source_i686=("${pkgver}_Linux-x86_MSM.tar.gz::http://docs.avagotech.com/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_x86_installer-${_pkgver}.tar.gz")
+source_x86_64=("${pkgver}_Linux-x64_MSM.tar.gz::http://docs.avagotech.com/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/https:/avagodocs.s3.amazonaws.com:443/docs-and-downloads/raid-controllers/raid-controllers-common-files/MSM_linux_x64_installer-${_pkgver}.tar.gz")
 sha1sums=('c832eaf240f6dfba843c4937f7a935382d48b9be'
           '0e5d7b71435760e3ef7c1e132ba05145ccbd1268'
           '79fbe24898030db50295a6254e7c4627e2b51b7c'
@@ -62,8 +66,8 @@ sha1sums=('c832eaf240f6dfba843c4937f7a935382d48b9be'
           'e8c0cea2589daebcd94ec2baf726391d4cd516cd'
           'a4d642b7be3c3400539dac5014f66463dc567221'
           '1eadb4d032cb7e7367317e61fee6a6e1f9f68868')
-sha1sums_i686=('caac4ba06e9e9e3d519f51eef4d33d9dbb0d501c')
-sha1sums_x86_64=('ca53ea0c32ae6d041c03dab6d5d99e1f3cca088d')
+sha1sums_i686=('74b03ef3ca8c9ceb8ae3a60adc3d22303d239798')
+sha1sums_x86_64=('7c687b8a18955053580849c68512d0bef4b5dba1')
 install=lsi-msm.install
 backup=('etc/lsi_mrdsnmp/LSI_StorSNMP.ini'
         'etc/lsi_mrdsnmp/sas/sas_TrapDestination.conf'
@@ -140,11 +144,11 @@ package() {
   # Fix permisions
   find . -type d -not \( -path */jre/* -prune \) -print0 2>/dev/null | xargs -0r chmod 755
   find . -type f -not \( -path */jre/* -prune \) -print0 2>/dev/null | xargs -0r chmod 644
-  for i in $(find . -type f -not \( -path */jre/* -prune \) -name '*.sh' -o -name 'popup_bin' -o -name 'popup' -o -name "add_entry" -o -name 'storcli64' -o -name 'mrmonitor' -o -name '*.so*'); do chmod +x ${i}; done
+  for i in $(find . -type f -not \( -path */jre/* -prune \) -name '*.sh' -o -name 'popup_bin' -o -name 'popup' -o -name "add_entry" -o -name 'storcli*' -o -name 'mrmonitor' -o -name '*.so*'); do chmod +x ${i}; done
   chmod +x etc/lsi_mrdsnmp/lsi_mrdsnmp{agent,main}
 
   # Make symlinks
-  mkdir -p usr/bin
+  install -d usr/bin
   ln -sf /etc/lsi_mrdsnmp/lsi_mrdsnmpagent usr/bin/lsi_mrdsnmpagent
   ln -sf /etc/lsi_mrdsnmp/lsi_mrdsnmpmain usr/bin/lsi_mrdsnmpmain
 
diff --git a/lsi-msm.install b/lsi-msm.install
index 55cb5245ad05..d54910d7b082 100644
--- a/lsi-msm.install
+++ b/lsi-msm.install
@@ -6,29 +6,30 @@ green="${bold}$(tput setaf 2)"
 
 _instructions_install() {
   printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}
-${green}==>${all_off} ${bold}First Steps needed for run 'LSI MegaRAID SNMP Agent':
+${green}==>${all_off} First Steps needed for run '${bold}LSI MegaRAID SNMP Agent${all_off}':
   ${blue}->${all_off} Create or edit the file: '${bold}/etc/snmp/snmpd.conf${all_off}' and put in:
      '${bold}pass .1.3.6.1.4.1.3582 /usr/bin/lsi_mrdsnmpmain${all_off}' and save.
   ${blue}->${all_off} Edit the file '${bold}/etc/lsi_mrdsnmp/LSI_StorSNMP.ini${all_off}'
      and comment out the option you want use.
-${green}==>${all_off} ${bold}For start 'LSI MegaRAID Storage Manager Framework' service, run:
-  ${blue}->${all_off} '# ${bold}systemctl start lsi_msm${all_off}'
-${green}==>${all_off} ${bold}For start 'LSI MegaRAID SNMP Agent' service, run:
-  ${blue}->${all_off} '# ${bold}systemctl start lsi_mrdsnmpd${all_off}'
-${green}==>${all_off} ${bold}For open 'LSI MegaRAID Storage Manager' client:
-  ${blue}->${all_off} '${bold}Menu${all_off}' -> '${bold}System${all_off}' -> '${bold}MegaRAID Storage Manager StartupUI${all_off}'
-  ${blue}->${all_off} Or launch: # '${bold}/usr/share/MegaRAID_Storage_Manager/startupui.sh${all_off}'\n"
+  ${blue}->${all_off} For start '${bold}LSI MegaRAID Storage Manager Framework${all_off}' service, run:
+     '# ${bold}systemctl start lsi_msm${all_off}'
+  ${blue}->${all_off} For start '${bold}LSI MegaRAID SNMP Agent${all_off}' service, run:
+     '# ${bold}systemctl start lsi_mrdsnmpd${all_off}'
+  ${blue}->${all_off} For open '${bold}LSI MegaRAID Storage Manager${bold}' client:
+     '${bold}Menu${all_off}' -> '${bold}System${all_off}' -> '${bold}MegaRAID Storage Manager StartupUI${all_off}'
+     Or launch:
+     # '${bold}/usr/share/MegaRAID_Storage_Manager/startupui.sh${all_off}'\n"
 }
 
 _instructions_update() {
     printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}\n"
   if [  -f /etc/snmp/snmpd.conf ]; then
-printf "${green}==>${all_off} ${bold}The file «/etc/snmp/snmpd.conf» not found.${all_off}
+    printf "${green}==>${all_off} The file '${bold}/etc/snmp/snmpd.conf${all_off}' is not found.
   ${blue}->${all_off} Please Create and put this content:
      '${bold}pass .1.3.6.1.4.1.3582 /usr/bin/lsi_mrdsnmpmain${all_off}'
      before start/restart the '${bold}LSI MegaRAID SNMP Agent${all_off}' service.\n"
   else
-printf "${green}==>${all_off} ${bold}The file '/etc/snmp/snmpd.conf' is found.${all_off}
+    printf "${green}==>${all_off} The file '${bold}/etc/snmp/snmpd.conf${all_off}' is found.
   ${blue}->${all_off} Please make sure if have this content:
      '${bold}pass .1.3.6.1.4.1.3582 /usr/bin/lsi_mrdsnmpmain${all_off}'
      before start/restart the '${bold}LSI MegaRAID SNMP Agent${all_off}' service.\n"
@@ -38,7 +39,7 @@ printf "${green}==>${all_off} ${bold}The file '/etc/snmp/snmpd.conf' is found.${
 post_install() {
   ldconfig &> /dev/null
   cd "/usr/share/MegaRAID_Storage_Manager"
-  jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}" &> /dev/null &> /dev/null
+  jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}" &> /dev/null
 
   _instructions_install
 }
@@ -63,11 +64,11 @@ pre_remove() {
 
   if [ "$(systemctl is-active lsi_msm)" = "active" ]; then
     systemctl stop lsi_msm &> /dev/null
-    printf "${yellow}==>${all_off} ${bold}Stopping 'lsi_msm' Service${all_off}\n"
+    printf "${yellow}==>${all_off} Stopping '${bold}lsi_msm${all_off}' Service\n"
   fi
   if [ "$(systemctl is-enabled lsi_msm)" = "enable" ]; then
     systemctl disable lsi_msm &> /dev/null
-    printf "${yellow}==>${all_off} ${bold}Disabling 'lsi_msm' Service${all_off}\n"
+    printf "${yellow}==>${all_off} Disabling '${bold}lsi_msm${all_off}' Service\n"
   fi
 }