Update to 008.003.012.000

2 files changed, 47 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6f0ec23c3de..cf92ece774d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,40 @@
 pkgbase = lsi-lsa
 	pkgdesc = LSI Storage Authority Software Suite
-	pkgver = 007.019.006.000
-	pkgrel = 5
+	pkgver = 008.003.012.000
+	pkgrel = 1
 	url = https://www.broadcom.com/products/storage
 	install = lsi-lsa.install
 	arch = x86_64
 	license = custom:Broadcom
 	makedepends = patchelf
+	makedepends = openssl-1.1
+	makedepends = libxcrypt-compat
+	makedepends = curl
+	makedepends = lsi-openpegasus
 	depends = openslp
-	depends = lsi-openpegasus
-	depends = curl
 	depends = perl
-	depends = libcrypt.so=1
 	depends = libldap24
+	depends = libcrypt.so=1
+	depends = libcrypto.so=1.1
+	depends = libssl.so=1.1
+	depends = libpegclient.so
+	depends = libpegcommon.so
+	depends = libpeglistener.so
+	depends = libcurl.so
 	options = !strip
 	backup = opt/lsi/LSIStorageAuthority/installtype
 	backup = opt/lsi/LSIStorageAuthority/conf/LSA.conf
 	backup = opt/lsi/LSIStorageAuthority/server/conf/nginx.conf
 	backup = opt/lsi/LSIStorageAuthority/conf/monitor/config-current.json
 	source = LSI_Storage_Authority_Lightweight_Monitor_User_Guide_rev1.0.pdf::https://docs.broadcom.com/doc/pub-005092
-	source = LSI_Storage_Authority_Software_User_Guide_rev2.2.pdf::https://docs.broadcom.com/doc/DB15-001161
+	source = LSI_Storage_Authority_Software_User_Guide_rev2.6.pdf::https://docs.broadcom.com/doc/LSA-Software-UG
 	source = lsi_lsa.service
 	source = lsa_launcher.sh
-	source = 007.019.006.000_LSA_Linux-x64.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.019.006.000_LSA_Linux-x64.zip
+	source = 008.003.012.000_LSA_Linux-x64.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/008.003.012.000_LSA_Linux_x64.zip
 	sha256sums = 5196f542b52457abb94bce4e069005543a7e748270b7b673e5afa669e7af2e03
-	sha256sums = edb87a322a06afb7c78058132f648123325fc633db2df4d062a127f5ed9f465a
+	sha256sums = 6de3c303b4a8c1e30bf7e6dcb1a7bf4a46d00224c9d068a3fe982eabe53c1e03
 	sha256sums = 5d65b855b7d38192ef8fd0ce34cab567efd5f9af922c080876a10e96a62b0b17
 	sha256sums = 1df03403bc1d780797f0eba59d85b1941a1c77f911d9e7d5d5ae4f288e52663a
-	sha256sums = d0cfca9e144b12b8c5886f7d975546fe7e1ca13573f62d80f721363397e3b5dd
+	sha256sums = 5b68f1743708fec3fa8c1de322b8b2dce15cfb28d7f462a038013fd699cabc31
 
 pkgname = lsi-lsa
diff --git a/PKGBUILD b/PKGBUILD
index 81434b94ab0e..7f670abd9686 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,41 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=lsi-lsa
-pkgver=007.019.006.000
-pkgrel=5
+pkgver=008.003.012.000
+pkgrel=1
 pkgdesc="LSI Storage Authority Software Suite"
 arch=('x86_64')
 url='https://www.broadcom.com/products/storage'
 license=('custom:Broadcom')
 depends=('openslp'
-         'lsi-openpegasus'
-         'curl'
          'perl'
-         'libcrypt.so=1'
          'libldap24'
+         'libcrypt.so=1'
+         'libcrypto.so=1.1'
+         'libssl.so=1.1'
+         'libpegclient.so'
+         'libpegcommon.so'
+         'libpeglistener.so'
+         'libcurl.so'
          )
