1 |
commit: 7a41eeb53c3b63ee0806ff556211b9b093df414b |
2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 2 10:59:43 2017 +0000 |
4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 2 10:59:43 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a41eeb5 |
7 |
|
8 |
dev-db/postgresql: Patch Cleanup |
9 |
|
10 |
Remove unused patch files. |
11 |
|
12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
13 |
|
14 |
dev-db/postgresql/files/pg_ctl-exit-status.patch | 12 -- |
15 |
.../files/postgresql-9.1-no-server.patch | 141 --------------------- |
16 |
.../files/postgresql-9.1-tz-dir-overflow.patch | 29 ----- |
17 |
.../files/postgresql-9.6-no-server.patch | 110 ---------------- |
18 |
.../files/postgresql-9.6.1-no-server.patch | 130 ------------------- |
19 |
5 files changed, 422 deletions(-) |
20 |
|
21 |
diff --git a/dev-db/postgresql/files/pg_ctl-exit-status.patch b/dev-db/postgresql/files/pg_ctl-exit-status.patch |
22 |
deleted file mode 100644 |
23 |
index bbbd4498555..00000000000 |
24 |
--- a/dev-db/postgresql/files/pg_ctl-exit-status.patch |
25 |
+++ /dev/null |
26 |
@@ -1,12 +0,0 @@ |
27 |
-diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c |
28 |
---- a/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:18:15 -0400 |
29 |
-+++ b/src/bin/pg_ctl/pg_ctl.c 2011-08-01 19:44:54 -0400 |
30 |
-@@ -975,7 +975,7 @@ |
31 |
- } |
32 |
- } |
33 |
- printf(_("%s: no server running\n"), progname); |
34 |
-- exit(1); |
35 |
-+ exit(3); |
36 |
- } |
37 |
- |
38 |
- |
39 |
|
40 |
diff --git a/dev-db/postgresql/files/postgresql-9.1-no-server.patch b/dev-db/postgresql/files/postgresql-9.1-no-server.patch |
41 |
deleted file mode 100644 |
42 |
index 64363a0f411..00000000000 |
43 |
--- a/dev-db/postgresql/files/postgresql-9.1-no-server.patch |
44 |
+++ /dev/null |
45 |
@@ -1,141 +0,0 @@ |
46 |
-diff -Naur a/contrib/Makefile b/contrib/Makefile |
47 |
---- a/contrib/Makefile 2011-09-08 17:13:27.000000000 -0400 |
48 |
-+++ b/contrib/Makefile 2011-09-16 21:58:34.080579316 -0400 |
49 |
-@@ -5,56 +5,10 @@ |
50 |
- include $(top_builddir)/src/Makefile.global |
51 |
- |
52 |
- SUBDIRS = \ |
53 |
-- adminpack \ |
54 |
-- auth_delay \ |
55 |
-- auto_explain \ |
56 |
-- btree_gin \ |
57 |
-- btree_gist \ |
58 |
-- chkpass \ |
59 |
-- citext \ |
60 |
-- cube \ |
61 |
-- dblink \ |
62 |
-- dict_int \ |
63 |
-- dict_xsyn \ |
64 |
-- dummy_seclabel \ |
65 |
-- earthdistance \ |
66 |
-- file_fdw \ |
67 |
-- fuzzystrmatch \ |
68 |
-- hstore \ |
69 |
-- intagg \ |
70 |
-- intarray \ |
71 |
-- isn \ |
72 |
-- lo \ |
73 |
-- ltree \ |
74 |
- oid2name \ |
75 |
-- pageinspect \ |
76 |
-- passwordcheck \ |
77 |
-- pg_archivecleanup \ |
78 |
-- pg_buffercache \ |
79 |
-- pg_freespacemap \ |
80 |
-- pg_standby \ |
81 |
-- pg_stat_statements \ |
82 |
-- pg_test_fsync \ |
83 |
-- pg_trgm \ |
84 |
-- pg_upgrade \ |
85 |
-- pg_upgrade_support \ |
86 |
- pgbench \ |
87 |
-- pgcrypto \ |
88 |
-- pgrowlocks \ |
89 |
-- pgstattuple \ |
90 |
-- seg \ |
91 |
-- spi \ |
92 |
-- tablefunc \ |
93 |
-- test_parser \ |
94 |
-- tsearch2 \ |
95 |
-- unaccent \ |
96 |
- vacuumlo |
97 |
- |
98 |
--ifeq ($(with_openssl),yes) |
99 |
--SUBDIRS += sslinfo |
100 |
--else |
101 |
--ALWAYS_SUBDIRS += sslinfo |
102 |
--endif |
103 |
- |
104 |
- ifeq ($(with_ossp_uuid),yes) |
105 |
- SUBDIRS += uuid-ossp |
106 |
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile |
107 |
---- a/src/backend/Makefile 2011-09-08 17:13:27.000000000 -0400 |
108 |
-+++ b/src/backend/Makefile 2011-09-16 22:01:48.400579314 -0400 |
109 |
-@@ -45,7 +45,7 @@ |
110 |
- |
111 |
- ########################################################################## |
112 |
- |
113 |
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP) |
114 |
-+all: someheaders |
115 |
- |
116 |
- ifneq ($(PORTNAME), cygwin) |
117 |
- ifneq ($(PORTNAME), win32) |
118 |
-@@ -114,7 +114,7 @@ |
119 |
- endif # aix |
120 |
- |
121 |
- # Update the commonly used headers before building the subdirectories |
122 |
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h |
123 |
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h |
124 |
- |
125 |
- # run this unconditionally to avoid needing to know its dependencies here: |
126 |
- submake-schemapg: |
127 |
-@@ -206,23 +206,7 @@ |
128 |
- |
129 |
- ########################################################################## |
130 |
- |
131 |
--install: all installdirs install-bin |
132 |
--ifeq ($(PORTNAME), cygwin) |
133 |
--ifeq ($(MAKE_DLL), true) |
134 |
-- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' |
135 |
--endif |
136 |
--endif |
137 |
--ifeq ($(PORTNAME), win32) |
138 |
--ifeq ($(MAKE_DLL), true) |
139 |
-- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' |
140 |
--endif |
141 |
--endif |
142 |
-- $(MAKE) -C catalog install-data |
143 |
-- $(MAKE) -C tsearch install-data |
144 |
-- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' |
145 |
-- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' |
146 |
-- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' |
147 |
-- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' |
148 |
-+install: |
149 |
- |
150 |
- install-bin: postgres $(POSTGRES_IMP) installdirs |
151 |
- $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
152 |
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile |
153 |
---- a/src/bin/Makefile 2011-09-08 17:13:27.000000000 -0400 |
154 |
-+++ b/src/bin/Makefile 2011-09-16 22:03:48.250579314 -0400 |
155 |
-@@ -13,8 +13,7 @@ |
156 |
- top_builddir = ../.. |
157 |
- include $(top_builddir)/src/Makefile.global |
158 |
- |
159 |
--SUBDIRS = initdb pg_ctl pg_dump \ |
160 |
-- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup |
161 |
-+SUBDIRS = pg_dump psql scripts pg_config |
162 |
- |
163 |
- ifeq ($(PORTNAME), win32) |
164 |
- SUBDIRS += pgevent |
165 |
-diff -Naur a/src/Makefile b/src/Makefile |
166 |
---- a/src/Makefile 2011-09-08 17:13:27.000000000 -0400 |
167 |
-+++ b/src/Makefile 2011-09-16 22:29:17.650579302 -0400 |
168 |
-@@ -14,17 +14,11 @@ |
169 |
- |
170 |
- SUBDIRS = \ |
171 |
- port \ |
172 |
-- timezone \ |
173 |
- backend \ |
174 |
-- backend/utils/mb/conversion_procs \ |
175 |
-- backend/snowball \ |
176 |
- include \ |
177 |
- interfaces \ |
178 |
-- backend/replication/libpqwalreceiver \ |
179 |
- bin \ |
180 |
-- pl \ |
181 |
-- makefiles \ |
182 |
-- test/regress |
183 |
-+ makefiles |
184 |
- |
185 |
- # There are too many interdependencies between the subdirectories, so |
186 |
- # don't attempt parallel make here. |
187 |
|
188 |
diff --git a/dev-db/postgresql/files/postgresql-9.1-tz-dir-overflow.patch b/dev-db/postgresql/files/postgresql-9.1-tz-dir-overflow.patch |
189 |
deleted file mode 100644 |
190 |
index 9d12c57ecc3..00000000000 |
191 |
--- a/dev-db/postgresql/files/postgresql-9.1-tz-dir-overflow.patch |
192 |
+++ /dev/null |
193 |
@@ -1,29 +0,0 @@ |
194 |
---- a/src/timezone/pgtz.c 2015-02-02 15:45:23.000000000 -0500 |
195 |
-+++ b/src/timezone/pgtz.c 2015-04-07 14:21:22.341832190 -0400 |
196 |
-@@ -586,6 +586,12 @@ |
197 |
- if (direntry->d_name[0] == '.') |
198 |
- continue; |
199 |
- |
200 |
-+ /* if current working directory has the same name as current direntry name, |
201 |
-+ * then skip as this is a recursive fs loop |
202 |
-+ */ |
203 |
-+ if (strncmp(direntry->d_name,tzdirsub,strlen(direntry->d_name)) == 0) |
204 |
-+ continue; |
205 |
-+ |
206 |
- snprintf(tzdir + tzdir_orig_len, MAXPGPATH - tzdir_orig_len, |
207 |
- "/%s", direntry->d_name); |
208 |
- |
209 |
-@@ -1615,6 +1621,13 @@ |
210 |
- if (direntry->d_name[0] == '.') |
211 |
- continue; |
212 |
- |
213 |
-+ /* copy current working directory so that there is no risk of modification by basename(), |
214 |
-+ * and compare to current direntry name; skip if they are the same as this is a recursive fs loop |
215 |
-+ */ |
216 |
-+ snprintf(fullname, MAXPGPATH, "%s", dir->dirname[dir->depth]); |
217 |
-+ if (strncmp(direntry->d_name,basename(fullname),strlen(direntry->d_name)) == 0) |
218 |
-+ continue; |
219 |
-+ |
220 |
- snprintf(fullname, MAXPGPATH, "%s/%s", |
221 |
- dir->dirname[dir->depth], direntry->d_name); |
222 |
- if (stat(fullname, &statbuf) != 0) |
223 |
|
224 |
diff --git a/dev-db/postgresql/files/postgresql-9.6-no-server.patch b/dev-db/postgresql/files/postgresql-9.6-no-server.patch |
225 |
deleted file mode 100644 |
226 |
index 637e65ecc47..00000000000 |
227 |
--- a/dev-db/postgresql/files/postgresql-9.6-no-server.patch |
228 |
+++ /dev/null |
229 |
@@ -1,110 +0,0 @@ |
230 |
-vdiff -ru a/contrib/Makefile b/contrib/Makefile |
231 |
---- a/contrib/Makefile 2015-06-29 15:42:18.000000000 -0400 |
232 |
-+++ b/contrib/Makefile 2015-09-06 07:50:51.258463861 -0400 |
233 |
-@@ -5,58 +5,9 @@ |
234 |
- include $(top_builddir)/src/Makefile.global |
235 |
- |
236 |
- SUBDIRS = \ |
237 |
-- adminpack \ |
238 |
-- auth_delay \ |
239 |
-- auto_explain \ |
240 |
-- bloom \ |
241 |
-- btree_gin \ |
242 |
-- btree_gist \ |
243 |
-- chkpass \ |
244 |
-- citext \ |
245 |
-- cube \ |
246 |
-- dblink \ |
247 |
-- dict_int \ |
248 |
-- dict_xsyn \ |
249 |
-- earthdistance \ |
250 |
-- file_fdw \ |
251 |
-- fuzzystrmatch \ |
252 |
-- hstore \ |
253 |
-- intagg \ |
254 |
-- intarray \ |
255 |
-- isn \ |
256 |
-- lo \ |
257 |
-- ltree \ |
258 |
- oid2name \ |
259 |
-- pageinspect \ |
260 |
-- passwordcheck \ |
261 |
-- pg_buffercache \ |
262 |
-- pg_freespacemap \ |
263 |
-- pg_prewarm \ |
264 |
-- pg_standby \ |
265 |
-- pg_stat_statements \ |
266 |
-- pg_trgm \ |
267 |
-- pgcrypto \ |
268 |
-- pgrowlocks \ |
269 |
-- pgstattuple \ |
270 |
-- pg_visibility \ |
271 |
-- postgres_fdw \ |
272 |
-- seg \ |
273 |
-- spi \ |
274 |
-- tablefunc \ |
275 |
-- tcn \ |
276 |
-- test_decoding \ |
277 |
-- tsm_system_rows \ |
278 |
-- tsm_system_time \ |
279 |
-- tsearch2 \ |
280 |
-- unaccent \ |
281 |
- vacuumlo |
282 |
- |
283 |
--ifeq ($(with_openssl),yes) |
284 |
--SUBDIRS += sslinfo |
285 |
--else |
286 |
--ALWAYS_SUBDIRS += sslinfo |
287 |
--endif |
288 |
-- |
289 |
- ifneq ($(with_uuid),no) |
290 |
- SUBDIRS += uuid-ossp |
291 |
- else |
292 |
-diff -ru a/src/bin/Makefile b/src/bin/Makefile |
293 |
---- a/src/bin/Makefile 2015-06-29 15:42:18.000000000 -0400 |
294 |
-+++ b/src/bin/Makefile 2015-09-06 08:03:27.014847309 -0400 |
295 |
-@@ -14,20 +14,8 @@ |
296 |
- include $(top_builddir)/src/Makefile.global |
297 |
- |
298 |
- SUBDIRS = \ |
299 |
-- initdb \ |
300 |
-- pg_archivecleanup \ |
301 |
-- pg_basebackup \ |
302 |
- pg_config \ |
303 |
-- pg_controldata \ |
304 |
-- pg_ctl \ |
305 |
- pg_dump \ |
306 |
-- pg_resetxlog \ |
307 |
-- pg_rewind \ |
308 |
-- pg_test_fsync \ |
309 |
-- pg_test_timing \ |
310 |
-- pg_upgrade \ |
311 |
-- pg_xlogdump \ |
312 |
-- pgbench \ |
313 |
- psql \ |
314 |
- scripts |
315 |
- |
316 |
-diff -ru a/src/Makefile b/src/Makefile |
317 |
---- a/src/Makefile 2015-06-29 15:42:18.000000000 -0400 |
318 |
-+++ b/src/Makefile 2015-09-06 08:04:25.274568519 -0400 |
319 |
-@@ -15,19 +15,11 @@ |
320 |
- SUBDIRS = \ |
321 |
- common \ |
322 |
- port \ |
323 |
-- timezone \ |
324 |
- backend \ |
325 |
-- backend/utils/mb/conversion_procs \ |
326 |
-- backend/snowball \ |
327 |
- include \ |
328 |
- interfaces \ |
329 |
-- backend/replication/libpqwalreceiver \ |
330 |
-- fe_utils \ |
331 |
- bin \ |
332 |
-- pl \ |
333 |
-- makefiles \ |
334 |
-- test/regress \ |
335 |
-- test/perl |
336 |
-+ makefiles |
337 |
- |
338 |
- # There are too many interdependencies between the subdirectories, so |
339 |
- # don't attempt parallel make here. |
340 |
|
341 |
diff --git a/dev-db/postgresql/files/postgresql-9.6.1-no-server.patch b/dev-db/postgresql/files/postgresql-9.6.1-no-server.patch |
342 |
deleted file mode 100644 |
343 |
index 868567cadb2..00000000000 |
344 |
--- a/dev-db/postgresql/files/postgresql-9.6.1-no-server.patch |
345 |
+++ /dev/null |
346 |
@@ -1,130 +0,0 @@ |
347 |
-diff -Naruw a/contrib/Makefile b/contrib/Makefile |
348 |
---- a/contrib/Makefile 2016-10-24 16:08:51.000000000 -0400 |
349 |
-+++ b/contrib/Makefile 2016-10-28 11:41:00.450589656 -0400 |
350 |
-@@ -5,58 +5,9 @@ |
351 |
- include $(top_builddir)/src/Makefile.global |
352 |
- |
353 |
- SUBDIRS = \ |
354 |
-- adminpack \ |
355 |
-- auth_delay \ |
356 |
-- auto_explain \ |
357 |
-- bloom \ |
358 |
-- btree_gin \ |
359 |
-- btree_gist \ |
360 |
-- chkpass \ |
361 |
-- citext \ |
362 |
-- cube \ |
363 |
-- dblink \ |
364 |
-- dict_int \ |
365 |
-- dict_xsyn \ |
366 |
-- earthdistance \ |
367 |
-- file_fdw \ |
368 |
-- fuzzystrmatch \ |
369 |
-- hstore \ |
370 |
-- intagg \ |
371 |
-- intarray \ |
372 |
-- isn \ |
373 |
-- lo \ |
374 |
-- ltree \ |
375 |
- oid2name \ |
376 |
-- pageinspect \ |
377 |
-- passwordcheck \ |
378 |
-- pg_buffercache \ |
379 |
-- pg_freespacemap \ |
380 |
-- pg_prewarm \ |
381 |
-- pg_standby \ |
382 |
-- pg_stat_statements \ |
383 |
-- pg_trgm \ |
384 |
-- pgcrypto \ |
385 |
-- pgrowlocks \ |
386 |
-- pgstattuple \ |
387 |
-- pg_visibility \ |
388 |
-- postgres_fdw \ |
389 |
-- seg \ |
390 |
-- spi \ |
391 |
-- tablefunc \ |
392 |
-- tcn \ |
393 |
-- test_decoding \ |
394 |
-- tsm_system_rows \ |
395 |
-- tsm_system_time \ |
396 |
-- tsearch2 \ |
397 |
-- unaccent \ |
398 |
- vacuumlo |
399 |
- |
400 |
--ifeq ($(with_openssl),yes) |
401 |
--SUBDIRS += sslinfo |
402 |
--else |
403 |
--ALWAYS_SUBDIRS += sslinfo |
404 |
--endif |
405 |
-- |
406 |
- ifneq ($(with_uuid),no) |
407 |
- SUBDIRS += uuid-ossp |
408 |
- else |
409 |
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
410 |
---- a/src/backend/Makefile 2016-10-24 16:08:51.000000000 -0400 |
411 |
-+++ b/src/backend/Makefile 2016-10-28 11:48:58.571353118 -0400 |
412 |
-@@ -51,7 +51,7 @@ |
413 |
- |
414 |
- ########################################################################## |
415 |
- |
416 |
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP) |
417 |
-+all: someheaders |
418 |
- |
419 |
- ifneq ($(PORTNAME), cygwin) |
420 |
- ifneq ($(PORTNAME), win32) |
421 |
-@@ -110,7 +110,7 @@ |
422 |
- endif # aix |
423 |
- |
424 |
- # Update the commonly used headers before building the subdirectories |
425 |
--$(SUBDIRS:%=%-recursive): | generated-headers |
426 |
-+someheaders $(SUBDIRS:%=%-recursive): | generated-headers |
427 |
- |
428 |
- # src/port needs a convenient way to force just errcodes.h to get built |
429 |
- submake-errcodes: $(top_builddir)/src/include/utils/errcodes.h |
430 |
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
431 |
---- a/src/bin/Makefile 2016-10-24 16:08:51.000000000 -0400 |
432 |
-+++ b/src/bin/Makefile 2016-10-28 11:42:26.000129832 -0400 |
433 |
-@@ -14,19 +14,8 @@ |
434 |
- include $(top_builddir)/src/Makefile.global |
435 |
- |
436 |
- SUBDIRS = \ |
437 |
-- initdb \ |
438 |
-- pg_archivecleanup \ |
439 |
-- pg_basebackup \ |
440 |
- pg_config \ |
441 |
-- pg_controldata \ |
442 |
-- pg_ctl \ |
443 |
- pg_dump \ |
444 |
-- pg_resetxlog \ |
445 |
-- pg_rewind \ |
446 |
-- pg_test_fsync \ |
447 |
-- pg_test_timing \ |
448 |
-- pg_upgrade \ |
449 |
-- pg_xlogdump \ |
450 |
- pgbench \ |
451 |
- psql \ |
452 |
- scripts |
453 |
-diff -Naruw a/src/Makefile b/src/Makefile |
454 |
---- a/src/Makefile 2016-10-24 16:08:51.000000000 -0400 |
455 |
-+++ b/src/Makefile 2016-10-28 11:41:00.453922971 -0400 |
456 |
-@@ -15,19 +15,11 @@ |
457 |
- SUBDIRS = \ |
458 |
- common \ |
459 |
- port \ |
460 |
-- timezone \ |
461 |
- backend \ |
462 |
-- backend/utils/mb/conversion_procs \ |
463 |
-- backend/snowball \ |
464 |
- include \ |
465 |
- interfaces \ |
466 |
-- backend/replication/libpqwalreceiver \ |
467 |
-- fe_utils \ |
468 |
- bin \ |
469 |
-- pl \ |
470 |
-- makefiles \ |
471 |
-- test/regress \ |
472 |
-- test/perl |
473 |
-+ makefiles |
474 |
- |
475 |
- # There are too many interdependencies between the subdirectories, so |
476 |
- # don't attempt parallel make here. |