[gentoo-commits] gentoo-x86 commit in dev-db/postgresql-server/files: postgresql-8.4-common.patch postgresql.init-8.4 postgresql.conf-8.4 postgresql-8.4-server.patch

[Patrick Lauer (patrick)]

patrick     09/09/09 21:41:26

  Added:                postgresql-8.4-common.patch postgresql.init-8.4
                        postgresql.conf-8.4 postgresql-8.4-server.patch
  Log:
  Bump to 8.4.0. Fixes #276125
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-db/postgresql-server/files/postgresql-8.4-common.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql-8.4-common.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql-8.4-common.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.4-common.patch
===================================================================
=== configure.in
==================================================================
--- configure.in	2009-06-27 02:14:47.000000000 +0200
+++ configure.in	2009-07-09 15:05:02.000000000 +0200
@@ -19,10 +19,6 @@
 
 AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@××××××××××.org])
 
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 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-2009, PostgreSQL Global Development Group])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
=== src/include/storage/s_lock.h
==================================================================
--- src/include/storage/s_lock.h	2009-01-01 18:24:01.000000000 +0100
+++ src/include/storage/s_lock.h	2009-07-09 15:03:08.000000000 +0200
@@ -298,6 +298,29 @@
 
 #endif	 /* __s390__ || __s390x__ */
 
+#if defined(__sh__)
+#define HAS_TEST_AND_SET
+
+typedef unsigned char slock_t;
+
+#define TAS(lock) tas(lock)
+
+static __inline__ int
+tas(volatile slock_t *lock)
+{
+	register int _res = 1;
+
+	__asm__ __volatile__(
+		"tas.b	@%1\n\t"
+		"movt	%0\n\t"
+		"xor	#1,%0"
+:		"=z"(_res)
+:		"r"(lock)
+:		"t","memory");
+	return _res;
+}
+
+#endif	 /* __sh__ */
 
 #if defined(__sparc__)		/* Sparc */
 #define HAS_TEST_AND_SET
=== src/makefiles/Makefile.darwin
==================================================================
--- src/makefiles/Makefile.darwin	2008-11-14 11:22:47.000000000 +0100
+++ src/makefiles/Makefile.darwin	2009-07-09 15:07:11.000000000 +0200
@@ -5,7 +5,15 @@
 CFLAGS_SL =
 
 ifdef PGXS
+ifdef PGXS_IN_SERVER
+ifndef PGXS_WITH_SERVER
+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
+else
+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
+endif
+else
 BE_DLLLIBS= -bundle_loader $(bindir)/postgres
+endif
 else
 BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
 endif



1.1                  dev-db/postgresql-server/files/postgresql.init-8.4

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4?rev=1.1&content-type=text/plain

Index: postgresql.init-8.4
===================================================================
#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.1 2009/09/09 21:41:25 patrick Exp $

opts="${opts} reload"

depend() {
	use net
	if [ -L /etc/eselect/postgresql/service ] ; then 
		local p_service="$(for f in /etc/eselect/postgresql/service/* ; do source $f ; done ; echo $postgres_service )"
		test "${p_service}" = "${SVCNAME}" && provide postgresql
	fi
}

checkconfig() {
	if [ ! -d "$PGDATA" ] ; then
		eerror "Directory not found: $PGDATA"
		eerror "Please make sure that PGDATA points to the right path."
		eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster."
		return 1
	fi
}

start() {
	checkconfig || return 1

	ebegin "Starting PostgreSQL"

	if [ -f "$PGDATA/postmaster.pid" ] ; then
		rm -f "$PGDATA/postmaster.pid"
	fi

	local retval

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
	retval=$?
	[ $retval -ne 0 ] && eend $retval && return $retval

	# The following is to catch the case of an already running server
	# in which pg_ctl doesn't know to which server it connected to and false reports the server as 'up'
	sleep 2
	if [ ! -f "$PGDATA/postmaster.pid" ] ; then
		eerror "The pid-file doesn't exist but pg_ctl reported a running server."
		eerror "Please check whether there is another server running on the same port or read the log-file."
		eend 1
		return 1
	fi

	local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
	ps -p "${pid}" &> /dev/null
	eend $?
}

stop() {
	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"

	local retval

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"

	retval=$?
	[ $retval -eq 0 ] && eend $retval && return $retval

	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
	ewarn "Going to shutdown the server anyway."

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m fast"

	retval=$?
	[ $retval -eq 0 ] && eend $retval && return $retval

	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
		eend $retval
		return $retval
	fi

	ewarn "Shutting down the server gracefully failed."
	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m immediate"

	retval=$?
	[ $retval -eq 0 ] && eend $retval && return $retval

	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
	eend $?
}

reload() {
	ebegin "Reloading PostgreSQL configuration"
	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl reload"	
	eend $?
}



1.1                  dev-db/postgresql-server/files/postgresql.conf-8.4

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.4?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.4?rev=1.1&content-type=text/plain

