From 702bdb8c8b42b90bef851f30735bfe0ae8deaadd Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Mon, 22 May 2006 16:08:15 +0000
Subject: [PATCH] Update to PostgreSQL 8.1.4 and PyGreSQL 3.8.

---
 .cvsignore      |  4 ++--
 postgresql.init |  2 +-
 postgresql.spec | 17 ++++++++++++-----
 sources         |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2600886..46f586f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.1.3.tar.bz2
-PyGreSQL-3.7.tgz
+postgresql-8.1.4.tar.bz2
+PyGreSQL-3.8.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip
 postgresql-8.1-US.pdf
diff --git a/postgresql.init b/postgresql.init
index d616b96..96e81eb 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -129,7 +129,7 @@ start(){
 		touch "$PGLOG" || exit 1
 		chown postgres:postgres "$PGLOG"
 		chmod go-rwx "$PGLOG"
-		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG"
+		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
 	fi
 
 	# Check for the PGDATA structure
diff --git a/postgresql.spec b/postgresql.spec
index 42ed993..3835128 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,8 +81,8 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.1.3
-Release: 2
+Version: 8.1.4
+Release: 1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -101,7 +101,7 @@ Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
 Source17: http://www.postgresql.org/docs/manuals/postgresql-8.1-US.pdf
-Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.7.tgz
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.tgz
 Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
 Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
 
@@ -349,7 +349,7 @@ cp -p %{SOURCE17} .
    PYGRESQLDIR=`basename %{SOURCE18} .tgz`
    mv $PYGRESQLDIR PyGreSQL
    # Some versions of PyGreSQL.tgz contain wrong file permissions
-   chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
+   chmod 644 PyGreSQL/announce.txt PyGreSQL/changelog.txt PyGreSQL/README
    chmod 755 PyGreSQL/tutorial
    chmod 644 PyGreSQL/tutorial/*.py
    chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
@@ -809,7 +809,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %python
 %files python
 %defattr(-,root,root)
-%doc PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
+%doc PyGreSQL/announce.txt PyGreSQL/changelog.txt PyGreSQL/README
+%doc PyGreSQL/tutorial
 %{_libdir}/python%{pyver}/site-packages/_pgmodule.so
 %{_libdir}/python%{pyver}/site-packages/*.py
 %endif
@@ -828,6 +829,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon May 22 2006 Tom Lane <tgl@redhat.com> 8.1.4-1
+- Update to PostgreSQL 8.1.4 (includes fixes for CVE-2006-2313, CVE-2006-2314;
+  see bug #192173)
+- Update to PyGreSQL 3.8
+- Suppress noise from chcon, per bug #187744
+
 * Mon Mar 27 2006 Tom Lane <tgl@redhat.com> 8.1.3-2
 - Remove JDBC from this build; we will package it as separate SRPM
 
diff --git a/sources b/sources
index 52cfdd7..f1b91dd 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-bb510edbb533962c0692e211b3bd8cfa  postgresql-8.1.3.tar.bz2
-9fa4c2fc1dd0b3b93a3381c048443e16  PyGreSQL-3.7.tgz
+a65bdc5d833169d28bf6fbaaa8d57fcf  postgresql-8.1.4.tar.bz2
+312f5e90a63ea17f8c65bc83b85a55f3  PyGreSQL-3.8.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip
 66d80897840724917cb838c76393692b  postgresql-8.1-US.pdf