-makedepends=('patchelf')
+makedepends=('patchelf'
+             'openssl-1.1'
+             'libxcrypt-compat'
+             'curl'
+             'lsi-openpegasus'
+             )
 DLAGENTS=('https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -b "agreement=true" -o %o %u')
 source=('LSI_Storage_Authority_Lightweight_Monitor_User_Guide_rev1.0.pdf::https://docs.broadcom.com/doc/pub-005092'
-        'LSI_Storage_Authority_Software_User_Guide_rev2.2.pdf::https://docs.broadcom.com/doc/DB15-001161'
+        'LSI_Storage_Authority_Software_User_Guide_rev2.6.pdf::https://docs.broadcom.com/doc/LSA-Software-UG'
         'lsi_lsa.service'
         'lsa_launcher.sh'
-        "${pkgver}_LSA_Linux-x64.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_LSA_Linux-x64.zip"
+        "${pkgver}_LSA_Linux-x64.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_LSA_Linux_x64.zip"
         )
 sha256sums=('5196f542b52457abb94bce4e069005543a7e748270b7b673e5afa669e7af2e03'
-            'edb87a322a06afb7c78058132f648123325fc633db2df4d062a127f5ed9f465a'
+            '6de3c303b4a8c1e30bf7e6dcb1a7bf4a46d00224c9d068a3fe982eabe53c1e03'
             '5d65b855b7d38192ef8fd0ce34cab567efd5f9af922c080876a10e96a62b0b17'
             '1df03403bc1d780797f0eba59d85b1941a1c77f911d9e7d5d5ae4f288e52663a'
-            'd0cfca9e144b12b8c5886f7d975546fe7e1ca13573f62d80f721363397e3b5dd'
+            '5b68f1743708fec3fa8c1de322b8b2dce15cfb28d7f462a038013fd699cabc31'
             )
 install=lsi-lsa.install
 backup=('opt/lsi/LSIStorageAuthority/installtype'
@@ -52,7 +61,7 @@ package() {
   # Extract LSA RPM
   for i in $(find "${srcdir}" -type f -name "LSIStorageAuthority-${pkgver}*.rpm"); do bsdtar -xf "${i}"; done &> /dev/null
 
-  # Remove unnused stuff (include bundled openpegasus libs)
+  # Remove unused stuff (include bundled openpegasus libs)
   rm -fr etc \
          opt/lsi/LSIStorageAuthority/uninstaller.sh \
          opt/lsi/LSIStorageAuthority/logs/* \
@@ -81,7 +90,7 @@ package() {
 
   # Install Docs
   install -Dm644 "${srcdir}/LSI_Storage_Authority_Lightweight_Monitor_User_Guide_rev1.0.pdf" "usr/share/doc/${pkgname}/LSI_Storage_Authority_Lightweight_Monitor_User_Guide.pdf"
-  install -Dm644 "${srcdir}/LSI_Storage_Authority_Software_User_Guide_rev2.2.pdf" "usr/share/doc/${pkgname}/LSI_Storage_Authority_Software_User_Guide.pdf"
+  install -Dm644 "${srcdir}/LSI_Storage_Authority_Software_User_Guide_rev2.6.pdf" "usr/share/doc/${pkgname}/LSI_Storage_Authority_Software_User_Guide.pdf"
   install -Dm644 "${srcdir}/"*/LSA_Linux_*_readme.txt "usr/share/doc/${pkgname}/LSA_Linux_readme.txt"
 
   # Configure the port server/client: 2463 for bundled nginx server & 9009 for LSA client
@@ -89,7 +98,8 @@ package() {
   #       this interfiere with this software, for this, i've change the port 9000 to 9009.
   sed -e 's|nginx_default|2463|g' \
       -e 's|LSA_Default|9009|g' \
-      -i opt/lsi/LSIStorageAuthority/server/conf/nginx.conf
+      -i opt/lsi/LSIStorageAuthority/server/conf/nginx.conf \
+      -i opt/lsi/LSIStorageAuthority/conf/LSA.conf
   sed 's|9000|9009|g' \
       -i opt/lsi/LSIStorageAuthority/conf/LSA.conf \
       -i usr/share/doc/lsi-lsa/LSA_Linux_readme.txt
@@ -103,4 +113,11 @@ package() {
 
   # Create soname links
   _create_links
+
+  # Fix the LSA.conf mess
+  sed -e 's|c:\\program files\\lsi\\lsistorageauthority\\|..|g' \
+      -e 's|C:\\Program Files\\LSI\\LSIStorageAuthority\\|..|g' \
+      -e 's|Administrators|root|g' \
+      -e 's|Authenticated U|u|g' \
+      -i opt/lsi/LSIStorageAuthority/conf/LSA.conf
 }