commit: 7a41eeb53c3b63ee0806ff556211b9b093df414b
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 10:59:43 2017 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 10:59:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a41eeb5
dev-db/postgresql: Patch Cleanup
Remove unused patch files.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-db/postgresql/files/pg_ctl-exit-status.patch | 12 --
.../files/postgresql-9.1-no-server.patch | 141 ---------------------
.../files/postgresql-9.1-tz-dir-overflow.patch | 29 -----
.../files/postgresql-9.6-no-server.patch | 110 ----------------
.../files/postgresql-9.6.1-no-server.patch | 130 -------------------
5 files changed, 422 deletions(-)
diff --git a/dev-db/postgresql/files/pg_ctl-exit-status.patch
b/dev-db/postgresql/files/pg_ctl-exit-status.patch
deleted file mode 100644
index bbbd4498555..00000000000
--- a/dev-db/postgresql/files/pg_ctl-exit-status.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
---- a/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:18:15 -0400
-+++ b/src/bin/pg_ctl/pg_ctl.c 2011-08-01 19:44:54 -0400
-@@ -975,7 +975,7 @@
- }
- }
- printf(_("%s: no server running\n"), progname);
-- exit(1);
-+ exit(3);
- }
-
-
diff --git a/dev-db/postgresql/files/postgresql-9.1-no-server.patch
b/dev-db/postgresql/files/postgresql-9.1-no-server.patch
deleted file mode 100644
index 64363a0f411..00000000000
--- a/dev-db/postgresql/files/postgresql-9.1-no-server.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile 2011-09-08 17:13:27.000000000 -0400
-+++ b/contrib/Makefile 2011-09-16 21:58:34.080579316 -0400
-@@ -5,56 +5,10 @@
- include $(top_builddir)/src/Makefile.global
-
- SUBDIRS = \
-- adminpack \
-- auth_delay \
-- auto_explain \
-- btree_gin \
-- btree_gist \
-- chkpass \
-- citext \
-- cube \
-- dblink \
-- dict_int \
-- dict_xsyn \
-- dummy_seclabel \
-- earthdistance \
-- file_fdw \
-- fuzzystrmatch \
-- hstore \
-- intagg \
-- intarray \
-- isn \
-- lo \
-- ltree \
- oid2name \
-- pageinspect \
-- passwordcheck \
-- pg_archivecleanup \
-- pg_buffercache \
-- pg_freespacemap \
-- pg_standby \
-- pg_stat_statements \
-- pg_test_fsync \
-- pg_trgm \
-- pg_upgrade \
-- pg_upgrade_support \
- pgbench \
-- pgcrypto \
-- pgrowlocks \
-- pgstattuple \
-- seg \
-- spi \
-- tablefunc \
-- test_parser \
-- tsearch2 \
-- unaccent \
- vacuumlo
-
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
-
- ifeq ($(with_ossp_uuid),yes)
- SUBDIRS += uuid-ossp
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile 2011-09-08 17:13:27.000000000 -0400
-+++ b/src/backend/Makefile 2011-09-16 22:01:48.400579314 -0400
-@@ -45,7 +45,7 @@
-
- ##########################################################################
-
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
-
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -114,7 +114,7 @@
- endif # aix
-
- # Update the commonly used headers before building the subdirectories
--$(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
-+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
-
- # run this unconditionally to avoid needing to know its dependencies here:
- submake-schemapg:
-@@ -206,23 +206,7 @@
-
- ##########################################################################
-
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
-- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
-- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
-- $(MAKE) -C catalog install-data
-- $(MAKE) -C tsearch install-data
-- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample
'$(DESTDIR)$(datadir)/pg_hba.conf.sample'
-- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample
'$(DESTDIR)$(datadir)/pg_ident.conf.sample'
-- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample
'$(DESTDIR)$(datadir)/postgresql.conf.sample'
-- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample
'$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
-
- install-bin: postgres $(POSTGRES_IMP) installdirs
- $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile 2011-09-08 17:13:27.000000000 -0400
-+++ b/src/bin/Makefile 2011-09-16 22:03:48.250579314 -0400
-@@ -13,8 +13,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
-
--SUBDIRS = initdb pg_ctl pg_dump \
-- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = pg_dump psql scripts pg_config
-
- ifeq ($(PORTNAME), win32)
- SUBDIRS += pgevent
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile 2011-09-08 17:13:27.000000000 -0400
-+++ b/src/Makefile 2011-09-16 22:29:17.650579302 -0400
-@@ -14,17 +14,11 @@
-
- SUBDIRS = \
- port \
-- timezone \
- backend \
-- backend/utils/mb/conversion_procs \
-- backend/snowball \
- include \
- interfaces \
-- backend/replication/libpqwalreceiver \
- bin \
-- pl \
-- makefiles \
-- test/regress
-+ makefiles
-
- # There are too many interdependencies between the subdirectories, so
- # don't attempt parallel make here.
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
deleted file mode 100644
index 9d12c57ecc3..00000000000
--- a/dev-db/postgresql/files/postgresql-9.1-tz-dir-overflow.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/timezone/pgtz.c 2015-02-02 15:45:23.000000000 -0500
-+++ b/src/timezone/pgtz.c 2015-04-07 14:21:22.341832190 -0400
-@@ -586,6 +586,12 @@
- if (direntry->d_name[0] == '.')
- continue;
-
-+ /* if current working directory has the same name as current
direntry name,
-+ * then skip as this is a recursive fs loop
-+ */
-+ if (strncmp(direntry->d_name,tzdirsub,strlen(direntry->d_name))
== 0)
-+ continue;
-+
- snprintf(tzdir + tzdir_orig_len, MAXPGPATH - tzdir_orig_len,
- "/%s", direntry->d_name);
-
-@@ -1615,6 +1621,13 @@
- if (direntry->d_name[0] == '.')
- continue;
-
-+ /* copy current working directory so that there is no risk of
modification by basename(),
-+ * and compare to current direntry name; skip if they are the
same as this is a recursive fs loop
-+ */
-+ snprintf(fullname, MAXPGPATH, "%s", dir->dirname[dir->depth]);
-+ if
(strncmp(direntry->d_name,basename(fullname),strlen(direntry->d_name)) == 0)
-+ continue;
-+
- snprintf(fullname, MAXPGPATH, "%s/%s",
- dir->dirname[dir->depth], direntry->d_name);
- if (stat(fullname, &statbuf) != 0)
diff --git a/dev-db/postgresql/files/postgresql-9.6-no-server.patch
b/dev-db/postgresql/files/postgresql-9.6-no-server.patch
deleted file mode 100644
index 637e65ecc47..00000000000
--- a/dev-db/postgresql/files/postgresql-9.6-no-server.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-vdiff -ru a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile 2015-06-29 15:42:18.000000000 -0400
-+++ b/contrib/Makefile 2015-09-06 07:50:51.258463861 -0400
-@@ -5,58 +5,9 @@
- include $(top_builddir)/src/Makefile.global
-
- SUBDIRS = \
-- adminpack \
-- auth_delay \
-- auto_explain \
-- bloom \
-- btree_gin \
-- btree_gist \
-- chkpass \
-- citext \
-- cube \
-- dblink \
-- dict_int \
-- dict_xsyn \
-- earthdistance \
-- file_fdw \
-- fuzzystrmatch \
-- hstore \
-- intagg \
-- intarray \
-- isn \
-- lo \
-- ltree \
- oid2name \
-- pageinspect \
-- passwordcheck \
-- pg_buffercache \
-- pg_freespacemap \
-- pg_prewarm \
-- pg_standby \
-- pg_stat_statements \
-- pg_trgm \
-- pgcrypto \
-- pgrowlocks \
-- pgstattuple \
-- pg_visibility \
-- postgres_fdw \
-- seg \
-- spi \
-- tablefunc \
-- tcn \
-- test_decoding \
-- tsm_system_rows \
-- tsm_system_time \
-- tsearch2 \
-- unaccent \
- vacuumlo
-
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
--
- ifneq ($(with_uuid),no)
- SUBDIRS += uuid-ossp
- else
-diff -ru a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile 2015-06-29 15:42:18.000000000 -0400
-+++ b/src/bin/Makefile 2015-09-06 08:03:27.014847309 -0400
-@@ -14,20 +14,8 @@
- include $(top_builddir)/src/Makefile.global
-
- SUBDIRS = \
-- initdb \
-- pg_archivecleanup \
-- pg_basebackup \
- pg_config \
-- pg_controldata \
-- pg_ctl \
- pg_dump \
-- pg_resetxlog \
-- pg_rewind \
-- pg_test_fsync \
-- pg_test_timing \
-- pg_upgrade \
-- pg_xlogdump \
-- pgbench \
- psql \
- scripts
-
-diff -ru a/src/Makefile b/src/Makefile
---- a/src/Makefile 2015-06-29 15:42:18.000000000 -0400
-+++ b/src/Makefile 2015-09-06 08:04:25.274568519 -0400
-@@ -15,19 +15,11 @@
- SUBDIRS = \
- common \
- port \
-- timezone \
- backend \
-- backend/utils/mb/conversion_procs \
-- backend/snowball \
- include \
- interfaces \
-- backend/replication/libpqwalreceiver \
-- fe_utils \
- bin \
-- pl \
-- makefiles \
-- test/regress \
-- test/perl
-+ makefiles
-
- # There are too many interdependencies between the subdirectories, so
- # don't attempt parallel make here.
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
deleted file mode 100644
index 868567cadb2..00000000000
--- a/dev-db/postgresql/files/postgresql-9.6.1-no-server.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naruw a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile 2016-10-24 16:08:51.000000000 -0400
-+++ b/contrib/Makefile 2016-10-28 11:41:00.450589656 -0400
-@@ -5,58 +5,9 @@
- include $(top_builddir)/src/Makefile.global
-
- SUBDIRS = \
-- adminpack \
-- auth_delay \
-- auto_explain \
-- bloom \
-- btree_gin \
-- btree_gist \
-- chkpass \
-- citext \
-- cube \
-- dblink \
-- dict_int \
-- dict_xsyn \
-- earthdistance \
-- file_fdw \
-- fuzzystrmatch \
-- hstore \
-- intagg \
-- intarray \
-- isn \
-- lo \
-- ltree \
- oid2name \
-- pageinspect \
-- passwordcheck \
-- pg_buffercache \
-- pg_freespacemap \
-- pg_prewarm \
-- pg_standby \
-- pg_stat_statements \
-- pg_trgm \
-- pgcrypto \
-- pgrowlocks \
-- pgstattuple \
-- pg_visibility \
-- postgres_fdw \
-- seg \
-- spi \
-- tablefunc \
-- tcn \
-- test_decoding \
-- tsm_system_rows \
-- tsm_system_time \
-- tsearch2 \
-- unaccent \
- vacuumlo
-
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
--
- ifneq ($(with_uuid),no)
- SUBDIRS += uuid-ossp
- else
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile 2016-10-24 16:08:51.000000000 -0400
-+++ b/src/backend/Makefile 2016-10-28 11:48:58.571353118 -0400
-@@ -51,7 +51,7 @@
-
- ##########################################################################
-
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
-
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -110,7 +110,7 @@
- endif # aix
-
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): | generated-headers
-+someheaders $(SUBDIRS:%=%-recursive): | generated-headers
-
- # src/port needs a convenient way to force just errcodes.h to get built
- submake-errcodes: $(top_builddir)/src/include/utils/errcodes.h
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile 2016-10-24 16:08:51.000000000 -0400
-+++ b/src/bin/Makefile 2016-10-28 11:42:26.000129832 -0400
-@@ -14,19 +14,8 @@
- include $(top_builddir)/src/Makefile.global
-
- SUBDIRS = \
-- initdb \
-- pg_archivecleanup \
-- pg_basebackup \
- pg_config \
-- pg_controldata \
-- pg_ctl \
- pg_dump \
-- pg_resetxlog \
-- pg_rewind \
-- pg_test_fsync \
-- pg_test_timing \
-- pg_upgrade \
-- pg_xlogdump \
- pgbench \
- psql \
- scripts
-diff -Naruw a/src/Makefile b/src/Makefile
---- a/src/Makefile 2016-10-24 16:08:51.000000000 -0400
-+++ b/src/Makefile 2016-10-28 11:41:00.453922971 -0400
-@@ -15,19 +15,11 @@
- SUBDIRS = \
- common \
- port \
-- timezone \
- backend \
-- backend/utils/mb/conversion_procs \
-- backend/snowball \
- include \
- interfaces \
-- backend/replication/libpqwalreceiver \
-- fe_utils \
- bin \
-- pl \
-- makefiles \
-- test/regress \
-- test/perl
-+ makefiles
-
- # There are too many interdependencies between the subdirectories, so
- # don't attempt parallel make here.
