Update for beta2.patches-9.3

1 files changed, 33 insertions, 42 deletions

diff --git a/server.patch b/server.patch
index 26daf20..6f356ca 100644
--- a/server.patch
+++ b/server.patch
@@ -1,6 +1,6 @@
-diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
---- a/contrib/adminpack/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/contrib/adminpack/Makefile	2013-06-09 02:13:20.036927349 +0000
+diff -Naruw a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
+--- a/contrib/adminpack/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/contrib/adminpack/Makefile	2013-07-02 11:48:44.485660773 +0000
 @@ -2,7 +2,7 @@
  
  MODULE_big = adminpack
@@ -10,9 +10,9 @@ diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
  
  EXTENSION = adminpack
  DATA = adminpack--1.0.sql
-diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
---- a/contrib/dblink/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/contrib/dblink/Makefile	2013-06-09 02:13:55.792790503 +0000
+diff -Naruw a/contrib/dblink/Makefile b/contrib/dblink/Makefile
+--- a/contrib/dblink/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/contrib/dblink/Makefile	2013-07-02 11:49:29.708947869 +0000
 @@ -2,7 +2,7 @@
  
  MODULE_big = dblink
@@ -22,9 +22,9 @@ diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
  SHLIB_LINK = $(libpq)
  SHLIB_PREREQS = submake-libpq
  
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/contrib/Makefile	2013-06-09 02:14:58.328544645 +0000
+diff -Naruw a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/contrib/Makefile	2013-07-02 11:50:20.868133459 +0000
 @@ -26,7 +26,6 @@
  		isn		\
  		lo		\
@@ -49,9 +49,9 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
  		worker_spi
  
  ifeq ($(with_openssl),yes)
-diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
---- a/contrib/uuid-ossp/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/contrib/uuid-ossp/Makefile	2013-06-09 02:16:11.512246537 +0000
+diff -Naruw a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
+--- a/contrib/uuid-ossp/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/contrib/uuid-ossp/Makefile	2013-07-02 11:51:29.915023515 +0000
 @@ -6,7 +6,7 @@
  EXTENSION = uuid-ossp
  DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
@@ -61,9 +61,9 @@ diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
---- a/contrib/xml2/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/contrib/xml2/Makefile	2013-06-09 02:18:40.363606425 +0000
+diff -Naruw a/contrib/xml2/Makefile b/contrib/xml2/Makefile
+--- a/contrib/xml2/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/contrib/xml2/Makefile	2013-07-02 11:57:07.591066516 +0000
 @@ -8,7 +8,8 @@
  
  REGRESS = xml2
@@ -74,9 +74,9 @@ diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
-diff -Naur a/GNUmakefile.in b/GNUmakefile.in
---- a/GNUmakefile.in	2013-05-06 20:57:06.000000000 +0000
-+++ b/GNUmakefile.in	2013-06-09 02:20:34.063087792 +0000
+diff -Naruw a/GNUmakefile.in b/GNUmakefile.in
+--- a/GNUmakefile.in	2013-06-24 18:55:41.000000000 +0000
++++ b/GNUmakefile.in	2013-07-02 11:58:45.762013959 +0000
 @@ -8,7 +8,7 @@
  top_builddir = .
  include $(top_builddir)/src/Makefile.global
@@ -112,9 +112,9 @@ diff -Naur a/GNUmakefile.in b/GNUmakefile.in
  
  $(call recurse,distprep,doc src config contrib)
  
-diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
---- a/src/bin/initdb/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/bin/initdb/Makefile	2013-06-09 02:22:10.874626508 +0000
+diff -Naruw a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
+--- a/src/bin/initdb/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/src/bin/initdb/Makefile	2013-07-02 11:59:27.689537553 +0000
 @@ -16,7 +16,7 @@
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
@@ -124,9 +124,9 @@ diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
  
  # use system timezone data?
  ifneq (,$(with_system_tzdata))
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/bin/Makefile	2013-06-09 02:22:52.978420360 +0000
+diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/src/bin/Makefile	2013-07-02 12:00:31.684783271 +0000
 @@ -13,8 +13,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -137,9 +137,9 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
  
  ifeq ($(PORTNAME), win32)
  SUBDIRS += pgevent
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/Makefile	2013-06-09 02:25:13.697707579 +0000
+diff -Naruw a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/src/Makefile	2013-07-02 12:37:39.341299813 +0000
 @@ -19,12 +19,9 @@
  	backend \
  	backend/utils/mb/conversion_procs \
@@ -162,18 +162,9 @@ diff -Naur a/src/Makefile b/src/Makefile
  
  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	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/Makefile.global.in	2013-06-09 02:26:43.957231533 +0000
-@@ -434,7 +434,7 @@
- CONTRIB_TESTDB = contrib_regression
- ifneq ($(MODULE_big),)
-   CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULE_big)
--else 
-+else
-   ifneq ($(MODULES),)
-     CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULES)
-   else
+diff -Naruw a/src/Makefile.global.in b/src/Makefile.global.in
+--- a/src/Makefile.global.in	2013-06-24 18:55:41.000000000 +0000
++++ b/src/Makefile.global.in	2013-07-02 12:04:23.848715753 +0000
 @@ -492,6 +492,7 @@
     LDFLAGS += $(PROFILE)
  endif
@@ -182,9 +173,9 @@ diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
  
  ##########################################################################
  #
-diff -Naur a/src/port/Makefile b/src/port/Makefile
---- a/src/port/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/port/Makefile	2013-06-09 02:27:29.520985747 +0000
+diff -Naruw a/src/port/Makefile b/src/port/Makefile
+--- a/src/port/Makefile	2013-06-24 18:55:41.000000000 +0000
++++ b/src/port/Makefile	2013-07-02 12:05:34.221193705 +0000
 @@ -39,11 +39,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)