Use external libldap24 [AUR]

2 files changed, 12 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df136f029b5a..f6f0ec23c3de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = lsi-lsa
 	pkgdesc = LSI Storage Authority Software Suite
 	pkgver = 007.019.006.000
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.broadcom.com/products/storage
 	install = lsi-lsa.install
 	arch = x86_64
-	license = custom:LSI
+	license = custom:Broadcom
 	makedepends = patchelf
 	depends = openslp
 	depends = lsi-openpegasus
 	depends = curl
 	depends = perl
 	depends = libcrypt.so=1
+	depends = libldap24
 	options = !strip
 	backup = opt/lsi/LSIStorageAuthority/installtype
 	backup = opt/lsi/LSIStorageAuthority/conf/LSA.conf
@@ -21,13 +22,11 @@ pkgbase = lsi-lsa
 	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.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
+	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
 	sha256sums = 5196f542b52457abb94bce4e069005543a7e748270b7b673e5afa669e7af2e03
 	sha256sums = edb87a322a06afb7c78058132f648123325fc633db2df4d062a127f5ed9f465a
 	sha256sums = 5d65b855b7d38192ef8fd0ce34cab567efd5f9af922c080876a10e96a62b0b17
 	sha256sums = 1df03403bc1d780797f0eba59d85b1941a1c77f911d9e7d5d5ae4f288e52663a
 	sha256sums = d0cfca9e144b12b8c5886f7d975546fe7e1ca13573f62d80f721363397e3b5dd
-	sha256sums = 8589d6d7ba2c2890961ac5a28b664bc4a066cc00b19f22ee0af792f0d9ed182c
 
 pkgname = lsi-lsa
diff --git a/PKGBUILD b/PKGBUILD
index c33e6963cb75..145c46b48927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,17 @@
 
 pkgname=lsi-lsa
 pkgver=007.019.006.000
-pkgrel=4
+pkgrel=5
 pkgdesc="LSI Storage Authority Software Suite"
 arch=('x86_64')
 url='https://www.broadcom.com/products/storage'
-license=('custom:LSI')
+license=('custom:Broadcom')
 depends=('openslp'
          'lsi-openpegasus'
          'curl'
          'perl'
          'libcrypt.so=1'
+         'libldap24'
          )
 makedepends=('patchelf')
 DLAGENTS=('https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -b "agreement=true" -o %o %u')
@@ -19,15 +20,13 @@ source=('LSI_Storage_Authority_Lightweight_Monitor_User_Guide_rev1.0.pdf::https:
         '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'
+        "${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'
             '5d65b855b7d38192ef8fd0ce34cab567efd5f9af922c080876a10e96a62b0b17'
             '1df03403bc1d780797f0eba59d85b1941a1c77f911d9e7d5d5ae4f288e52663a'
             'd0cfca9e144b12b8c5886f7d975546fe7e1ca13573f62d80f721363397e3b5dd'
-            '8589d6d7ba2c2890961ac5a28b664bc4a066cc00b19f22ee0af792f0d9ed182c'
             )
 install=lsi-lsa.install
 backup=('opt/lsi/LSIStorageAuthority/installtype'
@@ -62,16 +61,10 @@ package() {
          opt/lsi/LSIStorageAuthority/bin/*peg*.so* \
          opt/lsi/LSIStorageAuthority/bin/libcurl*
 
-  # LSA needs ldap 2.4x
-  install -Dm755 "${srcdir}/usr/lib/libldap-2.4.so.2.11.7" opt/lsi/LSIStorageAuthority/bin/libldap-2.4.so.2
-  install -Dm755 "${srcdir}/usr/lib/libldap_r-2.4.so.2.11.7" opt/lsi/LSIStorageAuthority/bin/libldap_r-2.4.so.2
-  install -Dm755 "${srcdir}/usr/lib/liblber-2.4.so.2.11.7" opt/lsi/LSIStorageAuthority/bin/liblber-2.4.so.2
-
   # Set RPATH
   patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/bin/libpluginmanager.so
   patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/bin/libhttpcgi.so
   patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/bin/libutility.so
-  patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/bin/libldap-2.4.so.2
   patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/bin/slp_deregister
   patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/bin/LSA
   patchelf --set-rpath /opt/lsi/LSIStorageAuthority/bin opt/lsi/LSIStorageAuthority/plugins/libcacheinit.so
@@ -104,6 +97,10 @@ package() {
   # Setup type
   echo gateway > opt/lsi/LSIStorageAuthority/installtype
 
+  # Install licenses
+  install -d "usr/share/licenses/${pkgname}/"
+  cat "${srcdir}/x64/install.sh" | sed -n '22,72p' | sed -e 's|echo "||g' -e 's|^"||g' -e 's| "$||g' -e 's|"$||g' > "usr/share/licenses/${pkgname}/LICENSE"
+
   # Create soname links
   _create_links
 }