1 |
commit: be2fa3947868e58ab535bb61631ba8562b205a59 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 26 14:11:47 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 26 14:11:47 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=be2fa394 |
7 |
|
8 |
Drop dev-db/myodbc from the repo |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
11 |
|
12 |
dev-db/myodbc/ChangeLog | 181 --------------------- |
13 |
dev-db/myodbc/Manifest | 24 --- |
14 |
.../myodbc/files/5.2.7-mariadb-dynamic-array.patch | 79 --------- |
15 |
dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 -- |
16 |
dev-db/myodbc/files/5.3-cmake-doc-path.patch | 43 ----- |
17 |
dev-db/myodbc/files/5.3-cxxlinkage.patch | 43 ----- |
18 |
.../myodbc/files/5.3-mariadb-buffer_length.patch | 93 ----------- |
19 |
.../myodbc/files/5.3-mariadb-dynamic-array.patch | 96 ----------- |
20 |
dev-db/myodbc/files/5.3.10-cxxlinkage.patch | 29 ---- |
21 |
dev-db/myodbc/files/5.3.4-cxxlinkage.patch | 40 ----- |
22 |
dev-db/myodbc/files/cmake-doc-path.patch | 43 ----- |
23 |
dev-db/myodbc/files/odbc.ini.m4 | 17 -- |
24 |
dev-db/myodbc/files/odbcinst.ini.m4 | 5 - |
25 |
dev-db/myodbc/metadata.xml | 8 - |
26 |
dev-db/myodbc/myodbc-5.3.10.ebuild | 146 ----------------- |
27 |
dev-db/myodbc/myodbc-5.3.4.ebuild | 122 -------------- |
28 |
16 files changed, 987 deletions(-) |
29 |
|
30 |
diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog |
31 |
deleted file mode 100644 |
32 |
index f9d3054..0000000 |
33 |
--- a/dev-db/myodbc/ChangeLog |
34 |
+++ /dev/null |
35 |
@@ -1,181 +0,0 @@ |
36 |
-# ChangeLog for dev-db/myodbc |
37 |
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
38 |
-# $Id$ |
39 |
- |
40 |
- 18 Nov 2015; Brian Evans <grknight@g.o> myodbc-5.3.4.ebuild: |
41 |
- dev-db/myodbc: Clean up build process using multilib-minimal; adding die to |
42 |
- external commands |
43 |
- |
44 |
- 11 Aug 2015; Brian Evans <grknight@g.o> +files/5.2.7-my_malloc.patch, |
45 |
- myodbc-5.2.7-r2.ebuild: |
46 |
- dev-db/myodbc Add patch from bug 548912 |
47 |
- |
48 |
- 17 May 2015; Brian Evans <grknight@g.o> -files/5.2.7-cxxlinkage.patch, |
49 |
- -files/myodbc-5.1.6-qt4-includedir.patch, -myodbc-5.1.6.ebuild, |
50 |
- -myodbc-5.2.7.ebuild: |
51 |
- Drop old; 5.1 series no longer builds with current libmysqlclient from servers |
52 |
- |
53 |
- 19 Apr 2015; Pacho Ramos <pacho@g.o> myodbc-5.2.7-r1.ebuild: |
54 |
- x86 stable wrt bug #525298 |
55 |
- |
56 |
- 02 Mar 2015; Agostino Sarubbo <ago@g.o> myodbc-5.2.7-r1.ebuild: |
57 |
- Stable for ppc, wrt bug #525298 |
58 |
- |
59 |
- 12 Feb 2015; Pacho Ramos <pacho@g.o> myodbc-5.2.7-r1.ebuild: |
60 |
- amd64 stable, bug #525298 |
61 |
- |
62 |
- 15 Nov 2014; Chema Alonso <nimiux@g.o> myodbc-5.2.7.ebuild: |
63 |
- Stable for amd64 wrt bug #513646 |
64 |
- |
65 |
-*myodbc-5.2.7-r1 (01 Sep 2014) |
66 |
- |
67 |
- 01 Sep 2014; Brian Evans <grknight@g.o> |
68 |
- +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild: |
69 |
- Revision bump to enable multilib |
70 |
- |
71 |
- 20 Aug 2014; Brian Evans <grknight@g.o> +files/5.2.7-cxxlinkage.patch, |
72 |
- +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild: |
73 |
- Fix build failures on >=dev-db/mariadb-10.0 |
74 |
- |
75 |
-*myodbc-5.2.7 (29 Jul 2014) |
76 |
- |
77 |
- 29 Jul 2014; Brian Evans <grknight@g.o> +myodbc-5.2.7.ebuild, |
78 |
- -myodbc-5.2.6.ebuild: |
79 |
- Version bump, fix slotting of installer utility, and bump required mysql |
80 |
- version. Remove old |
81 |
- |
82 |
-*myodbc-5.2.6 (04 May 2014) |
83 |
- |
84 |
- 04 May 2014; Brian Evans <grknight@g.o> +files/cmake-doc-path.patch, |
85 |
- +myodbc-5.2.6.ebuild: |
86 |
- Version bump to 5.2.6. Fixes bugs #380141, #442322, #462432, #474088 |
87 |
- |
88 |
- 10 May 2013; Patrick Lauer <patrick@g.o> myodbc-5.1.6.ebuild: |
89 |
- Fix src_prepare |
90 |
- |
91 |
- 02 Mar 2013; Markos Chandras <hwoarang@g.o> myodbc-5.1.6.ebuild: |
92 |
- Move Qt dependencies to the new category |
93 |
- |
94 |
- 31 Jul 2012; Michael Palimaka <kensington@g.o> myodbc-5.1.6.ebuild: |
95 |
- Add missing slot dependencies on Qt. |
96 |
- |
97 |
- 10 Jul 2010; Robin H. Johnson <robbat2@g.o> -myodbc-3.51.06.ebuild, |
98 |
- -myodbc-3.51.11.ebuild, -myodbc-3.51.12.ebuild, |
99 |
- -myodbc-3.51.26_p1127.ebuild, -myodbc-3.51.26_p1127-r1.ebuild, |
100 |
- -myodbc-3.51.27_p695.ebuild, -myodbc-5.1.5_p1144.ebuild: |
101 |
- Old versions don't work on newer unixODBC, so clean them up. Latest is |
102 |
- stable anyway. |
103 |
- |
104 |
- 26 Jun 2010; <nixnut@g.o> myodbc-5.1.6.ebuild: |
105 |
- ppc stable #322277 |
106 |
- |
107 |
- 24 Jun 2010; Pacho Ramos <pacho@g.o> myodbc-5.1.6.ebuild: |
108 |
- stable amd64, bug 322277 |
109 |
- |
110 |
- 14 Jun 2010; Christian Faulhammer <fauli@g.o> myodbc-5.1.6.ebuild: |
111 |
- stable x86, bug 322277 |
112 |
- |
113 |
- 11 Apr 2010; <nixnut@g.o> myodbc-3.51.26_p1127-r1.ebuild, |
114 |
- myodbc-5.1.5_p1144.ebuild: |
115 |
- ppc stable #302944 |
116 |
- |
117 |
- 07 Feb 2010; Markos Chandras <hwoarang@g.o> |
118 |
- myodbc-3.51.26_p1127-r1.ebuild, myodbc-5.1.5_p1144.ebuild: |
119 |
- Stable on amd64 wrt bug #302944 |
120 |
- |
121 |
- 03 Feb 2010; Christian Faulhammer <fauli@g.o> |
122 |
- myodbc-3.51.26_p1127-r1.ebuild: |
123 |
- stable x86, bug 302944 |
124 |
- |
125 |
- 03 Feb 2010; Christian Faulhammer <fauli@g.o> |
126 |
- myodbc-5.1.5_p1144.ebuild: |
127 |
- stable x86, bug 302944 |
128 |
- |
129 |
-*myodbc-5.1.6 (31 Jan 2010) |
130 |
- |
131 |
- 31 Jan 2010; Robin H. Johnson <robbat2@g.o> +myodbc-5.1.6.ebuild, |
132 |
- +files/myodbc-5.1.6-qt4-includedir.patch: |
133 |
- Version bump for 5.1 slot, now includes support for Qt Gui. |
134 |
- |
135 |
-*myodbc-3.51.27_p695 (31 Jan 2010) |
136 |
- |
137 |
- 31 Jan 2010; Robin H. Johnson <robbat2@g.o> |
138 |
- +myodbc-3.51.27_p695.ebuild: |
139 |
- Add 3.51.27 as the final release in the 3.51 series. |
140 |
- |
141 |
- 26 Feb 2009; Joseph Jezak <josejx@g.o> myodbc-3.51.12.ebuild: |
142 |
- Marked ppc stable. |
143 |
- |
144 |
-*myodbc-5.1.5_p1144 (01 Nov 2008) |
145 |
- |
146 |
- 01 Nov 2008; Robin H. Johnson <robbat2@g.o> |
147 |
- +myodbc-5.1.5_p1144.ebuild: |
148 |
- Include 5.1 version now, in a new SLOT. |
149 |
- |
150 |
-*myodbc-3.51.26_p1127-r1 (01 Nov 2008) |
151 |
- |
152 |
- 01 Nov 2008; Robin H. Johnson <robbat2@g.o> |
153 |
- +myodbc-3.51.26_p1127-r1.ebuild: |
154 |
- Bring in slotted myodbc in preparation for 5.1. Also fix bug #159026 with |
155 |
- $FILESDIR usage during pkg_config. Use sed instead of m4. Driver name for |
156 |
- DSN also includes SLOT value. |
157 |
- |
158 |
-*myodbc-3.51.26_p1127 (01 Nov 2008) |
159 |
- |
160 |
- 01 Nov 2008; Robin H. Johnson <robbat2@g.o> |
161 |
- +myodbc-3.51.26_p1127.ebuild: |
162 |
- Version bump per bug #240088, also handles new upstream source location |
163 |
- and versioning. |
164 |
- |
165 |
- 02 Jul 2007; Piotr Jaroszyński <peper@g.o> myodbc-3.51.12.ebuild: |
166 |
- (QA) RESTRICT clean up. |
167 |
- |
168 |
- 31 Jan 2007; Marius Mauch <genone@g.o> myodbc-3.51.06.ebuild, |
169 |
- myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild: |
170 |
- Replacing einfo with elog |
171 |
- |
172 |
- 23 Nov 2006; Francesco Riosa <vivo@g.o> myodbc-3.51.06.ebuild, |
173 |
- myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild: |
174 |
- dev-db/mysql => virtual/mysql |
175 |
- |
176 |
- 28 Oct 2006; Sven Wegener <swegener@g.o> myodbc-3.51.06.ebuild, |
177 |
- myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild: |
178 |
- Use emerge --config instead of ebuild config. |
179 |
- |
180 |
-*myodbc-3.51.12 (24 Jun 2006) |
181 |
- |
182 |
- 24 Jun 2006; Francesco Riosa <vivo@g.o> +myodbc-3.51.12.ebuild: |
183 |
- version bump |
184 |
- |
185 |
- 21 Jan 2006; <nixnut@g.o> myodbc-3.51.11.ebuild: |
186 |
- Added ~ppc keyword. |
187 |
- |
188 |
- 16 Aug 2005; Francesco Riosa <vivo@g.o> myodbc-3.51.11.ebuild: |
189 |
- Workaround for bug #102026, now configuring without samples and test |
190 |
- |
191 |
- 27 Jul 2005; Francesco Riosa <vivo@g.o> myodbc-3.51.11.ebuild: |
192 |
- "unstable" to "stable" after testing on amd64 and x86. |
193 |
- |
194 |
- 28 Jun 2005; Simon Stelling <blubb@g.o> myodbc-3.51.11.ebuild: |
195 |
- added ~amd64 keyword |
196 |
- |
197 |
-*myodbc-3.51.11 (17 May 2005) |
198 |
- |
199 |
- 17 May 2005; Robin H. Johnson <robbat2@g.o> +metadata.xml, |
200 |
- +myodbc-3.51.11.ebuild: |
201 |
- Add metadata. New version for mysql-4.1 support. |
202 |
- |
203 |
- 29 Jun 2004; Aron Griffis <agriffis@g.o> myodbc-3.51.06.ebuild: |
204 |
- sync IUSE (+debug, +doc, +static) |
205 |
- |
206 |
- 07 Dec 2003; Martin Holzer <mholzer@g.o> myodbc-3.51.06.ebuild: |
207 |
- adding RESTRICT="nomirror" |
208 |
- |
209 |
- 26 Oct 2003; Robin H. Johnson <robbat2@g.o> myodbc-3.51.06.ebuild, |
210 |
- files/odbc.ini.m4, files/odbcinst.ini.m4: |
211 |
- major changes made for auto-configuration of driver and DSN. |
212 |
- |
213 |
-*myodbc-3.51.06 (26 Oct 2003) |
214 |
- |
215 |
- 26 Oct 2003; Robin H. Johnson <robbat2@g.o> myodbc-3.51.06.ebuild: |
216 |
- initial commit, bug #15546, submitted by Zhen Lin <lowzl@×××××××.com> |
217 |
|
218 |
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest |
219 |
deleted file mode 100644 |
220 |
index 0941e8b..0000000 |
221 |
--- a/dev-db/myodbc/Manifest |
222 |
+++ /dev/null |
223 |
@@ -1,24 +0,0 @@ |
224 |
------BEGIN PGP SIGNED MESSAGE----- |
225 |
-Hash: SHA256 |
226 |
- |
227 |
-DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 SHA256 e15fe714b0236bdb7adea28a5d14a62511b5657cd83a6be664b45a4ef077fcb5 SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b WHIRLPOOL e27aa8c51b575972ceb2f82d36ae4146835e1893808d9a5f98c31924fb16ee576880c7ae3393b89beb4f952c5436699d25efb4cd0e0d25b454a31bdfeedea98e |
228 |
-DIST mysql-connector-odbc-5.3.4-src.tar.gz 667340 SHA256 a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d SHA512 1e3a0c06091f6ca34e89f9fc915f34e94b840db8626a93f56d464aff8d1f8a275c4ef494046ac760e8bcf910a05b91e39a8a1842711e4a78adddcc412ff77ec8 WHIRLPOOL 37bbaac3098377c82889cc30a3bd8b088b751e81a0116b87945a0efccd60f5c3a689176ccbaf866f7957404bbb08d08f9a7885ad68448f7a65188da3b33eb9f2 |
229 |
------BEGIN PGP SIGNATURE----- |
230 |
-Version: GnuPG v2 |
231 |
- |
232 |
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlvGk7xfFIAAAAAALgAo |
233 |
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2 |
234 |
-QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0 |
235 |
-o7YUkRAAsl1lJcDOEH4i3f7i0438IcDzttcMx1T1tLnDG6pBPlD9Bi5igUNJ2x76 |
236 |
-7y8N5CdCJ23aF9UfuqgCVromlxIXIzOzczTHE+cTwRRyeAiDagKfrgkF8Whs+4pD |
237 |
-bMzeZbFOsxlUSPWZXJ8OZXjA1/pILplo+Nc2gvieoR7ykaoRSndVkKxLHzC68QpW |
238 |
-8ZS3kPCQ3U55OIcwMc0T4UNsrEqOW3dC3eRMXuAy+Qy0HYrPSpdvrupm2gi/zOUF |
239 |
-HVm1JfoW+OaBoLxdCp2nnEnrBCEoGB+nu9QDexk1XmHLILmOarVngb83gfEjYW0b |
240 |
-bw0ltQvhf7/AU+27k0lMtv0DbwJ7akbz5nCy7XszcBMZsoqtIs2jNg6lqiwGa4JO |
241 |
-bOQ/eqIPrHYUWd1hq3HMRw30/dVdXGyRmYJWl8y0hucx2NxoEGop4bWWSpB210Fq |
242 |
-PPakT1T6ySjrVGnrMitg4Omug+a9rWoPhGMrYhK1leT5FFoK0sjeZO/rBupTOuSo |
243 |
-9i7g3Old3suvoIF2e2saWHGZS7+E1DH/iEWnu8g+kNcMqmj4Q8+ctC33SIkVll08 |
244 |
-PVpHZ9D1a+mFTpSSQrntsBotIaid3QZgJ9aDEW2DTHG+1iXy/rPRIwEvjW32q/fj |
245 |
-c0P1wKU8Nk/GLR59Vd6aAIPF5ofvywEMBkafa+6GTaTLg/l8vCo= |
246 |
-=5Rnq |
247 |
------END PGP SIGNATURE----- |
248 |
|
249 |
diff --git a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch |
250 |
deleted file mode 100644 |
251 |
index 6cfe7cd..0000000 |
252 |
--- a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch |
253 |
+++ /dev/null |
254 |
@@ -1,79 +0,0 @@ |
255 |
-diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c |
256 |
---- a/driver/catalog_no_i_s.c 2014-06-18 18:50:16.000000000 -0400 |
257 |
-+++ b/driver/catalog_no_i_s.c 2014-08-20 14:08:33.997339096 -0400 |
258 |
-@@ -1093,7 +1093,11 @@ |
259 |
- unsigned long *lengths; |
260 |
- SQLRETURN rc= SQL_SUCCESS; |
261 |
- |
262 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
263 |
-+ my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0)); |
264 |
-+#else |
265 |
- my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0); |
266 |
-+#endif |
267 |
- |
268 |
- /* Get the list of tables that match szCatalog and szTable */ |
269 |
- pthread_mutex_lock(&stmt->dbc->lock); |
270 |
-diff -aurN a/driver/desc.c b/driver/desc.c |
271 |
---- a/driver/desc.c 2014-06-18 18:50:16.000000000 -0400 |
272 |
-+++ b/driver/desc.c 2014-08-20 14:07:37.409169269 -0400 |
273 |
-@@ -63,8 +63,12 @@ |
274 |
- but in desc_get_rec we manually get a pointer to it. This avoids |
275 |
- having to call set_dynamic after modifying the DESCREC. |
276 |
- */ |
277 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
278 |
-+ if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0))) |
279 |
-+#else |
280 |
- if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) |
281 |
-+#endif |
282 |
- { |
283 |
- x_free((char *)desc); |
284 |
- return NULL; |
285 |
- } |
286 |
-@@ -995,9 +1003,15 @@ |
287 |
- |
288 |
- /* copy the records */ |
289 |
- delete_dynamic(&dest->records); |
290 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
291 |
-+ if (my_init_dynamic_array(&dest->records, sizeof(DESCREC), |
292 |
-+ src->records.max_element, |
293 |
-+ src->records.alloc_increment, MYF(0))) |
294 |
-+#else |
295 |
- if (my_init_dynamic_array(&dest->records, sizeof(DESCREC), |
296 |
- src->records.max_element, |
297 |
- src->records.alloc_increment)) |
298 |
-+#endif |
299 |
- { |
300 |
- return set_desc_error(dest, "HY001", |
301 |
- "Memory allocation error", |
302 |
-diff -aurN a/driver/handle.c b/driver/handle.c |
303 |
---- a/driver/handle.c 2014-06-18 18:50:16.000000000 -0400 |
304 |
-+++ b/driver/handle.c 2014-08-20 14:05:00.364248403 -0400 |
305 |
-@@ -403,7 +403,11 @@ |
306 |
- } |
307 |
- } |
308 |
- |
309 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
310 |
-+ my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0)); |
311 |
-+#else |
312 |
- my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10); |
313 |
-+#endif |
314 |
- memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) * |
315 |
- (*param_bind)->max_element); |
316 |
- |
317 |
-diff -aurN a/driver/parse.c b/driver/parse.c |
318 |
---- a/driver/parse.c 2014-06-18 18:50:16.000000000 -0400 |
319 |
-+++ b/driver/parse.c 2014-08-20 14:03:54.336383876 -0400 |
320 |
-@@ -129,8 +129,13 @@ |
321 |
- |
322 |
- /* TODO: Store offsets rather than ptrs. In this case we will be fine |
323 |
- if work with copy of the originally parsed string */ |
324 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
325 |
-+ my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0)); |
326 |
-+ my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0)); |
327 |
-+#else |
328 |
- my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10); |
329 |
- my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10); |
330 |
-+#endif |
331 |
- } |
332 |
- |
333 |
- return pq; |
334 |
|
335 |
diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch b/dev-db/myodbc/files/5.2.7-my_malloc.patch |
336 |
deleted file mode 100644 |
337 |
index bc6c65e..0000000 |
338 |
--- a/dev-db/myodbc/files/5.2.7-my_malloc.patch |
339 |
+++ /dev/null |
340 |
@@ -1,18 +0,0 @@ |
341 |
-diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c |
342 |
---- a/util/odbcinstw.c 2014-04-23 21:54:40.000000000 +0200 |
343 |
-+++ b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200 |
344 |
-@@ -68,13 +68,7 @@ |
345 |
- |
346 |
- if (lpszRetBuffer && cbRetBuffer) |
347 |
- { |
348 |
-- ret= malloc(cbRetBuffer + 1); |
349 |
-- /* |
350 |
-- We cannot rely on getting correct results from the next call of |
351 |
-- SQLGetPrivateProfileString. So, taking precautions against unititialized |
352 |
-- values in the allocated buffer. |
353 |
-- */ |
354 |
-- memset(ret, 0, cbRetBuffer + 1); |
355 |
-+ ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL)); |
356 |
- } |
357 |
- else |
358 |
- ret= NULL; |
359 |
|
360 |
diff --git a/dev-db/myodbc/files/5.3-cmake-doc-path.patch b/dev-db/myodbc/files/5.3-cmake-doc-path.patch |
361 |
deleted file mode 100644 |
362 |
index 54f35d4..0000000 |
363 |
--- a/dev-db/myodbc/files/5.3-cmake-doc-path.patch |
364 |
+++ /dev/null |
365 |
@@ -1,43 +0,0 @@ |
366 |
-=== modified file 'CMakeLists.txt' |
367 |
---- a/CMakeLists.txt 2013-03-09 09:51:06 +0000 |
368 |
-+++ b/CMakeLists.txt 2013-03-09 11:05:27 +0000 |
369 |
-@@ -33,6 +33,12 @@ |
370 |
- |
371 |
- INCLUDE(version.cmake) |
372 |
- |
373 |
-+IF(WITH_DOCUMENTATION_INSTALL_PATH) |
374 |
-+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH}) |
375 |
-+ELSE(WITH_DOCUMENTATION_INSTALL_PATH) |
376 |
-+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}) |
377 |
-+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH) |
378 |
-+ |
379 |
- #Default is to build both drivers |
380 |
- IF(UNICODE OR NOT ANSI) |
381 |
- MESSAGE(STATUS "Configuring to build Unicode driver") |
382 |
-@@ -329,19 +335,17 @@ |
383 |
- |
384 |
- ELSE(WIN32) |
385 |
- |
386 |
-- INSTALL(FILES ChangeLog DESTINATION .) |
387 |
-- INSTALL(FILES README DESTINATION .) |
388 |
-- INSTALL(FILES README.debug DESTINATION .) |
389 |
-- INSTALL(FILES INSTALL DESTINATION .) |
390 |
-+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
391 |
-+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
392 |
-+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
393 |
-+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
394 |
- IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") |
395 |
-- INSTALL(FILES COPYING DESTINATION .) |
396 |
- ELSE() |
397 |
-- INSTALL(FILES LICENSE.mysql DESTINATION .) |
398 |
- ENDIF() |
399 |
- |
400 |
- ENDIF(WIN32) |
401 |
- |
402 |
--INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) |
403 |
-+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
404 |
- |
405 |
- INCLUDE(CPack) |
406 |
- |
407 |
- |
408 |
- |
409 |
|
410 |
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch b/dev-db/myodbc/files/5.3-cxxlinkage.patch |
411 |
deleted file mode 100644 |
412 |
index 319262c..0000000 |
413 |
--- a/dev-db/myodbc/files/5.3-cxxlinkage.patch |
414 |
+++ /dev/null |
415 |
@@ -1,43 +0,0 @@ |
416 |
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake |
417 |
---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 |
418 |
-+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 |
419 |
-@@ -747,7 +747,7 @@ |
420 |
- endif() |
421 |
- |
422 |
- if(NOT MYSQL_CXXFLAGS) |
423 |
-- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) |
424 |
-+ if(MYSQL_CXX_LINKAGE) |
425 |
- _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") |
426 |
- set(MYSQL_CXX_LINKAGE 1) |
427 |
- else() |
428 |
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt |
429 |
---- a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500 |
430 |
-+++ b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500 |
431 |
-@@ -242,10 +242,9 @@ |
432 |
- SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") |
433 |
- SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") |
434 |
- |
435 |
--SET(LIB_SUBDIR "lib") |
436 |
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") |
437 |
-- SET(LIB_SUBDIR "lib64") |
438 |
--ENDIF() |
439 |
-+IF(NOT LIB_SUBDIR) |
440 |
-+ MESSAGE(ERROR "LIB_SUBDIR is not set") |
441 |
-+ENDIF(NOT LIB_SUBDIR) |
442 |
- |
443 |
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") |
444 |
- |
445 |
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake |
446 |
---- a/cmake/FindMySQL.cmake 2017-02-17 14:44:29.532733308 -0500 |
447 |
-+++ b/cmake/FindMySQL.cmake 2017-02-17 14:48:56.756740330 -0500 |
448 |
-@@ -270,8 +270,8 @@ |
449 |
- set(_static_lib_ext ".lib") # Careful, can be import library for DLL |
450 |
- elseif(MYSQLCLIENT_NO_THREADS) |
451 |
- # In 5.1 and below there is a single threaded library |
452 |
-- set(_dynamic_libs "mysqlclient") |
453 |
-- set(_static_libs "libmysqlclient.a") |
454 |
-+ set(_dynamic_libs "${MYSQLCLIENT_LIB_NAME}") |
455 |
-+ set(_static_libs "lib${MYSQLCLIENT_LIB_NAME}.a") |
456 |
- set(_static_lib_ext ".a") |
457 |
- else() |
458 |
- # We try the multithreaded "libmysqlclient_r" first and if not |
459 |
|
460 |
diff --git a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch |
461 |
deleted file mode 100644 |
462 |
index 1be9cc4..0000000 |
463 |
--- a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch |
464 |
+++ /dev/null |
465 |
@@ -1,93 +0,0 @@ |
466 |
-diff -aurN a/driver/connect.c b/driver/connect.c |
467 |
---- a/driver/connect.c 2016-11-29 07:40:13.000000000 -0500 |
468 |
-+++ b/driver/connect.c 2017-02-17 16:14:48.116640371 -0500 |
469 |
-@@ -510,11 +510,11 @@ |
470 |
- } |
471 |
- } |
472 |
- |
473 |
--#if MYSQL_VERSION_ID >= 50709 |
474 |
-- mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length); |
475 |
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) |
476 |
-+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length_value); |
477 |
- #else |
478 |
- // for older versions just use net_buffer_length() macro |
479 |
-- dbc->net_buffer_length = net_buffer_length; |
480 |
-+ dbc->net_buffer_length_value = net_buffer_length; |
481 |
- #endif |
482 |
- return rc; |
483 |
- |
484 |
-diff -aurN a/driver/cursor.c b/driver/cursor.c |
485 |
---- a/driver/cursor.c 2016-11-29 07:40:13.000000000 -0500 |
486 |
-+++ b/driver/cursor.c 2017-02-17 16:13:19.163299885 -0500 |
487 |
-@@ -1485,7 +1485,7 @@ |
488 |
- We have a limited capacity to shove data across the wire, but |
489 |
- we handle this by sending in multiple calls to exec_stmt_query() |
490 |
- */ |
491 |
-- if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length) |
492 |
-+ if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length_value) |
493 |
- { |
494 |
- break_insert= TRUE; |
495 |
- break; |
496 |
-diff -aurN a/driver/driver.h b/driver/driver.h |
497 |
---- a/driver/driver.h 2016-11-29 07:40:13.000000000 -0500 |
498 |
-+++ b/driver/driver.h 2017-02-17 16:10:57.072950723 -0500 |
499 |
-@@ -378,7 +378,7 @@ |
500 |
- int txn_isolation; |
501 |
- uint port; |
502 |
- uint cursor_count; |
503 |
-- ulong net_buffer_length; |
504 |
-+ ulong net_buffer_length_value; |
505 |
- uint commit_flag; |
506 |
- #ifdef THREAD |
507 |
- myodbc_mutex_t lock; |
508 |
-diff -aurN a/driver/info.c b/driver/info.c |
509 |
---- a/driver/info.c 2016-11-29 07:40:13.000000000 -0500 |
510 |
-+++ b/driver/info.c 2017-02-17 16:12:54.315763441 -0500 |
511 |
-@@ -587,7 +587,7 @@ |
512 |
- MYINFO_SET_USHORT(0); |
513 |
- |
514 |
- case SQL_MAX_STATEMENT_LEN: |
515 |
-- MYINFO_SET_ULONG(dbc->net_buffer_length); |
516 |
-+ MYINFO_SET_ULONG(dbc->net_buffer_length_value); |
517 |
- |
518 |
- case SQL_MAX_TABLE_NAME_LEN: |
519 |
- MYINFO_SET_USHORT(NAME_LEN); |
520 |
-diff -aurN a/driver/connect.c b/driver/connect.c |
521 |
---- a/driver/connect.c 2017-02-17 16:16:14.609026769 -0500 |
522 |
-+++ b/driver/connect.c 2017-02-17 16:34:29.637592664 -0500 |
523 |
-@@ -179,7 +179,7 @@ |
524 |
- /* Set other connection options */ |
525 |
- |
526 |
- if (ds->allow_big_results || ds->safe) |
527 |
--#if MYSQL_VERSION_ID >= 50709 |
528 |
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) |
529 |
- mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long); |
530 |
- #else |
531 |
- /* max_allowed_packet is a magical mysql macro. */ |
532 |
-@@ -252,7 +252,7 @@ |
533 |
- ds_get_utf8attr(ds->rsakey, &ds->rsakey8)); |
534 |
- } |
535 |
- |
536 |
--#if MYSQL_VERSION_ID >= 50710 |
537 |
-+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION) |
538 |
- { |
539 |
- char tls_options[128] = { 0 }; |
540 |
- if (!ds->no_tls_1) |
541 |
-@@ -323,7 +323,7 @@ |
542 |
- #endif |
543 |
- |
544 |
- mysql->options.use_ssl = !ds->disable_ssl_default; |
545 |
--#if MYSQL_VERSION_ID >= 50703 |
546 |
-+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION) |
547 |
- { |
548 |
- if (ds->ssl_enforce) |
549 |
- { |
550 |
-@@ -332,7 +332,7 @@ |
551 |
- } |
552 |
- #endif |
553 |
- |
554 |
--#if MYSQL_VERSION_ID >= 50711 |
555 |
-+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION) |
556 |
- if (ds->sslmode) |
557 |
- { |
558 |
- unsigned int mode = 0; |
559 |
|
560 |
diff --git a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch |
561 |
deleted file mode 100644 |
562 |
index 9672061..0000000 |
563 |
--- a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch |
564 |
+++ /dev/null |
565 |
@@ -1,96 +0,0 @@ |
566 |
-diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c |
567 |
---- a/driver/catalog_no_i_s.c 2016-11-29 07:40:13.000000000 -0500 |
568 |
-+++ b/driver/catalog_no_i_s.c 2017-02-17 14:07:03.979683613 -0500 |
569 |
-@@ -1093,7 +1093,11 @@ |
570 |
- unsigned long *lengths; |
571 |
- SQLRETURN rc= SQL_SUCCESS; |
572 |
- |
573 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
574 |
-+ myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0)); |
575 |
-+#else |
576 |
- myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0); |
577 |
-+#endif |
578 |
- |
579 |
- /* Get the list of tables that match szCatalog and szTable */ |
580 |
- myodbc_mutex_lock(&stmt->dbc->lock); |
581 |
-diff -aurN a/driver/desc.c b/driver/desc.c |
582 |
---- a/driver/desc.c 2016-11-29 07:40:13.000000000 -0500 |
583 |
-+++ b/driver/desc.c 2017-02-17 14:09:30.139954232 -0500 |
584 |
-@@ -63,13 +63,21 @@ |
585 |
- but in desc_get_rec we manually get a pointer to it. This avoids |
586 |
- having to call set_dynamic after modifying the DESCREC. |
587 |
- */ |
588 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
589 |
-+ if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0))) |
590 |
-+#else |
591 |
- if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) |
592 |
-+#endif |
593 |
- { |
594 |
- x_free((char *)desc); |
595 |
- return NULL; |
596 |
- } |
597 |
- |
598 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
599 |
-+ if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, MYF(0))) |
600 |
-+#else |
601 |
- if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0)) |
602 |
-+#endif |
603 |
- { |
604 |
- delete_dynamic(&desc->records); |
605 |
- x_free((char *)desc); |
606 |
-@@ -997,7 +1005,11 @@ |
607 |
- delete_dynamic(&dest->records); |
608 |
- if (myodbc_init_dynamic_array(&dest->records, sizeof(DESCREC), |
609 |
- src->records.max_element, |
610 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
611 |
-+ src->records.alloc_increment, MYF(0))) |
612 |
-+#else |
613 |
- src->records.alloc_increment)) |
614 |
-+#endif |
615 |
- { |
616 |
- return set_desc_error(dest, "HY001", |
617 |
- "Memory allocation error", |
618 |
-diff -aurN a/driver/handle.c b/driver/handle.c |
619 |
---- a/driver/handle.c 2016-11-29 07:40:13.000000000 -0500 |
620 |
-+++ b/driver/handle.c 2017-02-17 14:10:32.078797593 -0500 |
621 |
-@@ -409,7 +409,11 @@ |
622 |
- } |
623 |
- } |
624 |
- |
625 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
626 |
-+ myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0)); |
627 |
-+#else |
628 |
- myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10); |
629 |
-+#endif |
630 |
- memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) * |
631 |
- (*param_bind)->max_element); |
632 |
- |
633 |
-diff -aurN a/driver/parse.c b/driver/parse.c |
634 |
---- a/driver/parse.c 2016-11-29 07:40:13.000000000 -0500 |
635 |
-+++ b/driver/parse.c 2017-02-17 14:12:00.638143846 -0500 |
636 |
-@@ -139,8 +139,13 @@ |
637 |
- |
638 |
- /* TODO: Store offsets rather than ptrs. In this case we will be fine |
639 |
- if work with copy of the originally parsed string */ |
640 |
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 |
641 |
-+ myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0)); |
642 |
-+ myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0)); |
643 |
-+#else |
644 |
- myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10); |
645 |
- myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10); |
646 |
-+#endif |
647 |
- } |
648 |
- |
649 |
- return pq; |
650 |
-diff -aurN a/MYODBC_MYSQL.h b/MYODBC_MYSQL.h |
651 |
---- a/MYODBC_MYSQL.h 2016-11-29 07:40:13.000000000 -0500 |
652 |
-+++ b/MYODBC_MYSQL.h 2017-02-17 15:04:47.153994839 -0500 |
653 |
-@@ -44,7 +44,7 @@ |
654 |
- #endif |
655 |
- |
656 |
- #ifdef THREAD |
657 |
--#if MYSQL_VERSION_ID < 50703 |
658 |
-+#if MYSQL_VERSION_ID < 50703 || defined(MARIADB_BASE_VERSION) |
659 |
- #include <my_pthread.h> |
660 |
- #define myodbc_mutex_t pthread_mutex_t |
661 |
- #define myodbc_key_t pthread_key_t |
662 |
|
663 |
diff --git a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch |
664 |
deleted file mode 100644 |
665 |
index 796a137..0000000 |
666 |
--- a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch |
667 |
+++ /dev/null |
668 |
@@ -1,29 +0,0 @@ |
669 |
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake |
670 |
---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 |
671 |
-+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 |
672 |
-@@ -747,7 +747,7 @@ |
673 |
- endif() |
674 |
- |
675 |
- if(NOT MYSQL_CXXFLAGS) |
676 |
-- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) |
677 |
-+ if(MYSQL_CXX_LINKAGE) |
678 |
- _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") |
679 |
- set(MYSQL_CXX_LINKAGE 1) |
680 |
- else() |
681 |
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt |
682 |
---- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500 |
683 |
-+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500 |
684 |
-@@ -379,10 +379,9 @@ |
685 |
- SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") |
686 |
- SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") |
687 |
- |
688 |
--SET(LIB_SUBDIR "lib") |
689 |
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") |
690 |
-- SET(LIB_SUBDIR "lib64") |
691 |
--ENDIF() |
692 |
-+IF(NOT LIB_SUBDIR) |
693 |
-+ MESSAGE(ERROR "LIB_SUBDIR is not set") |
694 |
-+ENDIF(NOT LIB_SUBDIR) |
695 |
- |
696 |
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") |
697 |
- |
698 |
|
699 |
diff --git a/dev-db/myodbc/files/5.3.4-cxxlinkage.patch b/dev-db/myodbc/files/5.3.4-cxxlinkage.patch |
700 |
deleted file mode 100644 |
701 |
index c770c9b..0000000 |
702 |
--- a/dev-db/myodbc/files/5.3.4-cxxlinkage.patch |
703 |
+++ /dev/null |
704 |
@@ -1,40 +0,0 @@ |
705 |
-diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake |
706 |
---- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 |
707 |
-+++ b/cmake/FindMySQL.cmake 2015-07-17 12:25:30.706091000 -0400 |
708 |
-@@ -105,16 +105,16 @@ |
709 |
- # Finally remove the dot |
710 |
- STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") |
711 |
- |
712 |
-- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) |
713 |
-+ IF(MYSQL_CXX_LINKAGE) |
714 |
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" |
715 |
- OUTPUT_VARIABLE _mysql_config_output |
716 |
- ) |
717 |
- SET(MYSQL_CXX_LINKAGE 1) |
718 |
-- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) |
719 |
-+ ELSE (MYSQL_CXX_LINKAGE) |
720 |
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" |
721 |
- OUTPUT_VARIABLE _mysql_config_output |
722 |
- ) |
723 |
-- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) |
724 |
-+ ENDIF(MYSQL_CXX_LINKAGE) |
725 |
- |
726 |
- # Remove the stl4port dependency |
727 |
- STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") |
728 |
-diff -uarN a/CMakeLists.txt b/CMakeLists.txt |
729 |
---- a/CMakeLists.txt 2015-07-17 12:20:19.106091000 -0400 |
730 |
-+++ b/CMakeLists.txt 2015-07-17 12:26:36.909091000 -0400 |
731 |
-@@ -256,10 +256,9 @@ |
732 |
- SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") |
733 |
- SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") |
734 |
- |
735 |
--SET(LIB_SUBDIR "lib") |
736 |
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") |
737 |
-- SET(LIB_SUBDIR "lib64") |
738 |
--ENDIF() |
739 |
-+IF(NOT LIB_SUBDIR) |
740 |
-+ MESSAGE(ERROR "LIB_SUBDIR is not set") |
741 |
-+ENDIF(NOT LIB_SUBDIR) |
742 |
- |
743 |
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") |
744 |
- |
745 |
|
746 |
diff --git a/dev-db/myodbc/files/cmake-doc-path.patch b/dev-db/myodbc/files/cmake-doc-path.patch |
747 |
deleted file mode 100644 |
748 |
index c7f7d9d..0000000 |
749 |
--- a/dev-db/myodbc/files/cmake-doc-path.patch |
750 |
+++ /dev/null |
751 |
@@ -1,43 +0,0 @@ |
752 |
-=== modified file 'CMakeLists.txt' |
753 |
---- CMakeLists.txt 2013-03-09 09:51:06 +0000 |
754 |
-+++ CMakeLists.txt 2013-03-09 11:05:27 +0000 |
755 |
-@@ -33,6 +33,12 @@ |
756 |
- SET(CONNECTOR_MAJOR "5") |
757 |
- SET(CONNECTOR_MINOR "2") |
758 |
- |
759 |
-+IF(WITH_DOCUMENTATION_INSTALL_PATH) |
760 |
-+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH}) |
761 |
-+ELSE(WITH_DOCUMENTATION_INSTALL_PATH) |
762 |
-+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}) |
763 |
-+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH) |
764 |
-+ |
765 |
- IF(CONNECTOR_MINOR LESS 10) |
766 |
- SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}") |
767 |
- ELSE(CONNECTOR_MINOR LESS 10) |
768 |
-@@ -329,19 +335,17 @@ |
769 |
- |
770 |
- ELSE(WIN32) |
771 |
- |
772 |
-- INSTALL(FILES ChangeLog DESTINATION .) |
773 |
-- INSTALL(FILES README DESTINATION .) |
774 |
-- INSTALL(FILES README.debug DESTINATION .) |
775 |
-- INSTALL(FILES INSTALL DESTINATION .) |
776 |
-+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
777 |
-+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
778 |
-+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
779 |
-+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
780 |
- IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") |
781 |
-- INSTALL(FILES COPYING DESTINATION .) |
782 |
- ELSE() |
783 |
-- INSTALL(FILES LICENSE.mysql DESTINATION .) |
784 |
- ENDIF() |
785 |
- |
786 |
- ENDIF(WIN32) |
787 |
- |
788 |
--INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) |
789 |
-+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
790 |
- |
791 |
- INCLUDE(CPack) |
792 |
- |
793 |
- |
794 |
- |
795 |
|
796 |
diff --git a/dev-db/myodbc/files/odbc.ini.m4 b/dev-db/myodbc/files/odbc.ini.m4 |
797 |
deleted file mode 100644 |
798 |
index 4255730..0000000 |
799 |
--- a/dev-db/myodbc/files/odbc.ini.m4 |
800 |
+++ /dev/null |
801 |
@@ -1,17 +0,0 @@ |
802 |
-# vim:ts=4 noexpandtab ft=dosini: |
803 |
-# |
804 |
-[ODBC Data Sources] |
805 |
-__PN__-test = MySQL ODBC __PF__ Driver Testing DSN |
806 |
- |
807 |
-# see http://www.mysql.com/products/myodbc/faq_toc.html |
808 |
-# for details about the following entry |
809 |
-[__PN__-test] |
810 |
-Description = MySQL ODBC __PF__ Driver Testing DSN |
811 |
-Driver = __PN__ |
812 |
-Socket = /var/run/mysqld/mysqld.sock |
813 |
-Server = localhost |
814 |
-User = root |
815 |
-Database = test |
816 |
-Option = 3 |
817 |
-#Port = |
818 |
-#Password = |
819 |
|
820 |
diff --git a/dev-db/myodbc/files/odbcinst.ini.m4 b/dev-db/myodbc/files/odbcinst.ini.m4 |
821 |
deleted file mode 100644 |
822 |
index 744503c..0000000 |
823 |
--- a/dev-db/myodbc/files/odbcinst.ini.m4 |
824 |
+++ /dev/null |
825 |
@@ -1,5 +0,0 @@ |
826 |
-# vim:ts=4 noexpandtab ft=dosini: |
827 |
-# |
828 |
-[__PN__] |
829 |
-Description = MySQL ODBC __PF__ Driver |
830 |
-Driver = /usr/lib/libmyodbc3.so |
831 |
|
832 |
diff --git a/dev-db/myodbc/metadata.xml b/dev-db/myodbc/metadata.xml |
833 |
deleted file mode 100644 |
834 |
index 709689b..0000000 |
835 |
--- a/dev-db/myodbc/metadata.xml |
836 |
+++ /dev/null |
837 |
@@ -1,8 +0,0 @@ |
838 |
-<?xml version="1.0" encoding="UTF-8"?> |
839 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
840 |
-<pkgmetadata> |
841 |
-<maintainer type="project"> |
842 |
- <email>mysql-bugs@g.o</email> |
843 |
- <name>MySQL</name> |
844 |
-</maintainer> |
845 |
-</pkgmetadata> |
846 |
|
847 |
diff --git a/dev-db/myodbc/myodbc-5.3.10.ebuild b/dev-db/myodbc/myodbc-5.3.10.ebuild |
848 |
deleted file mode 100644 |
849 |
index f4ac130..0000000 |
850 |
--- a/dev-db/myodbc/myodbc-5.3.10.ebuild |
851 |
+++ /dev/null |
852 |
@@ -1,146 +0,0 @@ |
853 |
-# Copyright 1999-2018 Gentoo Foundation |
854 |
-# Distributed under the terms of the GNU General Public License v2 |
855 |
- |
856 |
-EAPI=6 |
857 |
- |
858 |
-# Build is broken with ninja |
859 |
-CMAKE_MAKEFILE_GENERATOR=emake |
860 |
- |
861 |
-inherit cmake-multilib flag-o-matic versionator |
862 |
- |
863 |
-MAJOR="$(get_version_component_range 1-2 $PV)" |
864 |
-MY_PN="mysql-connector-odbc" |
865 |
-MY_P="${MY_PN}-${PV/_p/r}-src" |
866 |
- |
867 |
-DESCRIPTION="ODBC driver for MySQL" |
868 |
-HOMEPAGE="http://www.mysql.com/products/myodbc/" |
869 |
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" |
870 |
- |
871 |
-LICENSE="GPL-2" |
872 |
-SLOT="${MAJOR}" |
873 |
-KEYWORDS="~amd64 ~ppc ~x86" |
874 |
-IUSE="" |
875 |
- |
876 |
-# Does not build with mariadb |
877 |
-RDEPEND=" |
878 |
- dev-db/unixODBC[${MULTILIB_USEDEP}] |
879 |
- ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}] |
880 |
- abi_x86_32? ( |
881 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
882 |
- ) |
883 |
- !dev-db/mariadb[client-libs(+)] |
884 |
-" |
885 |
-DEPEND="${RDEPEND}" |
886 |
-S=${WORKDIR}/${MY_P} |
887 |
- |
888 |
-# Careful! |
889 |
-DRIVER_NAME="${PN}-${SLOT}" |
890 |
- |
891 |
-# Patch document path so it doesn't install files to /usr |
892 |
-PATCHES=( |
893 |
- "${FILESDIR}/${MAJOR}-cmake-doc-path.patch" |
894 |
- "${FILESDIR}/5.3.10-cxxlinkage.patch" |
895 |
-# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch" |
896 |
- "${FILESDIR}/5.2.7-my_malloc.patch" |
897 |
-# "${FILESDIR}/${MAJOR}-mariadb-buffer_length.patch" |
898 |
-) |
899 |
- |
900 |
-src_prepare() { |
901 |
- # Fix undefined references due to standards change |
902 |
-# append-cflags -std=gnu89 |
903 |
- |
904 |
- # Remove Tests |
905 |
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ |
906 |
- "${S}/CMakeLists.txt" |
907 |
- |
908 |
- # Fix as-needed on the installer binary |
909 |
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" |
910 |
- |
911 |
- cmake-utils_src_prepare |
912 |
-} |
913 |
- |
914 |
-multilib_src_configure() { |
915 |
-# local clientlib |
916 |
-# for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do |
917 |
-# [[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break |
918 |
-# done |
919 |
-# [[ "${clientlib}x" == "notfoundx" ]] && \ |
920 |
-# die "Installed client library name could not be determined" |
921 |
- |
922 |
- # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB |
923 |
- mycmakeargs+=( |
924 |
- -DMYSQL_CXX_LINKAGE=0 |
925 |
- -DWITH_UNIXODBC=1 |
926 |
-# -DMYSQLCLIENT_LIB_NAME="${clientlib}" |
927 |
-# -DMYSQLCLIENT_LIB_NAME="mysqlclient" |
928 |
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} |
929 |
- -DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
930 |
- -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}" |
931 |
- -DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)" |
932 |
- -DMYSQLCLIENT_NO_THREADS=ON |
933 |
- -DDISABLE_GUI=ON |
934 |
- # The NUMA and LIBWRAP options are not really used. |
935 |
- # They are just copied from the server code |
936 |
- -DWITH_NUMA=OFF |
937 |
- -DWITH_LIBWRAP=OFF |
938 |
- ) |
939 |
- cmake-utils_src_configure |
940 |
-} |
941 |
- |
942 |
-multilib_src_install_all() { |
943 |
- debug-print-function ${FUNCNAME} "$@" |
944 |
- |
945 |
- dodir /usr/share/${PN}-${SLOT} |
946 |
- for i in odbc.ini odbcinst.ini; do |
947 |
- einfo "Building $i" |
948 |
- sed \ |
949 |
- -e "s,__PN__,${DRIVER_NAME},g" \ |
950 |
- -e "s,__PF__,${MAJOR},g" \ |
951 |
- -e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \ |
952 |
- >"${D}"/usr/share/${PN}-${SLOT}/${i} \ |
953 |
- <"${FILESDIR}"/${i}.m4 \ |
954 |
- || die "Failed to build $i" |
955 |
- done; |
956 |
- mv "${D}/usr/bin/myodbc-installer" \ |
957 |
- "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" |
958 |
-} |
959 |
- |
960 |
-pkg_config() { |
961 |
- |
962 |
- [ "${ROOT}" != "/" ] && \ |
963 |
- die 'Sorry, non-standard ROOT setting is not supported :-(' |
964 |
- |
965 |
- local msg='MySQL ODBC driver' |
966 |
- local drivers=$(/usr/bin/odbcinst -q -d) |
967 |
- |
968 |
- if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then |
969 |
- ebegin "Installing ${msg}" |
970 |
- /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini |
971 |
- rc=$? |
972 |
- eend $rc |
973 |
- [ $rc -ne 0 ] && die |
974 |
- else |
975 |
- einfo "Skipping already installed ${msg}" |
976 |
- fi |
977 |
- |
978 |
- local sources=$(/usr/bin/odbcinst -q -s) |
979 |
- msg='sample MySQL ODBC DSN' |
980 |
- if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then |
981 |
- ebegin "Installing ${msg}" |
982 |
- /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini |
983 |
- rc=$? |
984 |
- eend $rc |
985 |
- [ $rc -ne 0 ] && die |
986 |
- else |
987 |
- einfo "Skipping already installed ${msg}" |
988 |
- fi |
989 |
-} |
990 |
- |
991 |
-pkg_postinst() { |
992 |
- |
993 |
- elog "If this is a new install, please run the following command" |
994 |
- elog "to configure the MySQL ODBC drivers and sources:" |
995 |
- elog "emerge --config =${CATEGORY}/${PF}" |
996 |
- elog "Please note that the driver name used to form the DSN now includes the SLOT." |
997 |
- elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" |
998 |
-} |
999 |
|
1000 |
diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild b/dev-db/myodbc/myodbc-5.3.4.ebuild |
1001 |
deleted file mode 100644 |
1002 |
index 876fa6c..0000000 |
1003 |
--- a/dev-db/myodbc/myodbc-5.3.4.ebuild |
1004 |
+++ /dev/null |
1005 |
@@ -1,122 +0,0 @@ |
1006 |
-# Copyright 1999-2017 Gentoo Foundation |
1007 |
-# Distributed under the terms of the GNU General Public License v2 |
1008 |
- |
1009 |
-EAPI=5 |
1010 |
-inherit cmake-utils multilib-minimal eutils flag-o-matic versionator |
1011 |
- |
1012 |
-MAJOR="$(get_version_component_range 1-2 $PV)" |
1013 |
-MY_PN="mysql-connector-odbc" |
1014 |
-MY_P="${MY_PN}-${PV/_p/r}-src" |
1015 |
- |
1016 |
-DESCRIPTION="ODBC driver for MySQL" |
1017 |
-HOMEPAGE="http://www.mysql.com/products/myodbc/" |
1018 |
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" |
1019 |
-RESTRICT="primaryuri" |
1020 |
- |
1021 |
-LICENSE="GPL-2" |
1022 |
-SLOT="${MAJOR}" |
1023 |
-KEYWORDS="~amd64 ~ppc ~x86" |
1024 |
-IUSE="gtk" |
1025 |
- |
1026 |
-# Does not build with mysql-connector-c |
1027 |
-RDEPEND=" |
1028 |
- dev-db/unixODBC[${MULTILIB_USEDEP}] |
1029 |
- ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}] |
1030 |
- gtk? ( x11-libs/gtk+:2= ) |
1031 |
- !dev-db/mysql-connector-c |
1032 |
-" |
1033 |
-DEPEND="${RDEPEND}" |
1034 |
-S=${WORKDIR}/${MY_P} |
1035 |
- |
1036 |
-# Careful! |
1037 |
-DRIVER_NAME="${PN}-${SLOT}" |
1038 |
- |
1039 |
-src_prepare() { |
1040 |
- # Remove Tests |
1041 |
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ |
1042 |
- "${S}/CMakeLists.txt" || die |
1043 |
- |
1044 |
- # Fix as-needed on the installer binary |
1045 |
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" || die |
1046 |
- |
1047 |
- # Patch document path so it doesn't install files to /usr |
1048 |
- epatch "${FILESDIR}/cmake-doc-path.patch" \ |
1049 |
- "${FILESDIR}/${PV}-cxxlinkage.patch" \ |
1050 |
- "${FILESDIR}/5.2.7-mariadb-dynamic-array.patch" |
1051 |
-} |
1052 |
- |
1053 |
-multilib_src_configure() { |
1054 |
- # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64" |
1055 |
- # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB |
1056 |
- |
1057 |
-# append-ldflags |
1058 |
- local mycmakeargs=( |
1059 |
- -DMYSQL_CXX_LINKAGE=0 |
1060 |
- -DWITH_UNIXODBC=1 |
1061 |
- -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so" |
1062 |
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} |
1063 |
- -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" |
1064 |
- -DLIB_SUBDIR="$(get_libdir)" |
1065 |
- -DMYSQL_CONFIG_EXECUTABLE="/usr/bin/${CHOST}-mysql_config" |
1066 |
- -DDISABLE_GUI=$(usex gtk 0 1) |
1067 |
- ) |
1068 |
- cmake-utils_src_configure |
1069 |
-} |
1070 |
- |
1071 |
-multilib_src_install_all() { |
1072 |
- debug-print-function ${FUNCNAME} "$@" |
1073 |
- |
1074 |
- dodir /usr/share/${PN}-${SLOT} |
1075 |
- for i in odbc.ini odbcinst.ini; do |
1076 |
- einfo "Building $i" |
1077 |
- sed \ |
1078 |
- -e "s,__PN__,${DRIVER_NAME},g" \ |
1079 |
- -e "s,__PF__,${MAJOR},g" \ |
1080 |
- -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \ |
1081 |
- >"${D}"/usr/share/${PN}-${SLOT}/${i} \ |
1082 |
- <"${FILESDIR}"/${i}.m4 \ |
1083 |
- || die "Failed to build $i" |
1084 |
- done; |
1085 |
- mv "${D}/usr/bin/myodbc-installer" \ |
1086 |
- "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" |
1087 |
-} |
1088 |
- |
1089 |
-pkg_config() { |
1090 |
- |
1091 |
- [ "${ROOT}" != "/" ] && \ |
1092 |
- die 'Sorry, non-standard ROOT setting is not supported :-(' |
1093 |
- |
1094 |
- local msg='MySQL ODBC driver' |
1095 |
- local drivers=$(/usr/bin/odbcinst -q -d) |
1096 |
- |
1097 |
- if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then |
1098 |
- ebegin "Installing ${msg}" |
1099 |
- /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini |
1100 |
- rc=$? |
1101 |
- eend $rc |
1102 |
- [ $rc -ne 0 ] && die |
1103 |
- else |
1104 |
- einfo "Skipping already installed ${msg}" |
1105 |
- fi |
1106 |
- |
1107 |
- local sources=$(/usr/bin/odbcinst -q -s) |
1108 |
- msg='sample MySQL ODBC DSN' |
1109 |
- if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then |
1110 |
- ebegin "Installing ${msg}" |
1111 |
- /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini |
1112 |
- rc=$? |
1113 |
- eend $rc |
1114 |
- [ $rc -ne 0 ] && die |
1115 |
- else |
1116 |
- einfo "Skipping already installed ${msg}" |
1117 |
- fi |
1118 |
-} |
1119 |
- |
1120 |
-pkg_postinst() { |
1121 |
- |
1122 |
- elog "If this is a new install, please run the following command" |
1123 |
- elog "to configure the MySQL ODBC drivers and sources:" |
1124 |
- elog "emerge --config =${CATEGORY}/${PF}" |
1125 |
- elog "Please note that the driver name used to form the DSN now includes the SLOT." |
1126 |
- elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" |
1127 |
-} |