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 929390981b2c28686415af8d01767b0eddc65bd7 Author: Amul Shah <[email protected]> Date: Thu Sep 4 22:37:15 2014 -0400 Add patches that enable building the encryption plugins --- debian/patches/series | 2 + .../upstream_backport_build_encryption_plugin | 138 +++++++++++++++++++++ .../upstream_backport_encryption_build_fixes | 30 +++++ 3 files changed, 170 insertions(+) diff --git a/debian/patches/series b/debian/patches/series index 3d69340..804ac08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,5 @@ up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR upstream_backport_i586_default_32bit_linux upstream_backport_README_change +upstream_backport_encryption_build_fixes +upstream_backport_build_encryption_plugin diff --git a/debian/patches/upstream_backport_build_encryption_plugin b/debian/patches/upstream_backport_build_encryption_plugin new file mode 100644 index 0000000..11e5839 --- /dev/null +++ b/debian/patches/upstream_backport_build_encryption_plugin @@ -0,0 +1,138 @@ +The CMakeLists.txt in the V6.1-000 source release did not build the encryption plugins. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,8 +57,8 @@ + set(gt_src_list) + set(sources_used "") + set(extralibs "") +-# Disable encryption for the time being. Need to change this to invoke the gtmcrypt Makefile AS 2013.12.18 +-set(is_encryption_supported 0) ++set(GTMCRYPTLIB "GCRYPT") ++set(GTMCRYPTALGO "AES256CFB") + set(libmumpsrestoreregex "") + message("--> OS = ${CMAKE_SYSTEM_NAME} / ARCH = ${CMAKE_SYSTEM_PROCESSOR}") + # Establish platform +@@ -74,6 +74,7 @@ + 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") +@@ -221,9 +222,8 @@ + set_source_list(gtcm_shmclean gtcm_shmclean) + set_source_list(gtmsecshr gtmsecshr_wrapper) + set_source_list(gtmsecshr_real gtmsecshr) +-set_source_list(libgtmcrypt gtmcrypt_ref gtmcrypt_pk_ref gtmcrypt_dbk_ref gtmcrypt_sym_ref) +-set_source_list(libgtmtls gtm_tls_impl) +-set_source_list(libgtmcryptutil gtmcrypt_util) ++set_source_list(libgtmcrypt gtmcrypt_ref gtmcrypt_pk_ref gtmcrypt_dbk_ref gtmcrypt_sym_ref gtmcrypt_util) ++set_source_list(libgtmtls gtm_tls_impl gtmcrypt_util) + set_source_list(libgtmshr gtm_main) + set_source_list(lke lke lke_cmd) + set_source_list(maskpass maskpass gtmcrypt_util) +@@ -386,7 +386,7 @@ + endforeach() + + # TODO: find_package or find_library for system libs? +-include_directories ("/usr/local/include") ++include_directories (/usr/local/include) + target_link_libraries(libmumps ${libmumpslibs}) + + add_executable(mumps ${mumps_SOURCES}) +@@ -466,57 +466,47 @@ + add_dependencies(libgtmshr gen_export) + add_dependencies(mumps libgtmshr) + +-if(is_encryption_supported) +- # Iterate over the list of GPG related libraries +- foreach(gpglib gpg-error gpgme gcrypt) +- # For each library, we need a new CMake variable, hence GPGLIB_${gpglib} +- find_library(GPGLIB_${gpglib} NAME ${gpglib} PATHS ${CMAKE_LIBRARY_PATH}) +- # Append the found library to the list +- set(GPG_LIBRARIES ${GPG_LIBRARIES} ${GPGLIB_${gpglib}}) +- endforeach() +- +- # Iterate over the list of SSL related libraries +- foreach(ssl) +- # For each library, we need a new CMake variable, hence TLSLIB_${tlslib} +- find_library(TLSLIB_${tlslib} NAME ${tlslib} PATHS ${CMAKE_LIBRARY_PATH}) +- # Append the found library to the list +- set(TLS_LIBRARIES ${TLS_LIBRARIES} ${TLSLIB_${tlslib}}) +- endforeach() ++# 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} ++ find_library(GPGLIB_${gpglib} NAME ${gpglib} PATHS ${CMAKE_LIBRARY_PATH}) ++ # Append the found library to the list ++ set(GPG_LIBRARIES ${GPG_LIBRARIES} ${GPGLIB_${gpglib}}) ++endforeach() + +- add_library(libgtmcrypt MODULE ${libgtmcrypt_SOURCES}) +- set_target_properties(libgtmcrypt PROPERTIES +- OUTPUT_NAME gtmcrypt +- 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) ++# Iterate over the list of GPG related libraries ++foreach(lib ssl crypto config) ++ # For each library, we need a new CMake variable, hence SSLLIB_${lib} ++ find_library(SSLLIB_${lib} NAME ${lib} PATHS ${CMAKE_LIBRARY_PATH}) ++ # Append the found library to the list ++ set(SSL_LIBRARIES ${SSL_LIBRARIES} ${SSLLIB_${lib}}) ++endforeach() + +- add_library(libgtmtls MODULE ${libgtmtls_SOURCES}) +- set_target_properties(libgtmtls PROPERTIES +- OUTPUT_NAME gtmtls +- LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin +- ) +- target_link_libraries(libgtmtls ${TLS_LIBRARIES}) +- install(TARGETS libgtmtls DESTINATION ${GTM_INSTALL_DIR}/plugin) ++add_library(libgtmcrypt MODULE ${libgtmcrypt_SOURCES}) ++set_target_properties(libgtmcrypt PROPERTIES ++ OUTPUT_NAME gtmcrypt ++ COMPILE_DEFINITIONS "USE_${GTMCRYPTLIB} -DUSE_${GTMCRYPTALGO}" ++ LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin ++ ) ++target_link_libraries(libgtmcrypt ${GPG_LIBRARIES}) ++install(TARGETS libgtmcrypt DESTINATION ${GTM_INSTALL_DIR}/plugin) + +- add_library(libgtmcryptutil MODULE ${libgtmcryptutil_SOURCES}) +- set_target_properties(libgtmcryptutil PROPERTIES +- OUTPUT_NAME gtmcryptutil +- COMPILE_DEFINITIONS "USE_GCRYPT -DUSE_AES256CFB" +- LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin +- ) +- target_link_libraries(libgtmcryptutil ${GPG_LIBRARIES}) +- install(TARGETS libgtmcryptutil DESTINATION ${GTM_INSTALL_DIR}/plugin) ++add_library(libgtmtls MODULE ${libgtmtls_SOURCES}) ++set_target_properties(libgtmtls PROPERTIES ++ OUTPUT_NAME gtmtls ++ COMPILE_DEFINITIONS "USE_OPENSSL" ++ LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin ++ ) ++target_link_libraries(libgtmtls ${SSL_LIBRARIES}) ++install(TARGETS libgtmtls DESTINATION ${GTM_INSTALL_DIR}/plugin) + +- add_executable(maskpass ${maskpass_SOURCES}) +- target_link_libraries(maskpass ${GPG_LIBRARIES}) +- set_target_properties(maskpass PROPERTIES +- COMPILE_DEFINITIONS "USE_GCRYPT -DUSE_SYSLIB_FUNCS" +- RUNTIME_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin/gtmcrypt +- ) +- install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt) +-endif() ++add_executable(maskpass ${maskpass_SOURCES}) ++target_link_libraries(maskpass ${GPG_LIBRARIES} ${SSL_LIBRARIES}) ++set_target_properties(maskpass PROPERTIES ++ COMPILE_DEFINITIONS "USE_${GTMCRYPTLIB} -DUSE_SYSLIB_FUNCS" ++ RUNTIME_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin/gtmcrypt ++ ) ++install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt) + + # Always copy files into the plugin directory + foreach(f diff --git a/debian/patches/upstream_backport_encryption_build_fixes b/debian/patches/upstream_backport_encryption_build_fixes new file mode 100644 index 0000000..483551a --- /dev/null +++ b/debian/patches/upstream_backport_encryption_build_fixes @@ -0,0 +1,30 @@ +Encryption plugin Makefile.mk needed some extra library paths to build on all platforms. + +Fix an undefined symbol problem when building a release encryption plugin. +--- a/sr_unix/Makefile.mk ++++ b/sr_unix/Makefile.mk +@@ -133,9 +133,11 @@ + # Common header and library paths + IFLAGS += -I /usr/local/ssl/include -I /usr/local/include -I /usr/include -I $(gtm_dist) -I $(CURDIR) + ifeq ($(BIT64),0) +- LIBFLAGS += -L /usr/local/ssl/lib -L /usr/local/lib64 -L /usr/local/lib -L /usr/lib64 -L /usr/lib -L /lib64 -L /lib -L `pwd` ++ LIBFLAGS += -L /usr/local/ssl/lib -L /usr/lib/x86_64-linux-gnu -L /usr/local/lib64 ++ LIBFLAGS += -L /usr/local/lib -L /usr/lib64 -L /usr/lib -L /lib64 -L /lib -L `pwd` + else +- LIBFLAGS += -L /usr/local/ssl/lib -L /usr/local/lib32 -L /usr/local/lib -L /usr/lib32 -L /usr/lib -L /lib32 -L /lib -L `pwd` ++ LIBFLAGS += -L /usr/local/ssl/lib -L /usr/lib/x86-linux-gnu -L /usr/local/lib32 ++ LIBFLAGS += -L /usr/local/lib -L /usr/lib32 -L /usr/lib -L /lib32 -L /lib -L `pwd` + endif + + CFLAGS += $(IFLAGS) +--- a/sr_unix/gtm_tls_impl.h ++++ b/sr_unix/gtm_tls_impl.h +@@ -48,7 +48,7 @@ + #define DBG_VERIFY_AUTORETRY_SET(TLS_DESC) assert(SSL_MODE_AUTO_RETRY & SSL_CTX_get_mode((SSL_CTX *)TLS_DESC)); + + #else +-#define DBG_VERIFY_SOCK_IS_NONBLOCKING(SOCKFD) ++#define DBG_VERIFY_SOCK_IS_BLOCKING(SOCKFD) + #define DBG_VERIFY_AUTORETRY_SET(TLS_DESC) + #endif + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