Index: postgresql.conf-8.4
===================================================================
# PostgreSQL's Database Directory
PGDATA="/var/lib/postgresql/8.4/data"

# PostgreSQL User
PGUSER="postgres"

# PostgreSQL Group
PGGROUP="postgres"

# Extra options to run postmaster with, e.g.:
# -N is the maximal number of client connections
# -B is the number of shared buffers and has to be at least 2x the value for -N
# Please read the man-page to postmaster for more options. Many of these options
# can be set directly in the configuration-file.
#PGOPTS="-N 512 -B 1024"


# SERVER SHUTDOWN:
# The server will receive 3 signals in the worst case:
# 1. SIGTERM
#  This signals the server to ignore new connections and to
#  wait for all clients to end their transactions before shutting down.
#  Use WAIT_FOR_DISCONNECT to control how much time the clients
#  should have until the next signal is being sent.
# 2. SIGINT
#  Tell the server to forcefully disconnect all clients.
#  Terminating a client results in a rollback of the open transactions for this client.
#  Use WAIT_FOR_CLEANUP to determine how much time the server has
#  for cleanup.
# 3. SIGQUIT
#  This will terminate the server immediately and results in a recovery run for the next start.

# Wait for clients to disconnect
WAIT_FOR_DISCONNECT=30

# Time the server has to clean up
WAIT_FOR_CLEANUP=60

# Time the server has to quit (with a recover-run on next startup)
# Set to 0 to deactivate it
WAIT_FOR_QUIT=60

# Comment this out if you don't want to wait for the server to
# startup before continuing.  For example, if this server is a 
# PITR log shipping based replication standby
WAIT_FOR_START="-w"

# If you have to export environment variables for the database process,
# this can be done here.
#
# Example:
#   export R_HOME="/usr/lib/R"



1.1                  dev-db/postgresql-server/files/postgresql-8.4-server.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql-8.4-server.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql-8.4-server.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.4-server.patch
===================================================================
diff -Naur postgresql-8.4.0.orig/contrib/adminpack/Makefile postgresql-8.4.0/contrib/adminpack/Makefile
--- postgresql-8.4.0.orig/contrib/adminpack/Makefile	2007-11-11 00:59:50.000000000 +0100
+++ postgresql-8.4.0/contrib/adminpack/Makefile	2009-07-09 18:10:56.000000000 +0200
@@ -1,7 +1,7 @@
 # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
 
 MODULE_big = adminpack
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 DATA_built = adminpack.sql
 DATA = uninstall_adminpack.sql
 OBJS = adminpack.o
diff -Naur postgresql-8.4.0.orig/contrib/dblink/Makefile postgresql-8.4.0/contrib/dblink/Makefile
--- postgresql-8.4.0.orig/contrib/dblink/Makefile	2007-11-11 00:59:50.000000000 +0100
+++ postgresql-8.4.0/contrib/dblink/Makefile	2009-07-09 22:22:02.000000000 +0200
@@ -1,7 +1,7 @@
 # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
 
 MODULE_big = dblink
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 OBJS	= dblink.o
 SHLIB_LINK = $(libpq)
 
diff -Naur postgresql-8.4.0.orig/contrib/Makefile postgresql-8.4.0/contrib/Makefile
--- postgresql-8.4.0.orig/contrib/Makefile	2009-03-26 00:20:01.000000000 +0100
+++ postgresql-8.4.0/contrib/Makefile	2009-07-09 18:13:23.000000000 +0200
@@ -23,23 +23,20 @@
 		isn		\
 		lo		\
 		ltree		\
-		oid2name	\
 		pageinspect	\
 		pg_buffercache	\
 		pg_freespacemap \
 		pg_standby	\
 		pg_stat_statements \
 		pg_trgm		\
-		pgbench		\
 		pgcrypto	\
 		pgrowlocks	\
 		pgstattuple	\
 		seg		\
 		spi		\
 		tablefunc	\
-		test_parser	\
 		tsearch2	\
-		vacuumlo
+		test_parser
 
 ifeq ($(with_openssl),yes)
 WANTED_DIRS += sslinfo
diff -Naur postgresql-8.4.0.orig/contrib/uuid-ossp/Makefile postgresql-8.4.0/contrib/uuid-ossp/Makefile
--- postgresql-8.4.0.orig/contrib/uuid-ossp/Makefile	2007-11-13 01:13:19.000000000 +0100
+++ postgresql-8.4.0/contrib/uuid-ossp/Makefile	2009-07-09 19:12:44.000000000 +0200
@@ -1,11 +1,13 @@
 # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
 
+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
+
 MODULE_big = uuid-ossp
 OBJS = uuid-ossp.o
 DATA_built = uuid-ossp.sql
 DATA = uninstall_uuid-ossp.sql
 
