| x
Specifies the directory of the Unix-domain socket on which
postgres is to listen for
@@ -299,10 +299,10 @@ diff -Naur postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml postgresql-9.2.3/doc/src/sgml/runtime.sgml
---- postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/runtime.sgml 2013-02-06 19:57:37.137795062 -0500
-@@ -1798,7 +1798,7 @@
+diff -up postgresql-9.2.10/doc/src/sgml/runtime.sgml.orig postgresql-9.2.10/doc/src/sgml/runtime.sgml
+--- postgresql-9.2.10/doc/src/sgml/runtime.sgml.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/doc/src/sgml/runtime.sgml 2015-02-26 14:04:26.633801354 +0100
+@@ -1800,7 +1800,7 @@ pg_dumpall -p 5432 | psql -d postgres -p
The simplest way to prevent spoofing for local
connections is to use a Unix domain socket directory (/tmp for the
-diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src/backend/libpq/pqcomm.c
---- postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/libpq/pqcomm.c 2013-02-06 19:57:37.138794950 -0500
+diff -up postgresql-9.2.10/src/backend/libpq/pqcomm.c.orig postgresql-9.2.10/src/backend/libpq/pqcomm.c
+--- postgresql-9.2.10/src/backend/libpq/pqcomm.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/backend/libpq/pqcomm.c 2015-02-26 14:04:26.634801364 +0100
@@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client
@@ -323,7 +323,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
* pq_init - initialize libpq at backend startup
* pq_comm_reset - reset libpq during error recovery
* pq_close - shutdown libpq at backend exit
-@@ -103,8 +103,8 @@
+@@ -103,8 +103,8 @@ int Unix_socket_permissions;
char *Unix_socket_group;
@@ -334,7 +334,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
/*
-@@ -140,8 +140,8 @@
+@@ -141,8 +141,8 @@ static int internal_flush(void);
static void pq_set_nonblocking(bool nonblocking);
#ifdef HAVE_UNIX_SOCKETS
@@ -345,7 +345,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
#endif /* HAVE_UNIX_SOCKETS */
-@@ -234,29 +234,43 @@
+@@ -236,29 +236,43 @@ pq_close(int code, Datum arg)
/* StreamDoUnlink()
* Shutdown routine for backend connection
@@ -395,7 +395,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
pgsocket ListenSocket[], int MaxListen)
{
pgsocket fd;
-@@ -273,6 +287,9 @@
+@@ -275,6 +289,9 @@ StreamServerPort(int family, char *hostN
int listen_index = 0;
int added = 0;
@@ -405,7 +405,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
#if !defined(WIN32) || defined(IPV6_V6ONLY)
int one = 1;
#endif
-@@ -286,10 +303,22 @@
+@@ -288,10 +305,22 @@ StreamServerPort(int family, char *hostN
#ifdef HAVE_UNIX_SOCKETS
if (family == AF_UNIX)
{
@@ -431,7 +431,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
}
else
#endif /* HAVE_UNIX_SOCKETS */
-@@ -432,7 +461,7 @@
+@@ -434,7 +463,7 @@ StreamServerPort(int family, char *hostN
(IS_AF_UNIX(addr->ai_family)) ?
errhint("Is another postmaster already running on port %d?"
" If not, remove socket file \"%s\" and retry.",
@@ -440,7 +440,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
errhint("Is another postmaster already running on port %d?"
" If not, wait a few seconds and retry.",
(int) portNumber)));
-@@ -443,7 +472,7 @@
+@@ -445,7 +474,7 @@ StreamServerPort(int family, char *hostN
#ifdef HAVE_UNIX_SOCKETS
if (addr->ai_family == AF_UNIX)
{
@@ -449,7 +449,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
{
closesocket(fd);
break;
-@@ -490,18 +519,8 @@
+@@ -492,18 +521,8 @@ StreamServerPort(int family, char *hostN
* Lock_AF_UNIX -- configure unix socket file path
*/
static int
@@ -469,7 +469,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
/*
* Grab an interlock file associated with the socket file.
*
-@@ -510,13 +529,23 @@
+@@ -512,13 +531,23 @@ Lock_AF_UNIX(unsigned short portNumber,
* more portable, and second, it lets us remove any pre-existing socket
* file without race conditions.
*/
@@ -495,7 +495,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
return STATUS_OK;
}
-@@ -526,11 +555,8 @@
+@@ -528,11 +557,8 @@ Lock_AF_UNIX(unsigned short portNumber,
* Setup_AF_UNIX -- configure unix socket permissions
*/
static int
@@ -508,7 +508,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src
/*
* Fix socket ownership/permission if requested. Note we must do this
* before we listen() to avoid a window where unwanted connections could
-@@ -712,20 +738,24 @@
+@@ -714,20 +740,24 @@ StreamClose(pgsocket sock)
}
/*
@@ -539,10 +539,10 @@ diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/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.2.3.orig/src/backend/postmaster/postmaster.c postgresql-9.2.3/src/backend/postmaster/postmaster.c
---- postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/postmaster/postmaster.c 2013-02-06 19:57:37.139794840 -0500
-@@ -156,7 +156,9 @@
+diff -up postgresql-9.2.10/src/backend/postmaster/postmaster.c.orig postgresql-9.2.10/src/backend/postmaster/postmaster.c
+--- postgresql-9.2.10/src/backend/postmaster/postmaster.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/backend/postmaster/postmaster.c 2015-02-26 14:04:26.636801383 +0100
+@@ -160,7 +160,9 @@ static Backend *ShmemBackendArray;
/* The socket number we are listening for connections on */
int PostPortNumber;
@@ -553,7 +553,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
char *ListenAddresses;
/*
-@@ -608,7 +610,7 @@
+@@ -636,7 +638,7 @@ PostmasterMain(int argc, char *argv[])
break;
case 'k':
@@ -562,7 +562,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
break;
case 'l':
-@@ -852,7 +854,7 @@
+@@ -880,7 +882,7 @@ PostmasterMain(int argc, char *argv[])
/* Need a modifiable copy of ListenAddresses */
rawstring = pstrdup(ListenAddresses);
@@ -571,7 +571,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
if (!SplitIdentifierString(rawstring, ',', &elemlist))
{
/* syntax error in list */
-@@ -868,12 +870,12 @@
+@@ -896,12 +898,12 @@ PostmasterMain(int argc, char *argv[])
if (strcmp(curhost, "*") == 0)
status = StreamServerPort(AF_UNSPEC, NULL,
(unsigned short) PostPortNumber,
@@ -586,7 +586,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
ListenSocket, MAXLISTEN);
if (status == STATUS_OK)
-@@ -892,7 +894,7 @@
+@@ -920,7 +922,7 @@ PostmasterMain(int argc, char *argv[])
curhost)));
}
@@ -595,7 +595,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
ereport(FATAL,
(errmsg("could not create any TCP/IP sockets")));
-@@ -939,13 +941,54 @@
+@@ -967,13 +969,54 @@ PostmasterMain(int argc, char *argv[])
#endif
#ifdef HAVE_UNIX_SOCKETS
@@ -657,7 +657,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
#endif
/*
-@@ -1435,15 +1478,15 @@
+@@ -1452,15 +1495,15 @@ ServerLoop(void)
}
/*
@@ -675,11 +675,11 @@ diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-
+ TouchSocketLockFiles();
last_touch_time = now;
}
- }
-diff -Naur postgresql-9.2.3.orig/src/backend/tcop/postgres.c postgresql-9.2.3/src/backend/tcop/postgres.c
---- postgresql-9.2.3.orig/src/backend/tcop/postgres.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/tcop/postgres.c 2013-02-06 19:57:37.140794732 -0500
-@@ -3333,7 +3333,7 @@
+
+diff -up postgresql-9.2.10/src/backend/tcop/postgres.c.orig postgresql-9.2.10/src/backend/tcop/postgres.c
+--- postgresql-9.2.10/src/backend/tcop/postgres.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/backend/tcop/postgres.c 2015-02-26 14:04:26.638801403 +0100
+@@ -3393,7 +3393,7 @@ process_postgres_switches(int argc, char
break;
case 'k':
@@ -688,10 +688,10 @@ diff -Naur postgresql-9.2.3.orig/src/backend/tcop/postgres.c postgresql-9.2.3/sr
break;
case 'l':
-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.3.orig/src/backend/utils/adt/varlena.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/adt/varlena.c 2013-02-06 19:57:37.141794626 -0500
-@@ -2446,6 +2446,119 @@
+diff -up postgresql-9.2.10/src/backend/utils/adt/varlena.c.orig postgresql-9.2.10/src/backend/utils/adt/varlena.c
+--- postgresql-9.2.10/src/backend/utils/adt/varlena.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/backend/utils/adt/varlena.c 2015-02-26 14:04:26.639801413 +0100
+@@ -2446,6 +2446,119 @@ SplitIdentifierString(char *rawstring, c
}
@@ -811,9 +811,9 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c postgresql-9.2.
/*****************************************************************************
* Comparison Functions used for bytea
*
-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.3.orig/src/backend/utils/init/miscinit.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/init/miscinit.c 2013-02-06 20:03:33.247073549 -0500
+diff -up postgresql-9.2.10/src/backend/utils/init/miscinit.c.orig postgresql-9.2.10/src/backend/utils/init/miscinit.c
+--- postgresql-9.2.10/src/backend/utils/init/miscinit.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/backend/utils/init/miscinit.c 2015-02-26 14:04:26.640801422 +0100
@@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing;
@@ -825,7 +825,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
/* ----------------------------------------------------------------
-@@ -640,32 +640,35 @@
+@@ -640,32 +640,35 @@ GetUserNameFromId(Oid roleid)
*/
/*
@@ -871,7 +871,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
bool isDDLock, const char *refName)
{
int fd;
-@@ -891,12 +894,7 @@
+@@ -891,12 +894,7 @@ CreateLockFile(const char *filename, boo
DataDir,
(long) MyStartTime,
PostPortNumber,
@@ -885,7 +885,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
/*
* In a standalone backend, the next line (LOCK_FILE_LINE_LISTEN_ADDR)
-@@ -941,9 +939,14 @@
+@@ -941,9 +939,14 @@ CreateLockFile(const char *filename, boo
}
/*
@@ -902,7 +902,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
}
/*
-@@ -952,41 +955,50 @@
+@@ -952,41 +955,50 @@ CreateLockFile(const char *filename, boo
* When this is called, we must have already switched the working
* directory to DataDir, so we can just use a relative path. This
* helps ensure that we are locking the directory we should be.
@@ -964,7 +964,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
/*
* utime() is POSIX standard, utimes() is a common alternative; if we
* have neither, fall back to actually reading the file (which only
-@@ -1018,8 +1030,10 @@
+@@ -1018,8 +1030,10 @@ TouchSocketLockFile(void)
* Add (or replace) a line in the data directory lock file.
* The given string should not include a trailing newline.
*
@@ -977,7 +977,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
*/
void
AddToDataDirLockFile(int target_line, const char *str)
-@@ -1027,8 +1041,10 @@
+@@ -1027,8 +1041,10 @@ AddToDataDirLockFile(int target_line, co
int fd;
int len;
int lineno;
@@ -990,7 +990,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0);
if (fd < 0)
-@@ -1039,7 +1055,7 @@
+@@ -1039,7 +1055,7 @@ AddToDataDirLockFile(int target_line, co
DIRECTORY_LOCK_FILE)));
return;
}
@@ -999,7 +999,7 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.
if (len < 0)
{
ereport(LOG,
-@@ -1049,37 +1065,51 @@
+@@ -1049,37 +1065,51 @@ AddToDataDirLockFile(int target_line, co
close(fd);
return;
}
@@ -1059,10 +1059,10 @@ diff -Naur postgresql-9.2.3.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.2.3.orig/src/backend/utils/misc/guc.c postgresql-9.2.3/src/backend/utils/misc/guc.c
---- postgresql-9.2.3.orig/src/backend/utils/misc/guc.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/misc/guc.c 2013-02-06 19:57:37.144794320 -0500
-@@ -2894,14 +2894,18 @@
+diff -up postgresql-9.2.10/src/backend/utils/misc/guc.c.orig postgresql-9.2.10/src/backend/utils/misc/guc.c
+--- postgresql-9.2.10/src/backend/utils/misc/guc.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/backend/utils/misc/guc.c 2015-02-26 14:04:26.643801452 +0100
+@@ -2894,14 +2894,18 @@ static struct config_string ConfigureNam
},
{
@@ -1085,10 +1085,10 @@ diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/guc.c postgresql-9.2.3/s
},
{
-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.3.orig/src/backend/utils/misc/postgresql.conf.sample 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample 2013-02-06 19:57:37.145794222 -0500
-@@ -65,7 +65,8 @@
+diff -up postgresql-9.2.10/src/backend/utils/misc/postgresql.conf.sample.orig postgresql-9.2.10/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.2.10/src/backend/utils/misc/postgresql.conf.sample.orig 2015-02-26 14:04:11.574654149 +0100
++++ postgresql-9.2.10/src/backend/utils/misc/postgresql.conf.sample 2015-02-26 14:04:26.644801461 +0100
+@@ -67,7 +67,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction).
#superuser_reserved_connections = 3 # (change requires restart)
@@ -1098,10 +1098,10 @@ diff -Naur postgresql-9.2.3.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.2.3.orig/src/bin/initdb/initdb.c postgresql-9.2.3/src/bin/initdb/initdb.c
---- postgresql-9.2.3.orig/src/bin/initdb/initdb.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/bin/initdb/initdb.c 2013-02-06 19:57:37.146794124 -0500
-@@ -983,7 +983,7 @@
+diff -up postgresql-9.2.10/src/bin/initdb/initdb.c.orig postgresql-9.2.10/src/bin/initdb/initdb.c
+--- postgresql-9.2.10/src/bin/initdb/initdb.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/bin/initdb/initdb.c 2015-02-26 14:04:26.645801471 +0100
+@@ -991,7 +991,7 @@ static void
setup_config(void)
{
char **conflines;
@@ -1110,7 +1110,7 @@ diff -Naur postgresql-9.2.3.orig/src/bin/initdb/initdb.c postgresql-9.2.3/src/bi
char path[MAXPGPATH];
const char *default_timezone;
-@@ -1005,6 +1005,15 @@
+@@ -1013,6 +1013,15 @@ setup_config(void)
n_buffers * (BLCKSZ / 1024));
conflines = replace_token(conflines, "#shared_buffers = 32MB", repltok);
@@ -1126,10 +1126,10 @@ diff -Naur postgresql-9.2.3.orig/src/bin/initdb/initdb.c postgresql-9.2.3/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.2.3.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c 2013-02-06 19:57:37.147794028 -0500
-@@ -559,7 +559,7 @@
+diff -up postgresql-9.2.10/src/bin/pg_ctl/pg_ctl.c.orig postgresql-9.2.10/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.2.10/src/bin/pg_ctl/pg_ctl.c.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/bin/pg_ctl/pg_ctl.c 2015-02-26 14:04:26.646801481 +0100
+@@ -561,7 +561,7 @@ test_postmaster_connection(bool do_check
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
/*
@@ -1138,10 +1138,10 @@ diff -Naur postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.3/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.2.3.orig/src/include/libpq/libpq.h postgresql-9.2.3/src/include/libpq/libpq.h
---- postgresql-9.2.3.orig/src/include/libpq/libpq.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/libpq/libpq.h 2013-02-06 19:57:37.147794028 -0500
-@@ -44,12 +44,12 @@
+diff -up postgresql-9.2.10/src/include/libpq/libpq.h.orig postgresql-9.2.10/src/include/libpq/libpq.h
+--- postgresql-9.2.10/src/include/libpq/libpq.h.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/include/libpq/libpq.h 2015-02-26 14:04:26.647801491 +0100
+@@ -44,12 +44,12 @@ typedef struct
/*
* prototypes for functions in pqcomm.c
*/
@@ -1158,10 +1158,10 @@ diff -Naur postgresql-9.2.3.orig/src/include/libpq/libpq.h postgresql-9.2.3/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.2.3.orig/src/include/miscadmin.h postgresql-9.2.3/src/include/miscadmin.h
---- postgresql-9.2.3.orig/src/include/miscadmin.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/miscadmin.h 2013-02-06 19:57:37.148793934 -0500
-@@ -411,7 +411,7 @@
+diff -up postgresql-9.2.10/src/include/miscadmin.h.orig postgresql-9.2.10/src/include/miscadmin.h
+--- postgresql-9.2.10/src/include/miscadmin.h.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/include/miscadmin.h 2015-02-26 14:04:26.647801491 +0100
+@@ -424,7 +424,7 @@ extern char *local_preload_libraries_str
* 2 data directory path
* 3 postmaster start timestamp (time_t representation)
* 4 port number
@@ -1170,7 +1170,7 @@ diff -Naur postgresql-9.2.3.orig/src/include/miscadmin.h postgresql-9.2.3/src/in
* 6 first listen_address (IP address or "*"; empty if no TCP port)
* 7 shared memory key (not present on Windows)
*
-@@ -429,8 +429,9 @@
+@@ -442,8 +442,9 @@ extern char *local_preload_libraries_str
#define LOCK_FILE_LINE_SHMEM_KEY 7
extern void CreateDataDirLockFile(bool amPostmaster);
@@ -1182,10 +1182,10 @@ diff -Naur postgresql-9.2.3.orig/src/include/miscadmin.h postgresql-9.2.3/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.2.3.orig/src/include/postmaster/postmaster.h postgresql-9.2.3/src/include/postmaster/postmaster.h
---- postgresql-9.2.3.orig/src/include/postmaster/postmaster.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/postmaster/postmaster.h 2013-02-06 19:57:37.148793934 -0500
-@@ -19,7 +19,7 @@
+diff -up postgresql-9.2.10/src/include/postmaster/postmaster.h.orig postgresql-9.2.10/src/include/postmaster/postmaster.h
+--- postgresql-9.2.10/src/include/postmaster/postmaster.h.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/include/postmaster/postmaster.h 2015-02-26 14:04:26.648801500 +0100
+@@ -19,7 +19,7 @@ extern int ReservedBackends;
extern int PostPortNumber;
extern int Unix_socket_permissions;
extern char *Unix_socket_group;
@@ -1194,10 +1194,10 @@ diff -Naur postgresql-9.2.3.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses;
extern bool ClientAuthInProgress;
extern int PreAuthDelay;
-diff -Naur postgresql-9.2.3.orig/src/include/utils/builtins.h postgresql-9.2.3/src/include/utils/builtins.h
---- postgresql-9.2.3.orig/src/include/utils/builtins.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/utils/builtins.h 2013-02-06 19:57:37.149793843 -0500
-@@ -754,6 +754,8 @@
+diff -up postgresql-9.2.10/src/include/utils/builtins.h.orig postgresql-9.2.10/src/include/utils/builtins.h
+--- postgresql-9.2.10/src/include/utils/builtins.h.orig 2015-02-02 21:44:39.000000000 +0100
++++ postgresql-9.2.10/src/include/utils/builtins.h 2015-02-26 14:04:26.649801510 +0100
+@@ -754,6 +754,8 @@ extern int varstr_cmp(char *arg1, int le
extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
List **namelist);
@@ -1206,13 +1206,13 @@ diff -Naur postgresql-9.2.3.orig/src/include/utils/builtins.h postgresql-9.2.3/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.2.3.orig/doc/src/sgml/html-stamp postgresql-9.2.3/doc/src/sgml/html-stamp
---- postgresql-9.2.3.orig/doc/src/sgml/html-stamp 2013-02-04 16:36:12.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html-stamp 2013-02-06 19:57:37.149793843 -0500
+diff -up postgresql-9.2.10/doc/src/sgml/html-stamp.orig postgresql-9.2.10/doc/src/sgml/html-stamp
+--- postgresql-9.2.10/doc/src/sgml/html-stamp.orig 2015-02-02 22:00:12.000000000 +0100
++++ postgresql-9.2.10/doc/src/sgml/html-stamp 2015-02-26 14:04:26.649801510 +0100
@@ -0,0 +1 @@
+hack
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man-stamp postgresql-9.2.3/doc/src/sgml/man-stamp
---- postgresql-9.2.3.orig/doc/src/sgml/man-stamp 2013-02-04 16:37:18.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/man-stamp 2013-02-06 19:57:37.149793843 -0500
+diff -up postgresql-9.2.10/doc/src/sgml/man-stamp.orig postgresql-9.2.10/doc/src/sgml/man-stamp
+--- postgresql-9.2.10/doc/src/sgml/man-stamp.orig 2015-02-02 22:01:15.000000000 +0100
++++ postgresql-9.2.10/doc/src/sgml/man-stamp 2015-02-26 14:04:26.650801520 +0100
@@ -0,0 +1 @@
+hack
diff --git a/SOURCES/postgresql-var-run-socket.patch b/SOURCES/postgresql-var-run-socket.patch
index 22b8a0c..adfb690 100644
--- a/SOURCES/postgresql-var-run-socket.patch
+++ b/SOURCES/postgresql-var-run-socket.patch
@@ -68,24 +68,3 @@ diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.
/*
* The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2.2/src/test/regress/pg_regress.c
---- postgresql-9.2.2.sockets/src/test/regress/pg_regress.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/test/regress/pg_regress.c 2013-01-03 17:38:30.186271622 -0500
-@@ -772,7 +772,7 @@
- if (hostname != NULL)
- doputenv("PGHOST", hostname);
- else
-- unsetenv("PGHOST");
-+ doputenv("PGHOST", "/tmp");
- unsetenv("PGHOSTADDR");
- if (port != -1)
- {
-@@ -2246,7 +2246,7 @@
- */
- header(_("starting postmaster"));
- snprintf(buf, sizeof(buf),
-- SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
-+ SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" -c \"unix_socket_directories=/tmp\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
- bindir, temp_install,
- debug ? " -d 5" : "",
- hostname ? hostname : "",
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index a6a135a..7cc1717 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -58,8 +58,8 @@
Summary: PostgreSQL client programs
Name: %{?scl_prefix}postgresql
%global majorversion 9.2
-Version: 9.2.8
-Release: 2%{?dist}
+Version: 9.2.10
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -71,7 +71,7 @@ Url: http://www.postgresql.org/
# 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;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 8.4.21
+%global prevversion 8.4.22
%global prevmajorversion 8.4
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -1147,6 +1147,12 @@ cat psql-%{majorversion}.lang >>main.lst
%endif
%changelog
+* Thu Feb 26 2015 Jozef Mlich - 9.2.10-1
+- Rebase to 9.2.10 minor version per release notes:
+ http://www.postgresql.org/docs/9.2/static/release-9-2-10.html
+ CVE-2015-0244 CVE-2014-8161 CVE-2015-0241 CVE-2015-0243
+ Resolves: #1198663
+
* Mon Apr 07 2014 Jozef Mlich 9.2.8-2
- added two dashes into scl-legacy.patch
Resolves: #1060767
|