From e8f554df7da74b7e7951a33e14d62925095e5971 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Tue, 10 May 2005 15:34:35 +0000
Subject: [PATCH] Update to PostgreSQL 8.0.3 (includes security and data-loss
 fixes; see     bz#156727, CAN-2005-1409, CAN-2005-1410).

---
 .cvsignore      |  8 ++++----
 postgresql.spec | 30 ++++++++++++++++++++++++------
 sources         |  8 ++++----
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3446a69..1d7dd83 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
-postgresql-8.0.2.tar.bz2
+postgresql-8.0.3.tar.bz2
 PyGreSQL-3.6.1.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip
-postgresql-8.0.309.jdbc2.jar
-postgresql-8.0.309.jdbc2ee.jar
-postgresql-8.0.309.jdbc3.jar
+postgresql-8.0-311.jdbc2.jar
+postgresql-8.0-311.jdbc2ee.jar
+postgresql-8.0-311.jdbc3.jar
 postgresql-8.0-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 4d968d7..e27d413 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -42,7 +42,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.0.2
+Version: 8.0.3
 
 # Conventions for PostgreSQL Global Development Group RPM releases:
 
@@ -64,16 +64,16 @@ Version: 8.0.2
 # Pre-release RPM's should not be put up on the public ftp.postgresql.org server
 # -- only test releases or full releases should be.
 
-Release: 2
+Release: 1
 License: BSD
 Group: Applications/Databases
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 Source3: postgresql.init
 Source4: Makefile.regress
 Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc3.jar
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
 Source17: postgresql-8.0-US.pdf
@@ -569,6 +569,14 @@ groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
 
+# If we're upgrading from rh-postgresql, we have to repeat the above actions
+# after rh-postgresql-server is uninstalled, because its postun script runs
+# after our pre script ...
+%triggerpostun -n postgresql-server -- rh-postgresql-server
+groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
+useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+
 %post server
 chkconfig --add postgresql
 /sbin/ldconfig
@@ -581,6 +589,9 @@ fi
 
 %postun server
 /sbin/ldconfig 
+if [ $1 -ge 1 ] ; then
+	/sbin/service postgresql condrestart >/dev/null 2>&1 || :
+fi
 if [ $1 = 0 ] ; then
 	userdel postgres >/dev/null 2>&1 || :
 	groupdel postgres >/dev/null 2>&1 || : 
@@ -793,7 +804,14 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Thu Apr 14 2005 Florian La Roche <laroche@redhat.com>
+* Tue May 10 2005 Tom Lane <tgl@redhat.com> 8.0.3-1
+- Update to PostgreSQL 8.0.3 (includes security and data-loss fixes; see
+  bz#156727, CAN-2005-1409, CAN-2005-1410)
+- Update to jdbc driver build 311
+- Recreate postgres user after superseding an rh-postgresql install (bug #151911)
+- Ensure postgresql server is restarted if running during an upgrade
+
+* Thu Apr 14 2005 Florian La Roche <laroche@redhat.com> 8.0.2-2
 - rebuild for postgresql-tcl
 
 * Tue Apr 12 2005 Tom Lane <tgl@redhat.com> 8.0.2-1
diff --git a/sources b/sources
index ef0fef6..767515b 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-1d44b9ca9a05a0df6c4bf8ebb7164a06  postgresql-8.0.2.tar.bz2
+c0914a133ce6c1e0f1d8b93982d6e881  postgresql-8.0.3.tar.bz2
 057c2d93f333ff2ed2177a8b87e19c0c  PyGreSQL-3.6.1.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip
-35ecfedea6bfb21eca15c85da6f062e9  postgresql-8.0.309.jdbc2.jar
-0c565f0fce11c55242467aade130f86c  postgresql-8.0.309.jdbc2ee.jar
-04fb5bd60b3caddbf9322d6a9398f108  postgresql-8.0.309.jdbc3.jar
+5d5d0d8e97ea3d117380068131b136ac  postgresql-8.0-311.jdbc2.jar
+c4d7009a4baaf06858a2923066ba2529  postgresql-8.0-311.jdbc2ee.jar
+0ae011c390d94566326c61aad3ad9b6a  postgresql-8.0-311.jdbc3.jar
 2edd229aa83105175a1212a001dd030a  postgresql-8.0-US.pdf