-SHLIB_LINK += $(OSSP_UUID_LIBS)
+SHLIB_LINK += -lossp-uuid
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff -Naur postgresql-8.4.0.orig/contrib/xml2/Makefile postgresql-8.4.0/contrib/xml2/Makefile
--- postgresql-8.4.0.orig/contrib/xml2/Makefile	2008-05-08 18:49:37.000000000 +0200
+++ postgresql-8.4.0/contrib/xml2/Makefile	2009-07-09 19:14:32.000000000 +0200
@@ -4,7 +4,8 @@
 
 OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
 
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
+PG_CPPFLAGS = $(shell xml2-config --cflags)
+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
 
 DATA_built = pgxml.sql
 DATA = uninstall_pgxml.sql
diff -Naur postgresql-8.4.0.orig/GNUmakefile.in postgresql-8.4.0/GNUmakefile.in
--- postgresql-8.4.0.orig/GNUmakefile.in	2009-01-15 02:53:49.000000000 +0100
+++ postgresql-8.4.0/GNUmakefile.in	2009-07-09 19:16:19.000000000 +0200
@@ -11,19 +11,16 @@
 all:
 	$(MAKE) -C doc all
 	$(MAKE) -C src all
-	$(MAKE) -C config all
 	@echo "All of PostgreSQL successfully made. Ready to install."
 
 install:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
-	$(MAKE) -C config $@
 	@echo "PostgreSQL installation complete."
 
 installdirs uninstall:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
-	$(MAKE) -C config $@
 
 distprep:
 	$(MAKE) -C doc $@
diff -Naur postgresql-8.4.0.orig/src/bin/initdb/Makefile postgresql-8.4.0/src/bin/initdb/Makefile
--- postgresql-8.4.0.orig/src/bin/initdb/Makefile	2009-01-01 18:23:53.000000000 +0100
+++ postgresql-8.4.0/src/bin/initdb/Makefile	2009-07-09 19:17:40.000000000 +0200
@@ -14,7 +14,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-8.4.0.orig/src/bin/Makefile postgresql-8.4.0/src/bin/Makefile
--- postgresql-8.4.0.orig/src/bin/Makefile	2009-01-01 18:23:53.000000000 +0100
+++ postgresql-8.4.0/src/bin/Makefile	2009-07-09 19:18:21.000000000 +0200
@@ -13,8 +13,8 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-DIRS = initdb pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog
+DIRS = initdb pg_ctl \
+	pg_controldata pg_resetxlog
 ifeq ($(PORTNAME), win32)
 DIRS+=pgevent
 endif
diff -Naur postgresql-8.4.0.orig/src/include/pg_config_manual.h postgresql-8.4.0/src/include/pg_config_manual.h
--- postgresql-8.4.0.orig/src/include/pg_config_manual.h	2009-06-11 16:49:08.000000000 +0200
+++ postgresql-8.4.0/src/include/pg_config_manual.h	2009-07-09 19:19:40.000000000 +0200
@@ -146,7 +146,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  "/var/run/postgresql"
 
 /*
  * The random() function is expected to yield values between 0 and
diff -Naur postgresql-8.4.0.orig/src/Makefile postgresql-8.4.0/src/Makefile
--- postgresql-8.4.0.orig/src/Makefile	2009-02-24 11:06:32.000000000 +0100
+++ postgresql-8.4.0/src/Makefile	2009-07-09 19:20:44.000000000 +0200
@@ -19,14 +19,11 @@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
 	$(MAKE) -C backend/snowball $@
-	$(MAKE) -C include $@
-	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
-	$(MAKE) -C makefiles $@
 	$(MAKE) -C test/regress $@
 
-install: install-local
+install:
 
 install-local: installdirs-local
 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in
--- postgresql-8.4.0.orig/src/Makefile.global.in	2009-06-23 05:46:00.000000000 +0200
+++ postgresql-8.4.0/src/Makefile.global.in	2009-07-09 19:39:46.000000000 +0200
@@ -443,6 +441,8 @@
    LDFLAGS += $(PROFILE)
 endif
 
+CFLAGS += -I${top_srcdir}/src/include
+
 
 ##########################################################################
 #
diff -Naur postgresql-8.4.0.orig/src/port/Makefile postgresql-8.4.0/src/port/Makefile
--- postgresql-8.4.0.orig/src/port/Makefile	2008-11-25 19:19:31.000000000 +0100
+++ postgresql-8.4.0/src/port/Makefile	2009-07-09 19:24:34.000000000 +0200
@@ -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)
 
-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:
 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
diff -Naur postgresql-8.4.0.orig/src/test/regress/GNUmakefile postgresql-8.4.0/src/test/regress/GNUmakefile
--- postgresql-8.4.0.orig/src/test/regress/GNUmakefile	2009-01-01 18:24:04.000000000 +0100
+++ postgresql-8.4.0/src/test/regress/GNUmakefile	2009-07-09 19:28:25.000000000 +0200
@@ -141,7 +141,7 @@
 pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
 
 check: all
-	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
 
 installcheck: all
 	$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule