[med-svn] [fis-gtm] 01/01: Do not install the reference 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 1b25b24d20b5ac795e80f1564f1421514092b692
Author: Amul Shah <Amul.Shah at fisglobal.com>
Date:   Tue Oct 7 20:16:23 2014 -0400

    Do not install the reference encryption plugins
---
 debian/patches/upstream_build_all_encryption_libs | 61 +++++++++++++----------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/debian/patches/upstream_build_all_encryption_libs b/debian/patches/upstream_build_all_encryption_libs
index a333826..4d7f942 100644
--- a/debian/patches/upstream_build_all_encryption_libs
+++ b/debian/patches/upstream_build_all_encryption_libs
@@ -6,9 +6,10 @@ Description: The upstream V6.2-000 CMakeLists.txt file built only one of three
   possible encryption plugin libraries. This meant that the debian fis-gtm
   package was missing a core piece of the distributed binaries. Upstream will
   apply this change to the next release after internal review.
-  UPDATE: Do not build the reference encryption plugins because dynamically
-  linking to OpenSSL creates a licensing conflict between OpenSSL's license and
-  the AGPL.
+  UPDATE: Build, but do not install the reference encryption plugins due to
+  licensing conflicts between the AGPL and the OpenSSL license. Reference
+  plugins are built simply to ensure that they could compile on the target
+  system provided the correct libraries are installed.
 Last-Update: 2014-10-04
 
 --- a/CMakeLists.txt
@@ -46,12 +47,10 @@ Last-Update: 2014-10-04
 +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 ${GPG_LIBRARIES})
--install(TARGETS libgtmcrypt DESTINATION ${GTM_INSTALL_DIR}/plugin)
++  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)
++#install(TARGETS libgtmcrypt_gcrypt_AES256CFB.so DESTINATION ${GTM_INSTALL_DIR}/plugin)
 +
 +# Establish the default encryption link
 +set(default_encr_link   ${GTM_BINARY_DIR}/plugin/libgtmcrypt.so)
@@ -63,31 +62,39 @@ Last-Update: 2014-10-04
 +	COMMENT "Generating default_encr symbolic link"
 +	)
 +add_custom_target(install_default_encr ALL DEPENDS ${default_encr_link})
-+install(FILES ${default_encr_link} DESTINATION ${GTM_INSTALL_DIR}/plugin)
++#install(FILES ${default_encr_link} 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})
++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_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
++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 +515,7 @@
+@@ -477,15 +510,15 @@
+   LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
+   )
+ target_link_libraries(libgtmtls ${TLS_LIBRARIES})
+-install(TARGETS libgtmtls DESTINATION ${GTM_INSTALL_DIR}/plugin)
++#install(TARGETS libgtmtls DESTINATION ${GTM_INSTALL_DIR}/plugin)
+ 
  add_executable(maskpass ${maskpass_SOURCES})
  target_link_libraries(maskpass ${GPG_LIBRARIES} ${TLS_LIBRARIES})
  set_target_properties(maskpass PROPERTIES
@@ -95,4 +102,8 @@ Last-Update: 2014-10-04
 +  COMPILE_DEFINITIONS "USE_GCRYPT -DUSE_SYSLIB_FUNCS"
    RUNTIME_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin/gtmcrypt
    )
- install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)
+-install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)
++#install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)
+ 
+ # Always copy files into the plugin directory
+ foreach(f

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