Initial commit of patches. Specific to Postgres 9.1 alpha 4.

4 files changed, 429 insertions, 0 deletions

diff --git a/postgresql-9.1alpha4-autoconf.patch b/postgresql-9.1alpha4-autoconf.patch
new file mode 100644
index 0000000..d88e2ac
--- /dev/null
+++ b/postgresql-9.1alpha4-autoconf.patch
@@ -0,0 +1,14 @@
+diff -Naur from/configure.in to/configure.in
+--- from/configure.in	2010-07-08 22:43:12.000000000 -0400
++++ to/configure.in	2010-07-12 00:13:37.585527031 -0400
+@@ -19,10 +19,6 @@
+ 
+ AC_INIT([PostgreSQL], [9.1alpha4], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
diff --git a/postgresql-9.1alpha4-base.patch b/postgresql-9.1alpha4-base.patch
new file mode 100644
index 0000000..cf2cb3f
--- /dev/null
+++ b/postgresql-9.1alpha4-base.patch
@@ -0,0 +1,152 @@
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/contrib/Makefile	2011-03-18 18:44:16.832829001 -0400
+@@ -5,55 +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
+-endif
+-
+ ifeq ($(with_ossp_uuid),yes)
+ SUBDIRS += uuid-ossp
+ endif
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/src/Makefile	2011-03-18 18:52:50.115898001 -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 -Naur a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/src/backend/Makefile	2011-03-18 18:48:58.775898001 -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:
+@@ -203,23 +203,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-03-09 09:19:24.000000000 -0500
++++ b/src/bin/Makefile	2011-03-18 18:50:41.615898001 -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
+ endif
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-03-09 09:19:24.000000000 -0500
++++ b/src/include/pg_config_manual.h	2011-03-18 18:51:36.835898001 -0400
+@@ -141,7 +141,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "@GENTOO_PORTAGE_EPREFIX@/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
diff --git a/postgresql-9.1alpha4-regress.patch b/postgresql-9.1alpha4-regress.patch
new file mode 100644
index 0000000..a42ed7e
--- /dev/null
+++ b/postgresql-9.1alpha4-regress.patch
@@ -0,0 +1,53 @@
+diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
+--- a/src/test/regress/pg_regress.c	2011-03-09 09:19:24.000000000 -0500
++++ b/src/test/regress/pg_regress.c	2011-03-18 22:07:11.104847001 -0400
+@@ -803,7 +803,7 @@
+ 		datadir = tmp;
+ 
+ 		/* psql will be installed into temp-install bindir */
+-		psqldir = bindir;
++		/* psqldir = bindir; */
+ 
+ 		/*
+ 		 * Set up shared library paths to include the temp install.
+@@ -901,7 +901,7 @@
+ 
+ 	/* And now we can build and execute the shell command */
+ 	snprintf(psql_cmd, sizeof(psql_cmd),
+-			 SYSTEMQUOTE "\"%s%spsql\" -X -c \"%s\" \"%s\"" SYSTEMQUOTE,
++			 SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -c \"%s\" \"%s\"" SYSTEMQUOTE,
+ 			 psqldir ? psqldir : "",
+ 			 psqldir ? "/" : "",
+ 			 query_escaped,
+@@ -2178,8 +2178,8 @@
+ 		 * Check if there is a postmaster running already.
+ 		 */
+ 		snprintf(buf2, sizeof(buf2),
+-				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
+-				 bindir, DEVNULL, DEVNULL);
++				 SYSTEMQUOTE "\"%s/psql\" -h @SOCKETDIR@ -X postgres <%s 2>%s" SYSTEMQUOTE,
++				 psqldir, DEVNULL, DEVNULL);
+ 
+ 		for (i = 0; i < 16; i++)
+ 		{
+@@ -2210,7 +2210,7 @@
+ 		 */
+ 		header(_("starting postmaster"));
+ 		snprintf(buf, sizeof(buf),
+-				 SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
++				 SYSTEMQUOTE "\"%s/postgres\" -k @SOCKETDIR@ -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
+ 				 bindir, temp_install,
+ 				 debug ? " -d 5" : "",
+ 				 hostname ? hostname : "",
+diff -Naur a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
+--- a/src/test/regress/pg_regress_main.c	2011-03-09 09:19:24.000000000 -0500
++++ b/src/test/regress/pg_regress_main.c	2011-03-18 22:10:05.263089001 -0400
+@@ -64,7 +64,7 @@
+ 						   "%s ", launcher);
+ 
+ 	snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
+-			 SYSTEMQUOTE "\"%s%spsql\" -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
++			 SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
+ 			 psqldir ? psqldir : "",
+ 			 psqldir ? "/" : "",
+ 			 dblist->str,
diff --git a/postgresql-9.1alpha4-server.patch b/postgresql-9.1alpha4-server.patch
new file mode 100644
index 0000000..d2703f1
--- /dev/null
+++ b/postgresql-9.1alpha4-server.patch
@@ -0,0 +1,210 @@
+diff -Naur a/GNUmakefile.in b/GNUmakefile.in
+--- a/GNUmakefile.in	2011-03-09 09:19:24.000000000 -0500
++++ b/GNUmakefile.in	2011-03-18 19:17:04.815898001 -0400
+@@ -8,7 +8,7 @@
+ top_builddir = .
+ include $(top_builddir)/src/Makefile.global
+ 
+-$(call recurse,all install,src config)
++$(call recurse,all install,src)
+ 
+ all:
+ 	+@echo "All of PostgreSQL successfully made. Ready to install."
+@@ -16,7 +16,7 @@
+ docs:
+ 	$(MAKE) -C doc all
+ 
+-$(call recurse,world,doc src config contrib,all)
++$(call recurse,world,doc src contrib,all)
+ world:
+ 	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
+ 
+@@ -29,11 +29,11 @@
+ install-docs:
+ 	$(MAKE) -C doc install
+ 
+-$(call recurse,install-world,doc src config contrib,install)
++$(call recurse,install-world,doc src contrib,install)
+ install-world:
+ 	+@echo "PostgreSQL, contrib, and documentation installation complete."
+ 
+-$(call recurse,installdirs uninstall coverage,doc src config)
++$(call recurse,installdirs uninstall coverage,doc src)
+ 
+ $(call recurse,distprep,doc src config contrib)
+ 
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/contrib/Makefile	2011-03-18 19:10:24.415898001 -0400
+@@ -26,7 +26,6 @@
+ 		isn		\
+ 		lo		\
+ 		ltree		\
+-		oid2name	\
+ 		pageinspect	\
+ 		passwordcheck	\
+ 		pg_archivecleanup \
+@@ -38,7 +37,6 @@
+ 		pg_trgm		\
+ 		pg_upgrade	\
+ 		pg_upgrade_support \
+-		pgbench		\
+ 		pgcrypto	\
+ 		pgrowlocks	\
+ 		pgstattuple	\
+@@ -47,8 +45,7 @@
+ 		tablefunc	\
+ 		test_parser	\
+ 		tsearch2	\
+-		unaccent	\
+-		vacuumlo
++		unaccent
+ 
+ ifeq ($(with_openssl),yes)
+ SUBDIRS += sslinfo
+diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
+--- a/contrib/adminpack/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/contrib/adminpack/Makefile	2011-03-18 19:08:19.375898001 -0400
+@@ -2,7 +2,7 @@
+ 
+ MODULE_big = adminpack
+ OBJS = adminpack.o
+-PG_CPPFLAGS = -I$(libpq_srcdir)
++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
+ 
+ EXTENSION = adminpack
+ DATA = adminpack--1.0.sql
+diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
+--- a/contrib/dblink/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/contrib/dblink/Makefile	2011-03-18 19:09:04.655898001 -0400
+@@ -2,7 +2,7 @@
+ 
+ MODULE_big = dblink
+ OBJS	= dblink.o
+-PG_CPPFLAGS = -I$(libpq_srcdir)
++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
+ SHLIB_LINK = $(libpq)
+ SHLIB_PREREQS = submake-libpq
+ 
+diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
+--- a/contrib/uuid-ossp/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/contrib/uuid-ossp/Makefile	2011-03-18 19:11:40.055898001 -0400
+@@ -1,12 +1,14 @@
+ # contrib/uuid-ossp/Makefile
+ 
++PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
++
+ MODULE_big = uuid-ossp
+ OBJS = uuid-ossp.o
+ 
+ EXTENSION = uuid-ossp
+ DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
+ 
+-SHLIB_LINK += $(OSSP_UUID_LIBS)
++SHLIB_LINK += -lossp-uuid
+ 
+ ifdef USE_PGXS
+ PG_CONFIG = pg_config
+diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
+--- a/contrib/xml2/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/contrib/xml2/Makefile	2011-03-18 19:13:29.625898001 -0400
+@@ -8,7 +8,8 @@
+ 
+ REGRESS = xml2
+ 
+-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
++PG_CPPFLAGS = $(shell xml2-config --cflags)                                    
++SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
+ 
+ ifdef USE_PGXS
+ PG_CONFIG = pg_config
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/src/Makefile	2011-03-18 19:43:49.633641001 -0400
+@@ -18,12 +18,9 @@
+ 	backend \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+-	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	bin \
+ 	pl \
+-	makefiles \
+ 	test/regress
+ 
+ # There are too many interdependencies between the subdirectories, so
+@@ -32,7 +29,7 @@
+ 
+ $(recurse)
+ 
+-install: install-local
++install:
+ 
+ install-local: installdirs-local
+ 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
+diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
+--- a/src/Makefile.global.in	2011-03-09 09:19:24.000000000 -0500
++++ b/src/Makefile.global.in	2011-03-18 19:59:53.876991001 -0400
+@@ -474,6 +474,7 @@
+    LDFLAGS += $(PROFILE)
+ endif
+ 
++CFLAGS += -I$(top_srcdir)/src/include
+ 
+ ##########################################################################
+ #
+diff -Naur a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/src/bin/Makefile	2011-03-18 19:29:28.872631001 -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 = initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup
+ ifeq ($(PORTNAME), win32)
+ SUBDIRS+=pgevent
+ endif
+diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
+--- a/src/bin/initdb/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/src/bin/initdb/Makefile	2011-03-18 19:27:46.042631001 -0400
+@@ -16,7 +16,7 @@
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
++override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
+ 
+ OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
+ 
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-03-09 09:19:24.000000000 -0500
++++ b/src/include/pg_config_manual.h	2011-03-18 19:30:57.712631001 -0400
+@@ -141,7 +141,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "@GENTOO_PORTAGE_EPREFIX@/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
+diff -Naur a/src/port/Makefile b/src/port/Makefile
+--- a/src/port/Makefile	2011-03-09 09:19:24.000000000 -0500
++++ b/src/port/Makefile	2011-03-18 20:01:10.986991001 -0400
+@@ -37,11 +37,10 @@
+ # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
+ OBJS_SRV = $(OBJS:%.o=%_srv.o)
+ 
+-all: libpgport.a libpgport_srv.a
++all: libpgport_srv.a
+ 
+ # libpgport is needed by some contrib
+-install: all installdirs
+-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
++install:
+ 
+ installdirs:
+ 	$(MKDIR_P) '$(DESTDIR)$(libdir)'