[med-svn] [fis-gtm] 01/01: Fix #828300 fis-gtm: FTBFS with openssl 1.1.0

[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 8139f966588b0559fec01724c4656764f15fcdd5
Author: Amul Shah <amul.shah at fisglobal.com>
Date:   Thu Oct 27 22:18:04 2016 -0400

    Fix #828300 fis-gtm: FTBFS with openssl 1.1.0
    
    Even though fis-gtm does not include the encryption plugin libraries in the
    debian package, the build scripts perform a build test. It is this build test
    that failed with the below errors.
    
    To work-around the bug in the summary, we have temporarily disabled the build
    of the encryption plugins. The test build will be re-enabled once a fix is
    found.
    
    Build errors:
      make -f CMakeFiles/libdbcertify.dir/build.make CMakeFiles/libdbcertify.dir/build
      [  3%] Building C object CMakeFiles/libgtmcrypt_gcrypt_AES256CFB.so.dir/sr_unix/gtmcrypt_pk_ref.c.o
      /usr/bin/cc  -DUSE_GCRYPT -DUSE_AES256CFB -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE=600 -Dlibgtmcrypt_gcrypt_AES256CFB_so_EXPORTS -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/gen -I/<<PKGBUILDDIR>>/sr_linux -I/<<PKGBUILDDIR>>/sr_x86_64 -I/<<PKGBUILDDIR>>/sr_x86_regs -I/<<PKGBUILDDIR>>/sr_unix_gnp -I/<<PKGBUILDDIR>>/sr_unix_cm -I/<<PKGBUILDDIR>>/sr_unix -I/<<PKGBUILDDIR>>/sr_port_cm -I/<<PKGBUILDDIR>>/sr_port -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/usr/ [...]
      Scanning dependencies of target liblke
      make[3]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
      make -f CMakeFiles/liblke.dir/build.make CMakeFiles/liblke.dir/build
      make[3]: Entering directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
      make[3]: Entering directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
      In file included from /<<PKGBUILDDIR>>/sr_unix/gtmcrypt_ref.c:37:0:
      /<<PKGBUILDDIR>>/sr_unix/gtmcrypt_dbk_ref.h:105:18: error: field 'handle' has incomplete type
        crypt_key_t     handle;    /* Encryption / decryption state. */
                        ^
      In file included from /<<PKGBUILDDIR>>/sr_unix/gtm_tls_impl.c:34:0:
      /<<PKGBUILDDIR>>/sr_unix/gtm_tls_impl.c: In function 'gtm_tls_get_conn_info':
      /<<PKGBUILDDIR>>/sr_unix/gtm_tls_impl.c:1678:89: error: dereferencing pointer to incomplete type 'EVP_PKEY {aka struct evp_pkey_st}'
           SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s", OBJ_nid2ln(pubkey->type));
                                                                                               ^
      /<<PKGBUILDDIR>>/sr_unix/gtmcrypt_util.h:99:27: note: in definition of macro 'SNPRINTF'
         rc = snprintf(SRC, LEN, __VA_ARGS__); /* BYPASSOK */  \
                                 ^
---
 debian/changelog                                   |  8 +++++++
 .../upstream_donot_deploy_all_encryption_libs      | 25 ++++++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f5631d..e85662c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fis-gtm (6.3-000-3) unstable; urgency=medium
+
+  [ Amul Shah ]
+  * Temporarily drop encryption plugin test builds
+    Closes: #828300
+
+ -- Amul Shah <Amul.Shah at fisglobal.com>  Thu, 27 Oct 2016 22:04:43 -0400
+
 fis-gtm (6.3-000-2) unstable; urgency=medium
 
   [ Amul Shah ]
diff --git a/debian/patches/upstream_donot_deploy_all_encryption_libs b/debian/patches/upstream_donot_deploy_all_encryption_libs
index ae43f7b..fc98ae5 100644
--- a/debian/patches/upstream_donot_deploy_all_encryption_libs
+++ b/debian/patches/upstream_donot_deploy_all_encryption_libs
@@ -11,7 +11,16 @@ Last-Update: 2015-01-11
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -519,7 +519,7 @@
+@@ -467,6 +467,8 @@
+ add_dependencies(libgtmshr gen_export)
+ add_dependencies(mumps libgtmshr)
+ 
++# FIXME: Temporarily disable building of encryption plugin libraries
++if (0) 
+ # Iterate over the list of GPG related libraries
+ foreach(gpglib gpg-error gpgme gcrypt config)
+   # For each library, we need a new CMake variable, hence GPGLIB_${gpglib}
+@@ -519,7 +521,7 @@
    )
  target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
  add_dependencies(libgtmcrypt_openssl_AES256CFB gen_gtm_threadgbl_deftypes)
@@ -20,7 +29,7 @@ Last-Update: 2015-01-11
  
  # Library=OPENSSL Algorithm=BLOWFISHCFB
  add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
-@@ -530,7 +530,7 @@
+@@ -530,7 +532,7 @@
    )
  target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
  add_dependencies(libgtmcrypt_openssl_BLOWFISHCFB gen_gtm_threadgbl_deftypes)
@@ -29,7 +38,7 @@ Last-Update: 2015-01-11
  
  add_library(libgtmtls MODULE ${libgtmtls_SOURCES})
  set_target_properties(libgtmtls PROPERTIES
-@@ -540,7 +540,7 @@
+@@ -540,7 +542,7 @@
    )
  target_link_libraries(libgtmtls ${TLS_LIBRARIES})
  add_dependencies(libgtmtls gen_gtm_threadgbl_deftypes)
@@ -38,7 +47,15 @@ Last-Update: 2015-01-11
  
  add_executable(maskpass ${maskpass_SOURCES})
  target_link_libraries(maskpass ${GPG_LIBRARIES} ${TLS_LIBRARIES})
-@@ -768,14 +768,14 @@
+@@ -549,6 +551,7 @@
+   RUNTIME_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin/gtmcrypt
+   )
+ install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)
++endif(0)
+ 
+ # Always copy files into the plugin directory
+ foreach(f
+@@ -768,14 +771,14 @@
    STRING(REGEX REPLACE "\n" ";" locale_list "${locale_list}")
    foreach(lc ${locale_list})
      string(TOLOWER "${lc}" lc_lower)

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