From e3dfee8fab27db14f554e784178c404b2c032d53 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@redhat.com>
Date: Wed, 29 Dec 2010 18:28:19 -0500
Subject: [PATCH] Update pg_filedump to version 9.0.0

---
 .gitignore      |  2 +-
 pg_crc.c        | 10 +++++-----
 rhdb-utils.spec | 12 ++++++++----
 sources         |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f1ef18..47e0670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-pg_filedump-8.4.0.tar
+/pg_filedump-9.0.0.tar
diff --git a/pg_crc.c b/pg_crc.c
index c4ba3de..0777faa 100644
--- a/pg_crc.c
+++ b/pg_crc.c
@@ -14,12 +14,12 @@
  * code for possible future use.
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.21 2009/01/01 17:23:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.24 2010/02/26 02:01:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -115,7 +115,7 @@ const uint32 pg_crc32_table[256] = {
  * (ECMA-182, available from http://www.ecma.ch/ecma1/STAND/ECMA-182.HTM)
  */
 
-#ifdef INT64_IS_BUSTED
+#if SIZEOF_VOID_P < 8			/* this test must match the one in pg_crc.h */
 
 const uint32 pg_crc64_table0[256] = {
 	0x00000000, 0xA9EA3693,
@@ -378,7 +378,7 @@ const uint32 pg_crc64_table1[256] = {
 	0x5DEDC41A, 0x1F1D25F1,
 	0xD80C07CD, 0x9AFCE626
 };
-#else							/* int64 works */
+#else							/* use int64 implementation */
 
 const uint64 pg_crc64_table[256] = {
 	UINT64CONST(0x0000000000000000), UINT64CONST(0x42F0E1EBA9EA3693),
@@ -510,6 +510,6 @@ const uint64 pg_crc64_table[256] = {
 	UINT64CONST(0x5DEDC41A34BBEEB2), UINT64CONST(0x1F1D25F19D51D821),
 	UINT64CONST(0xD80C07CD676F8394), UINT64CONST(0x9AFCE626CE85B507)
 };
-#endif   /* INT64_IS_BUSTED */
+#endif   /* SIZEOF_VOID_P < 8 */
 
 #endif   /* PROVIDE_64BIT_CRC */
diff --git a/rhdb-utils.spec b/rhdb-utils.spec
index 90ce1fc..f012033 100644
--- a/rhdb-utils.spec
+++ b/rhdb-utils.spec
@@ -5,11 +5,11 @@
 
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition
 Name: rhdb-utils
-Version: 8.4.0
-Release: 5%{?dist}
+Version: 9.0.0
+Release: 1%{?dist}
 URL: http://sources.redhat.com/rhdb/
-# pg_crc.c is copied from postgresql, hence MIT; the rest is GPL
-License: GPLv2+ and MIT
+# pg_crc.c is copied from postgresql; the rest is GPL
+License: GPLv2+ and PostgreSQL
 Group: Applications/Databases
 BuildRequires: postgresql-devel
 
@@ -46,6 +46,10 @@ install -p -m 755 pg_filedump ${RPM_BUILD_ROOT}%{_bindir}
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Wed Dec 29 2010 Tom Lane <tgl@redhat.com> 9.0.0-1
+- Update pg_filedump to version 9.0.0, to support PostgreSQL 9.0.
+- Relabel license as PostgreSQL now that that's separately recognized by OSI.
+
 * Wed Sep 29 2010 jkeating - 8.4.0-5
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index 3f3946f..790a89b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc7d8960adfcb642eb4db5aa39632380  pg_filedump-8.4.0.tar
+8fa46ed67369e6434b60ac21f6fad67c  pg_filedump-9.0.0.tar