From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-597956-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 285AE1381F3
for <garchives@archives.gentoo.org>; Sun, 9 Jun 2013 02:30:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D1E03E086D;
Sun, 9 Jun 2013 02:30:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 51A1BE086D
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Jun 2013 02:30:12 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1FB8433E302
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Jun 2013 02:30:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 7BF6BE468F
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Jun 2013 02:30:07 +0000 (UTC)
From: "Aaron Swenson" <titanofold@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" <titanofold@gentoo.org>
Message-ID: <1370744989.7034f18db9e85a1c321ba4ae094ef0a79a25a1bd.titanofold@gentoo>
Subject: [gentoo-commits] proj/pgsql-patches:patches-9.3 commit in: /
X-VCS-Repository: proj/pgsql-patches
X-VCS-Files: server.patch
X-VCS-Directories: /
X-VCS-Committer: titanofold
X-VCS-Committer-Name: Aaron Swenson
X-VCS-Revision: 7034f18db9e85a1c321ba4ae094ef0a79a25a1bd
X-VCS-Branch: patches-9.3
Date: Sun, 9 Jun 2013 02:30:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 58d0b2a8-de24-4504-af01-2b31998bec22
X-Archives-Hash: 1d1e11381c9807869d2b8ea701cc59d9
commit: 7034f18db9e85a1c321ba4ae094ef0a79a25a1bd
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 02:29:49 2013 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 02:29:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=7034f18d
Update for 9.3.
---
server.patch | 81 +++++++++++++++++++++++++++++++++---------------------------
1 file changed, 44 insertions(+), 37 deletions(-)
diff --git a/server.patch b/server.patch
index 05f06b2..c295c53 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 2012-05-10 18:35:09.000000000 -0400
-+++ b/contrib/adminpack/Makefile 2012-05-20 10:02:56.705637432 -0400
+--- a/contrib/adminpack/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/contrib/adminpack/Makefile 2013-06-09 02:13:20.036927349 +0000
@@ -2,7 +2,7 @@
MODULE_big = adminpack
@@ -11,8 +11,8 @@ 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 2012-05-10 18:35:09.000000000 -0400
-+++ b/contrib/dblink/Makefile 2012-05-20 10:03:36.338139189 -0400
+--- a/contrib/dblink/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/contrib/dblink/Makefile 2013-06-09 02:13:55.792790503 +0000
@@ -2,7 +2,7 @@
MODULE_big = dblink
@@ -23,8 +23,8 @@ diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
SHLIB_PREREQS = submake-libpq
diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile 2012-05-10 18:35:09.000000000 -0400
-+++ b/contrib/Makefile 2012-05-20 10:05:21.330819252 -0400
+--- a/contrib/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/contrib/Makefile 2013-06-09 02:14:58.328544645 +0000
@@ -26,7 +26,6 @@
isn \
lo \
@@ -41,19 +41,17 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
pgcrypto \
pgrowlocks \
pgstattuple \
-@@ -49,8 +47,7 @@
- tcn \
+@@ -52,7 +50,6 @@
test_parser \
tsearch2 \
-- unaccent \
-- vacuumlo
-+ unaccent
+ unaccent \
+- vacuumlo \
+ worker_spi
ifeq ($(with_openssl),yes)
- SUBDIRS += sslinfo
diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
---- a/contrib/uuid-ossp/Makefile 2012-05-10 18:35:09.000000000 -0400
-+++ b/contrib/uuid-ossp/Makefile 2012-05-20 10:06:57.251613365 -0400
+--- 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
@@ -6,7 +6,7 @@
EXTENSION = uuid-ossp
DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
@@ -64,8 +62,8 @@ 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 2012-05-10 18:35:09.000000000 -0400
-+++ b/contrib/xml2/Makefile 2012-05-20 10:07:40.202073404 -0400
+--- a/contrib/xml2/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/contrib/xml2/Makefile 2013-06-09 02:18:40.363606425 +0000
@@ -8,7 +8,8 @@
REGRESS = xml2
@@ -77,8 +75,8 @@ 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 2012-05-10 18:35:09.000000000 -0400
-+++ b/GNUmakefile.in 2012-05-20 10:09:31.035680036 -0400
+--- a/GNUmakefile.in 2013-05-06 20:57:06.000000000 +0000
++++ b/GNUmakefile.in 2013-06-09 02:20:34.063087792 +0000
@@ -8,7 +8,7 @@
top_builddir = .
include $(top_builddir)/src/Makefile.global
@@ -109,14 +107,14 @@ diff -Naur a/GNUmakefile.in b/GNUmakefile.in
# build src/ before contrib/
install-world-contrib-recurse: install-world-src-recurse
--$(call recurse,installdirs uninstall coverage,doc src config)
-+$(call recurse,installdirs uninstall coverage,doc src)
+-$(call recurse,installdirs uninstall coverage init-po update-po,doc src config)
++$(call recurse,installdirs uninstall coverage init-po update-po,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 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/bin/initdb/Makefile 2012-05-20 10:11:07.706464719 -0400
+--- 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
@@ -16,7 +16,7 @@
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
@@ -127,8 +125,8 @@ 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 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/bin/Makefile 2012-05-20 10:12:05.619736652 -0400
+--- a/src/bin/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/src/bin/Makefile 2013-06-09 02:22:52.978420360 +0000
@@ -13,8 +13,7 @@
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
@@ -140,21 +138,21 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
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 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/include/pg_config_manual.h 2012-05-20 10:13:33.358633625 -0400
+--- a/src/include/pg_config_manual.h 2013-05-06 20:57:06.000000000 +0000
++++ b/src/include/pg_config_manual.h 2013-06-09 02:24:08.790040861 +0000
@@ -144,7 +144,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@@RUNDIR@/run/postgresql"
++#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@/run/postgresql"
/*
* The random() function is expected to yield values between 0 and
diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/Makefile 2012-05-20 10:15:28.923180781 -0400
-@@ -18,12 +18,9 @@
+--- a/src/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/src/Makefile 2013-06-09 02:25:13.697707579 +0000
+@@ -19,12 +19,9 @@
backend \
backend/utils/mb/conversion_procs \
backend/snowball \
@@ -167,7 +165,7 @@ diff -Naur a/src/Makefile b/src/Makefile
test/regress
# There are too many interdependencies between the subdirectories, so
-@@ -32,7 +29,7 @@
+@@ -33,7 +30,7 @@
$(recurse)
@@ -177,9 +175,18 @@ 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 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/Makefile.global.in 2012-05-20 10:16:23.701492126 -0400
-@@ -482,6 +482,7 @@
+--- 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
+@@ -492,6 +492,7 @@
LDFLAGS += $(PROFILE)
endif
@@ -188,9 +195,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 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/port/Makefile 2012-05-20 10:18:09.773158623 -0400
-@@ -37,11 +37,10 @@
+--- a/src/port/Makefile 2013-05-06 20:57:06.000000000 +0000
++++ b/src/port/Makefile 2013-06-09 02:27:29.520985747 +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)