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 7bfe39d17c9e830db93e9dc53d8916d87708f27c Author: Amul Shah <[email protected]> Date: Mon Jan 22 04:54:07 2018 -0500 Update for GT.M V6.3-003A --- debian/changelog | 6 ++ debian/control | 4 +- debian/patches/series | 3 - .../upstream_fix_for_aio_header_incompatibility | 46 -------- debian/patches/upstream_gtminstall_enquote | 119 --------------------- .../upstream_include_statsdb_symbols_in_libgtmshr | 30 ------ 6 files changed, 8 insertions(+), 200 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41fbdff..ba4ac60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fis-gtm (6.3-003A-1) UNRELEASED; urgency=medium + + * Update to fis-gtm V6.3-003A + + -- Amul Shah <[email protected]> Mon, 22 Jan 2018 04:45:57 -0500 + fis-gtm (6.3-002-4) unstable; urgency=medium [ Andreas Tille ] diff --git a/debian/control b/debian/control index 625fe14..54200ef 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-002 + fis-gtm-6.3-003a 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-002 +Package: fis-gtm-6.3-003a Architecture: amd64 i386 Multi-Arch: same Depends: ${shlibs:Depends}, diff --git a/debian/patches/series b/debian/patches/series index f2d359e..22560c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -upstream_include_statsdb_symbols_in_libgtmshr -upstream_gtminstall_enquote upstream_disable_autorelink upstream_donot_deploy_all_encryption_libs -upstream_fix_for_aio_header_incompatibility diff --git a/debian/patches/upstream_fix_for_aio_header_incompatibility b/debian/patches/upstream_fix_for_aio_header_incompatibility deleted file mode 100644 index 36bb00f..0000000 --- a/debian/patches/upstream_fix_for_aio_header_incompatibility +++ /dev/null @@ -1,46 +0,0 @@ -From: Amul Shah <[email protected]> -Forwarded: not-needed -Summary: Fix Bug#884236: fis-gtm FTBFS with linux-libc-dev 4.14.2-1 -Applied-Upstream: V6.3-003A -Last-Update: 2018-01-03 - ---- a/sr_port/gtm_libaio.h -+++ b/sr_port/gtm_libaio.h -@@ -65,11 +65,21 @@ - - /* This struct mimics the structure of struct iocb, but adds a few fields - * to the end for our own use. See <linux/aio_abi.h>::struct iocb. -+ * Note: that Linux v4.14 typedef'ed aio_rw_flags like so. -+ * typedef int __bitwise __kernel_rwf_t; - */ - struct aiocb { - /* kernel-internel structure, mirrors struct iocb */ - __u64 aio_data; -- __u32 PADDED(aio_key, aio_reserved1); -+#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) -+ __u32 aio_key; /* the kernel sets aio_key to the req # */ -+ int __bitwise aio_rw_flags; /* RWF_* flags */ -+#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN) -+ int __bitwise aio_rw_flags; /* RWF_* flags */ -+ __u32 aio_key; /* the kernel sets aio_key to the req # */ -+#else -+#error edit for your odd byteorder. -+#endif - __u16 aio_lio_opcode; - __s16 aio_reqprio; - __u32 aio_fildes; -@@ -92,10 +102,12 @@ - #define IF_LIBAIO(x) x - #define IF_LIBAIO_ELSE(x,y) x - --/* linux/aio_abi.h provides PADDED to define the above struct, but this collides with -- * our personal #define which means something completely different. -+#ifdef PADDED -+/* linux/aio_abi.h provides PADDED until Linux v4.14 to define the above struct, but -+ * this collides with our personal #define which means something completely different. - */ - #undef PADDED -+#endif - #endif /* USE_LIBAIO */ - - #endif /* GTM_LIBAIO_H_INCLUDED */ diff --git a/debian/patches/upstream_gtminstall_enquote b/debian/patches/upstream_gtminstall_enquote deleted file mode 100644 index 0cdfb34..0000000 --- a/debian/patches/upstream_gtminstall_enquote +++ /dev/null @@ -1,119 +0,0 @@ -From: Amul Shah <[email protected]> -Forwarded: not-needed -Summary: Fix an interaction bug in gtminstall; Fix 64bit binary check -Description: There were two bugs in gtminstall related to user interaction - required for installation on systemd configurations with RemoveIPC=yes - in force. If no response was given, unquoted shell variables would - cause the script to exit with an error. With the variables properly - quoted, the script would exit prematurely with an error. To fix this an - new option was added to allow the installer to print a warning but - ignore the RemoveIPC=yes setting. - - The configure script uses the file command to determine if the current - installation is 64bit or 32bit by grep'ing for 64 in the output. This - usually works except when 64 is present in the sha1 hash of the binary. - The file command on all supportable platforms outputs either "64-bit" - or "32-bit", so the grep match was changed to make is more specific. -Applied-Upstream: post V6.3-002 -Last-Update: 2017-09-19 - ---- a/sr_unix/gtminstall.sh -+++ b/sr_unix/gtminstall.sh -@@ -79,6 +79,7 @@ - if [ -n "$gtm_linkexec" ] ; then echo gtm_linkexec " : " $gtm_linkexec ; fi - if [ -n "$gtm_overwrite_existing" ] ; then echo gtm_overwrite_existing " : " $gtm_overwrite_existing ; fi - if [ -n "$gtm_prompt_for_group" ] ; then echo gtm_prompt_for_group " : " $gtm_prompt_for_group ; fi -+ if [ -n "$gtm_prompt_for_sys_reconfig" ] ; then echo gtm_prompt_for_sys_reconfig " : " $gtm_prompt_for_sys_reconfig ; fi - if [ -n "$gtm_sf_dirname" ] ; then echo gtm_sf_dirname " : " $gtm_sf_dirname ; fi - if [ -n "$gtm_tmp" ] ; then echo gtm_tmp " : " $gtm_tmp ; fi - if [ -n "$gtm_user" ] ; then echo gtm_user " : " $gtm_user ; fi -@@ -109,6 +110,7 @@ - echo "$m1" - echo "--linkenv dirname - create link in dirname to gtmprofile and gtmcshrc files; incompatible with copyenv" - echo "--linkexec dirname - create link in dirname to gtm script; incompatible with copyexec" -+ echo "--noprompt-for-sys-cfg - do not prompt to adjust OS configuration files" - echo "--overwrite-existing - install into an existing directory, overwriting contents; defaults to requiring new directory" - m1="--prompt-for-group - * GT.M installation " - m1="$m1""script will prompt for group; default is yes for production releases V5.4-002 or later, no for all others" -@@ -142,7 +144,7 @@ - { - read resp - response=`echo $resp | tr '[a-z]' '[A-Z]'` -- if [ "Y" = $response -o "YES" = $response ] ; then -+ if [ "Y" = "$response" -o "YES" = "$response" ] ; then - echo "yes" - else - echo "no" -@@ -157,6 +159,7 @@ - if [ -z "$gtm_lcase_utils" ] ; then gtm_lcase_utils="Y" ; fi - if [ -z "$gtm_overwrite_existing" ] ; then gtm_overwrite_existing="N" ; fi - if [ -z "$gtm_prompt_for_group" ] ; then gtm_prompt_for_group="N" ; fi -+if [ -z "$gtm_prompt_for_sys_reconfig" ] ; then gtm_prompt_for_sys_reconfig="Y" ; fi - if [ -z "$gtm_verbose" ] ; then gtm_verbose="N" ; fi - - # Initializing internal flags -@@ -229,6 +232,7 @@ - fi - unset gtm_copyexec - shift ;; -+ --noprompt-for-sys-cfg) gtm_prompt_for_sys_reconfig="N" ; shift ;; - --overwrite-existing) gtm_overwrite_existing="Y" ; shift ;; - --prompt-for-group) gtm_prompt_for_group="Y" ; shift ;; - --ucaseonly-utils) gtm_lcase_utils="N" ; shift ;; -@@ -444,23 +448,29 @@ - echo " $ipcline2" - echo "And issue the below command to restart systemd-logind" - echo " $ipccmd" -- echo -n "Do you wish to proceed (Y/N)? " -- answer=`read_yes_no` -- if [ "yes" != "$answer" ] ; then -- echo "Will abort installation" -- echo $ipcissue1 -- echo $ipcissue2 -- echo "Please add the below two lines to $logindconf" -- echo " $ipcline1" -- echo " $ipcline2" -- echo "and restart systemd-logind using the below command, for example or by rebooting the system" -- echo " $ipccmd" -- echo "and retry GT.M installation" -- exit 1 -+ if [ "N" != "$gtm_prompt_for_sys_reconfig" ]; then -+ echo -n "Do you wish to proceed (Y/N)? " -+ answer=`read_yes_no` -+ if [ "yes" != "$answer" ] ; then -+ echo "Will abort installation" -+ echo $ipcissue1 -+ echo $ipcissue2 -+ echo "Please add the below two lines to $logindconf" -+ echo " $ipcline1" -+ echo " $ipcline2" -+ echo "and restart systemd-logind using the below command, for example or by rebooting the system" -+ echo " $ipccmd" -+ echo "and retry GT.M installation" -+ exit 1 -+ fi -+ echo $ipcline1 >> $logindconf -+ echo $ipcline2 >> $logindconf -+ $ipccmd -+ else -+ echo "===============================================================" -+ echo "Installation directed to not change systemd configuration files" -+ echo "===============================================================" - fi -- echo $ipcline1 >> $logindconf -- echo $ipcline2 >> $logindconf -- $ipccmd - fi - fi - if [ "Y" = "$gtm_verbose" ] ; then echo Finished checking options and assigning defaults ; dump_info ; fi ---- a/sr_unix/configure.gtc -+++ b/sr_unix/configure.gtc -@@ -194,7 +194,7 @@ - $echo "Installing GT.M...." - $echo "" - --is64bit_gtm=`file mumps | grep -c 64` -+is64bit_gtm=`file mumps | grep -c 64.bit` - - # Create $gtmdist/utf8 if this platform can support "UTF-8" mode. - diff --git a/debian/patches/upstream_include_statsdb_symbols_in_libgtmshr b/debian/patches/upstream_include_statsdb_symbols_in_libgtmshr deleted file mode 100644 index 3892184..0000000 --- a/debian/patches/upstream_include_statsdb_symbols_in_libgtmshr +++ /dev/null @@ -1,30 +0,0 @@ -From: Amul Shah <[email protected]> -Summary: Include the symbols needed for the statsdb feature -Description: GT.M V6.3-001 added a new feature to monitor database statistics - with GTM-6699. The feature added some newly exposed symbols. While the - regular GT.M builds included these symbols, the CMake built GT.M did - not. This patch addresses those missing symbols. -Origin: upstream -Forwarded: not-needed -Applied-Upstream: post V6.3-002 -Last-Update: 2017-09-27 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/sr_linux/platform.cmake -+++ b/sr_linux/platform.cmake -@@ -1,6 +1,6 @@ - ################################################################# - # # --# Copyright (c) 2013-2016 Fidelity National Information # -+# Copyright (c) 2013-2017 Fidelity National Information # - # Services, Inc. and/or its subsidiaries. All rights reserved. # - # # - # This source code contains the intellectual property # -@@ -69,6 +69,7 @@ - set(gtm_dep "${GTM_BINARY_DIR}/gtmexe_symbols.export") - - set(libgtmshr_link "-Wl,-u,gtm_ci -Wl,-u,gtm_filename_to_id -Wl,-u,gtm_is_main_thread") -+set(libgtmshr_link "${libgtmshr_link} -Wl,-u,accumulate -Wl,-u,is_big_endian -Wl,-u,to_ulong") - set(libgtmshr_link "${libgtmshr_link} -Wl,--version-script,\"${GTM_BINARY_DIR}/gtmshr_symbols.export\"") - set(libgtmshr_dep "${GTM_BINARY_DIR}/gtmexe_symbols.export") - -- 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
