Updated for 9.1rc1

5 files changed, 157 insertions, 158 deletions

diff --git a/autoconf.patch b/autoconf.patch
index 0eeeabf..da62bbf 100644
--- a/autoconf.patch
+++ b/autoconf.patch
@@ -1,9 +1,9 @@
 diff -Naur a/configure.in b/configure.in
---- a/configure.in	2011-06-09 19:40:42.000000000 -0400
-+++ b/configure.in	2011-06-25 16:18:43.649614947 -0400
+--- a/configure.in	2011-08-18 17:23:13.000000000 -0400
++++ b/configure.in	2011-08-27 14:31:11.341460966 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [9.1beta2], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.1rc1], [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
diff --git a/base.patch b/base.patch
index 9a1b711..580e08f 100644
--- a/base.patch
+++ b/base.patch
@@ -1,6 +1,6 @@
-diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
---- postgresql-9.1beta3.orig/contrib/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/Makefile	2011-07-13 17:33:27.267411316 -0400
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/Makefile	2011-08-27 14:36:55.246794233 -0400
 @@ -5,56 +5,10 @@
  include $(top_builddir)/src/Makefile.global
  
@@ -58,31 +58,9 @@ diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib
  
  ifeq ($(with_ossp_uuid),yes)
  SUBDIRS += uuid-ossp
-diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
---- postgresql-9.1beta3.orig/src/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/Makefile	2011-07-13 17:44:20.182005354 -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 postgresql-9.1beta3.orig/src/backend/Makefile postgresql-9.1beta3/src/backend/Makefile
---- postgresql-9.1beta3.orig/src/backend/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/backend/Makefile	2011-07-13 17:47:18.641651141 -0400
+diff -Naur a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/backend/Makefile	2011-08-27 14:40:35.484593573 -0400
 @@ -45,7 +45,7 @@
  
  ##########################################################################
@@ -126,9 +104,9 @@ diff -Naur postgresql-9.1beta3.orig/src/backend/Makefile postgresql-9.1beta3/src
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
---- postgresql-9.1beta3.orig/src/bin/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/bin/Makefile	2011-07-13 17:49:20.174599808 -0400
+diff -Naur a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/Makefile	2011-08-27 14:41:38.598231520 -0400
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -139,9 +117,9 @@ diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin
  
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
-diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
---- postgresql-9.1beta3.orig/src/include/pg_config_manual.h	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/include/pg_config_manual.h	2011-07-13 17:50:30.010547932 -0400
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-08-18 17:23:13.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-08-27 14:42:56.600368661 -0400
 @@ -141,7 +141,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -151,3 +129,25 @@ diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.
  
  /*
   * The random() function is expected to yield values between 0 and
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/Makefile	2011-08-27 14:38:05.049757875 -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/bool.patch b/bool.patch
index a338be6..53f502a 100644
--- a/bool.patch
+++ b/bool.patch
@@ -1,7 +1,7 @@
 diff -Naur a/src/include/c.h b/src/include/c.h
---- a/src/include/c.h	2011-04-14 23:19:01.000000000 -0400
-+++ b/src/include/c.h	2011-07-31 18:23:00.648671437 -0400
-@@ -170,6 +170,7 @@
+--- a/src/include/c.h	2011-08-18 17:23:13.000000000 -0400
++++ b/src/include/c.h	2011-08-27 14:48:50.154729275 -0400
+@@ -179,6 +179,7 @@
   */
  
  #ifndef __cplusplus
diff --git a/pg_ctl-exit-status.patch b/pg_ctl-exit-status.patch
index f55c9ac..6f78167 100644
--- a/pg_ctl-exit-status.patch
+++ b/pg_ctl-exit-status.patch
@@ -1,7 +1,7 @@
 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.000000000 -0400
-+++ b/src/bin/pg_ctl/pg_ctl.c	2011-08-01 19:44:54.009993121 -0400
-@@ -975,7 +975,7 @@
+--- a/src/bin/pg_ctl/pg_ctl.c	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/pg_ctl/pg_ctl.c	2011-08-27 17:18:26.424185561 -0400
+@@ -1184,7 +1184,7 @@
  		}
  	}
  	printf(_("%s: no server running\n"), progname);
diff --git a/server.patch b/server.patch
index fbbb34c..4e50514 100644
--- a/server.patch
+++ b/server.patch
@@ -1,41 +1,30 @@
-diff -Naur postgresql-9.1beta3.orig/GNUmakefile.in postgresql-9.1beta3/GNUmakefile.in
---- postgresql-9.1beta3.orig/GNUmakefile.in	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/GNUmakefile.in	2011-07-14 06:41:47.153039815 -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
+diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
+--- a/contrib/adminpack/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/adminpack/Makefile	2011-08-27 17:43:07.864849241 -0400
+@@ -2,7 +2,7 @@
  
