rebus pushed to openvas-scanner (master). "Try to take the gcrypt checking part from openvas-manager where it works fine"

[notifications at fedoraproject.org]

From e5afef4566ec91c9da0a9c8e6abf423a7ab3eb28 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus at seznam.cz>
Date: Fri, 29 May 2015 03:42:14 +0200
Subject: Try to take the gcrypt checking part from openvas-manager where it
 works fine


diff --git a/openvas-scanner-gcrypt.patch b/openvas-scanner-gcrypt.patch
new file mode 100644
index 0000000..64fb5ef
--- /dev/null
+++ b/openvas-scanner-gcrypt.patch
@@ -0,0 +1,30 @@
+diff -ru openvas-scanner-5.0.3/CMakeLists.txt openvas-scanner-5.0.3.new/CMakeLists.txt
+--- openvas-scanner-5.0.3/CMakeLists.txt	2015-05-26 19:05:39.301421866 +0200
++++ openvas-scanner-5.0.3.new/CMakeLists.txt	2015-05-29 03:36:21.769126834 +0200
+@@ -196,18 +196,18 @@
+ pkg_check_modules (GLIB REQUIRED glib-2.0>=2.16)
+ 
+ message (STATUS "Looking for libgcrypt...")
+-find_library (GCRYPT gcrypt)
+-if (NOT GCRYPT)
++find_library (LIBGCRYPT gcrypt)
++if (NOT LIBGCRYPT)
+   message (SEND_ERROR "The libgcrypt library is required.")
+-else (NOT GCRYPT)
+-  message (STATUS "Looking for libgcrypt... ${GCRYPT}")
+-  execute_process (COMMAND libgcrypt-config --libs
+-    OUTPUT_VARIABLE GCRYPT_LDFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
++else (NOT LIBGCRYPT)
++  message (STATUS "Looking for libgcrypt... ${LIBGCRYPT}")
+   execute_process (COMMAND libgcrypt-config --cflags
+     OUTPUT_VARIABLE GCRYPT_CFLAGS
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif (NOT GCRYPT)
++  execute_process (COMMAND libgcrypt-config --libs
++    OUTPUT_VARIABLE GCRYPT_LDFLAGS
++    OUTPUT_STRIP_TRAILING_WHITESPACE)
++endif (NOT LIBGCRYPT)
+ 
+ ## Version
+ 
diff --git a/openvas-scanner.spec b/openvas-scanner.spec
index 9f8adbc..c63486c 100644
--- a/openvas-scanner.spec
+++ b/openvas-scanner.spec
@@ -38,6 +38,10 @@ Patch3:		openvas-scanner-rulesdir.patch
 # Replace _BSD_SOURCE and _SVID_SOURCE with _DEFAULT_SOURCE otherwise build fails with Werror
 Patch4:		openvas-scanner-bsdsource.patch
 
+# Build on FC23 fails because not able to find the libgcrypt
+Patch5:		openvas-scanner-gcrypt.patch
+
+
 BuildRequires:	openvas-libraries-devel >= 7.0
 BuildRequires:	cmake >= 2.6.0
 BuildRequires:	glib2-devel
@@ -102,6 +106,8 @@ Scanner module for the Open Vulnerability Assessment System (OpenVAS).
 #%patch4 -p 1 -b .bsdsource
 #%endif
 
+%patch5 -p 1 -b .gcrypt
+
 for i in CHANGES ChangeLog; do
 	iconv -f iso8859-1 -t utf-8 $i > $i.utf8 && \
 	touch -r $i $i.utf8 && \
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openvas-scanner.git/commit/?h=master&id=e5afef4566ec91c9da0a9c8e6abf423a7ab3eb28