From 3adc308eb217765f86e77736d8968ed14b5e1ccd Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Mon, 17 May 2010 17:30:50 +0000
Subject: [PATCH] Update to PostgreSQL 8.4.4

---
 .cvsignore                  |  4 ++--
 postgresql-ac-version.patch |  8 ++++----
 postgresql-perl-rpath.patch | 10 +++++-----
 postgresql.spec             |  8 +++++++-
 sources                     |  4 ++--
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0c68227..2846e3a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postgresql-8.4.3.tar.bz2
-postgresql-8.4.3-US.pdf
+postgresql-8.4.4.tar.bz2
+postgresql-8.4.4-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 8555061..e04d852 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.3.orig/configure.in postgresql-8.4.3/configure.in
---- postgresql-8.4.3.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.3/configure.in	2009-09-04 13:03:07.000000000 -0400
+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
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.3], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs@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-perl-rpath.patch b/postgresql-perl-rpath.patch
index 26634b7..28331ee 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,9 +7,9 @@ So work around it by adding an rpath spec to plperl.so (only).
 Per bug #162198.
 
 
-diff -Naur postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile postgresql-8.4.0/src/pl/plperl/GNUmakefile
---- postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile	2009-06-05 14:29:56.000000000 -0400
-+++ postgresql-8.4.0/src/pl/plperl/GNUmakefile	2009-08-12 23:28:57.000000000 -0400
+diff -Naur postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile postgresql-8.4.4/src/pl/plperl/GNUmakefile
+--- postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile	2010-05-13 12:40:36.000000000 -0400
++++ postgresql-8.4.4/src/pl/plperl/GNUmakefile	2010-05-14 11:50:27.000000000 -0400
 @@ -38,6 +38,9 @@
  
  SHLIB_LINK = $(perl_embed_ldflags)
@@ -17,6 +17,6 @@ diff -Naur postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile postgresql-8.4.0/src/
 +# Force rpath to be used even though we disable it everywhere else
 +SHLIB_LINK += $(rpath)
 +
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
+ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl  --load-language=plperlu
  REGRESS = plperl plperl_trigger plperl_shared plperl_elog
- # where to find psql for running the tests
+ # if Perl can support two interpreters in one backend, 
diff --git a/postgresql.spec b/postgresql.spec
index eea68be..10e412c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 8.4
-Version: 8.4.3
+Version: 8.4.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.
@@ -713,6 +713,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon May 17 2010 Tom Lane <tgl@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
+  including fixes for CVE-2010-1169 and CVE-2010-1170
+Resolves: #593032
+
 * Sun Mar 14 2010 Tom Lane <tgl@redhat.com> 8.4.3-1
 - Update to PostgreSQL 8.4.3, for various fixes described at
   http://www.postgresql.org/docs/8.4/static/release-8-4-3.html
diff --git a/sources b/sources
index 6e72099..f169b55 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7f70e7b140fb190f268837255582b07e  postgresql-8.4.3.tar.bz2
-fa50777e0964e86bd1bfbefda645aa82  postgresql-8.4.3-US.pdf
+4bf2448ad965bca3940df648c02194df  postgresql-8.4.4.tar.bz2
+1d67db52cd8493c2b76dd827e8d46d25  postgresql-8.4.4-US.pdf