ibm_db 5.1.0-x86-mingw32 → 5.2.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/Makefile +12 -14
- data/ext/extconf.rb +4 -4
- data/ext/ibm_db.o +0 -0
- data/ext/ibm_db.so +0 -0
- data/ext/mkmf.log +21 -23
- data/ext/ruby_ibm_db_cli.o +0 -0
- data/lib/mswin32/ibm_db.rb +7 -3
- data/lib/mswin32/rb2x/i386/ruby25/ibm_db.so +0 -0
- data/lib/mswin32/rb3x/i386/ruby30/ibm_db.so +0 -0
- metadata +15 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 589b2145571657426eb4fe77394c89f8b095d87ac39f62695daa3b66628fe64a
|
4
|
+
data.tar.gz: b890c87a3ed0fedaa5266faae9ffb54912d531aec4ff4eddde860c23829807be
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7816ba3f4f9c451d1fcbc606cf8cde063038e73f5505c89463cde429cf2ec74ead7921e098af752ae13853b50cbb3d2b7f757bb4561c32a51e780a1a467900bd
|
7
|
+
data.tar.gz: 72578e7d940737ce9935621315cb02eb645f335ff2e4d30d60de99039c123a2402880d4b968774bff6c6faf2d04beab31f1bf488783f2a81a7d176f30df6025a
|
data/ext/Makefile
CHANGED
@@ -12,12 +12,12 @@ NULLCMD = :
|
|
12
12
|
#### Start of system configuration section. ####
|
13
13
|
|
14
14
|
srcdir = .
|
15
|
-
topdir = /C/
|
15
|
+
topdir = /C/Ruby25/include/ruby-2.5.0
|
16
16
|
hdrdir = $(topdir)
|
17
|
-
arch_hdrdir = C:/
|
17
|
+
arch_hdrdir = C:/Ruby25/include/ruby-2.5.0/i386-mingw32
|
18
18
|
PATH_SEPARATOR = :
|
19
19
|
VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
|
20
|
-
prefix = $(DESTDIR)/C/
|
20
|
+
prefix = $(DESTDIR)/C/Ruby25
|
21
21
|
rubysitearchprefix = $(rubylibprefix)/$(sitearch)
|
22
22
|
rubyarchprefix = $(rubylibprefix)/$(arch)
|
23
23
|
rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
|
@@ -63,13 +63,12 @@ bindir = $(exec_prefix)/bin
|
|
63
63
|
archdir = $(rubyarchdir)
|
64
64
|
|
65
65
|
|
66
|
-
CC_WRAPPER =
|
67
66
|
CC = i686-w64-mingw32-gcc
|
68
67
|
CXX = i686-w64-mingw32-g++
|
69
68
|
LIBRUBY = lib$(RUBY_SO_NAME).dll.a
|
70
69
|
LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
|
71
70
|
LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
|
72
|
-
LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
|
71
|
+
LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
|
73
72
|
empty =
|
74
73
|
OUTFLAG = -o $(empty)
|
75
74
|
COUTFLAG = -o $(empty)
|
@@ -80,16 +79,15 @@ cflags = $(optflags) $(debugflags) $(warnflags)
|
|
80
79
|
cxxflags = $(optflags) $(debugflags) $(warnflags)
|
81
80
|
optflags = -O3 -fno-omit-frame-pointer
|
82
81
|
debugflags = -ggdb3
|
83
|
-
warnflags = -Wall -Wextra -
|
84
|
-
cppflags =
|
82
|
+
warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wno-tautological-compare -Wno-parentheses-equality -Wno-constant-logical-operand -Wno-self-assign -Wunused-variable -Wimplicit-int -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration -Wdeprecated-declarations -Wmisleading-indentation -Wno-packed-bitfield-compat -Wsuggest-attribute=noreturn -Wsuggest-attribute=format -Wimplicit-fallthrough=0 -Wduplicated-cond -Wrestrict
|
85
83
|
CCDLFLAGS =
|
86
|
-
CFLAGS = $(CCDLFLAGS) -O3 -fno-fast-math $(ARCH_FLAG)
|
84
|
+
CFLAGS = $(CCDLFLAGS) -O3 -fno-fast-math -fstack-protector-strong $(ARCH_FLAG)
|
87
85
|
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
|
88
86
|
DEFS = -D_FILE_OFFSET_BITS=64
|
89
|
-
CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=
|
87
|
+
CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT $(DEFS) $(cppflags)
|
90
88
|
CXXFLAGS = $(CCDLFLAGS) -march=i686 -mtune=generic -O2 -pipe $(ARCH_FLAG)
|
91
|
-
ldflags = -L. -pipe -s
|
92
|
-
dldflags = -pipe -s -Wl,--enable-auto-image-base,--enable-auto-import $(DEFFILE)
|
89
|
+
ldflags = -L. -pipe -s -fstack-protector-strong
|
90
|
+
dldflags = -pipe -s -fstack-protector-strong -Wl,--enable-auto-image-base,--enable-auto-import $(DEFFILE)
|
93
91
|
ARCH_FLAG =
|
94
92
|
DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
|
95
93
|
LDSHARED = $(CC) -shared
|
@@ -98,7 +96,7 @@ AR = ar
|
|
98
96
|
EXEEXT = .exe
|
99
97
|
|
100
98
|
RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
|
101
|
-
RUBY_SO_NAME = msvcrt-
|
99
|
+
RUBY_SO_NAME = msvcrt-ruby250
|
102
100
|
RUBYW_INSTALL_NAME = $(RUBYW_BASE_NAME)
|
103
101
|
RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
|
104
102
|
RUBYW_BASE_NAME = rubyw
|
@@ -106,7 +104,7 @@ RUBY_BASE_NAME = ruby
|
|
106
104
|
|
107
105
|
arch = i386-mingw32
|
108
106
|
sitearch = i386-msvcrt
|
109
|
-
ruby_version = 2.
|
107
|
+
ruby_version = 2.5.0
|
110
108
|
ruby = $(bindir)/$(RUBY_BASE_NAME)
|
111
109
|
RUBY = $(ruby)
|
112
110
|
ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
|
@@ -136,7 +134,7 @@ extout =
|
|
136
134
|
extout_prefix =
|
137
135
|
target_prefix =
|
138
136
|
LOCAL_LIBS =
|
139
|
-
LIBS = $(LIBRUBYARG_SHARED) -ldb2cli -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi
|
137
|
+
LIBS = $(LIBRUBYARG_SHARED) -ldb2cli -lgmp -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi
|
140
138
|
ORIG_SRCS = ibm_db.c ruby_ibm_db_cli.c
|
141
139
|
SRCS = $(ORIG_SRCS)
|
142
140
|
OBJS = ibm_db.o ruby_ibm_db_cli.o
|
data/ext/extconf.rb
CHANGED
@@ -242,7 +242,7 @@ def crash(str)
|
|
242
242
|
exit 1
|
243
243
|
end
|
244
244
|
|
245
|
-
if( RUBY_VERSION =~ /1.9/ || RUBY_VERSION =~ /2./)
|
245
|
+
if( RUBY_VERSION =~ /1.9/ || RUBY_VERSION =~ /2./ || RUBY_VERSION =~ /3./)
|
246
246
|
create_header('gil_release_version.h')
|
247
247
|
create_header('unicode_support_version.h')
|
248
248
|
end
|
@@ -266,14 +266,14 @@ step 3: - Retry gem install
|
|
266
266
|
EOL
|
267
267
|
end
|
268
268
|
|
269
|
-
if(RUBY_VERSION =~ /2./)
|
269
|
+
if(RUBY_VERSION =~ /2./ || RUBY_VERSION =~ /3./)
|
270
270
|
require 'rbconfig'
|
271
271
|
end
|
272
272
|
|
273
273
|
alias :libpathflag0 :libpathflag
|
274
274
|
def libpathflag(libpath)
|
275
275
|
if(RUBY_PLATFORM =~ /darwin/i)
|
276
|
-
if(RUBY_VERSION =~ /2./)
|
276
|
+
if(RUBY_VERSION =~ /2./ || RUBY_VERSION =~ /3./)
|
277
277
|
libpathflag0 + case RbConfig::CONFIG["arch"]
|
278
278
|
when /solaris2/
|
279
279
|
libpath[0..-2].map {|path| " -R#{path}"}.join
|
@@ -293,7 +293,7 @@ def libpathflag(libpath)
|
|
293
293
|
end
|
294
294
|
end
|
295
295
|
else
|
296
|
-
if(RUBY_VERSION =~ /2./)
|
296
|
+
if(RUBY_VERSION =~ /2./ || RUBY_VERSION =~ /3./)
|
297
297
|
ldflags = case RbConfig::CONFIG["arch"]
|
298
298
|
when /solaris2/
|
299
299
|
libpath[0..-2].map {|path| " -R#{path}"}.join
|
data/ext/ibm_db.o
CHANGED
Binary file
|
data/ext/ibm_db.so
CHANGED
Binary file
|
data/ext/mkmf.log
CHANGED
@@ -14,7 +14,7 @@ unicode_support_version.h is:
|
|
14
14
|
|
15
15
|
have_library: checking for SQLConnect() in -ldb2cli... -------------------- yes
|
16
16
|
|
17
|
-
"i686-w64-mingw32-gcc -o conftest.exe -IC:/
|
17
|
+
"i686-w64-mingw32-gcc -o conftest.exe -IC:/Ruby25/include/ruby-2.5.0/i386-mingw32 -IC:/Ruby25/include/ruby-2.5.0/ruby/backward -IC:/Ruby25/include/ruby-2.5.0 -I. -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64 -O3 -fno-fast-math -fstack-protector-strong conftest.c -L. -LC:/Ruby25/lib -LC:\clidriver\32-bit\clidriver/lib -L. -pipe -s -fstack-protector-strong -lmsvcrt-ruby250 -lgmp -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi "
|
18
18
|
checked program was:
|
19
19
|
/* begin */
|
20
20
|
1: #include "ruby.h"
|
@@ -27,13 +27,13 @@ checked program was:
|
|
27
27
|
8: }
|
28
28
|
/* end */
|
29
29
|
|
30
|
-
"i686-w64-mingw32-gcc -o conftest.exe -IC:/
|
30
|
+
"i686-w64-mingw32-gcc -o conftest.exe -IC:/Ruby25/include/ruby-2.5.0/i386-mingw32 -IC:/Ruby25/include/ruby-2.5.0/ruby/backward -IC:/Ruby25/include/ruby-2.5.0 -I. -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64 -O3 -fno-fast-math -fstack-protector-strong conftest.c -L. -LC:/Ruby25/lib -LC:\clidriver\32-bit\clidriver/lib -L. -pipe -s -fstack-protector-strong -lmsvcrt-ruby250 -ldb2cli -lgmp -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi "
|
31
31
|
conftest.c: In function 't':
|
32
|
-
conftest.c:
|
33
|
-
|
32
|
+
conftest.c:16:57: error: 'SQLConnect' undeclared (first use in this function); did you mean 'WSAConnect'?
|
33
|
+
16 | int t(void) { void ((*volatile p)()); p = (void ((*)()))SQLConnect; return !p; }
|
34
34
|
| ^~~~~~~~~~
|
35
35
|
| WSAConnect
|
36
|
-
conftest.c:
|
36
|
+
conftest.c:16:57: note: each undeclared identifier is reported only once for each function it appears in
|
37
37
|
checked program was:
|
38
38
|
/* begin */
|
39
39
|
1: #include "ruby.h"
|
@@ -46,16 +46,15 @@ checked program was:
|
|
46
46
|
8: int main(int argc, char **argv)
|
47
47
|
9: {
|
48
48
|
10: if (argc > 1000000) {
|
49
|
-
11:
|
50
|
-
12:
|
51
|
-
13:
|
52
|
-
14:
|
53
|
-
15:
|
54
|
-
16: }
|
55
|
-
17: int t(void) { void ((*volatile p)()); p = (void ((*)()))SQLConnect; return !p; }
|
49
|
+
11: printf("%p", &t);
|
50
|
+
12: }
|
51
|
+
13:
|
52
|
+
14: return 0;
|
53
|
+
15: }
|
54
|
+
16: int t(void) { void ((*volatile p)()); p = (void ((*)()))SQLConnect; return !p; }
|
56
55
|
/* end */
|
57
56
|
|
58
|
-
"i686-w64-mingw32-gcc -o conftest.exe -IC:/
|
57
|
+
"i686-w64-mingw32-gcc -o conftest.exe -IC:/Ruby25/include/ruby-2.5.0/i386-mingw32 -IC:/Ruby25/include/ruby-2.5.0/ruby/backward -IC:/Ruby25/include/ruby-2.5.0 -I. -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64 -O3 -fno-fast-math -fstack-protector-strong conftest.c -L. -LC:/Ruby25/lib -LC:\clidriver\32-bit\clidriver/lib -L. -pipe -s -fstack-protector-strong -lmsvcrt-ruby250 -ldb2cli -lgmp -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi "
|
59
58
|
checked program was:
|
60
59
|
/* begin */
|
61
60
|
1: #include "ruby.h"
|
@@ -68,21 +67,20 @@ checked program was:
|
|
68
67
|
8: int main(int argc, char **argv)
|
69
68
|
9: {
|
70
69
|
10: if (argc > 1000000) {
|
71
|
-
11:
|
72
|
-
12:
|
73
|
-
13:
|
74
|
-
14:
|
75
|
-
15:
|
76
|
-
16:
|
77
|
-
17:
|
78
|
-
18: int t(void) { SQLConnect(); return 0; }
|
70
|
+
11: printf("%p", &t);
|
71
|
+
12: }
|
72
|
+
13:
|
73
|
+
14: return 0;
|
74
|
+
15: }
|
75
|
+
16: extern void SQLConnect();
|
76
|
+
17: int t(void) { SQLConnect(); return 0; }
|
79
77
|
/* end */
|
80
78
|
|
81
79
|
--------------------
|
82
80
|
|
83
81
|
have_header: checking for gil_release_version.h... -------------------- yes
|
84
82
|
|
85
|
-
"i686-w64-mingw32-gcc -E -IC:/
|
83
|
+
"i686-w64-mingw32-gcc -E -IC:/Ruby25/include/ruby-2.5.0/i386-mingw32 -IC:/Ruby25/include/ruby-2.5.0/ruby/backward -IC:/Ruby25/include/ruby-2.5.0 -I. -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64 -O3 -fno-fast-math -fstack-protector-strong conftest.c -o conftest.i"
|
86
84
|
checked program was:
|
87
85
|
/* begin */
|
88
86
|
1: #include "ruby.h"
|
@@ -96,7 +94,7 @@ checked program was:
|
|
96
94
|
|
97
95
|
have_header: checking for unicode_support_version.h... -------------------- yes
|
98
96
|
|
99
|
-
"i686-w64-mingw32-gcc -E -IC:/
|
97
|
+
"i686-w64-mingw32-gcc -E -IC:/Ruby25/include/ruby-2.5.0/i386-mingw32 -IC:/Ruby25/include/ruby-2.5.0/ruby/backward -IC:/Ruby25/include/ruby-2.5.0 -I. -IC:\clidriver\32-bit\clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64 -O3 -fno-fast-math -fstack-protector-strong conftest.c -o conftest.i"
|
100
98
|
checked program was:
|
101
99
|
/* begin */
|
102
100
|
1: #include "ruby.h"
|
data/ext/ruby_ibm_db_cli.o
CHANGED
Binary file
|
data/lib/mswin32/ibm_db.rb
CHANGED
@@ -86,10 +86,14 @@ end
|
|
86
86
|
machine_bits = ['ibm'].pack('p').size * 8
|
87
87
|
if machine_bits == 64
|
88
88
|
raise NotImplementedError, "ibm_db with Ruby 64-bit on Windows platform is not supported. Refer to README for more details"
|
89
|
-
else
|
90
|
-
if (RUBY_VERSION =~ /
|
89
|
+
else
|
90
|
+
if (RUBY_VERSION =~ /3/)
|
91
|
+
require 'rb3x/i386/ruby30/ibm_db.so'
|
92
|
+
elsif (RUBY_VERSION =~ /2.7/)
|
91
93
|
require 'rb2x/i386/ruby27/ibm_db.so'
|
92
|
-
|
94
|
+
elsif (RUBY_VERSION =~ /2.6/)
|
93
95
|
require 'rb2x/i386/ruby26/ibm_db.so'
|
96
|
+
else
|
97
|
+
require 'rb2x/i386/ruby25/ibm_db.so'
|
94
98
|
end
|
95
99
|
end
|
Binary file
|
Binary file
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ibm_db
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.
|
4
|
+
version: 5.2.0
|
5
5
|
platform: x86-mingw32
|
6
6
|
authors:
|
7
7
|
- IBM
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-04-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|
@@ -17,6 +17,9 @@ dependencies:
|
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 5.0.7
|
20
|
+
- - "<="
|
21
|
+
- !ruby/object:Gem::Version
|
22
|
+
version: 6.0.3
|
20
23
|
type: :runtime
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -24,6 +27,9 @@ dependencies:
|
|
24
27
|
- - ">="
|
25
28
|
- !ruby/object:Gem::Version
|
26
29
|
version: 5.0.7
|
30
|
+
- - "<="
|
31
|
+
- !ruby/object:Gem::Version
|
32
|
+
version: 6.0.3
|
27
33
|
- !ruby/object:Gem::Dependency
|
28
34
|
name: archive-zip
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -38,7 +44,7 @@ dependencies:
|
|
38
44
|
- - ">="
|
39
45
|
- !ruby/object:Gem::Version
|
40
46
|
version: 0.7.0
|
41
|
-
description:
|
47
|
+
description:
|
42
48
|
email: opendev@us.ibm.com
|
43
49
|
executables: []
|
44
50
|
extensions: []
|
@@ -74,8 +80,10 @@ files:
|
|
74
80
|
- lib/active_record/connection_adapters/ibmdb_adapter.rb
|
75
81
|
- lib/active_record/vendor/db2-i5-zOS.yaml
|
76
82
|
- lib/mswin32/ibm_db.rb
|
83
|
+
- lib/mswin32/rb2x/i386/ruby25/ibm_db.so
|
77
84
|
- lib/mswin32/rb2x/i386/ruby26/ibm_db.so
|
78
85
|
- lib/mswin32/rb2x/i386/ruby27/ibm_db.so
|
86
|
+
- lib/mswin32/rb3x/i386/ruby30/ibm_db.so
|
79
87
|
- test/active_record/connection_adapters/fake_adapter.rb
|
80
88
|
- test/assets/example.log
|
81
89
|
- test/assets/flowers.jpg
|
@@ -663,8 +671,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
663
671
|
version: '0'
|
664
672
|
requirements:
|
665
673
|
- ActiveRecord, at least 5.0.7
|
666
|
-
|
667
|
-
|
674
|
+
rubyforge_project: rubyibm
|
675
|
+
rubygems_version: 2.7.6.2
|
676
|
+
signing_key:
|
668
677
|
specification_version: 4
|
669
678
|
summary: 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows,
|
670
679
|
DB2 on zOS, DB2 on i5/OS, Informix (IDS)}'
|