[postgresql/f17] Update to 9.1.4.

[Tom Lane]

commit 4002e8473544ec03cbf79a664c9c4fffc9182cb2
Author: Tom Lane <tgl at redhat.com>
Date:   Mon Jun 4 08:31:09 2012 -0400

    Update to 9.1.4.

 .gitignore      |    6 +++---
 postgresql.init |   44 --------------------------------------------
 postgresql.spec |   22 ++++++++++++++--------
 sources         |    6 +++---
 4 files changed, 20 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bda415a..7ea9ff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.3.tar.bz2
-/postgresql-9.1.3-US.pdf
-/postgresql-9.0.7.tar.bz2
+/postgresql-9.1.4.tar.bz2
+/postgresql-9.1.4-US.pdf
+/postgresql-9.0.8.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 3bebb5b..8b72f46 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.1
-Version: 9.1.3
-Release: 3%{?dist}
+Version: 9.1.4
+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.
@@ -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.7
+%global prevversion 9.0.8
 %global prevmajorversion 9.0
 
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -83,7 +83,6 @@ Source7: ecpg_config.h
 Source8: README.rpm-dist
 Source9: postgresql-setup
 Source10: postgresql.service
-Source11: postgresql.init
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 
@@ -474,9 +473,6 @@ install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-chec
 install -d $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
 
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
-
 %if %pam
 install -d $RPM_BUILD_ROOT/etc/pam.d
 install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
@@ -834,7 +830,6 @@ rm -rf $RPM_BUILD_ROOT
 %files server -f server.lst
 %defattr(-,root,root)
 %{_unitdir}/postgresql.service
-/etc/rc.d/init.d/postgresql
 %if %pam
 %config(noreplace) /etc/pam.d/postgresql
 %endif
@@ -932,6 +927,17 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jun  4 2012 Tom Lane <tgl at redhat.com> 9.1.4-1
+- Update to PostgreSQL 9.1.4, for various fixes described at
+  http://www.postgresql.org/docs/9.1/static/release-9-1-4.html
+  including the fixes for CVE-2012-2143, CVE-2012-2655
+Resolves: #826606
+- Update previous version (embedded in postgresql-upgrade) to 9.0.8
+  because fix in whole-row variable dumping could be needed for upgrades
+- Revert fix for bug #800416, per fedora-packaging discussion at
+  http://lists.fedoraproject.org/pipermail/packaging/2012-April/008314.html
+  "service postgresql initdb" is dead and will stay that way
+
 * Sat Mar 17 2012 Tom Lane <tgl at redhat.com> 9.1.3-3
 - Fix postgresql-setup to rely on systemd to parse the unit file, instead
   of using ad-hoc code
diff --git a/sources b/sources
index a20d219..95818fc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-641e1915f7ebfdc9f138e4c55b6aec0e  postgresql-9.1.3.tar.bz2
-2deab3e198568853354f328852547d5a  postgresql-9.1.3-US.pdf
-27e67f48607c29df8ca6aab2a6fdf0b8  postgresql-9.0.7.tar.bz2
+a8035688dba988b782725ac1aec60186  postgresql-9.1.4.tar.bz2
+f59cc1a3dbe089d9cc496be119161b3b  postgresql-9.1.4-US.pdf
+0e830b0f6538e04b788c3208060256ef  postgresql-9.0.8.tar.bz2