Fixed new issue with cmake targeting incorrect openssl lib

3 files changed, 22 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20647c65e527..64908681b19c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bro-git
 	pkgdesc = A powerful framework for network analysis and security monitoring. (IDS Intrusion Detection System)
-	pkgver = 2.5.r365.g7c03f4dec
+	pkgver = 2.5.r569.g057c982b9
 	pkgrel = 1
 	url = https://www.bro.org
 	arch = i686
@@ -28,7 +28,9 @@ pkgbase = bro-git
 	backup = etc/bro/node.cfg
 	backup = etc/bro/broccoli.conf
 	source = bro-git::git+https://github.com/bro/bro.git
+	source = cmake_OpenSSLTests.patch
 	md5sums = SKIP
+	md5sums = c0bd228adfa3d34cb7e6623467f62502
 
 pkgname = bro-git
 
diff --git a/PKGBUILD b/PKGBUILD
index eead2c3f35de..8bd0b6aca501 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Aaron McDaniel (mcd1992) <'aur' at the domain 'fgthou.se'>
 
 pkgname=bro-git
-pkgver=2.5.r365.g7c03f4dec
+pkgver=2.5.r569.g057c982b9
 pkgrel=1
 pkgdesc='A powerful framework for network analysis and security monitoring. (IDS Intrusion Detection System)'
 url='https://www.bro.org'
@@ -11,8 +11,8 @@ makedepends=('git' 'fakeroot' 'cmake' 'make' 'flex' 'bison' 'swig')
 depends=('bash' 'libpcap' 'openssl-1.0' 'zlib' 'python')
 optdepends=('geoip' 'gperftools' 'sendmail' 'curl' 'actor-framework')
 backup=('etc/bro/broctl.cfg' 'etc/bro/networks.cfg' 'etc/bro/node.cfg' 'etc/bro/broccoli.conf')
-source=("${pkgname}::git+https://github.com/bro/bro.git")
-md5sums=('SKIP')
+source=("${pkgname}::git+https://github.com/bro/bro.git" 'cmake_OpenSSLTests.patch')
+md5sums=('SKIP' 'c0bd228adfa3d34cb7e6623467f62502')
 
 pkgver() {
   cd ${pkgname}
@@ -26,11 +26,13 @@ prepare() {
   # Update submodules
   git submodule update --init --recursive
 
+  # Change the cmake/OpenSSLTests.cmake file to bypass targeting the wrong library version...
+  patch -N -p1 -i "${srcdir}/cmake_OpenSSLTests.patch" || true
+
   # Create Makefiles
-  ./configure --prefix=/usr --spooldir=/var/spool/bro --logdir=/var/log/bro --conf-files-dir=/etc/bro
+  ./configure --prefix=/usr --spooldir=/var/spool/bro --logdir=/var/log/bro --conf-files-dir=/etc/bro --with-openssl=/usr/include/openssl-1.0
 
   # Temporary fix until openssl-1.1 is supported
-  # (Does this fix break i686 builds?)
   sed -i 's/^OPENSSL_CRYPTO_LIBRARY.*/OPENSSL_CRYPTO_LIBRARY:FILEPATH=\/usr\/lib\/openssl-1.0\/libcrypto.so/' build/CMakeCache.txt
   sed -i 's/^OPENSSL_INCLUDE_DIR.*/OPENSSL_INCLUDE_DIR:PATH=\/usr\/include\/openssl-1.0/' build/CMakeCache.txt
   sed -i 's/^OPENSSL_SSL_LIBRARY.*/OPENSSL_SSL_LIBRARY:FILEPATH=\/usr\/lib\/openssl-1.0\/libssl.so/' build/CMakeCache.txt
diff --git a/cmake_OpenSSLTests.patch b/cmake_OpenSSLTests.patch
new file mode 100644
index 000000000000..89b030d6e4da
--- /dev/null
+++ b/cmake_OpenSSLTests.patch
@@ -0,0 +1,12 @@
+diff -ura bro-git/cmake/OpenSSLTests.cmake bro-git.patched/cmake/OpenSSLTests.cmake
+--- bro-git/cmake/OpenSSLTests.cmake	2018-05-14 13:57:32.724543674 -0500
++++ bro-git.patched/cmake/OpenSSLTests.cmake	2018-05-14 13:58:36.355861923 -0500
+@@ -81,7 +81,7 @@
+     " OPENSSL_CORRECT_VERSION_NUMBER )
+ 
+     if (NOT OPENSSL_CORRECT_VERSION_NUMBER)
+-        message(FATAL_ERROR
++        message(WARNING
+             "OpenSSL library version does not match headers")
+     endif ()
+ endif ()