Fix load service by add libdap 2.4x form archive archlinux repository

2 files changed, 27 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2e66e4e6237..288773966237 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lsi-lsa
 	pkgdesc = LSI Storage Authority Software Suite
-	pkgver = 007.015.004.000
+	pkgver = 007.019.006.000
 	pkgrel = 1
 	url = https://www.broadcom.com/products/storage
 	install = lsi-lsa.install
@@ -16,15 +16,16 @@ pkgbase = lsi-lsa
 	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_rev1.15.pdf::https://docs.broadcom.com/doc/DB15-001161
+	source = LSI_Storage_Authority_Software_User_Guide_rev2.2.pdf::https://docs.broadcom.com/doc/DB15-001161
 	source = lsi_lsa.service
 	source = lsa_launcher.sh
-	source = 007.015.004.000_LSA_Linux.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.015.004.000_LSA_Linux-x64.zip
+	source = 007.019.006.000_LSA_Linux.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.019.006.000_LSA_Linux-x64.zip
+	source = https://archive.archlinux.org/repos/2021/11/18/core/os/x86_64/libldap-2.4.59-2-x86_64.pkg.tar.zst
 	sha256sums = 5196f542b52457abb94bce4e069005543a7e748270b7b673e5afa669e7af2e03
-	sha256sums = 7786c99f9489b272a5662d7d7a4442f1262b9ce2dc678c48d99c2c6e37a5fd2b
+	sha256sums = edb87a322a06afb7c78058132f648123325fc633db2df4d062a127f5ed9f465a
 	sha256sums = 5d65b855b7d38192ef8fd0ce34cab567efd5f9af922c080876a10e96a62b0b17
 	sha256sums = 977ff4069d4ae02b60a58e708ae5bb5c8fa10f9a331e527b518006e8e5eb03ea
-	sha256sums = 722b72eefb80fd40cbf57c06fe09073db3e8d01c686dd14f5367b2e6d42c54fc
+	sha256sums = d0cfca9e144b12b8c5886f7d975546fe7e1ca13573f62d80f721363397e3b5dd
+	sha256sums = 8589d6d7ba2c2890961ac5a28b664bc4a066cc00b19f22ee0af792f0d9ed182c
 
 pkgname = lsi-lsa
-
diff --git a/PKGBUILD b/PKGBUILD
index 55be51194c2d..4c7c02f99892 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=lsi-lsa
-pkgver=007.015.004.000
+pkgver=007.019.006.000
 pkgrel=1
 pkgdesc="LSI Storage Authority Software Suite"
 arch=('x86_64')
@@ -12,18 +12,20 @@ depends=('openslp'
          'curl'
          )
 makedepends=('chrpath')
-DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b "agreement=true" -o %o %u')
+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_rev1.15.pdf::https://docs.broadcom.com/doc/DB15-001161'
+        'LSI_Storage_Authority_Software_User_Guide_rev2.2.pdf::https://docs.broadcom.com/doc/DB15-001161'
         'lsi_lsa.service'
         'lsa_launcher.sh'
         "${pkgver}_LSA_Linux.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_LSA_Linux-x64.zip"
+        'https://archive.archlinux.org/repos/2021/11/18/core/os/x86_64/libldap-2.4.59-2-x86_64.pkg.tar.zst'
         )
 sha256sums=('5196f542b52457abb94bce4e069005543a7e748270b7b673e5afa669e7af2e03'
-            '7786c99f9489b272a5662d7d7a4442f1262b9ce2dc678c48d99c2c6e37a5fd2b'
+            'edb87a322a06afb7c78058132f648123325fc633db2df4d062a127f5ed9f465a'
             '5d65b855b7d38192ef8fd0ce34cab567efd5f9af922c080876a10e96a62b0b17'
             '977ff4069d4ae02b60a58e708ae5bb5c8fa10f9a331e527b518006e8e5eb03ea'
-            '722b72eefb80fd40cbf57c06fe09073db3e8d01c686dd14f5367b2e6d42c54fc'
+            'd0cfca9e144b12b8c5886f7d975546fe7e1ca13573f62d80f721363397e3b5dd'
+            '8589d6d7ba2c2890961ac5a28b664bc4a066cc00b19f22ee0af792f0d9ed182c'
             )
 install=lsi-lsa.install
 backup=('opt/lsi/LSIStorageAuthority/installtype'
@@ -55,7 +57,17 @@ package() {
          opt/lsi/LSIStorageAuthority/logs/* \
          opt/lsi/LSIStorageAuthority/server/start.log \
          opt/lsi/LSIStorageAuthority/server/logs/* \
-         opt/lsi/LSIStorageAuthority/bin/*peg*.so*
+         opt/lsi/LSIStorageAuthority/bin/*peg*.so* \
+         opt/lsi/LSIStorageAuthority/bin/libcurl*
+
+  # LSA needs ldap 2.4x
+  (cd opt/lsi/LSIStorageAuthority/bin
+    install -Dm755 "${srcdir}/usr/lib/libldap-2.4.so.2.11.7" .
+    ln -s libldap-2.4.so.2.11.7 libldap-2.4.so.2
+    ln -s libldap-2.4.so.2.11.7 libldap-2.4.so
+    ln -s libldap-2.4.so.2.11.7 libldap.so.2
+    ln -s libldap-2.4.so.2.11.7 libldap.so
+  )
 
   # Remove insecure RPATH
   chrpath -d opt/lsi/LSIStorageAuthority/bin/slp_deregister
@@ -64,11 +76,11 @@ package() {
   install -Dm644 "${srcdir}/lsi_lsa.service" usr/lib/systemd/system/lsi_lsa.service
 
   # LSA launcher
-  install -Dm755 ${srcdir}/lsa_launcher.sh opt/lsi/LSIStorageAuthority/bin/lsa_launcher.sh
+  install -Dm755 "${srcdir}/lsa_launcher.sh" opt/lsi/LSIStorageAuthority/bin/lsa_launcher.sh
 
   # 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_rev1.15.pdf" "usr/share/doc/${pkgname}/LSI_Storage_Authority_Software_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}/"*/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