rpms
/
postgresql
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to PostgreSQL 9.2.3

This commit is contained in:
Tom Lane 2013-02-07 10:50:50 -05:00
parent 1cd49a06e5
commit 3b77faf93c
5 changed files with 116 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,3 +1,3 @@
/postgresql-9.2.2.tar.bz2 /postgresql-9.2.3.tar.bz2
/postgresql-9.2.2-US.pdf /postgresql-9.2.3-US.pdf
/postgresql-9.1.7.tar.bz2 /postgresql-9.1.8.tar.bz2

183
postgresql-multi-sockets.patch
View File

@ -11,9 +11,9 @@ hunks *must be at the end* so that those files are newer than the
master doc files. master doc files.
diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/server.c postgresql-9.2.2/contrib/pg_upgrade/server.c diff -Naur postgresql-9.2.3.orig/contrib/pg_upgrade/server.c postgresql-9.2.3/contrib/pg_upgrade/server.c
--- postgresql-9.2.2.orig/contrib/pg_upgrade/server.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/contrib/pg_upgrade/server.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/contrib/pg_upgrade/server.c 2012-12-04 11:31:53.614801411 -0500 +++ postgresql-9.2.3/contrib/pg_upgrade/server.c 2013-02-06 19:57:37.124796707 -0500
@@ -197,7 +197,8 @@ @@ -197,7 +197,8 @@
snprintf(socket_string + strlen(socket_string), snprintf(socket_string + strlen(socket_string),
sizeof(socket_string) - strlen(socket_string), sizeof(socket_string) - strlen(socket_string),
@ -24,9 +24,9 @@ diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/server.c postgresql-9.2.2/co
"unix_socket_directory" : "unix_socket_directories", "unix_socket_directory" : "unix_socket_directories",
cluster->sockdir); cluster->sockdir);
#endif #endif
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.2/doc/src/sgml/client-auth.sgml diff -Naur postgresql-9.2.3.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.3/doc/src/sgml/client-auth.sgml
--- postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/client-auth.sgml 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/client-auth.sgml 2012-12-04 11:31:53.656801817 -0500 +++ postgresql-9.2.3/doc/src/sgml/client-auth.sgml 2013-02-06 19:57:37.125796568 -0500
@@ -838,7 +838,7 @@ @@ -838,7 +838,7 @@
<varname>unix_socket_permissions</varname> (and possibly <varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as <varname>unix_socket_group</varname>) configuration parameters as
@ -36,9 +36,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.2/
configuration parameter to place the socket file in a suitably configuration parameter to place the socket file in a suitably
restricted directory. restricted directory.
</para> </para>
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/config.sgml postgresql-9.2.2/doc/src/sgml/config.sgml diff -Naur postgresql-9.2.3.orig/doc/src/sgml/config.sgml postgresql-9.2.3/doc/src/sgml/config.sgml
--- postgresql-9.2.2.orig/doc/src/sgml/config.sgml 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/config.sgml 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/config.sgml 2012-12-04 11:31:53.706802299 -0500 +++ postgresql-9.2.3/doc/src/sgml/config.sgml 2013-02-06 19:57:37.128796163 -0500
@@ -453,17 +453,24 @@ @@ -453,17 +453,24 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -111,9 +111,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/config.sgml postgresql-9.2.2/doc/s
</row> </row>
<row> <row>
<entry><option>-l</option></entry> <entry><option>-l</option></entry>
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2.2/doc/src/sgml/html/app-postgres.html diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2.3/doc/src/sgml/html/app-postgres.html
--- postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html 2012-12-03 15:31:55.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html/app-postgres.html 2013-02-04 16:35:38.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html/app-postgres.html 2012-12-04 11:31:53.707802308 -0500 +++ postgresql-9.2.3/doc/src/sgml/html/app-postgres.html 2013-02-06 19:57:37.129796032 -0500
@@ -574,11 +574,19 @@ @@ -574,11 +574,19 @@
CLASS="COMMAND" CLASS="COMMAND"
>postgres</TT >postgres</TT
@ -136,9 +136,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html postgresql-
</P </P
></DD ></DD
><DT ><DT
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2.2/doc/src/sgml/html/auth-methods.html diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2.3/doc/src/sgml/html/auth-methods.html
--- postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html 2012-12-03 15:31:37.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html/auth-methods.html 2013-02-04 16:35:20.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html/auth-methods.html 2012-12-04 11:31:53.708802316 -0500 +++ postgresql-9.2.3/doc/src/sgml/html/auth-methods.html 2013-02-06 19:57:37.129796032 -0500
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
>. Or you >. Or you
could set the <TT could set the <TT
@ -148,10 +148,10 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html postgresql-
> >
configuration parameter to place the socket file in a suitably configuration parameter to place the socket file in a suitably
restricted directory. restricted directory.
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html postgresql-9.2.2/doc/src/sgml/html/bookindex.html diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/bookindex.html postgresql-9.2.3/doc/src/sgml/html/bookindex.html
--- postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html 2012-12-03 15:32:32.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html/bookindex.html 2013-02-04 16:36:12.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html/bookindex.html 2012-12-04 11:31:53.711802349 -0500 +++ postgresql-9.2.3/doc/src/sgml/html/bookindex.html 2013-02-06 19:57:37.133795530 -0500
@@ -17236,7 +17236,7 @@ @@ -17243,7 +17243,7 @@
></DL ></DL
></DD ></DD
><DT ><DT
@ -160,9 +160,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html postgresql-9.2
<A <A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS" HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A >Connection Settings</A
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2.2/doc/src/sgml/html/preventing-server-spoofing.html diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2.3/doc/src/sgml/html/preventing-server-spoofing.html
--- postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-03 15:31:36.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html/preventing-server-spoofing.html 2013-02-04 16:35:19.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-04 11:31:53.712802361 -0500 +++ postgresql-9.2.3/doc/src/sgml/html/preventing-server-spoofing.html 2013-02-06 19:57:37.134795410 -0500
@@ -115,8 +115,8 @@ @@ -115,8 +115,8 @@
>local</TT >local</TT
> >
@ -174,9 +174,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.ht
>) that has write permission only >) that has write permission only
for a trusted local user. This prevents a malicious user from creating for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that their own socket file in that directory. If you are concerned that
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2.2/doc/src/sgml/html/runtime-config-connection.html diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2.3/doc/src/sgml/html/runtime-config-connection.html
--- postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.html 2012-12-03 15:31:36.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-connection.html 2013-02-04 16:35:19.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html/runtime-config-connection.html 2012-12-04 11:31:53.712802361 -0500 +++ postgresql-9.2.3/doc/src/sgml/html/runtime-config-connection.html 2013-02-06 19:57:37.135795292 -0500
@@ -274,24 +274,31 @@ @@ -274,24 +274,31 @@
></DD ></DD
><DT ><DT
@ -251,9 +251,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.htm
sockets use the usual Unix file system permission set. sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode The parameter value is expected to be a numeric mode
specified in the format accepted by the specified in the format accepted by the
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2.2/doc/src/sgml/html/runtime-config-short.html diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2.3/doc/src/sgml/html/runtime-config-short.html
--- postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html 2012-12-03 15:31:37.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-short.html 2013-02-04 16:35:20.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html/runtime-config-short.html 2012-12-04 11:31:53.713802371 -0500 +++ postgresql-9.2.3/doc/src/sgml/html/runtime-config-short.html 2013-02-06 19:57:37.135795292 -0500
@@ -330,7 +330,7 @@ @@ -330,7 +330,7 @@
><TD ><TD
><TT ><TT
@ -263,9 +263,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE" CLASS="REPLACEABLE"
><I ><I
>x</I >x</I
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.2/doc/src/sgml/man1/postgres.1 diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.3/doc/src/sgml/man1/postgres.1
--- postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 2012-12-03 15:33:32.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/man1/postgres.1 2013-02-04 16:37:11.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/man1/postgres.1 2012-12-04 11:31:53.714802380 -0500 +++ postgresql-9.2.3/doc/src/sgml/man1/postgres.1 2013-02-06 19:57:37.136795176 -0500
@@ -195,8 +195,10 @@ @@ -195,8 +195,10 @@
.RS 4 .RS 4
Specifies the directory of the Unix\-domain socket on which Specifies the directory of the Unix\-domain socket on which
@ -279,9 +279,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.2/d
.RE .RE
.PP .PP
\fB\-l\fR \fB\-l\fR
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2.2/doc/src/sgml/ref/postgres-ref.sgml diff -Naur postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2.3/doc/src/sgml/ref/postgres-ref.sgml
--- postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/ref/postgres-ref.sgml 2012-12-04 11:31:53.714802380 -0500 +++ postgresql-9.2.3/doc/src/sgml/ref/postgres-ref.sgml 2013-02-06 19:57:37.136795176 -0500
@@ -254,8 +254,14 @@ @@ -254,8 +254,14 @@
<para> <para>
Specifies the directory of the Unix-domain socket on which Specifies the directory of the Unix-domain socket on which
@ -299,9 +299,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml postgresql-9.2.2/doc/src/sgml/runtime.sgml diff -Naur postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml postgresql-9.2.3/doc/src/sgml/runtime.sgml
--- postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/runtime.sgml 2012-12-04 11:31:53.715802388 -0500 +++ postgresql-9.2.3/doc/src/sgml/runtime.sgml 2013-02-06 19:57:37.137795062 -0500
@@ -1798,7 +1798,7 @@ @@ -1798,7 +1798,7 @@
<para> <para>
The simplest way to prevent spoofing for <literal>local</> The simplest way to prevent spoofing for <literal>local</>
@ -311,9 +311,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml postgresql-9.2.2/doc/
for a trusted local user. This prevents a malicious user from creating for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the some applications might still reference <filename>/tmp</> for the
diff -Naur postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c postgresql-9.2.2/src/backend/libpq/pqcomm.c diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src/backend/libpq/pqcomm.c
--- postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/libpq/pqcomm.c 2012-12-04 11:34:27.785273808 -0500 +++ postgresql-9.2.3/src/backend/libpq/pqcomm.c 2013-02-06 19:57:37.138794950 -0500
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port * StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client * StreamConnection - Create new connection with client
@ -539,9 +539,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c postgresql-9.2.2/src
/* /*
* utime() is POSIX standard, utimes() is a common alternative. If we * 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 * have neither, there's no way to affect the mod or access time of
diff -Naur postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c postgresql-9.2.2/src/backend/postmaster/postmaster.c diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-9.2.3/src/backend/postmaster/postmaster.c
--- postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/postmaster/postmaster.c 2012-12-04 11:31:53.718802420 -0500 +++ postgresql-9.2.3/src/backend/postmaster/postmaster.c 2013-02-06 19:57:37.139794840 -0500
@@ -156,7 +156,9 @@ @@ -156,7 +156,9 @@
/* The socket number we are listening for connections on */ /* The socket number we are listening for connections on */
@ -676,9 +676,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c postgresql-
last_touch_time = now; last_touch_time = now;
} }
} }
diff -Naur postgresql-9.2.2.orig/src/backend/tcop/postgres.c postgresql-9.2.2/src/backend/tcop/postgres.c diff -Naur postgresql-9.2.3.orig/src/backend/tcop/postgres.c postgresql-9.2.3/src/backend/tcop/postgres.c
--- postgresql-9.2.2.orig/src/backend/tcop/postgres.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/tcop/postgres.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/tcop/postgres.c 2012-12-04 11:31:53.719802432 -0500 +++ postgresql-9.2.3/src/backend/tcop/postgres.c 2013-02-06 19:57:37.140794732 -0500
@@ -3333,7 +3333,7 @@ @@ -3333,7 +3333,7 @@
break; break;
@ -688,9 +688,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/tcop/postgres.c postgresql-9.2.2/sr
break; break;
case 'l': case 'l':
diff -Naur postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c postgresql-9.2.2/src/backend/utils/adt/varlena.c diff -Naur postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c postgresql-9.2.3/src/backend/utils/adt/varlena.c
--- postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/utils/adt/varlena.c 2012-12-04 11:31:53.720802443 -0500 +++ postgresql-9.2.3/src/backend/utils/adt/varlena.c 2013-02-06 19:57:37.141794626 -0500
@@ -2446,6 +2446,119 @@ @@ -2446,6 +2446,119 @@
} }
@ -811,9 +811,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c postgresql-9.2.
/***************************************************************************** /*****************************************************************************
* Comparison Functions used for bytea * Comparison Functions used for bytea
* *
diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.2.2/src/backend/utils/init/miscinit.c diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.2.3/src/backend/utils/init/miscinit.c
--- postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/utils/init/miscinit.c 2012-12-04 11:31:53.721802453 -0500 +++ postgresql-9.2.3/src/backend/utils/init/miscinit.c 2013-02-06 20:03:33.247073549 -0500
@@ -49,8 +49,8 @@ @@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing; ProcessingMode Mode = InitProcessing;
@ -883,9 +883,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
- ); - );
+ socketDir); + socketDir);
errno = 0; /*
if (write(fd, buffer, strlen(buffer)) != strlen(buffer)) * In a standalone backend, the next line (LOCK_FILE_LINE_LISTEN_ADDR)
@@ -934,9 +932,14 @@ @@ -941,9 +939,14 @@
} }
/* /*
@ -902,7 +902,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
} }
/* /*
@@ -945,41 +948,50 @@ @@ -952,41 +955,50 @@
* When this is called, we must have already switched the working * When this is called, we must have already switched the working
* directory to DataDir, so we can just use a relative path. This * directory to DataDir, so we can just use a relative path. This
* helps ensure that we are locking the directory we should be. * helps ensure that we are locking the directory we should be.
@ -964,7 +964,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
/* /*
* utime() is POSIX standard, utimes() is a common alternative; if we * utime() is POSIX standard, utimes() is a common alternative; if we
* have neither, fall back to actually reading the file (which only * have neither, fall back to actually reading the file (which only
@@ -1011,8 +1023,10 @@ @@ -1018,8 +1030,10 @@
* Add (or replace) a line in the data directory lock file. * Add (or replace) a line in the data directory lock file.
* The given string should not include a trailing newline. * The given string should not include a trailing newline.
* *
@ -977,7 +977,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
*/ */
void void
AddToDataDirLockFile(int target_line, const char *str) AddToDataDirLockFile(int target_line, const char *str)
@@ -1020,8 +1034,10 @@ @@ -1027,8 +1041,10 @@
int fd; int fd;
int len; int len;
int lineno; int lineno;
@ -990,7 +990,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0); fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0);
if (fd < 0) if (fd < 0)
@@ -1032,7 +1048,7 @@ @@ -1039,7 +1055,7 @@
DIRECTORY_LOCK_FILE))); DIRECTORY_LOCK_FILE)));
return; return;
} }
@ -999,7 +999,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
if (len < 0) if (len < 0)
{ {
ereport(LOG, ereport(LOG,
@@ -1042,36 +1058,50 @@ @@ -1049,37 +1065,51 @@
close(fd); close(fd);
return; return;
} }
@ -1018,7 +1018,8 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
- if ((ptr = strchr(ptr, '\n')) == NULL) - if ((ptr = strchr(ptr, '\n')) == NULL)
+ if ((srcptr = strchr(srcptr, '\n')) == NULL) + if ((srcptr = strchr(srcptr, '\n')) == NULL)
{ {
elog(LOG, "bogus data in \"%s\"", DIRECTORY_LOCK_FILE); elog(LOG, "incomplete data in \"%s\": found only %d newlines while trying to add line %d",
DIRECTORY_LOCK_FILE, lineno - 1, target_line);
close(fd); close(fd);
return; return;
} }
@ -1058,9 +1059,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
{ {
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/guc.c postgresql-9.2.3/src/backend/utils/misc/guc.c
--- postgresql-9.2.2.orig/src/backend/utils/misc/guc.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/utils/misc/guc.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2012-12-04 11:31:53.723802472 -0500 +++ postgresql-9.2.3/src/backend/utils/misc/guc.c 2013-02-06 19:57:37.144794320 -0500
@@ -2894,14 +2894,18 @@ @@ -2894,14 +2894,18 @@
}, },
@ -1084,9 +1085,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/guc.c postgresql-9.2.2/s
}, },
{ {
diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2.2/src/backend/utils/misc/postgresql.conf.sample diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/backend/utils/misc/postgresql.conf.sample 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/backend/utils/misc/postgresql.conf.sample 2012-12-04 11:31:53.723802472 -0500 +++ postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample 2013-02-06 19:57:37.145794222 -0500
@@ -65,7 +65,8 @@ @@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per # Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction). # connection slot, plus lock space (see max_locks_per_transaction).
@ -1097,9 +1098,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample p
#unix_socket_group = '' # (change requires restart) #unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation #unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart) # (change requires restart)
diff -Naur postgresql-9.2.2.orig/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c diff -Naur postgresql-9.2.3.orig/src/bin/initdb/initdb.c postgresql-9.2.3/src/bin/initdb/initdb.c
--- postgresql-9.2.2.orig/src/bin/initdb/initdb.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/bin/initdb/initdb.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/bin/initdb/initdb.c 2012-12-04 11:31:53.725802491 -0500 +++ postgresql-9.2.3/src/bin/initdb/initdb.c 2013-02-06 19:57:37.146794124 -0500
@@ -983,7 +983,7 @@ @@ -983,7 +983,7 @@
setup_config(void) setup_config(void)
{ {
@ -1125,9 +1126,9 @@ diff -Naur postgresql-9.2.2.orig/src/bin/initdb/initdb.c postgresql-9.2.2/src/bi
#if DEF_PGPORT != 5432 #if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT); snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok); conflines = replace_token(conflines, "#port = 5432", repltok);
diff -Naur postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.2/src/bin/pg_ctl/pg_ctl.c diff -Naur postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c
--- postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/bin/pg_ctl/pg_ctl.c 2012-12-04 11:31:53.725802491 -0500 +++ postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c 2013-02-06 19:57:37.147794028 -0500
@@ -559,7 +559,7 @@ @@ -559,7 +559,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1]; hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
@ -1137,9 +1138,9 @@ diff -Naur postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.2/src/bi
* directories, libpq's host parameter must have a * directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So, * leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP * ignore sockdir if it's relative, and try to use TCP
diff -Naur postgresql-9.2.2.orig/src/include/libpq/libpq.h postgresql-9.2.2/src/include/libpq/libpq.h diff -Naur postgresql-9.2.3.orig/src/include/libpq/libpq.h postgresql-9.2.3/src/include/libpq/libpq.h
--- postgresql-9.2.2.orig/src/include/libpq/libpq.h 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/include/libpq/libpq.h 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/include/libpq/libpq.h 2012-12-04 11:31:53.726802502 -0500 +++ postgresql-9.2.3/src/include/libpq/libpq.h 2013-02-06 19:57:37.147794028 -0500
@@ -44,12 +44,12 @@ @@ -44,12 +44,12 @@
/* /*
* prototypes for functions in pqcomm.c * prototypes for functions in pqcomm.c
@ -1157,9 +1158,9 @@ diff -Naur postgresql-9.2.2.orig/src/include/libpq/libpq.h postgresql-9.2.2/src/
extern void pq_init(void); extern void pq_init(void);
extern void pq_comm_reset(void); extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len); extern int pq_getbytes(char *s, size_t len);
diff -Naur postgresql-9.2.2.orig/src/include/miscadmin.h postgresql-9.2.2/src/include/miscadmin.h diff -Naur postgresql-9.2.3.orig/src/include/miscadmin.h postgresql-9.2.3/src/include/miscadmin.h
--- postgresql-9.2.2.orig/src/include/miscadmin.h 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/include/miscadmin.h 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/include/miscadmin.h 2012-12-04 11:31:53.726802502 -0500 +++ postgresql-9.2.3/src/include/miscadmin.h 2013-02-06 19:57:37.148793934 -0500
@@ -411,7 +411,7 @@ @@ -411,7 +411,7 @@
* 2 data directory path * 2 data directory path
* 3 postmaster start timestamp (time_t representation) * 3 postmaster start timestamp (time_t representation)
@ -1181,9 +1182,9 @@ diff -Naur postgresql-9.2.2.orig/src/include/miscadmin.h postgresql-9.2.2/src/in
extern void AddToDataDirLockFile(int target_line, const char *str); extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path); extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void); extern void process_shared_preload_libraries(void);
diff -Naur postgresql-9.2.2.orig/src/include/postmaster/postmaster.h postgresql-9.2.2/src/include/postmaster/postmaster.h diff -Naur postgresql-9.2.3.orig/src/include/postmaster/postmaster.h postgresql-9.2.3/src/include/postmaster/postmaster.h
--- postgresql-9.2.2.orig/src/include/postmaster/postmaster.h 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/include/postmaster/postmaster.h 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/include/postmaster/postmaster.h 2012-12-04 11:31:53.727802513 -0500 +++ postgresql-9.2.3/src/include/postmaster/postmaster.h 2013-02-06 19:57:37.148793934 -0500
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
extern int PostPortNumber; extern int PostPortNumber;
extern int Unix_socket_permissions; extern int Unix_socket_permissions;
@ -1193,9 +1194,9 @@ diff -Naur postgresql-9.2.2.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses; extern char *ListenAddresses;
extern bool ClientAuthInProgress; extern bool ClientAuthInProgress;
extern int PreAuthDelay; extern int PreAuthDelay;
diff -Naur postgresql-9.2.2.orig/src/include/utils/builtins.h postgresql-9.2.2/src/include/utils/builtins.h diff -Naur postgresql-9.2.3.orig/src/include/utils/builtins.h postgresql-9.2.3/src/include/utils/builtins.h
--- postgresql-9.2.2.orig/src/include/utils/builtins.h 2012-12-03 15:16:10.000000000 -0500 --- postgresql-9.2.3.orig/src/include/utils/builtins.h 2013-02-04 16:28:13.000000000 -0500
+++ postgresql-9.2.2/src/include/utils/builtins.h 2012-12-04 11:31:53.727802513 -0500 +++ postgresql-9.2.3/src/include/utils/builtins.h 2013-02-06 19:57:37.149793843 -0500
@@ -754,6 +754,8 @@ @@ -754,6 +754,8 @@
extern List *textToQualifiedNameList(text *textval); extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator, extern bool SplitIdentifierString(char *rawstring, char separator,
@ -1205,13 +1206,13 @@ diff -Naur postgresql-9.2.2.orig/src/include/utils/builtins.h postgresql-9.2.2/s
extern Datum replace_text(PG_FUNCTION_ARGS); extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp, extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob); text *replace_text, bool glob);
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html-stamp postgresql-9.2.2/doc/src/sgml/html-stamp diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html-stamp postgresql-9.2.3/doc/src/sgml/html-stamp
--- postgresql-9.2.2.orig/doc/src/sgml/html-stamp 2012-12-03 15:32:32.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/html-stamp 2013-02-04 16:36:12.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/html-stamp 2012-12-04 11:31:53.728802524 -0500 +++ postgresql-9.2.3/doc/src/sgml/html-stamp 2013-02-06 19:57:37.149793843 -0500
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+hack +hack
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man-stamp postgresql-9.2.2/doc/src/sgml/man-stamp diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man-stamp postgresql-9.2.3/doc/src/sgml/man-stamp
--- postgresql-9.2.2.orig/doc/src/sgml/man-stamp 2012-12-03 15:33:38.000000000 -0500 --- postgresql-9.2.3.orig/doc/src/sgml/man-stamp 2013-02-04 16:37:18.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/man-stamp 2012-12-04 11:31:53.728802524 -0500 +++ postgresql-9.2.3/doc/src/sgml/man-stamp 2013-02-06 19:57:37.149793843 -0500
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+hack +hack

55
postgresql-upgrade-test.patch
View File

@ -1,55 +0,0 @@
Back-patch upstream fix to suppress creation of postmaster's TCP socket
during pg_upgrade testing. This will be in 9.2.3 and later.
diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
--- postgresql-9.2.2.orig/contrib/pg_upgrade/test.sh 2012-12-03 15:16:10.000000000 -0500
+++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2013-01-03 17:33:45.581567466 -0500
@@ -17,6 +17,13 @@
testhost=`uname -s`
+case $testhost in
+ MINGW*) LISTEN_ADDRESSES="localhost" ;;
+ *) LISTEN_ADDRESSES="" ;;
+esac
+
+POSTMASTER_OPTS="-F -c listen_addresses=$LISTEN_ADDRESSES"
+
temp_root=$PWD/tmp_check
if [ "$1" = '--install' ]; then
@@ -71,10 +78,11 @@
rm -rf "$logdir"
mkdir "$logdir"
+# enable echo so the user can see what is being executed
set -x
$oldbindir/initdb
-$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -w
+$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
if "$MAKE" -C "$oldsrc" installcheck; then
pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
if [ "$newsrc" != "$oldsrc" ]; then
@@ -117,7 +125,7 @@
pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
-pg_ctl start -l "$logdir/postmaster2.log" -w
+pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
case $testhost in
MINGW*) cmd /c analyze_new_cluster.bat ;;
@@ -126,6 +134,11 @@
pg_dumpall -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
pg_ctl -m fast stop
+
+# no need to echo commands anymore
+set +x
+echo
+
if [ -n "$pg_dumpall2_status" ]; then
echo "pg_dumpall of post-upgrade database cluster failed"
exit 1

25
postgresql.spec
View File

@ -57,8 +57,8 @@
Summary: PostgreSQL client programs Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 9.2 %global majorversion 9.2
Version: 9.2.2 Version: 9.2.3
Release: 3%{?dist} Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI # The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well. # recognizes it as an independent license, so we do as well.
@ -73,7 +73,7 @@ Url: http://www.postgresql.org/
# 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;
# but update when bugs affecting pg_dump output are fixed. # but update when bugs affecting pg_dump output are fixed.
%global prevversion 9.1.7 %global prevversion 9.1.8
%global prevmajorversion 9.1 %global prevmajorversion 9.1
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
@ -101,8 +101,7 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch Patch5: postgresql-multi-sockets.patch
Patch6: postgresql-upgrade-test.patch Patch6: postgresql-var-run-socket.patch
Patch7: postgresql-var-run-socket.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
@ -330,7 +329,6 @@ benchmarks.
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -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.
@ -571,6 +569,10 @@ make DESTDIR=$RPM_BUILD_ROOT install-world
mv -f src/Makefile.global.save src/Makefile.global mv -f src/Makefile.global.save src/Makefile.global
%endif %endif
# make sure these directories exist even if we suppressed all contrib modules
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/contrib
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
# multilib header hack; note pg_config.h is installed in two places! # multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564 # we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in case `uname -i` in
@ -653,7 +655,6 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
rm bin/initdb rm bin/initdb
rm bin/pg_basebackup rm bin/pg_basebackup
rm bin/pg_config rm bin/pg_config
rm bin/pg_controldata
rm bin/pg_dump rm bin/pg_dump
rm bin/pg_dumpall rm bin/pg_dumpall
rm bin/pg_restore rm bin/pg_restore
@ -1087,6 +1088,16 @@ fi
%endif %endif
%changelog %changelog
* Thu Feb 7 2013 Tom Lane <tgl@redhat.com> 9.2.3-1
- Update to PostgreSQL 9.2.3, for various fixes described at
http://www.postgresql.org/docs/9.2/static/release-9-2-3.html
including the fix for CVE-2013-0255
Resolves: #908722
- Make the package build with selinux option disabled
Resolves: #894367
- Include old version of pg_controldata in postgresql-upgrade subpackage
Related: #896161
* Thu Jan 3 2013 Tom Lane <tgl@redhat.com> 9.2.2-3 * Thu Jan 3 2013 Tom Lane <tgl@redhat.com> 9.2.2-3
- Prevent creation of TCP socket during pg_upgrade regression test, so that - Prevent creation of TCP socket during pg_upgrade regression test, so that
concurrent RPM builds on the same machine won't fail concurrent RPM builds on the same machine won't fail

6
sources
View File

@ -1,3 +1,3 @@
1cc388988e69bf75c6b55d59070100f6 postgresql-9.2.2.tar.bz2 59f42a93695b0186ed5eb03c2653a7d4 postgresql-9.2.3.tar.bz2
f34d72628321de53e536e689a31bd45c postgresql-9.2.2-US.pdf 33c8cd75dc2e0a5531a665a27b698718 postgresql-9.2.3-US.pdf
eaf7b67493d59d1a60767ffdfbd65ce9 postgresql-9.1.7.tar.bz2 54783b516880a586dcd7c07992d8c0b3 postgresql-9.1.8.tar.bz2