Update to PostgreSQL 9.1.0
This commit is contained in:
parent
72893f4818
commit
d1e157db19
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,3 @@
|
|||||||
|
/postgresql-9.1.0.tar.bz2
|
||||||
|
/postgresql-9.1.0-US.pdf
|
||||||
/postgresql-9.0.4.tar.bz2
|
/postgresql-9.0.4.tar.bz2
|
||||||
/postgresql-9.0.4-US.pdf
|
|
||||||
/postgresql-8.4.6.tar.bz2
|
|
||||||
|
@ -3,9 +3,6 @@
|
|||||||
# in an RPM installation
|
# in an RPM installation
|
||||||
#
|
#
|
||||||
|
|
||||||
# default encoding
|
|
||||||
MULTIBYTE = SQL_ASCII
|
|
||||||
|
|
||||||
# maximum simultaneous connections for parallel tests
|
# maximum simultaneous connections for parallel tests
|
||||||
MAXCONNOPT =
|
MAXCONNOPT =
|
||||||
ifdef MAX_CONNECTIONS
|
ifdef MAX_CONNECTIONS
|
||||||
@ -20,6 +17,12 @@ endif
|
|||||||
|
|
||||||
srcdir := .
|
srcdir := .
|
||||||
|
|
||||||
|
REGRESS_OPTS += --dlpath=.
|
||||||
|
|
||||||
|
pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
|
||||||
|
|
||||||
|
pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --psqldir='/usr/bin' $(pg_regress_locale_flags)
|
||||||
|
|
||||||
# Test input and expected files. These are created by pg_regress itself, so we
|
# Test input and expected files. These are created by pg_regress itself, so we
|
||||||
# don't have a rule to create them. We do need rules to clean them however.
|
# don't have a rule to create them. We do need rules to clean them however.
|
||||||
ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
|
ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
|
||||||
@ -33,10 +36,10 @@ abs_builddir := $(shell pwd)
|
|||||||
check: installcheck-parallel
|
check: installcheck-parallel
|
||||||
|
|
||||||
installcheck: cleandirs
|
installcheck: cleandirs
|
||||||
./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
|
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS)
|
||||||
|
|
||||||
installcheck-parallel: cleandirs
|
installcheck-parallel: cleandirs
|
||||||
./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
|
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
|
||||||
|
|
||||||
# The tests command the server to write into testtablespace and results.
|
# The tests command the server to write into testtablespace and results.
|
||||||
# On a SELinux-enabled system this will fail unless we mark those directories
|
# On a SELinux-enabled system this will fail unless we mark those directories
|
||||||
@ -52,12 +55,6 @@ runcheck: check
|
|||||||
runtest: installcheck
|
runtest: installcheck
|
||||||
runtest-parallel: installcheck-parallel
|
runtest-parallel: installcheck-parallel
|
||||||
|
|
||||||
bigtest: cleandirs
|
|
||||||
./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
|
|
||||||
|
|
||||||
bigcheck: cleandirs
|
|
||||||
./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
|
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Clean up
|
## Clean up
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
README.rpm-dist
|
README.rpm-dist
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
Version 9.0, for the PostgreSQL 9.0 RPM set.
|
Version 9.1, for the PostgreSQL 9.1 RPM set.
|
||||||
Devrim Gündüz <devrim@gunduz.org>
|
Devrim Gündüz <devrim@gunduz.org>
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -23,9 +23,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
|
|||||||
describe various RPM specifics, and to document special features found
|
describe various RPM specifics, and to document special features found
|
||||||
in the RPMset.
|
in the RPMset.
|
||||||
|
|
||||||
This document is written to be applicable to version 9.0 of PostgreSQL,
|
This document is written to be applicable to version 9.1 of PostgreSQL,
|
||||||
which is the current version of the RPMs as of this writing. More to the
|
which is the current version of the RPMs as of this writing. More to the
|
||||||
point, versions prior to 9.0 are not documented here.
|
point, versions prior to 9.1 are not documented here.
|
||||||
|
|
||||||
This document is intended for use only with the RPMs supplied in Red Hat
|
This document is intended for use only with the RPMs supplied in Red Hat
|
||||||
Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
|
Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
|
||||||
@ -68,9 +68,9 @@ or login as 'postgres' you will need to set a password using passwd.
|
|||||||
|
|
||||||
UPGRADING AN INSTALLATION
|
UPGRADING AN INSTALLATION
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
For a minor-version upgrade (such as 9.0.1 to 9.0.2), just install the
|
For a minor-version upgrade (such as 9.1.1 to 9.1.2), just install the
|
||||||
new RPMs; there's usually nothing more to it than that. Upgrading
|
new RPMs; there's usually nothing more to it than that. Upgrading
|
||||||
across a major release of PostgreSQL (for example, from 8.3.x to 8.4.x)
|
across a major release of PostgreSQL (for example, from 9.0.x to 9.1.x)
|
||||||
requires more effort.
|
requires more effort.
|
||||||
|
|
||||||
If you are upgrading across more than one major release of PostgreSQL
|
If you are upgrading across more than one major release of PostgreSQL
|
||||||
@ -82,10 +82,10 @@ and run the dump file through psql to restore your data.
|
|||||||
|
|
||||||
In some major releases, the RPMs also support in-place upgrade from the
|
In some major releases, the RPMs also support in-place upgrade from the
|
||||||
immediately previous major release. Currently, you can upgrade in-place
|
immediately previous major release. Currently, you can upgrade in-place
|
||||||
from 8.4.x to 9.0.x. This is much faster than a dump and reload.
|
from 9.0.x to 9.1.x. This is much faster than a dump and reload.
|
||||||
To do an in-place upgrade:
|
To do an in-place upgrade:
|
||||||
* shut down the old postmaster ("systemctl stop postgresql.service")
|
* shut down the old postmaster ("systemctl stop postgresql.service")
|
||||||
* optionally make a backup of /var/lib/pgsql/data/
|
* optionally make a backup of /var/lib/pgsql/data/ (recommended!)
|
||||||
* install the new version's RPMs (install all the ones you had before,
|
* install the new version's RPMs (install all the ones you had before,
|
||||||
plus postgresql-upgrade)
|
plus postgresql-upgrade)
|
||||||
* as root, run "postgresql-setup upgrade"
|
* as root, run "postgresql-setup upgrade"
|
||||||
@ -93,7 +93,8 @@ To do an in-place upgrade:
|
|||||||
customizations you had before (your old configuration files are in
|
customizations you had before (your old configuration files are in
|
||||||
/var/lib/pgsql/data-old/)
|
/var/lib/pgsql/data-old/)
|
||||||
* as root, run "systemctl start postgresql.service"
|
* as root, run "systemctl start postgresql.service"
|
||||||
* postgresql-upgrade can be removed after the update is complete
|
* the postgresql-upgrade RPM can be removed after the update is complete,
|
||||||
|
as can /var/lib/pgsql/data-old/
|
||||||
|
|
||||||
NOTE: The in-place upgrade process is new and relatively poorly tested,
|
NOTE: The in-place upgrade process is new and relatively poorly tested,
|
||||||
so if your data is critical it's a really good idea to make a tarball
|
so if your data is critical it's a really good idea to make a tarball
|
||||||
@ -290,7 +291,7 @@ uuid 1 #build contrib/uuid-ossp
|
|||||||
To use these defines, invoke a rebuild like this:
|
To use these defines, invoke a rebuild like this:
|
||||||
rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
|
rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
|
||||||
--define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
|
--define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
|
||||||
postgresql-9.0.2-1.src.rpm
|
postgresql-9.1.2-1.src.rpm
|
||||||
This line would disable the python, tcl, and test subpackages, disable the
|
This line would disable the python, tcl, and test subpackages, disable the
|
||||||
regression test run during build, and disable kerberos support.
|
regression test run during build, and disable kerberos support.
|
||||||
|
|
||||||
|
@ -1,111 +0,0 @@
|
|||||||
Back-patch upstream patch to cope with a gcc 4.6.0 bug. This will be
|
|
||||||
in PG 9.0.5 and later, but we need it in Fedora *now* because the bug
|
|
||||||
breaks WAL replay, thus causing crash recovery failures as well as the
|
|
||||||
originally reported symptom of frequent reconnections during standby.
|
|
||||||
|
|
||||||
|
|
||||||
commit 45d792f70272ed57b932816562f31c2f79426c2a
|
|
||||||
Author: Tom Lane <tgl@sss.pgh.pa.us>
|
|
||||||
Date: Fri Jun 10 17:03:11 2011 -0400
|
|
||||||
|
|
||||||
Work around gcc 4.6.0 bug that breaks WAL replay.
|
|
||||||
|
|
||||||
ReadRecord's habit of using both direct references to tmpRecPtr and
|
|
||||||
references to *RecPtr (which is pointing at tmpRecPtr) triggers an
|
|
||||||
optimization bug in gcc 4.6.0, which apparently has forgotten about
|
|
||||||
aliasing rules. Avoid the compiler bug, and make the code more readable
|
|
||||||
to boot, by getting rid of the direct references. Improve the comments
|
|
||||||
while at it.
|
|
||||||
|
|
||||||
Back-patch to all supported versions, in case they get built with 4.6.0.
|
|
||||||
|
|
||||||
Tom Lane, with some cosmetic suggestions from Alex Hunsaker
|
|
||||||
|
|
||||||
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
|
|
||||||
index bf8075d..6c18db4 100644
|
|
||||||
--- a/src/backend/access/transam/xlog.c
|
|
||||||
+++ b/src/backend/access/transam/xlog.c
|
|
||||||
@@ -3676,23 +3676,32 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt)
|
|
||||||
RecPtr = &tmpRecPtr;
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * Align recptr to next page if no more records can fit on the current
|
|
||||||
- * page.
|
|
||||||
+ * RecPtr is pointing to end+1 of the previous WAL record. We must
|
|
||||||
+ * advance it if necessary to where the next record starts. First,
|
|
||||||
+ * align to next page if no more records can fit on the current page.
|
|
||||||
*/
|
|
||||||
if (XLOG_BLCKSZ - (RecPtr->xrecoff % XLOG_BLCKSZ) < SizeOfXLogRecord)
|
|
||||||
- {
|
|
||||||
- NextLogPage(tmpRecPtr);
|
|
||||||
- /* We will account for page header size below */
|
|
||||||
- }
|
|
||||||
+ NextLogPage(*RecPtr);
|
|
||||||
|
|
||||||
- if (tmpRecPtr.xrecoff >= XLogFileSize)
|
|
||||||
+ /* Check for crossing of xlog segment boundary */
|
|
||||||
+ if (RecPtr->xrecoff >= XLogFileSize)
|
|
||||||
{
|
|
||||||
- (tmpRecPtr.xlogid)++;
|
|
||||||
- tmpRecPtr.xrecoff = 0;
|
|
||||||
+ (RecPtr->xlogid)++;
|
|
||||||
+ RecPtr->xrecoff = 0;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * If at page start, we must skip over the page header. But we can't
|
|
||||||
+ * do that until we've read in the page, since the header size is
|
|
||||||
+ * variable.
|
|
||||||
+ */
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
+ /*
|
|
||||||
+ * In this case, the passed-in record pointer should already be
|
|
||||||
+ * pointing to a valid record starting position.
|
|
||||||
+ */
|
|
||||||
if (!XRecOffIsValid(RecPtr->xrecoff))
|
|
||||||
ereport(PANIC,
|
|
||||||
(errmsg("invalid record offset at %X/%X",
|
|
||||||
@@ -3721,11 +3730,13 @@ retry:
|
|
||||||
if (targetRecOff == 0)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
- * Can only get here in the continuing-from-prev-page case, because
|
|
||||||
- * XRecOffIsValid eliminated the zero-page-offset case otherwise. Need
|
|
||||||
- * to skip over the new page's header.
|
|
||||||
+ * At page start, so skip over page header. The Assert checks that
|
|
||||||
+ * we're not scribbling on caller's record pointer; it's OK because we
|
|
||||||
+ * can only get here in the continuing-from-prev-record case, since
|
|
||||||
+ * XRecOffIsValid rejected the zero-page-offset case otherwise.
|
|
||||||
*/
|
|
||||||
- tmpRecPtr.xrecoff += pageHeaderSize;
|
|
||||||
+ Assert(RecPtr == &tmpRecPtr);
|
|
||||||
+ RecPtr->xrecoff += pageHeaderSize;
|
|
||||||
targetRecOff = pageHeaderSize;
|
|
||||||
}
|
|
||||||
else if (targetRecOff < pageHeaderSize)
|
|
||||||
diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
|
|
||||||
index 3f0930f..367de37 100644
|
|
||||||
--- a/src/include/access/xlog_internal.h
|
|
||||||
+++ b/src/include/access/xlog_internal.h
|
|
||||||
@@ -154,13 +154,13 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
|
|
||||||
/* Align a record pointer to next page */
|
|
||||||
#define NextLogPage(recptr) \
|
|
||||||
do { \
|
|
||||||
- if (recptr.xrecoff % XLOG_BLCKSZ != 0) \
|
|
||||||
- recptr.xrecoff += \
|
|
||||||
- (XLOG_BLCKSZ - recptr.xrecoff % XLOG_BLCKSZ); \
|
|
||||||
- if (recptr.xrecoff >= XLogFileSize) \
|
|
||||||
+ if ((recptr).xrecoff % XLOG_BLCKSZ != 0) \
|
|
||||||
+ (recptr).xrecoff += \
|
|
||||||
+ (XLOG_BLCKSZ - (recptr).xrecoff % XLOG_BLCKSZ); \
|
|
||||||
+ if ((recptr).xrecoff >= XLogFileSize) \
|
|
||||||
{ \
|
|
||||||
- (recptr.xlogid)++; \
|
|
||||||
- recptr.xrecoff = 0; \
|
|
||||||
+ ((recptr).xlogid)++; \
|
|
||||||
+ (recptr).xrecoff = 0; \
|
|
||||||
} \
|
|
||||||
} while (0)
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
Default to stderr-based logging with a week's worth of daily logfiles.
|
Default to stderr-based logging with a week's worth of daily logfiles.
|
||||||
|
|
||||||
|
|
||||||
diff -Naur postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.0.1/src/backend/utils/misc/postgresql.conf.sample
|
diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample
|
||||||
--- postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample 2010-10-01 10:25:44.000000000 -0400
|
--- postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2011-08-18 17:23:13.000000000 -0400
|
||||||
+++ postgresql-9.0.1/src/backend/utils/misc/postgresql.conf.sample 2010-10-11 11:53:34.650971490 -0400
|
+++ postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample 2011-08-18 18:39:39.697526799 -0400
|
||||||
@@ -262,17 +262,17 @@
|
@@ -279,7 +279,7 @@
|
||||||
# requires logging_collector to be on.
|
# requires logging_collector to be on.
|
||||||
|
|
||||||
# This is used when logging to stderr:
|
# This is used when logging to stderr:
|
||||||
@ -13,28 +13,29 @@ diff -Naur postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample p
|
|||||||
# into log files. Required to be on for
|
# into log files. Required to be on for
|
||||||
# csvlogs.
|
# csvlogs.
|
||||||
# (change requires restart)
|
# (change requires restart)
|
||||||
|
@@ -287,11 +287,11 @@
|
||||||
# These are only used if logging_collector is on:
|
# These are only used if logging_collector is on:
|
||||||
-#log_directory = 'pg_log' # directory where log files are written,
|
#log_directory = 'pg_log' # directory where log files are written,
|
||||||
+log_directory = 'pg_log' # directory where log files are written,
|
|
||||||
# can be absolute or relative to PGDATA
|
# can be absolute or relative to PGDATA
|
||||||
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
|
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
|
||||||
+log_filename = 'postgresql-%a.log' # log file name pattern,
|
+log_filename = 'postgresql-%a.log' # log file name pattern,
|
||||||
# can include strftime() escapes
|
# can include strftime() escapes
|
||||||
-#log_truncate_on_rotation = off # If on, an existing log file of the
|
#log_file_mode = 0600 # creation mode for log files,
|
||||||
+log_truncate_on_rotation = on # If on, an existing log file of the
|
# begin with 0 to use octal notation
|
||||||
|
-#log_truncate_on_rotation = off # If on, an existing log file with the
|
||||||
|
+log_truncate_on_rotation = on # If on, an existing log file with the
|
||||||
# same name as the new log file will be
|
# same name as the new log file will be
|
||||||
# truncated rather than appended to.
|
# truncated rather than appended to.
|
||||||
# But such truncation only occurs on
|
# But such truncation only occurs on
|
||||||
@@ -280,9 +280,9 @@
|
@@ -299,9 +299,9 @@
|
||||||
# or size-driven rotation. Default is
|
# or size-driven rotation. Default is
|
||||||
# off, meaning append to existing files
|
# off, meaning append to existing files
|
||||||
# in all cases.
|
# in all cases.
|
||||||
-#log_rotation_age = 1d # Automatic rotation of logfiles will
|
-#log_rotation_age = 1d # Automatic rotation of logfiles will
|
||||||
+log_rotation_age = 1d # Automatic rotation of logfiles will
|
+log_rotation_age = 1d # Automatic rotation of logfiles will
|
||||||
# happen after that time. 0 disables.
|
# happen after that time. 0 disables.
|
||||||
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
|
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
|
||||||
+log_rotation_size = 0 # Automatic rotation of logfiles will
|
+log_rotation_size = 0 # Automatic rotation of logfiles will
|
||||||
# happen after that much log output.
|
# happen after that much log output.
|
||||||
# 0 disables.
|
# 0 disables.
|
||||||
|
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
Back-patch upstream patch to cope with perl 5.14. This will be present
|
|
||||||
in PG 9.0.5 and later, but we want to build rawhide with 5.14 now.
|
|
||||||
|
|
||||||
|
|
||||||
commit cb252c2acd415d304e3254e99f82058d11a69e04
|
|
||||||
Author: Andrew Dunstan <andrew@dunslane.net>
|
|
||||||
Date: Sat Jun 4 19:35:04 2011 -0400
|
|
||||||
|
|
||||||
Allow building with perl 5.14.
|
|
||||||
|
|
||||||
Patch from Alex Hunsaker.
|
|
||||||
|
|
||||||
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
|
|
||||||
index 72c4dc2..1754489 100644
|
|
||||||
--- a/src/pl/plperl/plperl.c
|
|
||||||
+++ b/src/pl/plperl/plperl.c
|
|
||||||
@@ -874,7 +874,7 @@ plperl_trusted_init(void)
|
|
||||||
if (!isGV_with_GP(sv) || !GvCV(sv))
|
|
||||||
continue;
|
|
||||||
SvREFCNT_dec(GvCV(sv)); /* free the CV */
|
|
||||||
- GvCV(sv) = NULL; /* prevent call via GV */
|
|
||||||
+ GvCV_set(sv, NULL); /* prevent call via GV */
|
|
||||||
}
|
|
||||||
hv_clear(stash);
|
|
||||||
|
|
||||||
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
|
|
||||||
index 6d58f11..1d38d9e 100644
|
|
||||||
--- a/src/pl/plperl/plperl.h
|
|
||||||
+++ b/src/pl/plperl/plperl.h
|
|
||||||
@@ -42,6 +42,11 @@
|
|
||||||
#undef bool
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
|
|
||||||
+#ifndef GvCV_set
|
|
||||||
+#define GvCV_set(gv, cv) (GvCV(gv) = cv)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* declare routines from plperl.c for access by .xs files */
|
|
||||||
HV *plperl_spi_exec(char *, int);
|
|
||||||
void plperl_return_next(SV *);
|
|
@ -7,16 +7,16 @@ So work around it by adding an rpath spec to plperl.so (only).
|
|||||||
Per bug #162198.
|
Per bug #162198.
|
||||||
|
|
||||||
|
|
||||||
diff -Naur postgresql-9.0.1.orig/src/pl/plperl/GNUmakefile postgresql-9.0.1/src/pl/plperl/GNUmakefile
|
diff -Naur postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile postgresql-9.1rc1/src/pl/plperl/GNUmakefile
|
||||||
--- postgresql-9.0.1.orig/src/pl/plperl/GNUmakefile 2010-10-01 10:25:44.000000000 -0400
|
--- postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile 2011-08-18 17:23:13.000000000 -0400
|
||||||
+++ postgresql-9.0.1/src/pl/plperl/GNUmakefile 2010-10-11 11:50:19.933972244 -0400
|
+++ postgresql-9.1rc1/src/pl/plperl/GNUmakefile 2011-08-18 18:42:43.653729368 -0400
|
||||||
@@ -40,6 +40,9 @@
|
@@ -43,6 +43,9 @@
|
||||||
|
|
||||||
SHLIB_LINK = $(perl_embed_ldflags)
|
SHLIB_LINK = $(perl_embed_ldflags)
|
||||||
|
|
||||||
+# Force rpath to be used even though we disable it everywhere else
|
+# Force rpath to be used even though we disable it everywhere else
|
||||||
+SHLIB_LINK += $(rpath)
|
+SHLIB_LINK += $(rpath)
|
||||||
+
|
+
|
||||||
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl --load-language=plperlu
|
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl --load-extension=plperlu
|
||||||
REGRESS = plperl plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu
|
REGRESS = plperl plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
|
||||||
# if Perl can support two interpreters in one backend,
|
# if Perl can support two interpreters in one backend,
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
Back-port a PG 9.1 logic change to allow "pg_ctl start -w" to fail in
|
|
||||||
less than the -t timeout interval if the postmaster has clearly failed.
|
|
||||||
This is the minimum needed to make it sane to use this method of launching
|
|
||||||
the postmaster from a systemd service file. 9.1 will make this area
|
|
||||||
considerably more robust.
|
|
||||||
|
|
||||||
|
|
||||||
diff -Naur postgresql-9.0.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.0.4/src/bin/pg_ctl/pg_ctl.c
|
|
||||||
--- postgresql-9.0.4.orig/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:15:53.000000000 -0400
|
|
||||||
+++ postgresql-9.0.4/src/bin/pg_ctl/pg_ctl.c 2011-07-27 18:32:05.547066731 -0400
|
|
||||||
@@ -538,6 +538,22 @@
|
|
||||||
#endif
|
|
||||||
print_msg(".");
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * The postmaster should create postmaster.pid very soon after
|
|
||||||
+ * being started. If it's not there after we've waited 5 or more
|
|
||||||
+ * seconds, assume startup failed and give up waiting. (This
|
|
||||||
+ * won't cover cases where the postmaster crashes after creating
|
|
||||||
+ * the file, nor where there's a pre-existing postmaster, but
|
|
||||||
+ * it's better than nothing.)
|
|
||||||
+ */
|
|
||||||
+ if (i >= 5)
|
|
||||||
+ {
|
|
||||||
+ struct stat statbuf;
|
|
||||||
+
|
|
||||||
+ if (stat(pid_file, &statbuf) != 0)
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
pg_usleep(1000000); /* 1 sec */
|
|
||||||
}
|
|
||||||
}
|
|
@ -52,9 +52,9 @@
|
|||||||
|
|
||||||
Summary: PostgreSQL client programs
|
Summary: PostgreSQL client programs
|
||||||
Name: postgresql
|
Name: postgresql
|
||||||
%global majorversion 9.0
|
%global majorversion 9.1
|
||||||
Version: 9.0.4
|
Version: 9.1.0
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
# Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg:
|
# Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg:
|
||||||
%global first_systemd_version 9.0.4-8
|
%global first_systemd_version 9.0.4-8
|
||||||
|
|
||||||
@ -67,8 +67,8 @@ Url: http://www.postgresql.org/
|
|||||||
# This SRPM includes a copy of the previous major release, which is needed for
|
# This SRPM includes a copy of the previous major release, which is needed for
|
||||||
# in-place upgrade of an old database. In most cases it will not be critical
|
# in-place upgrade of an old database. In most cases it will not be critical
|
||||||
# that this be kept up with the latest minor release of the previous series.
|
# that this be kept up with the latest minor release of the previous series.
|
||||||
%global prevversion 8.4.6
|
%global prevversion 9.0.4
|
||||||
%global prevmajorversion 8.4
|
%global prevmajorversion 9.0
|
||||||
|
|
||||||
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
|
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
|
||||||
# The PDF file is generated by generate-pdf.sh, which see for comments
|
# The PDF file is generated by generate-pdf.sh, which see for comments
|
||||||
@ -89,9 +89,6 @@ Source15: postgresql-bashprofile
|
|||||||
Patch1: rpm-pgsql.patch
|
Patch1: rpm-pgsql.patch
|
||||||
Patch2: postgresql-logging.patch
|
Patch2: postgresql-logging.patch
|
||||||
Patch3: postgresql-perl-rpath.patch
|
Patch3: postgresql-perl-rpath.patch
|
||||||
Patch4: postgresql-gcc-workaround.patch
|
|
||||||
Patch5: postgresql-perl-5.14.patch
|
|
||||||
Patch6: postgresql-pgctl-timeout.patch
|
|
||||||
|
|
||||||
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
|
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
|
||||||
BuildRequires: perl(ExtUtils::Embed), perl-devel
|
BuildRequires: perl(ExtUtils::Embed), perl-devel
|
||||||
@ -315,9 +312,6 @@ system, including regression tests and benchmarks.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
|
|
||||||
# We used to run autoconf here, but there's no longer any real need to,
|
# We used to run autoconf here, but there's no longer any real need to,
|
||||||
# since Postgres ships with a reasonably modern configure script.
|
# since Postgres ships with a reasonably modern configure script.
|
||||||
@ -415,8 +409,15 @@ rm -f src/tutorial/GNUmakefile
|
|||||||
make MAX_CONNECTIONS=5 check
|
make MAX_CONNECTIONS=5 check
|
||||||
make clean
|
make clean
|
||||||
popd
|
popd
|
||||||
|
pushd src/pl
|
||||||
|
make MAX_CONNECTIONS=5 check
|
||||||
|
popd
|
||||||
|
pushd contrib
|
||||||
|
make MAX_CONNECTIONS=5 check
|
||||||
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# undo the "make clean" above
|
||||||
%if %test
|
%if %test
|
||||||
pushd src/test/regress
|
pushd src/test/regress
|
||||||
make all
|
make all
|
||||||
@ -541,6 +542,7 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
|
|||||||
pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
|
pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
|
||||||
strip *.so
|
strip *.so
|
||||||
rm -f GNUmakefile Makefile *.o
|
rm -f GNUmakefile Makefile *.o
|
||||||
|
chmod 0755 pg_regress regress.so
|
||||||
popd
|
popd
|
||||||
cp %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
|
cp %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
|
||||||
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
|
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
|
||||||
@ -563,6 +565,8 @@ cat ecpglib6-%{majorversion}.lang >libs.lst
|
|||||||
cat initdb-%{majorversion}.lang >server.lst
|
cat initdb-%{majorversion}.lang >server.lst
|
||||||
%find_lang libpq5-%{majorversion}
|
%find_lang libpq5-%{majorversion}
|
||||||
cat libpq5-%{majorversion}.lang >>libs.lst
|
cat libpq5-%{majorversion}.lang >>libs.lst
|
||||||
|
%find_lang pg_basebackup-%{majorversion}
|
||||||
|
cat pg_basebackup-%{majorversion}.lang >>server.lst
|
||||||
%find_lang pg_controldata-%{majorversion}
|
%find_lang pg_controldata-%{majorversion}
|
||||||
cat pg_controldata-%{majorversion}.lang >>server.lst
|
cat pg_controldata-%{majorversion}.lang >>server.lst
|
||||||
%find_lang pg_ctl-%{majorversion}
|
%find_lang pg_ctl-%{majorversion}
|
||||||
@ -657,7 +661,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files -f main.lst
|
%files -f main.lst
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
|
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
|
||||||
%doc COPYRIGHT README HISTORY doc/bug.template
|
%doc COPYRIGHT README HISTORY doc/bug.template
|
||||||
%doc README.rpm-dist
|
%doc README.rpm-dist
|
||||||
%doc doc/html
|
%doc doc/html
|
||||||
@ -699,8 +703,46 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files contrib
|
%files contrib
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%{_datadir}/pgsql/extension/adminpack*
|
||||||
|
%{_datadir}/pgsql/extension/autoinc*
|
||||||
|
%{_datadir}/pgsql/extension/btree_gin*
|
||||||
|
%{_datadir}/pgsql/extension/btree_gist*
|
||||||
|
%{_datadir}/pgsql/extension/chkpass*
|
||||||
|
%{_datadir}/pgsql/extension/citext*
|
||||||
|
%{_datadir}/pgsql/extension/cube*
|
||||||
|
%{_datadir}/pgsql/extension/dblink*
|
||||||
|
%{_datadir}/pgsql/extension/dict_int*
|
||||||
|
%{_datadir}/pgsql/extension/dict_xsyn*
|
||||||
|
%{_datadir}/pgsql/extension/earthdistance*
|
||||||
|
%{_datadir}/pgsql/extension/file_fdw*
|
||||||
|
%{_datadir}/pgsql/extension/fuzzystrmatch*
|
||||||
|
%{_datadir}/pgsql/extension/hstore*
|
||||||
|
%{_datadir}/pgsql/extension/insert_username*
|
||||||
|
%{_datadir}/pgsql/extension/intagg*
|
||||||
|
%{_datadir}/pgsql/extension/intarray*
|
||||||
|
%{_datadir}/pgsql/extension/isn*
|
||||||
|
%{_datadir}/pgsql/extension/lo*
|
||||||
|
%{_datadir}/pgsql/extension/ltree*
|
||||||
|
%{_datadir}/pgsql/extension/moddatetime*
|
||||||
|
%{_datadir}/pgsql/extension/pageinspect*
|
||||||
|
%{_datadir}/pgsql/extension/pg_buffercache*
|
||||||
|
%{_datadir}/pgsql/extension/pg_freespacemap*
|
||||||
|
%{_datadir}/pgsql/extension/pg_stat_statements*
|
||||||
|
%{_datadir}/pgsql/extension/pg_trgm*
|
||||||
|
%{_datadir}/pgsql/extension/pgcrypto*
|
||||||
|
%{_datadir}/pgsql/extension/pgrowlocks*
|
||||||
|
%{_datadir}/pgsql/extension/pgstattuple*
|
||||||
|
%{_datadir}/pgsql/extension/refint*
|
||||||
|
%{_datadir}/pgsql/extension/seg*
|
||||||
|
%{_datadir}/pgsql/extension/sslinfo*
|
||||||
|
%{_datadir}/pgsql/extension/tablefunc*
|
||||||
|
%{_datadir}/pgsql/extension/test_parser*
|
||||||
|
%{_datadir}/pgsql/extension/timetravel*
|
||||||
|
%{_datadir}/pgsql/extension/tsearch2*
|
||||||
|
%{_datadir}/pgsql/extension/unaccent*
|
||||||
%{_libdir}/pgsql/_int.so
|
%{_libdir}/pgsql/_int.so
|
||||||
%{_libdir}/pgsql/adminpack.so
|
%{_libdir}/pgsql/adminpack.so
|
||||||
|
%{_libdir}/pgsql/auth_delay.so
|
||||||
%{_libdir}/pgsql/autoinc.so
|
%{_libdir}/pgsql/autoinc.so
|
||||||
%{_libdir}/pgsql/auto_explain.so
|
%{_libdir}/pgsql/auto_explain.so
|
||||||
%{_libdir}/pgsql/btree_gin.so
|
%{_libdir}/pgsql/btree_gin.so
|
||||||
@ -711,7 +753,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pgsql/dblink.so
|
%{_libdir}/pgsql/dblink.so
|
||||||
%{_libdir}/pgsql/dict_int.so
|
%{_libdir}/pgsql/dict_int.so
|
||||||
%{_libdir}/pgsql/dict_xsyn.so
|
%{_libdir}/pgsql/dict_xsyn.so
|
||||||
|
%{_libdir}/pgsql/dummy_seclabel.so
|
||||||
%{_libdir}/pgsql/earthdistance.so
|
%{_libdir}/pgsql/earthdistance.so
|
||||||
|
%{_libdir}/pgsql/file_fdw.so
|
||||||
%{_libdir}/pgsql/fuzzystrmatch.so
|
%{_libdir}/pgsql/fuzzystrmatch.so
|
||||||
%{_libdir}/pgsql/hstore.so
|
%{_libdir}/pgsql/hstore.so
|
||||||
%{_libdir}/pgsql/insert_username.so
|
%{_libdir}/pgsql/insert_username.so
|
||||||
@ -737,15 +781,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pgsql/tsearch2.so
|
%{_libdir}/pgsql/tsearch2.so
|
||||||
%{_libdir}/pgsql/unaccent.so
|
%{_libdir}/pgsql/unaccent.so
|
||||||
%if %uuid
|
%if %uuid
|
||||||
|
%{_datadir}/pgsql/extension/uuid-ossp*
|
||||||
%{_libdir}/pgsql/uuid-ossp.so
|
%{_libdir}/pgsql/uuid-ossp.so
|
||||||
%endif
|
%endif
|
||||||
%if %xml
|
%if %xml
|
||||||
|
%{_datadir}/pgsql/extension/xml2*
|
||||||
%{_libdir}/pgsql/pgxml.so
|
%{_libdir}/pgsql/pgxml.so
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/pgsql/contrib/
|
|
||||||
%{_bindir}/oid2name
|
%{_bindir}/oid2name
|
||||||
%{_bindir}/pg_archivecleanup
|
%{_bindir}/pg_archivecleanup
|
||||||
%{_bindir}/pg_standby
|
%{_bindir}/pg_standby
|
||||||
|
%{_bindir}/pg_test_fsync
|
||||||
%{_bindir}/pgbench
|
%{_bindir}/pgbench
|
||||||
%{_bindir}/vacuumlo
|
%{_bindir}/vacuumlo
|
||||||
%{_mandir}/man3/dblink*
|
%{_mandir}/man3/dblink*
|
||||||
@ -766,6 +812,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%config(noreplace) /etc/pam.d/postgresql
|
%config(noreplace) /etc/pam.d/postgresql
|
||||||
%endif
|
%endif
|
||||||
%{_bindir}/initdb
|
%{_bindir}/initdb
|
||||||
|
%{_bindir}/pg_basebackup
|
||||||
%{_bindir}/pg_controldata
|
%{_bindir}/pg_controldata
|
||||||
%{_bindir}/pg_ctl
|
%{_bindir}/pg_ctl
|
||||||
%{_bindir}/pg_resetxlog
|
%{_bindir}/pg_resetxlog
|
||||||
@ -773,6 +820,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_bindir}/postmaster
|
%{_bindir}/postmaster
|
||||||
%{_bindir}/postgresql-setup
|
%{_bindir}/postgresql-setup
|
||||||
%{_mandir}/man1/initdb.*
|
%{_mandir}/man1/initdb.*
|
||||||
|
%{_mandir}/man1/pg_basebackup.*
|
||||||
%{_mandir}/man1/pg_controldata.*
|
%{_mandir}/man1/pg_controldata.*
|
||||||
%{_mandir}/man1/pg_ctl.*
|
%{_mandir}/man1/pg_ctl.*
|
||||||
%{_mandir}/man1/pg_resetxlog.*
|
%{_mandir}/man1/pg_resetxlog.*
|
||||||
@ -788,6 +836,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pgsql/dict_snowball.so
|
%{_libdir}/pgsql/dict_snowball.so
|
||||||
%{_libdir}/pgsql/plpgsql.so
|
%{_libdir}/pgsql/plpgsql.so
|
||||||
%dir %{_datadir}/pgsql
|
%dir %{_datadir}/pgsql
|
||||||
|
%dir %{_datadir}/pgsql/extension
|
||||||
|
%{_datadir}/pgsql/extension/plpgsql*
|
||||||
%attr(700,postgres,postgres) %dir /var/lib/pgsql
|
%attr(700,postgres,postgres) %dir /var/lib/pgsql
|
||||||
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
|
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
|
||||||
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
|
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
|
||||||
@ -823,12 +873,14 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%if %plperl
|
%if %plperl
|
||||||
%files plperl -f plperl.lst
|
%files plperl -f plperl.lst
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%{_datadir}/pgsql/extension/plperl*
|
||||||
%{_libdir}/pgsql/plperl.so
|
%{_libdir}/pgsql/plperl.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %pltcl
|
%if %pltcl
|
||||||
%files pltcl -f pltcl.lst
|
%files pltcl -f pltcl.lst
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%{_datadir}/pgsql/extension/pltcl*
|
||||||
%{_libdir}/pgsql/pltcl.so
|
%{_libdir}/pgsql/pltcl.so
|
||||||
%{_bindir}/pltcl_delmod
|
%{_bindir}/pltcl_delmod
|
||||||
%{_bindir}/pltcl_listmod
|
%{_bindir}/pltcl_listmod
|
||||||
@ -839,7 +891,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%if %plpython
|
%if %plpython
|
||||||
%files plpython -f plpython.lst
|
%files plpython -f plpython.lst
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/pgsql/plpython.so
|
%{_datadir}/pgsql/extension/plpython*
|
||||||
%{_libdir}/pgsql/plpython2.so
|
%{_libdir}/pgsql/plpython2.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -851,6 +903,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 12 2011 Tom Lane <tgl@redhat.com> 9.1.0-1
|
||||||
|
- Update to PostgreSQL 9.1.0 (major version bump);
|
||||||
|
in-place upgrade support now works from 9.0.x as the previous version
|
||||||
|
|
||||||
* Wed Jul 27 2011 Tom Lane <tgl@redhat.com> 9.0.4-8
|
* Wed Jul 27 2011 Tom Lane <tgl@redhat.com> 9.0.4-8
|
||||||
- Convert to systemd startup support
|
- Convert to systemd startup support
|
||||||
Resolves: #696427
|
Resolves: #696427
|
||||||
|
4
sources
4
sources
@ -1,3 +1,3 @@
|
|||||||
|
0497b9da1d7c380c340a9a87ba5500fe postgresql-9.1.0.tar.bz2
|
||||||
|
1fd0bd1bbc1e7679c2385934a73c54ec postgresql-9.1.0-US.pdf
|
||||||
80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
|
80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
|
||||||
7d27ebea9aa8654f73e47caa933e3fca postgresql-9.0.4-US.pdf
|
|
||||||
fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2
|
|
||||||
|
Loading…
Reference in New Issue
Block a user