[med-svn] [fis-gtm] 02/02: Update for fis-gtm V6.3-001A and remove patches that have been fixed in the upstream
Amul Shah
tuskentower-guest at moszumanska.debian.org
Fri Aug 11 11:15:12 UTC 2017
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 aba3fc7223a6c4227b69c62c542ee66359f4103a
Author: Amul Shah <amul.shah at fisglobal.com>
Date: Fri Aug 11 06:47:01 2017 -0400
Update for fis-gtm V6.3-001A and remove patches that have been fixed in the upstream
---
debian/changelog | 7 +
debian/control | 4 +-
debian/patches/series | 2 -
.../upstream_donot_deploy_all_encryption_libs | 13 +-
.../upstream_encryption_libs_openssl110_compatible | 154 ---------------------
debian/patches/upstream_fix_locale_setting_error | 21 ---
6 files changed, 11 insertions(+), 190 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a4a2bf..259ef05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fis-gtm (6.3-001A-1) UNRELEASED; urgency=medium
+
+ [ Amul Shah ]
+ * Update to fis-gtm V6.3-001A
+
+ -- Amul Shah <Amul.Shah at fisglobal.com> Fri, 11 Aug 2017 06:44:33 -0400
+
fis-gtm (6.3-000A-1) unstable; urgency=low
[ Amul Shah ]
diff --git a/debian/control b/debian/control
index c3a875e..9a40654 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Homepage: http://sourceforge.net/projects/fis-gtm
Package: fis-gtm
Architecture: all
Depends: ${misc:Depends},
- fis-gtm-6.3-000a
+ fis-gtm-6.3-001a
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
@@ -62,7 +62,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.3-000a
+Package: fis-gtm-6.3-001a
Architecture: amd64 i386
Multi-Arch: same
Depends: ${shlibs:Depends},
diff --git a/debian/patches/series b/debian/patches/series
index e6023c4..22560c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
upstream_disable_autorelink
upstream_donot_deploy_all_encryption_libs
-upstream_fix_locale_setting_error
-upstream_encryption_libs_openssl110_compatible
diff --git a/debian/patches/upstream_donot_deploy_all_encryption_libs b/debian/patches/upstream_donot_deploy_all_encryption_libs
index ee2cf26..4279656 100644
--- a/debian/patches/upstream_donot_deploy_all_encryption_libs
+++ b/debian/patches/upstream_donot_deploy_all_encryption_libs
@@ -18,18 +18,9 @@ Last-Update: 2015-01-11
-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})
-@@ -530,7 +530,7 @@
- )
- target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
- add_dependencies(libgtmcrypt_openssl_BLOWFISHCFB gen_gtm_threadgbl_deftypes)
--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
-@@ -540,7 +540,7 @@
+@@ -529,7 +529,7 @@
)
target_link_libraries(libgtmtls ${TLS_LIBRARIES})
add_dependencies(libgtmtls gen_gtm_threadgbl_deftypes)
@@ -40,7 +31,7 @@ Last-Update: 2015-01-11
target_link_libraries(maskpass ${GPG_LIBRARIES} ${TLS_LIBRARIES})
--- a/sr_unix/configure.gtc
+++ b/sr_unix/configure.gtc
-@@ -544,6 +544,7 @@
+@@ -507,6 +507,7 @@
chmod 0644 $gtmdist/$plugin_gtmcrypt/source.tar
chown ${owner}:${bingroup} $gtmdist/$plugin_gtmcrypt/source.tar
rm $plugin_gtmcrypt/README
diff --git a/debian/patches/upstream_encryption_libs_openssl110_compatible b/debian/patches/upstream_encryption_libs_openssl110_compatible
deleted file mode 100644
index eee1492..0000000
--- a/debian/patches/upstream_encryption_libs_openssl110_compatible
+++ /dev/null
@@ -1,154 +0,0 @@
-From: Amul Shah <Amul.Shah at fisglobal.com>
-Forwarded: not-needed
-Summary: Update encryption plugin for OpenSSL 1.1.0
-Description: #828300 resulted in a FTBFS for fis-gtm with openssl 1.1.0. These
- changes adapt the upstream fixes for OpenSSL 1.1.0 to V63000A
-Applied-Upstream: V6.3-001
-Last-Update: 2016-12-06
-
---- a/sr_unix/gtm_tls_impl.c
-+++ b/sr_unix/gtm_tls_impl.c
-@@ -1675,7 +1675,13 @@
- if (NULL != peer)
- {
- pubkey = X509_get_pubkey(peer);
-- SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s", OBJ_nid2ln(pubkey->type));
-+# if OPENSSL_VERSION_NUMBER >= 0x10000001L
-+ SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s",
-+ OBJ_nid2ln(EVP_PKEY_base_id(pubkey)));
-+# else
-+ SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s",
-+ OBJ_nid2ln(pubkey->type));
-+# endif
- } else
- conn_info->cert_algo[0] = '\0';
- /* Is Secure Renegotiation Supported? */
---- a/sr_unix/gtmcrypt_dbk_ref.c
-+++ b/sr_unix/gtmcrypt_dbk_ref.c
-@@ -770,7 +770,7 @@
- int keystore_new_cipher_ctx(gtm_keystore_t *entry, char *iv, int length, int action)
- {
- int rv;
-- crypt_key_t handle;
-+ crypt_key_t handle = NULL;
- gtm_cipher_ctx_t *ctx;
- unsigned char iv_array[GTMCRYPT_IV_LEN];
-
-@@ -809,8 +809,7 @@
-
- assert(NULL != ctx);
- status = 0;
-- if (-1 == gc_sym_destroy_cipher_handle(ctx->handle))
-- status = -1;
-+ gc_sym_destroy_cipher_handle(ctx->handle);
- next = ctx->next;
- prev = ctx->prev;
- if (NULL != prev)
-@@ -888,8 +887,7 @@
- while (NULL != curr)
- {
- temp = curr->next;
-- if (-1 == gc_sym_destroy_cipher_handle(curr->handle))
-- status = -1;
-+ gc_sym_destroy_cipher_handle(curr->handle);
- FREE(curr);
- curr = temp;
- }
---- a/sr_unix/gtmcrypt_dbk_ref.h
-+++ b/sr_unix/gtmcrypt_dbk_ref.h
-@@ -151,7 +151,7 @@
- struct gtm_keystore_unres_key_link_struct *next; /* Pointer to next element. */
- } gtm_keystore_unres_key_link_t;
-
--STATICFNDEF int keystore_refresh();
-+STATICFNDEF int keystore_refresh(void);
- STATICFNDEF int read_files_section(config_t *cfgp);
- STATICFNDEF int read_database_section(config_t *cfgp);
- STATICFNDEF int gtm_keystore_cleanup_node(gtm_keystore_t *);
---- a/sr_unix/gtmcrypt_ref.h
-+++ b/sr_unix/gtmcrypt_ref.h
-@@ -16,7 +16,7 @@
- # include <openssl/sha.h>
- # include <openssl/evp.h>
- # include <openssl/err.h>
--typedef EVP_CIPHER_CTX crypt_key_t;
-+typedef EVP_CIPHER_CTX *crypt_key_t;
- #else
- # include <gcrypt.h>
- typedef gcry_cipher_hd_t crypt_key_t;
---- a/sr_unix/gtmcrypt_sym_ref.c
-+++ b/sr_unix/gtmcrypt_sym_ref.c
-@@ -67,22 +67,18 @@
- *
- * Arguments: handle Encryption / decryption state object to destroy.
- *
-- * Returns: 1 if the cipher handle was successfully destroyed; -1 otherwise.
-+ * Returns: N/A neither OpenSSL nor GCrypt destructors return a status.
- */
--int gc_sym_destroy_cipher_handle(crypt_key_t handle)
-+void gc_sym_destroy_cipher_handle(crypt_key_t handle)
- {
--# ifdef USE_OPENSSL
-- if (!EVP_CIPHER_CTX_cleanup(&handle))
-- {
-- GC_APPEND_OPENSSL_ERROR("Failed to destroy encryption key handle.");
-- return -1;
-- }
--# endif
--# ifdef USE_GCRYPT
-- if (handle)
-+ if (NULL != handle)
-+#ifdef USE_OPENSSL
-+ EVP_CIPHER_CTX_free(handle);
-+#elif defined(USE_GCRYPT)
- gcry_cipher_close(handle);
--# endif
-- return 0;
-+#else
-+ error Encryption library not defined, please use either -DUSE_OPENSSL or -DUSE_GCRYPT
-+#endif
- }
-
- /*
-@@ -103,11 +99,13 @@
- int rv, plain_text_length;
-
- # ifdef USE_OPENSSL
-- if (!reuse)
-+ if (NULL == *handle)
-+ *handle = EVP_CIPHER_CTX_new();
-+ else if (!reuse)
- {
-- EVP_CIPHER_CTX_init(handle);
-+ EVP_CIPHER_CTX_init(*handle);
- }
-- if (!EVP_CipherInit_ex(handle, ALGO, NULL, raw_key, iv, direction))
-+ if (!EVP_CipherInit_ex(*handle, ALGO, NULL, raw_key, iv, direction))
- {
- GC_APPEND_OPENSSL_ERROR("Failed to initialize encryption key handle.");
- return -1;
-@@ -168,12 +166,12 @@
- }
- # endif
- # ifdef USE_OPENSSL
-- if (!EVP_CipherUpdate(key, out_block, &out_block_len, in_block, in_block_len))
-+ if (!EVP_CipherUpdate(*key, out_block, &out_block_len, in_block, in_block_len))
- {
- GC_APPEND_OPENSSL_ERROR("OpenSSL function 'EVP_CipherUpdate' failed.")
- return -1;
- }
-- if (!EVP_CipherFinal_ex(key, out_block + out_block_len, &tmp_len))
-+ if (!EVP_CipherFinal_ex(*key, out_block + out_block_len, &tmp_len))
- {
- GC_APPEND_OPENSSL_ERROR("OpenSSL function 'EVP_CipherFinal_ex' failed.")
- return -1;
---- a/sr_unix/gtmcrypt_sym_ref.h
-+++ b/sr_unix/gtmcrypt_sym_ref.h
-@@ -45,6 +45,6 @@
- #endif
- int gc_sym_destroy_key_handles(gtm_keystore_t *entry);
- int gc_sym_create_cipher_handle(unsigned char *raw_key, unsigned char *iv, crypt_key_t *handle, int direction, int reuse);
--int gc_sym_destroy_cipher_handle(crypt_key_t handle);
-+void gc_sym_destroy_cipher_handle(crypt_key_t handle);
- int gc_sym_encrypt_decrypt(crypt_key_t *key, unsigned char *in_block, int in_block_len, unsigned char *out_block, int flag);
- #endif /* GTMCRYPT_SYM_REF_H */
diff --git a/debian/patches/upstream_fix_locale_setting_error b/debian/patches/upstream_fix_locale_setting_error
deleted file mode 100644
index 209e0af..0000000
--- a/debian/patches/upstream_fix_locale_setting_error
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Amul Shah <Amul.Shah at fisglobal.com>
-Forwarded: not-needed
-Summary: Fix an error that caused the install script to not install UTF-8 object files
-Description: Upstream intended for autorelink to be enabled by default. However
- the default shared memory segment for autorelink is 93MiB, much greater than
- the system default of 32MiB. Users who wish to enable autorelink must
- increase the value of shmmax.
-Applied-Upstream: V6.3-001
-Last-Update: 2016-05-17
-
---- a/sr_unix/configure.gtc
-+++ b/sr_unix/configure.gtc
-@@ -626,7 +626,7 @@
- (
- # Ensure we ARE in UTF-8 mode
- utflocale=`locale -a | grep $binaryopt -iE 'en_us\.utf.?8$' | head -n1`
-- if [ $utflocale = "" ]; then
-+ if [ "$utflocale" = "" ]; then
- # If no locale defined, try C.UTF-8
- utflocale="C.UTF-8"
- fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list