[postgresql/f17] Update to PostgreSQL 9.1.7
Tom Lane
tgl at fedoraproject.org
Thu Dec 6 17:08:55 UTC 2012
commit 661f1313597fdb6b6be3afc61e50ed4db2d73259
Author: Tom Lane <tgl at redhat.com>
Date: Thu Dec 6 12:08:38 2012 -0500
Update to PostgreSQL 9.1.7
.gitignore | 6 +-
postgresql-multi-sockets.patch | 200 +++++++++++++++++++++------------------
postgresql-var-run-socket.patch | 34 ++++----
postgresql.spec | 8 +-
sources | 6 +-
5 files changed, 138 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c236be3..10d6fd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.6.tar.bz2
-/postgresql-9.1.6-US.pdf
-/postgresql-9.0.8.tar.bz2
+/postgresql-9.1.7.tar.bz2
+/postgresql-9.1.7-US.pdf
+/postgresql-9.0.11.tar.bz2
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
index 0dcbe9b..cbc546e 100644
--- a/postgresql-multi-sockets.patch
+++ b/postgresql-multi-sockets.patch
@@ -6,12 +6,14 @@ documentation files).
Note the patch also touches html-stamp and man-stamp in doc/src/sgml/;
this is to keep the makefiles from trying to rebuild the derived doc
files. We don't want that to happen because the BuildRequires for the
-package don't include the necessary documentation tools.
+package don't include the necessary documentation tools. Those diff
+hunks *must be at the end* so that those files are newer than the
+master doc files.
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.5/doc/src/sgml/client-auth.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/client-auth.sgml 2012-09-06 11:53:55.188679276 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.7/doc/src/sgml/client-auth.sgml
+--- postgresql-9.1.7.orig/doc/src/sgml/client-auth.sgml 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/client-auth.sgml 2012-12-04 12:01:46.549268161 -0500
@@ -831,7 +831,7 @@
<varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as
@@ -21,9 +23,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.5/
configuration parameter to place the socket file in a suitably
restricted directory.
</para>
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/src/sgml/config.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/config.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/config.sgml 2012-09-06 11:53:55.200679690 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/config.sgml postgresql-9.1.7/doc/src/sgml/config.sgml
+--- postgresql-9.1.7.orig/doc/src/sgml/config.sgml 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/config.sgml 2012-12-04 12:01:46.551268181 -0500
@@ -417,17 +417,24 @@
</listitem>
</varlistentry>
@@ -87,7 +89,7 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-@@ -6417,7 +6424,7 @@
+@@ -6432,7 +6439,7 @@
</row>
<row>
<entry><option>-k <replaceable>x</replaceable></option></entry>
@@ -96,9 +98,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
</row>
<row>
<entry><option>-l</option></entry>
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.5/doc/src/sgml/html/app-postgres.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html 2012-08-14 18:56:14.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/app-postgres.html 2012-09-06 11:53:55.201679728 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.7/doc/src/sgml/html/app-postgres.html
+--- postgresql-9.1.7.orig/doc/src/sgml/html/app-postgres.html 2012-12-03 15:35:39.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html/app-postgres.html 2012-12-04 12:01:46.552268191 -0500
@@ -531,11 +531,19 @@
CLASS="COMMAND"
>postgres</TT
@@ -121,9 +123,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html postgresql-
</P
></DD
><DT
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.5/doc/src/sgml/html/auth-methods.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html 2012-08-14 18:55:57.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/auth-methods.html 2012-09-06 11:53:55.201679728 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.7/doc/src/sgml/html/auth-methods.html
+--- postgresql-9.1.7.orig/doc/src/sgml/html/auth-methods.html 2012-12-03 15:35:22.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html/auth-methods.html 2012-12-04 12:01:46.553268201 -0500
@@ -161,7 +161,7 @@
>. Or you
could set the <TT
@@ -133,9 +135,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html postgresql-
>
configuration parameter to place the socket file in a suitably
restricted directory.
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.5/doc/src/sgml/html/bookindex.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html 2012-08-14 18:56:48.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/bookindex.html 2012-09-06 11:53:55.204679820 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.7/doc/src/sgml/html/bookindex.html
+--- postgresql-9.1.7.orig/doc/src/sgml/html/bookindex.html 2012-12-03 15:36:14.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html/bookindex.html 2012-12-04 12:01:46.557268243 -0500
@@ -16893,7 +16893,7 @@
></DL
></DD
@@ -145,9 +147,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html postgresql-9.1
<A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-14 18:55:56.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-06 11:53:55.205679845 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.7/doc/src/sgml/html/preventing-server-spoofing.html
+--- postgresql-9.1.7.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-03 15:35:21.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-04 12:01:46.557268243 -0500
@@ -115,8 +115,8 @@
>local</TT
>
@@ -159,9 +161,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.ht
>) that has write permission only
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html 2012-08-14 18:55:56.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html 2012-09-06 11:53:55.205679845 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.7/doc/src/sgml/html/runtime-config-connection.html
+--- postgresql-9.1.7.orig/doc/src/sgml/html/runtime-config-connection.html 2012-12-03 15:35:21.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html/runtime-config-connection.html 2012-12-04 12:01:46.558268253 -0500
@@ -274,24 +274,31 @@
></DD
><DT
@@ -236,9 +238,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.htm
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html 2012-08-14 18:55:57.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html 2012-09-06 11:53:55.206679864 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.7/doc/src/sgml/html/runtime-config-short.html
+--- postgresql-9.1.7.orig/doc/src/sgml/html/runtime-config-short.html 2012-12-03 15:35:22.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html/runtime-config-short.html 2012-12-04 12:01:46.559268263 -0500
@@ -323,7 +323,7 @@
><TD
><TT
@@ -248,9 +250,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE"
><I
>x</I
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.5/doc/src/sgml/man1/postgres.1
---- postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 2012-08-14 18:57:43.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/man1/postgres.1 2012-09-06 11:53:55.206679864 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.7/doc/src/sgml/man1/postgres.1
+--- postgresql-9.1.7.orig/doc/src/sgml/man1/postgres.1 2012-12-03 15:37:10.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/man1/postgres.1 2012-12-04 12:01:46.559268263 -0500
@@ -180,8 +180,10 @@
.RS 4
Specifies the directory of the Unix\-domain socket on which
@@ -264,9 +266,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.5/d
.RE
.PP
\fB\-l\fR
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml 2012-09-06 11:53:55.207679890 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.7/doc/src/sgml/ref/postgres-ref.sgml
+--- postgresql-9.1.7.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/ref/postgres-ref.sgml 2012-12-04 12:01:46.560268273 -0500
@@ -233,8 +233,14 @@
<para>
Specifies the directory of the Unix-domain socket on which
@@ -284,10 +286,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
</para>
</listitem>
</varlistentry>
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml postgresql-9.1.5/doc/src/sgml/runtime.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/runtime.sgml 2012-09-06 11:53:55.208679918 -0400
-@@ -1816,7 +1816,7 @@
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/runtime.sgml postgresql-9.1.7/doc/src/sgml/runtime.sgml
+--- postgresql-9.1.7.orig/doc/src/sgml/runtime.sgml 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/runtime.sgml 2012-12-04 12:01:46.561268283 -0500
+@@ -1830,7 +1830,7 @@
<para>
The simplest way to prevent spoofing for <literal>local</>
connections is to use a Unix domain socket directory (<xref
@@ -296,9 +298,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml postgresql-9.1.5/doc/
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the
-diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src/backend/libpq/pqcomm.c
---- postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/libpq/pqcomm.c 2012-09-06 11:53:55.209679942 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/libpq/pqcomm.c postgresql-9.1.7/src/backend/libpq/pqcomm.c
+--- postgresql-9.1.7.orig/src/backend/libpq/pqcomm.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/libpq/pqcomm.c 2012-12-04 12:03:08.786065392 -0500
@@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client
@@ -390,7 +392,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
#if !defined(WIN32) || defined(IPV6_V6ONLY)
int one = 1;
#endif
-@@ -286,10 +303,14 @@
+@@ -286,10 +303,22 @@
#ifdef HAVE_UNIX_SOCKETS
if (family == AF_UNIX)
{
@@ -401,6 +403,14 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
+ * that file path
+ */
+ UNIXSOCK_PATH(unixSocketPath, portNumber, unixSocketDir);
++ if (strlen(unixSocketPath) >= UNIXSOCK_PATH_BUFLEN)
++ {
++ ereport(LOG,
++ (errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
++ unixSocketPath,
++ (int) (UNIXSOCK_PATH_BUFLEN - 1))));
++ return STATUS_ERROR;
++ }
+ if (Lock_AF_UNIX(unixSocketDir, unixSocketPath) != STATUS_OK)
return STATUS_ERROR;
- service = sock_path;
@@ -408,7 +418,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
}
else
#endif /* HAVE_UNIX_SOCKETS */
-@@ -432,7 +453,7 @@
+@@ -432,7 +461,7 @@
(IS_AF_UNIX(addr->ai_family)) ?
errhint("Is another postmaster already running on port %d?"
" If not, remove socket file \"%s\" and retry.",
@@ -417,7 +427,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
errhint("Is another postmaster already running on port %d?"
" If not, wait a few seconds and retry.",
(int) portNumber)));
-@@ -443,7 +464,7 @@
+@@ -443,7 +472,7 @@
#ifdef HAVE_UNIX_SOCKETS
if (addr->ai_family == AF_UNIX)
{
@@ -426,7 +436,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
{
closesocket(fd);
break;
-@@ -490,10 +511,8 @@
+@@ -490,18 +519,8 @@
* Lock_AF_UNIX -- configure unix socket file path
*/
static int
@@ -434,11 +444,19 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
+Lock_AF_UNIX(char *unixSocketDir, char *unixSocketPath)
{
- UNIXSOCK_PATH(sock_path, portNumber, unixSocketName);
+- if (strlen(sock_path) >= UNIXSOCK_PATH_BUFLEN)
+- {
+- ereport(LOG,
+- (errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
+- sock_path,
+- (int) (UNIXSOCK_PATH_BUFLEN - 1))));
+- return STATUS_ERROR;
+- }
-
/*
* Grab an interlock file associated with the socket file.
*
-@@ -502,13 +521,23 @@
+@@ -510,13 +529,23 @@
* more portable, and second, it lets us remove any pre-existing socket
* file without race conditions.
*/
@@ -464,7 +482,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
return STATUS_OK;
}
-@@ -518,11 +547,8 @@
+@@ -526,11 +555,8 @@
* Setup_AF_UNIX -- configure unix socket permissions
*/
static int
@@ -477,7 +495,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
/*
* Fix socket ownership/permission if requested. Note we must do this
* before we listen() to avoid a window where unwanted connections could
-@@ -704,20 +730,24 @@
+@@ -712,20 +738,24 @@
}
/*
@@ -508,9 +526,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
/*
* utime() is POSIX standard, utimes() is a common alternative. If we
* have neither, there's no way to affect the mod or access time of
-diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-9.1.5/src/backend/postmaster/postmaster.c
---- postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/postmaster/postmaster.c 2012-09-06 11:53:55.210679959 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/postmaster/postmaster.c postgresql-9.1.7/src/backend/postmaster/postmaster.c
+--- postgresql-9.1.7.orig/src/backend/postmaster/postmaster.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/postmaster/postmaster.c 2012-12-04 12:01:46.565268324 -0500
@@ -157,7 +157,9 @@
/* The socket number we are listening for connections on */
@@ -645,9 +663,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
last_touch_time = now;
}
}
-diff -Naur postgresql-9.1.5.orig/src/backend/tcop/postgres.c postgresql-9.1.5/src/backend/tcop/postgres.c
---- postgresql-9.1.5.orig/src/backend/tcop/postgres.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/tcop/postgres.c 2012-09-06 11:53:55.211679977 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/tcop/postgres.c postgresql-9.1.7/src/backend/tcop/postgres.c
+--- postgresql-9.1.7.orig/src/backend/tcop/postgres.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/tcop/postgres.c 2012-12-04 12:01:46.566268335 -0500
@@ -3345,7 +3345,7 @@
break;
@@ -657,9 +675,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/tcop/postgres.c postgresql-9.1.5/sr
break;
case 'l':
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c postgresql-9.1.5/src/backend/utils/adt/varlena.c
---- postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/adt/varlena.c 2012-09-06 11:54:14.148859548 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/utils/adt/varlena.c postgresql-9.1.7/src/backend/utils/adt/varlena.c
+--- postgresql-9.1.7.orig/src/backend/utils/adt/varlena.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/utils/adt/varlena.c 2012-12-04 12:01:46.567268345 -0500
@@ -2387,6 +2387,119 @@
}
@@ -780,9 +798,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
/*****************************************************************************
* Comparison Functions used for bytea
*
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.1.5/src/backend/utils/init/miscinit.c
---- postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/init/miscinit.c 2012-09-06 11:53:55.213680015 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/utils/init/miscinit.c postgresql-9.1.7/src/backend/utils/init/miscinit.c
+--- postgresql-9.1.7.orig/src/backend/utils/init/miscinit.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/utils/init/miscinit.c 2012-12-04 12:01:46.568268354 -0500
@@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing;
@@ -1027,9 +1045,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
{
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/guc.c postgresql-9.1.5/src/backend/utils/misc/guc.c
---- postgresql-9.1.5.orig/src/backend/utils/misc/guc.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/misc/guc.c 2012-09-06 11:53:55.215680028 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/utils/misc/guc.c postgresql-9.1.7/src/backend/utils/misc/guc.c
+--- postgresql-9.1.7.orig/src/backend/utils/misc/guc.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/utils/misc/guc.c 2012-12-04 12:01:46.570268375 -0500
@@ -2867,14 +2867,18 @@
},
@@ -1053,9 +1071,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/guc.c postgresql-9.1.5/s
},
{
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample 2012-09-06 11:53:55.216680035 -0400
+diff -Naur postgresql-9.1.7.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.7/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1.7.orig/src/backend/utils/misc/postgresql.conf.sample 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/backend/utils/misc/postgresql.conf.sample 2012-12-04 12:01:46.571268386 -0500
@@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction).
@@ -1066,10 +1084,10 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample p
#unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart)
-diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bin/initdb/initdb.c
---- postgresql-9.1.5.orig/src/bin/initdb/initdb.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/bin/initdb/initdb.c 2012-09-06 11:53:55.217680041 -0400
-@@ -947,7 +947,7 @@
+diff -Naur postgresql-9.1.7.orig/src/bin/initdb/initdb.c postgresql-9.1.7/src/bin/initdb/initdb.c
+--- postgresql-9.1.7.orig/src/bin/initdb/initdb.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/bin/initdb/initdb.c 2012-12-04 12:01:46.572268396 -0500
+@@ -948,7 +948,7 @@
setup_config(void)
{
char **conflines;
@@ -1078,7 +1096,7 @@ diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bi
char path[MAXPGPATH];
fputs(_("creating configuration files ... "), stdout);
-@@ -968,6 +968,15 @@
+@@ -969,6 +969,15 @@
n_buffers * (BLCKSZ / 1024));
conflines = replace_token(conflines, "#shared_buffers = 32MB", repltok);
@@ -1094,10 +1112,10 @@ diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bi
#if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok);
-diff -Naur postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c 2012-09-06 11:53:55.218680049 -0400
-@@ -519,7 +519,7 @@
+diff -Naur postgresql-9.1.7.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.7/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.1.7.orig/src/bin/pg_ctl/pg_ctl.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/bin/pg_ctl/pg_ctl.c 2012-12-04 12:01:46.572268396 -0500
+@@ -554,7 +554,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
/*
@@ -1106,9 +1124,9 @@ diff -Naur postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.5/src/bi
* directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP
-diff -Naur postgresql-9.1.5.orig/src/include/libpq/libpq.h postgresql-9.1.5/src/include/libpq/libpq.h
---- postgresql-9.1.5.orig/src/include/libpq/libpq.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/libpq/libpq.h 2012-09-06 11:53:55.218680049 -0400
+diff -Naur postgresql-9.1.7.orig/src/include/libpq/libpq.h postgresql-9.1.7/src/include/libpq/libpq.h
+--- postgresql-9.1.7.orig/src/include/libpq/libpq.h 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/include/libpq/libpq.h 2012-12-04 12:01:46.573268406 -0500
@@ -44,12 +44,12 @@
/*
* prototypes for functions in pqcomm.c
@@ -1126,9 +1144,9 @@ diff -Naur postgresql-9.1.5.orig/src/include/libpq/libpq.h postgresql-9.1.5/src/
extern void pq_init(void);
extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len);
-diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/include/miscadmin.h
---- postgresql-9.1.5.orig/src/include/miscadmin.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/miscadmin.h 2012-09-06 11:53:55.219680061 -0400
+diff -Naur postgresql-9.1.7.orig/src/include/miscadmin.h postgresql-9.1.7/src/include/miscadmin.h
+--- postgresql-9.1.7.orig/src/include/miscadmin.h 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/include/miscadmin.h 2012-12-04 12:01:46.573268406 -0500
@@ -370,7 +370,7 @@
* 2 data directory path
* 3 postmaster start timestamp (time_t representation)
@@ -1150,9 +1168,9 @@ diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/in
extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void);
-diff -Naur postgresql-9.1.5.orig/src/include/postmaster/postmaster.h postgresql-9.1.5/src/include/postmaster/postmaster.h
---- postgresql-9.1.5.orig/src/include/postmaster/postmaster.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/postmaster/postmaster.h 2012-09-06 11:53:55.219680061 -0400
+diff -Naur postgresql-9.1.7.orig/src/include/postmaster/postmaster.h postgresql-9.1.7/src/include/postmaster/postmaster.h
+--- postgresql-9.1.7.orig/src/include/postmaster/postmaster.h 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/include/postmaster/postmaster.h 2012-12-04 12:01:46.574268416 -0500
@@ -20,7 +20,7 @@
extern int PostPortNumber;
extern int Unix_socket_permissions;
@@ -1162,9 +1180,9 @@ diff -Naur postgresql-9.1.5.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses;
extern bool ClientAuthInProgress;
extern int PreAuthDelay;
-diff -Naur postgresql-9.1.5.orig/src/include/utils/builtins.h postgresql-9.1.5/src/include/utils/builtins.h
---- postgresql-9.1.5.orig/src/include/utils/builtins.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/utils/builtins.h 2012-09-06 11:53:55.220680072 -0400
+diff -Naur postgresql-9.1.7.orig/src/include/utils/builtins.h postgresql-9.1.7/src/include/utils/builtins.h
+--- postgresql-9.1.7.orig/src/include/utils/builtins.h 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/include/utils/builtins.h 2012-12-04 12:01:46.574268416 -0500
@@ -728,6 +728,8 @@
extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
@@ -1174,13 +1192,13 @@ diff -Naur postgresql-9.1.5.orig/src/include/utils/builtins.h postgresql-9.1.5/s
extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob);
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html-stamp postgresql-9.1.5/doc/src/sgml/html-stamp
---- postgresql-9.1.5.orig/doc/src/sgml/html-stamp 2012-08-14 18:56:48.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html-stamp 2012-09-06 11:53:55.220680072 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/html-stamp postgresql-9.1.7/doc/src/sgml/html-stamp
+--- postgresql-9.1.7.orig/doc/src/sgml/html-stamp 2012-12-03 15:36:15.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/html-stamp 2012-12-04 12:01:46.575268426 -0500
@@ -0,0 +1 @@
+hack
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man-stamp postgresql-9.1.5/doc/src/sgml/man-stamp
---- postgresql-9.1.5.orig/doc/src/sgml/man-stamp 2012-08-14 18:57:47.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/man-stamp 2012-09-06 11:53:55.220680072 -0400
+diff -Naur postgresql-9.1.7.orig/doc/src/sgml/man-stamp postgresql-9.1.7/doc/src/sgml/man-stamp
+--- postgresql-9.1.7.orig/doc/src/sgml/man-stamp 2012-12-03 15:37:14.000000000 -0500
++++ postgresql-9.1.7/doc/src/sgml/man-stamp 2012-12-04 12:01:46.575268426 -0500
@@ -0,0 +1 @@
+hack
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 5bad691..dc70e17 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -16,9 +16,9 @@ This patch must be applied after postgresql-multi-sockets.patch, at
least until 9.3 when that will be part of the upstream package.
-diff -Naur postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c postgresql-9.1.4/contrib/pg_upgrade/server.c
---- postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/contrib/pg_upgrade/server.c 2012-08-12 22:43:10.388873678 -0400
+diff -Naur postgresql-9.1.7.sockets/contrib/pg_upgrade/server.c postgresql-9.1.7/contrib/pg_upgrade/server.c
+--- postgresql-9.1.7.sockets/contrib/pg_upgrade/server.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/contrib/pg_upgrade/server.c 2012-12-04 14:55:24.071997848 -0500
@@ -179,11 +179,14 @@
*/
snprintf(cmd, sizeof(cmd),
@@ -35,9 +35,9 @@ diff -Naur postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c postgresql-9.1.4
output_filename);
/*
-diff -Naur postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c postgresql-9.1.4/src/backend/utils/misc/guc.c
---- postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c 2012-08-12 20:35:22.559682963 -0400
-+++ postgresql-9.1.4/src/backend/utils/misc/guc.c 2012-08-12 20:35:55.071983609 -0400
+diff -Naur postgresql-9.1.7.sockets/src/backend/utils/misc/guc.c postgresql-9.1.7/src/backend/utils/misc/guc.c
+--- postgresql-9.1.7.sockets/src/backend/utils/misc/guc.c 2012-12-04 14:54:55.578729141 -0500
++++ postgresql-9.1.7/src/backend/utils/misc/guc.c 2012-12-04 14:55:24.074997791 -0500
@@ -2874,7 +2874,7 @@
},
&Unix_socket_directories,
@@ -47,10 +47,10 @@ diff -Naur postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c postgresql-9.1.
#else
"",
#endif
-diff -Naur postgresql-9.1.4.sockets/src/bin/initdb/initdb.c postgresql-9.1.4/src/bin/initdb/initdb.c
---- postgresql-9.1.4.sockets/src/bin/initdb/initdb.c 2012-08-12 20:35:22.561682693 -0400
-+++ postgresql-9.1.4/src/bin/initdb/initdb.c 2012-08-12 20:35:55.073983799 -0400
-@@ -970,7 +970,7 @@
+diff -Naur postgresql-9.1.7.sockets/src/bin/initdb/initdb.c postgresql-9.1.7/src/bin/initdb/initdb.c
+--- postgresql-9.1.7.sockets/src/bin/initdb/initdb.c 2012-12-04 14:54:55.580729162 -0500
++++ postgresql-9.1.7/src/bin/initdb/initdb.c 2012-12-04 14:55:24.075997776 -0500
+@@ -971,7 +971,7 @@
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -59,9 +59,9 @@ diff -Naur postgresql-9.1.4.sockets/src/bin/initdb/initdb.c postgresql-9.1.4/src
#else
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
-diff -Naur postgresql-9.1.4.sockets/src/include/pg_config_manual.h postgresql-9.1.4/src/include/pg_config_manual.h
---- postgresql-9.1.4.sockets/src/include/pg_config_manual.h 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/include/pg_config_manual.h 2012-08-12 20:35:55.073983799 -0400
+diff -Naur postgresql-9.1.7.sockets/src/include/pg_config_manual.h postgresql-9.1.7/src/include/pg_config_manual.h
+--- postgresql-9.1.7.sockets/src/include/pg_config_manual.h 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/include/pg_config_manual.h 2012-12-04 14:55:24.075997776 -0500
@@ -141,7 +141,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
@@ -71,9 +71,9 @@ diff -Naur postgresql-9.1.4.sockets/src/include/pg_config_manual.h postgresql-9.
/*
* The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.1.4.sockets/src/test/regress/pg_regress.c postgresql-9.1.4/src/test/regress/pg_regress.c
---- postgresql-9.1.4.sockets/src/test/regress/pg_regress.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/test/regress/pg_regress.c 2012-08-12 20:38:43.933609334 -0400
+diff -Naur postgresql-9.1.7.sockets/src/test/regress/pg_regress.c postgresql-9.1.7/src/test/regress/pg_regress.c
+--- postgresql-9.1.7.sockets/src/test/regress/pg_regress.c 2012-12-03 15:19:35.000000000 -0500
++++ postgresql-9.1.7/src/test/regress/pg_regress.c 2012-12-04 14:55:24.076997763 -0500
@@ -781,7 +781,7 @@
if (hostname != NULL)
doputenv("PGHOST", hostname);
@@ -83,7 +83,7 @@ diff -Naur postgresql-9.1.4.sockets/src/test/regress/pg_regress.c postgresql-9.1
unsetenv("PGHOSTADDR");
if (port != -1)
{
-@@ -2240,7 +2240,7 @@
+@@ -2253,7 +2253,7 @@
*/
header(_("starting postmaster"));
snprintf(buf, sizeof(buf),
diff --git a/postgresql.spec b/postgresql.spec
index cf5514c..b756781 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
-Version: 9.1.6
+Version: 9.1.7
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -67,7 +67,7 @@ Url: http://www.postgresql.org/
# 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
# that this be kept up with the latest minor release of the previous series.
-%global prevversion 9.0.8
+%global prevversion 9.0.11
%global prevmajorversion 9.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -919,6 +919,10 @@ fi
%endif
%changelog
+* Thu Dec 6 2012 Tom Lane <tgl at redhat.com> 9.1.7-1
+- Update to PostgreSQL 9.1.7, for various fixes described at
+ http://www.postgresql.org/docs/9.1/static/release-9-1-7.html
+
* Mon Sep 24 2012 Tom Lane <tgl at redhat.com> 9.1.6-1
- Update to PostgreSQL 9.1.6, for various fixes described at
http://www.postgresql.org/docs/9.1/static/release-9-1-6.html
diff --git a/sources b/sources
index ca5d378..08895e2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-000755f66c0de58bbd4cd2b89b45b8e2 postgresql-9.1.6.tar.bz2
-113e278c0204527a3b983fbd2a541743 postgresql-9.1.6-US.pdf
-0e830b0f6538e04b788c3208060256ef postgresql-9.0.8.tar.bz2
+eaf7b67493d59d1a60767ffdfbd65ce9 postgresql-9.1.7.tar.bz2
+0a4c005ec916f26b71dca74292ed7378 postgresql-9.1.7-US.pdf
+b6080b9d902126e452249aa750ef10cd postgresql-9.0.11.tar.bz2
More information about the scm-commits
mailing list