[postgresql/f13/master] Update to PostgreSQL 8.4.5

[Tom Lane]

commit ac297c44420df3bdef22a080077b0c2d3cb9ab4f
Author: Tom Lane <tgl at sss.pgh.pa.us>
Date:   Tue Oct 5 16:06:44 2010 -0400

    Update to PostgreSQL 8.4.5

 .gitignore                  |    4 ++--
 postgresql-ac-version.patch |    8 ++++----
 postgresql.init             |    2 +-
 postgresql.spec             |   12 +++++++++++-
 sources                     |    4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2846e3a..948254d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-postgresql-8.4.4.tar.bz2
-postgresql-8.4.4-US.pdf
+/postgresql-8.4.5.tar.bz2
+/postgresql-8.4.5-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index e04d852..53c774a 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
 Dike out the check.
 
 
-diff -Naur postgresql-8.4.4.orig/configure.in postgresql-8.4.4/configure.in
---- postgresql-8.4.4.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.4/configure.in	2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.5.orig/configure.in postgresql-8.4.5/configure.in
+--- postgresql-8.4.5.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.5/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.5], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.init b/postgresql.init
index ad2e470..44d032c 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -218,7 +218,7 @@ case "$1" in
 	stop
 	;;
   status)
-	status postmaster
+	status -p "$pidfile" postmaster
 	script_result=$?
 	;;
   restart)
diff --git a/postgresql.spec b/postgresql.spec
index 9ef3b7b..9d1e8c5 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 8.4
-Version: 8.4.4
+Version: 8.4.5
 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.
@@ -626,6 +626,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs -f libs.lst
 %defattr(-,root,root)
+%doc COPYRIGHT
 %{_libdir}/libpq.so.*
 %{_libdir}/libecpg.so.*
 %{_libdir}/libpgtypes.so.*
@@ -713,6 +714,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct  5 2010 Tom Lane <tgl at redhat.com> 8.4.5-1
+- Update to PostgreSQL 8.4.5, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-5.html
+  including the fix for CVE-2010-3433
+Related: #639371
+- Add -p "$pidfile" to initscript's status call to improve corner cases.
+Related: #561010
+- Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines
+
 * Mon May 17 2010 Tom Lane <tgl at redhat.com> 8.4.4-1
 - Update to PostgreSQL 8.4.4, for various fixes described at
   http://www.postgresql.org/docs/8.4/static/release-8-4-4.html
diff --git a/sources b/sources
index f169b55..5f91317 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4bf2448ad965bca3940df648c02194df  postgresql-8.4.4.tar.bz2
-1d67db52cd8493c2b76dd827e8d46d25  postgresql-8.4.4-US.pdf
+391a3f2eddd6fa78bb6ceba9955ffa5f  postgresql-8.4.5.tar.bz2
+b1eb40dd133acb73671c8862a45ed9c9  postgresql-8.4.5-US.pdf