rebuild

4 files changed, 18 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24defba9d25f..e349710a33b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Apr 28 01:52:58 UTC 2019
 pkgbase = lsi-openpegasus
 	pkgdesc = Openpegasus libs for LSI (Broadcom) Raid products
 	pkgver = 2.14.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.avagotech.com/products/server-storage
 	arch = x86_64
 	license = custom:TOG
@@ -13,6 +11,8 @@ pkgbase = lsi-openpegasus
 	makedepends = openslp
 	makedepends = setconf
 	depends = sqlite
+	depends = openssl
+	depends = libxcrypt
 	source = https://collaboration.opengroup.org/pegasus/documents/32572/pegasus-2.14.1.tar.gz
 	source = https://src.fedoraproject.org/rpms/tog-pegasus/raw/master/f/pegasus-2.7.0-PIE.patch
 	source = https://src.fedoraproject.org/rpms/tog-pegasus/raw/master/f/pegasus-2.9.0-no-rpath.patch
diff --git a/.gitignore b/.gitignore
index cb2c3284fc29..05c6d4d4c97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!lsi-openpegasus.install
diff --git a/PKGBUILD b/PKGBUILD
index 05809871c774..3ae437e4bd4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,15 @@
 
 pkgname=lsi-openpegasus
 pkgver=2.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Openpegasus libs for LSI (Broadcom) Raid products"
 arch=('x86_64')
 url='http://www.avagotech.com/products/server-storage'
 license=('custom:TOG')
-depends=('sqlite')
+depends=('sqlite'
+         'openssl'
+         'libxcrypt'
+         )
 makedepends=('icu'
              'openssl'
              'net-snmp'
@@ -58,15 +61,21 @@ prepare() {
   # set lib output directory
   setconf configure libbase lib
 
-  export PEGASUS_EXTRA_C_FLAGS="${CFLAGS}"
-  export PEGASUS_EXTRA_CXX_FLAGS="${CXXFLAGS}"
-  export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS="${LDFLAGS}"
+  # add missing z library
+  sed 's|lcrypt|& -lz|g' -i mak/config-linux.mak
 
-  ./configure
 }
 
 build() {
   cd pegasus
+
+  export PEGASUS_EXTRA_C_FLAGS="${CFLAGS} -Wall -Wno-unused -fno-strict-aliasing"
+  export PEGASUS_EXTRA_CXX_FLAGS="${PEGASUS_EXTRA_C_FLAGS} -std=c++14"
+  export PEGASUS_EXTRA_LINK_FLAGS="${LDFLAGS}"
+  export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS="-pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
+
+  ./configure
+
   make -f GNUmakefile
 }
 
diff --git a/lsi-openpegasus.install b/lsi-openpegasus.install
deleted file mode 100644
index 9432790cb1e7..000000000000
--- a/lsi-openpegasus.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  ldconfig &> /dev/null
-}
-
-post_upgrade() {
-  ldconfig &> /dev/null
-}
-
-
-post_remove() {
-  ldconfig &> /dev/null
-}