--$(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."
+ MODULE_big = adminpack
+ OBJS = adminpack.o
+-PG_CPPFLAGS = -I$(libpq_srcdir)
++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
  
--$(call recurse,installdirs uninstall coverage,doc src config)
-+$(call recurse,installdirs uninstall coverage,doc src)
+ EXTENSION = adminpack
+ DATA = adminpack--1.0.sql
+diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
+--- a/contrib/dblink/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/dblink/Makefile	2011-08-27 17:43:48.350768066 -0400
+@@ -2,7 +2,7 @@
  
- $(call recurse,distprep,doc src config contrib)
+ 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 postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
---- postgresql-9.1beta3.orig/contrib/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/Makefile	2011-07-14 06:42:56.928990954 -0400
+diff -Naur a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/Makefile	2011-08-27 17:41:23.565363128 -0400
 @@ -26,7 +26,6 @@
  		isn		\
  		lo		\
@@ -62,36 +51,12 @@ diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib
  
  ifeq ($(with_openssl),yes)
  SUBDIRS += sslinfo
-diff -Naur postgresql-9.1beta3.orig/contrib/adminpack/Makefile postgresql-9.1beta3/contrib/adminpack/Makefile
---- postgresql-9.1beta3.orig/contrib/adminpack/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/adminpack/Makefile	2011-07-14 06:44:00.275315180 -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 postgresql-9.1beta3.orig/contrib/dblink/Makefile postgresql-9.1beta3/contrib/dblink/Makefile
---- postgresql-9.1beta3.orig/contrib/dblink/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/dblink/Makefile	2011-07-14 06:44:35.943245493 -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 postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.1beta3/contrib/uuid-ossp/Makefile
---- postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/uuid-ossp/Makefile	2011-07-14 06:45:36.909707816 -0400
-@@ -1,12 +1,12 @@
+diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
+--- a/contrib/uuid-ossp/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/uuid-ossp/Makefile	2011-08-27 17:45:43.166793814 -0400
+@@ -1,12 +1,13 @@
  # contrib/uuid-ossp/Makefile
--
+ 
 +PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
  MODULE_big = uuid-ossp
  OBJS = uuid-ossp.o
@@ -104,23 +69,94 @@ diff -Naur postgresql-9.1beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.1bet
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur postgresql-9.1beta3.orig/contrib/xml2/Makefile postgresql-9.1beta3/contrib/xml2/Makefile
---- postgresql-9.1beta3.orig/contrib/xml2/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/contrib/xml2/Makefile	2011-07-14 06:46:58.764958033 -0400
-@@ -7,8 +7,8 @@
- DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
+diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
+--- a/contrib/xml2/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/contrib/xml2/Makefile	2011-08-27 17:47:07.078335070 -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 postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
---- postgresql-9.1beta3.orig/src/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/Makefile	2011-07-14 06:47:51.001926898 -0400
+diff -Naur a/GNUmakefile.in b/GNUmakefile.in
+--- a/GNUmakefile.in	2011-08-18 17:23:13.000000000 -0400
++++ b/GNUmakefile.in	2011-08-27 17:40:13.102466128 -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/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
+--- a/src/bin/initdb/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/initdb/Makefile	2011-08-27 17:51:46.200198057 -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/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/bin/Makefile	2011-08-27 17:50:31.507727467 -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
+diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+--- a/src/include/pg_config_manual.h	2011-08-18 17:23:13.000000000 -0400
++++ b/src/include/pg_config_manual.h	2011-08-27 17:53:01.442613210 -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/Makefile b/src/Makefile
+--- a/src/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/Makefile	2011-08-27 17:48:06.462348836 -0400
 @@ -18,12 +18,9 @@
  	backend \
  	backend/utils/mb/conversion_procs \
@@ -143,9 +179,9 @@ diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefil
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-9.1beta3.orig/src/Makefile.global.in postgresql-9.1beta3/src/Makefile.global.in
---- postgresql-9.1beta3.orig/src/Makefile.global.in	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/Makefile.global.in	2011-07-14 06:49:18.006878297 -0400
+diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
+--- a/src/Makefile.global.in	2011-08-18 17:23:13.000000000 -0400
++++ b/src/Makefile.global.in	2011-08-27 17:49:15.185421175 -0400
 @@ -482,6 +482,7 @@
     LDFLAGS += $(PROFILE)
  endif
@@ -154,46 +190,9 @@ diff -Naur postgresql-9.1beta3.orig/src/Makefile.global.in postgresql-9.1beta3/s
  
  ##########################################################################
  #
-diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
---- postgresql-9.1beta3.orig/src/bin/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/bin/Makefile	2011-07-14 06:50:50.241526233 -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
-diff -Naur postgresql-9.1beta3.orig/src/bin/initdb/Makefile postgresql-9.1beta3/src/bin/initdb/Makefile
---- postgresql-9.1beta3.orig/src/bin/initdb/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/bin/initdb/Makefile	2011-07-14 06:51:45.035409539 -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 postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
---- postgresql-9.1beta3.orig/src/include/pg_config_manual.h	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/include/pg_config_manual.h	2011-07-14 06:52:41.122154922 -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 postgresql-9.1beta3.orig/src/port/Makefile postgresql-9.1beta3/src/port/Makefile
---- postgresql-9.1beta3.orig/src/port/Makefile	2011-07-07 20:12:33.000000000 -0400
-+++ postgresql-9.1beta3/src/port/Makefile	2011-07-14 06:53:45.988390846 -0400
+diff -Naur a/src/port/Makefile b/src/port/Makefile
+--- a/src/port/Makefile	2011-08-18 17:23:13.000000000 -0400
++++ b/src/port/Makefile	2011-08-27 17:54:10.765625070 -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)