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 3e0ac10f4e65731de79441850e95f325c2247ca8 Author: Amul Shah <[email protected]> Date: Sun Jan 11 21:25:45 2015 -0500 Update package for V6.2-001 --- debian/changelog | 6 ++ debian/control | 4 +- debian/patches/series | 2 +- debian/patches/upstream_build_all_encryption_libs | 109 --------------------- .../upstream_donot_deploy_all_encryption_libs | 40 ++++++++ 5 files changed, 49 insertions(+), 112 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9bbf6ee..1dfeb68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fis-gtm (6.2-001-1) precise; urgency=low + + * Import latest sources and update package version + + -- Amul Shah <[email protected]> Sun, 11 Jan 2015 19:58:13 -0500 + fis-gtm (6.2-000-1) unstable; urgency=low * Import latest sources and update package version diff --git a/debian/control b/debian/control index 602b0ff..7286e2b 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Homepage: http://sourceforge.net/projects/fis-gtm Package: fis-gtm Architecture: all Depends: ${misc:Depends}, - fis-gtm-6.2-000 + fis-gtm-6.2-001 Provides: mumps Description: metapackage for the latest version of FIS-GT.M database GT.M is a database engine with scalability proven in large real-time @@ -61,7 +61,7 @@ Description: metapackage for the latest version of FIS-GT.M database . This metapackage always depends from the default fis-gtm version. -Package: fis-gtm-6.2-000 +Package: fis-gtm-6.2-001 Architecture: amd64 i386 Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, diff --git a/debian/patches/series b/debian/patches/series index 03d3f67..242d6e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ upstream_fix_speeling_errors -upstream_build_all_encryption_libs +upstream_donot_deploy_all_encryption_libs diff --git a/debian/patches/upstream_build_all_encryption_libs b/debian/patches/upstream_build_all_encryption_libs deleted file mode 100644 index 4d7f942..0000000 --- a/debian/patches/upstream_build_all_encryption_libs +++ /dev/null @@ -1,109 +0,0 @@ -From: Amul Shah <[email protected]> -Forwarded: not-needed -Summary: Build all encryption plugins and create default plugin symlink -Applied-Upstream: V6.2-001 -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: 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 -+++ 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,50 @@ - 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) -+ -+# Establish the default encryption link -+set(default_encr_link ${GTM_BINARY_DIR}/plugin/libgtmcrypt.so) -+set(default_encr_target libgtmcrypt_gcrypt_AES256CFB.so) -+add_custom_command( -+ OUTPUT ${default_encr_link} -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${default_encr_target}" "${default_encr_link}" -+ DEPENDS ${GTM_BINARY_DIR}/plugin/${default_encr_target} -+ 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) -+ -+# 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 -@@ -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 -- 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) -+#install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt) - - # Always copy files into the plugin directory - foreach(f diff --git a/debian/patches/upstream_donot_deploy_all_encryption_libs b/debian/patches/upstream_donot_deploy_all_encryption_libs new file mode 100644 index 0000000..1ea92aa --- /dev/null +++ b/debian/patches/upstream_donot_deploy_all_encryption_libs @@ -0,0 +1,40 @@ +From: Amul Shah <[email protected]> +Forwarded: not-needed +Summary: Do not deploy the encryption libraries that require OpenSSL +Description: 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. Upstream will pursue + alternate encryption libraries, but there are no plans for this at the + moment. +Last-Update: 2015-01-11 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -491,7 +491,7 @@ + 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) ++#install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin) + + # Library=OPENSSL Algorithm=BLOWFISHCFB + add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES}) +@@ -501,7 +501,7 @@ + LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin + ) + target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES}) +-install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin) ++#install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin) + + add_library(libgtmtls MODULE ${libgtmtls_SOURCES}) + set_target_properties(libgtmtls PROPERTIES +@@ -510,7 +510,7 @@ + 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}) -- 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
