[med-svn] [fis-gtm] 01/01: Fix up changelog todos and build all three encryption plugins

[Amul Shah]

This is an automated email from the git hooks/post-receive script.

tuskentower-guest pushed a commit to branch master
in repository fis-gtm.

commit 433f480febad1e6192b032630fa09ebb4985fbb6
Author: Amul Shah <Amul.Shah at fisglobal.com>
Date:   Thu Sep 25 00:10:33 2014 -0400

    Fix up changelog todos and build all three encryption plugins
---
 debian/changelog                                  |  7 +--
 debian/patches/series                             |  1 +
 debian/patches/upstream_build_all_encryption_libs | 73 +++++++++++++++++++++++
 3 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3766b2d..5080319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,10 @@ fis-gtm (6.2-000-1) UNRELEASED; urgency=low
 
   * Import latest sources and update package version
   * Delete prior patches and incorporate -emeb_source 
-  * (todo) UTF-8 mode plugin directory must be a real directory
-  * (todo) include both gcrypt and openssl AES256CFB encryption plugins.
-    Currently only gcrypt is built
+  * Build all three encryption plugins: gcrypt AES2568CFB, OpenSSL AES256CFB,
+    OpenSSL BLOWFISH.
 
- -- Amul Shah <Amul.Shah at fisglobal.com>  Wed, 24 Sep 2014 00:03:47 -0400
+ -- Amul Shah <Amul.Shah at fisglobal.com>  Thu, 25 Sep 2014 00:06:31 -0400
 
 fis-gtm (6.1-000-1) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..13650ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 
+upstream_build_all_encryption_libs
diff --git a/debian/patches/upstream_build_all_encryption_libs b/debian/patches/upstream_build_all_encryption_libs
new file mode 100644
index 0000000..e61eb04
--- /dev/null
+++ b/debian/patches/upstream_build_all_encryption_libs
@@ -0,0 +1,73 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,8 +60,6 @@
+ set(gt_src_list)
+ set(sources_used "")
+ set(extralibs "")
+-set(GTMCRYPTLIB "GCRYPT")
+-set(GTMCRYPTALGO "AES256CFB")
+ message("--> OS = ${CMAKE_SYSTEM_NAME} / ARCH = ${CMAKE_SYSTEM_PROCESSOR}")
+ # Establish platform
+ # Except for Solaris, CMAKE_COMPILER_IS_GNUCC is true
+@@ -76,7 +74,6 @@
+ else()
+   message(FATAL_ERROR "--> OS = ${CMAKE_SYSTEM_NAME} / ARCH = ${CMAKE_SYSTEM_PROCESSOR}")
+ endif()
+-message("--> Encryption Library = ${GTMCRYPTLIB} / Algorithm = ${GTMCRYPTALGO}")
+ 
+ # Choose where to get bootstrap sources.
+ set(GTM_DIST "" CACHE PATH "Existing GT.M Distribution")
+@@ -461,14 +458,38 @@
+   set(TLS_LIBRARIES ${TLS_LIBRARIES} ${TLSLIB_${tlslib}})
+ endforeach()
+ 
+-add_library(libgtmcrypt MODULE ${libgtmcrypt_SOURCES})
+-set_target_properties(libgtmcrypt PROPERTIES
+-  OUTPUT_NAME gtmcrypt
+-  COMPILE_DEFINITIONS "USE_${GTMCRYPTLIB} -DUSE_${GTMCRYPTALGO}"
++# Building the three encryption libraries could by a loop of some sort, but
++# manually creating each target is way easier.
++
++# Library=GCRYPT Algorithm=AES256CFB
++add_library(libgtmcrypt_gcrypt_AES256CFB.so MODULE ${libgtmcrypt_SOURCES})
++set_target_properties(libgtmcrypt_gcrypt_AES256CFB.so PROPERTIES
++  OUTPUT_NAME gtmcrypt_gcrypt_AES256CFB
++  COMPILE_DEFINITIONS "USE_GCRYPT -DUSE_AES256CFB"
++  LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
++  )
++target_link_libraries(libgtmcrypt_gcrypt_AES256CFB.so ${GPG_LIBRARIES})
++install(TARGETS libgtmcrypt_gcrypt_AES256CFB.so DESTINATION ${GTM_INSTALL_DIR}/plugin)
++
++# Library=OPENSSL Algorithm=AES256CFB
++add_library(libgtmcrypt_openssl_AES256CFB MODULE ${libgtmcrypt_SOURCES})
++set_target_properties(libgtmcrypt_openssl_AES256CFB PROPERTIES
++  OUTPUT_NAME gtmcrypt_openssl_AES256CFB
++  COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_AES256CFB"
++  LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
++  )
++target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
++install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
++
++# Library=OPENSSL Algorithm=BLOWFISHCFB
++add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
++set_target_properties(libgtmcrypt_openssl_BLOWFISHCFB PROPERTIES
++  OUTPUT_NAME gtmcrypt_openssl_BLOWFISHCFB
++  COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_BLOWFISHCFB"
+   LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
+   )
+-target_link_libraries(libgtmcrypt ${GPG_LIBRARIES})
+-install(TARGETS libgtmcrypt DESTINATION ${GTM_INSTALL_DIR}/plugin)
++target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
++install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
+ 
+ add_library(libgtmtls MODULE ${libgtmtls_SOURCES})
+ set_target_properties(libgtmtls PROPERTIES
+@@ -482,7 +503,7 @@
+ add_executable(maskpass ${maskpass_SOURCES})
+ target_link_libraries(maskpass ${GPG_LIBRARIES} ${TLS_LIBRARIES})
+ set_target_properties(maskpass PROPERTIES
+-  COMPILE_DEFINITIONS "USE_${GTMCRYPTLIB} -DUSE_SYSLIB_FUNCS"
++  COMPILE_DEFINITIONS "USE_GCRYPT -DUSE_SYSLIB_FUNCS"
+   RUNTIME_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin/gtmcrypt
+   )
+ install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git