From 9f8faddb11a1864fa3e42aedb6dd18a4356f78fe Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 02 2016 16:15:33 +0000
Subject: import postgresql-9.2.15-1.el7_2


---

diff --git a/.gitignore b/.gitignore
index 5bb687d..a365694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/postgresql-8.4.20.tar.bz2
-SOURCES/postgresql-9.2.14-US.pdf
-SOURCES/postgresql-9.2.14.tar.bz2
+SOURCES/postgresql-9.2.15-US.pdf
+SOURCES/postgresql-9.2.15.tar.bz2
diff --git a/.postgresql.metadata b/.postgresql.metadata
index a895a9a..e3ae05b 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
 bad68fc70f90a28212459e5347c32ebbdfcf2c8e SOURCES/postgresql-8.4.20.tar.bz2
-0032b22d41b9124cd02a9807198528693ba0ae9e SOURCES/postgresql-9.2.14-US.pdf
-d07311e7b44f92fb7b5e127c2f7069ff4dd47607 SOURCES/postgresql-9.2.14.tar.bz2
+4a0ab0ee2be5960b9d4be0442d29f932cf95cb85 SOURCES/postgresql-9.2.15-US.pdf
+73086d027966ffb190f650a468921e39f44120a4 SOURCES/postgresql-9.2.15.tar.bz2
diff --git a/SOURCES/postgresql-multi-sockets.patch b/SOURCES/postgresql-multi-sockets.patch
index f6b9379..9dc1c3d 100644
--- a/SOURCES/postgresql-multi-sockets.patch
+++ b/SOURCES/postgresql-multi-sockets.patch
@@ -670,16 +670,15 @@ index 07aca31..e84a18c 100644
  #endif
  
  	/*
-@@ -1452,15 +1495,15 @@ ServerLoop(void)
+@@ -1561,14 +1604,14 @@ ServerLoop(void)
  		}
  
  		/*
--		 * Touch the socket and lock file every 58 minutes, to ensure that
+-		 * Touch Unix socket and lock file every 58 minutes, to ensure that
 +		 * Touch Unix socket and lock files every 58 minutes, to ensure that
  		 * they are not removed by overzealous /tmp-cleaning tasks.  We assume
  		 * no one runs cleaners with cutoff times of less than an hour ...
  		 */
- 		now = time(NULL);
  		if (now - last_touch_time >= 58 * SECS_PER_MINUTE)
  		{
 -			TouchSocketFile();
@@ -688,7 +687,7 @@ index 07aca31..e84a18c 100644
 +			TouchSocketLockFiles();
  			last_touch_time = now;
  		}
- 
+ 	}
 diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
 index 39017ff..318ac38 100644
 --- a/src/backend/tcop/postgres.c
@@ -1192,7 +1191,7 @@ index 1051ca4..e6c663c 100644
   *		6	first listen_address (IP address or "*"; empty if no TCP port)
   *		7	shared memory key (not present on Windows)
   *
-@@ -442,8 +442,9 @@ extern char *local_preload_libraries_string;
+@@ -443,8 +443,9 @@ extern char *local_preload_libraries_string;
  #define LOCK_FILE_LINE_SHMEM_KEY	7
  
  extern void CreateDataDirLockFile(bool amPostmaster);
@@ -1202,8 +1201,8 @@ index 1051ca4..e6c663c 100644
 +					 const char *socketDir);
 +extern void TouchSocketLockFiles(void);
  extern void AddToDataDirLockFile(int target_line, const char *str);
+ extern bool RecheckDataDirLockFile(void);
  extern void ValidatePgVersion(const char *path);
- extern void process_shared_preload_libraries(void);
 diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h
 index 683ce3c..080a8ca 100644
 --- a/src/include/postmaster/postmaster.h
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index a0ea79a..bf9466b 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.2
-Version: 9.2.14
+Version: 9.2.15
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -1150,6 +1150,10 @@ fi
 %endif
 
 %changelog
+* Fri Feb 12 2016 Pavel Kajaba <pkajaba@redhat.com> - 9.2.15-1
+- update to 9.2.15 per release notes
+  http://www.postgresql.org/docs/9.2/static/release-9-2-15.html
+
 * Tue Oct 20 2015 Pavel Raiskup <praiskup@redhat.com> - 9.2.14-1
 - update to 9.2.14 per release notes
   http://www.postgresql.org/docs/9.2/static/release-9-2-14.html