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 88bca4dca8eb23965f864da6ea9d4e76f9984e5b Author: Amul Shah <[email protected]> Date: Wed Sep 24 00:08:46 2014 -0400 Update for V6.2-000 Remove all backported patches and the GTM_DESTDIR enhancement. GTM_DESTDIR was replaced by using -embed_source compile option via the env var gtmcompile. Add two new lintian overrides which have utf8 alternatives. --- debian/changelog | 9 ++ debian/control | 4 +- debian/patches/series | 8 - ...estdir_Refactor-object-file-source-name-storage | 165 --------------------- ...pport-source-to-object-compilation-in-a-DESTDIR | 38 ----- debian/patches/up_gtm_destdir_substitution | 29 ---- debian/patches/upstream_backport_README_change | 28 ---- .../upstream_backport_build_encryption_plugin | 144 ------------------ .../upstream_backport_encryption_build_fixes | 37 ----- debian/patches/upstream_backport_gtmprofile_icu_49 | 18 --- .../upstream_backport_i586_default_32bit_linux | 25 ---- debian/rules | 6 +- 12 files changed, 16 insertions(+), 495 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb9fbea..e41402b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +fis-gtm (6.2-000-1) precise; urgency=low + + * Import latest sources and update package version + * Delete prior patches and incorporate -emeb_source + * (todo) UTF-8 mode plugin directory must be a real directory + * (todo) include both gcrypt and openssl AES256CFB encryption plugins. Currently only gcrypt is built + + -- Amul Shah <[email protected]> Wed, 24 Sep 2014 00:03:47 -0400 + fis-gtm (6.1-000-1) unstable; urgency=medium [ Andreas Tille ] diff --git a/debian/control b/debian/control index f908d8c..602b0ff 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.1-000 + fis-gtm-6.2-000 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.1-000 +Package: fis-gtm-6.2-000 Architecture: amd64 i386 Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, diff --git a/debian/patches/series b/debian/patches/series index 4d1ad0b..8b13789 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1 @@ -up_gtm_destdir_substitution -up_gtm_destdir_Refactor-object-file-source-name-storage -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 -upstream_backport_gtmprofile_icu_49 diff --git a/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage b/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage deleted file mode 100644 index 1c0660d..0000000 --- a/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage +++ /dev/null @@ -1,165 +0,0 @@ -From: Brad King <[email protected]> -Date: Mon, 18 Jun 2012 14:04:28 -0400 -Subject: [PATCH 2/3] Refactor object file source name storage - -Teach 'comp_lits' and 'emit_literals' to lookup the source file name -through a new 'obj_source' structure. This will allow the source file -to be modified before storage in the object file. ---- - sr_i386/obj_file.c | 8 ++++++-- - sr_unix/comp_lits.c | 11 +++++++---- - sr_unix/obj_file.c | 10 ++++++---- - sr_unix/obj_source.c | 12 ++++++++++++ - sr_unix/obj_source.h | 12 ++++++++++++ - sr_unix_nsb/comp_lits.c | 11 +++++++---- - 6 files changed, 50 insertions(+), 14 deletions(-) - create mode 100644 sr_unix/obj_source.c - create mode 100644 sr_unix/obj_source.h - ---- a/sr_i386/obj_file.c -+++ b/sr_i386/obj_file.c -@@ -30,6 +30,7 @@ - #include "gtmio.h" - #include "mmemory.h" - #include "obj_file.h" -+#include <obj_source.h> - - LITREF char gtm_release_name[]; - LITREF int4 gtm_release_name_len; -@@ -444,8 +445,11 @@ - emit_immed(PADCHARS, padsize); - offset += padsize; - } -- emit_immed(source_file_name, source_name_len); -- offset += source_name_len; -+ { -+ struct obj_source s = get_obj_source(); -+ emit_immed(s.name, s.len); -+ offset += s.len; -+ } - /* comp_lits aligns the start of routine_name on a NATIVE_WSIZE boundary.*/ - padsize = PADLEN(offset, NATIVE_WSIZE); - if (padsize) ---- a/sr_unix/comp_lits.c -+++ b/sr_unix/comp_lits.c -@@ -14,10 +14,10 @@ - #include <rtnhdr.h> - #include "mdq.h" - #include "stringpool.h" -+#include <obj_source.h> - - GBLREF mliteral literal_chain; - GBLREF spdesc stringpool; --GBLREF unsigned short source_name_len; - GBLREF mident routine_name; - - GBLDEF uint4 lits_text_size, lits_mval_size; -@@ -34,9 +34,12 @@ - * following the literal text pool and is considered part of that text pool.*/ - offset = (stringpool.free - stringpool.base); - offset += PADLEN(offset, NATIVE_WSIZE); -- rhead->src_full_name.len = source_name_len; -- rhead->src_full_name.addr = (char *)offset; -- offset += source_name_len; -+ { -+ struct obj_source s = get_obj_source(); -+ rhead->src_full_name.len = s.len; -+ rhead->src_full_name.addr = (char *)offset; -+ offset += s.len; -+ } - offset += PADLEN(offset, NATIVE_WSIZE); - rhead->routine_name.len = routine_name.len; - rhead->routine_name.addr = (char *)offset; ---- a/sr_unix/obj_file.c -+++ b/sr_unix/obj_file.c -@@ -28,6 +28,7 @@ - #include "gtmio.h" - #include "mmemory.h" - #include "obj_file.h" -+#include <obj_source.h> - - GBLREF char object_file_name[]; - GBLREF short object_name_len; -@@ -38,8 +39,6 @@ - GBLREF int4 lits_text_size, lits_mval_size; - GBLREF unsigned char *runtime_base; - GBLREF mliteral literal_chain; --GBLREF char source_file_name[]; --GBLREF unsigned short source_name_len; - GBLREF mident routine_name; - GBLREF spdesc stringpool; - GBLREF int4 linkage_size; -@@ -387,8 +386,11 @@ - emit_immed(PADCHARS, padsize); - offset += padsize; - } -- emit_immed(source_file_name, source_name_len); -- offset += source_name_len; -+ { -+ struct obj_source s = get_obj_source(); -+ emit_immed(s.name, s.len); -+ offset += s.len; -+ } - padsize = (uint4)(PADLEN(offset, NATIVE_WSIZE)); /* comp_lits aligns the start of routine_name on NATIVE_WSIZE boundary.*/ - if (padsize) - { ---- /dev/null -+++ b/sr_unix/obj_source.c -@@ -0,0 +1,12 @@ -+#include "mdef.h" -+ -+#include "obj_source.h" -+ -+GBLREF char source_file_name[]; -+GBLREF unsigned short source_name_len; -+ -+struct obj_source get_obj_source(void) -+{ -+ struct obj_source sn = {source_file_name, source_name_len}; -+ return sn; -+} ---- /dev/null -+++ b/sr_unix/obj_source.h -@@ -0,0 +1,12 @@ -+#ifndef __OBJ_SOURCE_H__ -+#define __OBJ_SOURCE_H__ -+ -+struct obj_source -+{ -+ char* name; -+ unsigned short len; -+}; -+ -+struct obj_source get_obj_source(void); -+ -+#endif ---- a/sr_unix_nsb/comp_lits.c -+++ b/sr_unix_nsb/comp_lits.c -@@ -14,10 +14,10 @@ - #include <rtnhdr.h> - #include "mdq.h" - #include "stringpool.h" -+#include <obj_source.h> - - GBLREF mliteral literal_chain; - GBLREF spdesc stringpool; --GBLREF unsigned short source_name_len; - GBLREF mident routine_name; - - GBLDEF uint4 lits_size, lit_addrs; -@@ -31,9 +31,12 @@ - - offset = stringpool.free - stringpool.base; - offset += PADLEN(offset, NATIVE_WSIZE); -- rhead->src_full_name.len = source_name_len; -- rhead->src_full_name.addr = (char *)offset; -- offset += source_name_len; -+ { -+ struct obj_source s = get_obj_source(); -+ rhead->src_full_name.len = s.len; -+ rhead->src_full_name.addr = (char *)offset; -+ offset += s.len; -+ } - offset += PADLEN(offset, NATIVE_WSIZE); - rhead->routine_name.len = routine_name.len; - rhead->routine_name.addr = (char *)offset; diff --git a/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR b/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR deleted file mode 100644 index dfbbf4d..0000000 --- a/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR +++ /dev/null @@ -1,38 +0,0 @@ -From: Brad King <[email protected]> -Date: Mon, 18 Jun 2012 14:18:32 -0400 -Subject: [PATCH 3/3] Support source-to-object compilation in a DESTDIR - -If environment variable 'gtm_destdir' is set, treat it as a prefix to be -removed from any source file paths contained inside it. This will allow -sources to be compiled in a DESTDIR for packaging such that the object -files will find their sources in the final install prefix after -distribution. ---- - sr_unix/obj_source.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/sr_unix/obj_source.c -+++ b/sr_unix/obj_source.c -@@ -1,3 +1,5 @@ -+#include "gtm_stdlib.h" -+#include "gtm_string.h" - #include "mdef.h" - - #include "obj_source.h" -@@ -8,5 +10,16 @@ - struct obj_source get_obj_source(void) - { - struct obj_source sn = {source_file_name, source_name_len}; -+ char* gtm_destdir = getenv("gtm_destdir"); -+ if(gtm_destdir) -+ { -+ /* Strip the destdir prefix from sources inside it. */ -+ size_t const ddlen = strlen(gtm_destdir); -+ if(strncmp(sn.name, gtm_destdir, ddlen) == 0) -+ { -+ sn.name += ddlen; -+ sn.len -= ddlen; -+ } -+ } - return sn; - } diff --git a/debian/patches/up_gtm_destdir_substitution b/debian/patches/up_gtm_destdir_substitution deleted file mode 100644 index ffe1787..0000000 --- a/debian/patches/up_gtm_destdir_substitution +++ /dev/null @@ -1,29 +0,0 @@ -From: Yaroslav Halchenko <[email protected]> -Subject: [PATCH 1/3] Remove builddir prefix from the paths - -Origin: Debian -Last-Update: 2012-06-19 ---- - sr_unix/configure.gtc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sr_unix/configure.gtc -+++ b/sr_unix/configure.gtc -@@ -376,7 +376,7 @@ - cat << SEDSCRIPT > sedin$$ - s|ARCH|$arch|g - s|ECHO|"$echo"|g --s|GTMDIST|$gtmdist|g -+s|GTMDIST|${gtmdist#${gtm_destdir:-}}|g - s|SERVERID|$server_id|g - SEDSCRIPT - for i in $pathmods -@@ -609,7 +609,7 @@ - - # Install gpgagent.tab - # This is an external call table so the path to the shared library has to be adjusted -- echo "$gtmdist/plugin/libgtmcryptutil$ext" > $gtmdist/$plugin/gpgagent.tab -+ echo "${gtmdist#${gtm_destdir:-}}/plugin/libgtmcryptutil$ext" > $gtmdist/$plugin/gpgagent.tab - cat $plugin/gpgagent.tab | sed 1d >> $gtmdist/$plugin/gpgagent.tab - - # Tar the source files diff --git a/debian/patches/upstream_backport_README_change b/debian/patches/upstream_backport_README_change deleted file mode 100644 index 57439aa..0000000 --- a/debian/patches/upstream_backport_README_change +++ /dev/null @@ -1,28 +0,0 @@ -From: Amul Shah <[email protected]> -Description: Backport upstream changes to the source README file -Applied-Upstream: V6.2-000 - ---- a/README -+++ b/README -@@ -31,9 +31,9 @@ - from http://sourceforge.net/projects/fis-gtm/ Unpack the tar file and run - the configure script as root. Note: the tar file unpacks everything into - your current working directory, not a new subdirectory. The Linux Standard -- Base (LSB) install path for GT.M V6.1-000 is /opt/fis-gtm/V6.1-000_i686 or -- /opt/fis-gtm/V6.1-000_x8664. These instrcutions are written using x8664, please -- use i686 as necessary. -+ Base (LSB) install path for GT.M V6.1-000 is /opt/fis-gtm/V6.1-000_i586 or -+ /opt/fis-gtm/V6.1-000_x8664. These instructions are written using x8664, please -+ use i586 as necessary. - - $ tar xfz gtm_V61000_linux_x8664_pro.tar.gz - -@@ -71,7 +71,7 @@ - # - # -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package - # -- $ cmake <path to>/fis-gtm-V6.1-000 -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package -+ $ cmake -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package <path to>/fis-gtm-#VER# - - $ make - diff --git a/debian/patches/upstream_backport_build_encryption_plugin b/debian/patches/upstream_backport_build_encryption_plugin deleted file mode 100644 index 8a499a7..0000000 --- a/debian/patches/upstream_backport_build_encryption_plugin +++ /dev/null @@ -1,144 +0,0 @@ -From: Amul Shah <[email protected]> -Description: Backport upstream changes to the source CMakeLists.txt file - The CMakeLists.txt in the V6.1-000 source release did not build the - encryption plugins. The upstream CMakeLists.txt includes these changes - and set the default encryption engine and algorithm -Applied-Upstream: V6.2-000 - ---- 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 deleted file mode 100644 index 26969b6..0000000 --- a/debian/patches/upstream_backport_encryption_build_fixes +++ /dev/null @@ -1,37 +0,0 @@ -From: Amul Shah <[email protected]> -Description: Backport upstream changes to the source sr_unix/Makefile.mk file - The upstream V6.1-000 sources did not correctly the production enryption - plugin libraries. - - 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. -Applied-Upstream: V6.2-000 - ---- 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 - diff --git a/debian/patches/upstream_backport_gtmprofile_icu_49 b/debian/patches/upstream_backport_gtmprofile_icu_49 deleted file mode 100644 index d548515..0000000 --- a/debian/patches/upstream_backport_gtmprofile_icu_49 +++ /dev/null @@ -1,18 +0,0 @@ -From: Amul Shah <[email protected]> -Description: Backport upstream changes to the default GT.M profile script - ICU versions after 4.8, <major>.<minor> dropped the dot between the major and - minor numbers. The upstream fix handles setting gtm_icu_version correctly for - ICU versions after 4.8. -Applied-Upstream: V6.2-000 - ---- a/sr_unix/gtmprofile.gtc -+++ b/sr_unix/gtmprofile.gtc -@@ -81,7 +81,7 @@ - which="which" - fi - if [ -z "$gtm_icu_version" -a -n "`$which icu-config`" ] ; then -- gtm_icu_version=`icu-config --version | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $Piece(x,".",1,2)'` -+ gtm_icu_version=`icu-config --version | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $Select(+x>48:$Piece(x,".",1)/10,1:$Piece(x,".",1,2))'` - export gtm_icu_version - fi - diff --git a/debian/patches/upstream_backport_i586_default_32bit_linux b/debian/patches/upstream_backport_i586_default_32bit_linux deleted file mode 100644 index 9e5bfdb..0000000 --- a/debian/patches/upstream_backport_i586_default_32bit_linux +++ /dev/null @@ -1,25 +0,0 @@ -From: Amul Shah <[email protected]> -Description: Backport upstream change that makes i586 the default build type for 32bit GT.M -Applied-Upstream: V6.2-000 - ---- a/sr_linux/platform.cmake -+++ b/sr_linux/platform.cmake -@@ -13,6 +13,9 @@ - set(arch "x86") - set(bits 32) - set(FIND_LIBRARY_USE_LIB64_PATHS FALSE) -+ # Set arch to i586 in order to compile for Galileo -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i586") -+ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,-march=i586") - else() - set(arch "x86_64") - set(bits 64) -@@ -32,7 +35,7 @@ - - # Compiler - set(CMAKE_C_FLAGS -- "${CMAKE_C_FLAGS} -ansi -fsigned-char -fPIC -Wmissing-prototypes -fno-omit-frame-pointer") -+ "${CMAKE_C_FLAGS} -ansi -fsigned-char -fPIC -Wmissing-prototypes -Wreturn-type -Wpointer-sign -fno-omit-frame-pointer") - - set(CMAKE_C_FLAGS_RELEASE - "${CMAKE_C_FLAGS_RELEASE} -fno-defer-pop -fno-strict-aliasing -ffloat-store") diff --git a/debian/rules b/debian/rules index 2242184..5a02347 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,7 @@ override_dh_auto_install: dh_auto_install --destdir=debian/$(BINPKG)-stage1 $@ cd debian/$(BINPKG)-stage1/usr/$(GTM_INSTALL_DIR) && \ gtm_destdir=$(CURDIR)/debian/$(BINPKG) \ + gtmcompile="-embed_source" \ ./gtminstall --utf8 default --user root --group root --verbose \ --distrib . \ --installdir $(LOCAL_GTM_INSTALL_DIR) @@ -96,12 +97,15 @@ override_dh_fixperms: # The override is needed according to upstream for GTM to generate executable 'call-in's override_dh_lintian: echo "$(BINPKG) binary: shlib-with-executable-stack usr/lib/*/fis-gtm/*/libgtmshr.so" > debian/$(BINPKG).lintian-overrides - echo "$(BINPKG) binary: shared-lib-without-dependency-information usr/lib/*/fis-gtm/libgtmutil.so" >> debian/$(BINPKG).lintian-overrides + echo "$(BINPKG) binary: shared-lib-without-dependency-information usr/lib/*/fis-gtm/*/libgtmutil.so" >> debian/$(BINPKG).lintian-overrides + echo "$(BINPKG) binary: shared-lib-without-dependency-information usr/lib/*/fis-gtm/*/utf8/libgtmutil.so" >> debian/$(BINPKG).lintian-overrides echo "# The following permissions are really set intentionally in override_dh_fixpermissions" >> debian/$(BINPKG).lintian-overrides echo "$(BINPKG): setuid-binary usr/lib/*/fis-gtm/*/gtmsecshrdir/gtmsecshr 4500 root/root" >> debian/$(BINPKG).lintian-overrides echo "$(BINPKG): executable-is-not-world-readable usr/lib/*/fis-gtm/*/gtmsecshrdir/gtmsecshr 4500" >> debian/$(BINPKG).lintian-overrides echo "$(BINPKG): setuid-binary usr/lib/*/fis-gtm/*/gtmsecshr 4755 root/root" >> debian/$(BINPKG).lintian-overrides echo "$(BINPKG): non-standard-dir-perm usr/lib/*/fis-gtm/*/gtmsecshrdir/ 0500 != 0755" >> debian/$(BINPKG).lintian-overrides + echo "$(BINPKG): package-contains-hardlink usr/lib/*/fis-gtm/*/gtmsecshr -> usr/lib/*/fis-gtm/*/utf8/gtmsecshr" >> debian/$(BINPKG).lintian-overrides + echo "$(BINPKG): package-contains-hardlink usr/lib/*/fis-gtm/*/gtmsecshrdir/gtmsecshr -> usr/lib/*/fis-gtm/*/utf8/gtmsecshrdir/gtmsecshr" >> debian/$(BINPKG).lintian-overrides dh_lintian -- 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
