Update to PostgreSQL 9.0.3

This commit is contained in:
Tom Lane 2011-02-01 10:35:37 -05:00
parent 4753f3695e
commit e5c31247fc
4 changed files with 11 additions and 79 deletions

4
.gitignore vendored
View File

@ -1,3 +1,3 @@
/postgresql-9.0.2.tar.bz2 /postgresql-9.0.3.tar.bz2
/postgresql-9.0.2-US.pdf /postgresql-9.0.3-US.pdf
/postgresql-8.4.6.tar.bz2 /postgresql-8.4.6.tar.bz2

View File

@ -1,72 +0,0 @@
Patch pg_upgrade to not insist on useless baggage in the upgrade RPM,
as well as being more careful to check for things it does need.
diff -Naur postgresql-9.0.2.orig/contrib/pg_upgrade/exec.c postgresql-9.0.2/contrib/pg_upgrade/exec.c
--- postgresql-9.0.2.orig/contrib/pg_upgrade/exec.c 2010-12-13 21:55:50.000000000 -0500
+++ postgresql-9.0.2/contrib/pg_upgrade/exec.c 2010-12-28 16:56:05.734506648 -0500
@@ -14,7 +14,7 @@
static void check_data_dir(migratorContext *ctx, const char *pg_data);
-static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster);
+static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster);
static int check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
static const char *validate_exec(const char *path);
@@ -99,7 +99,7 @@
check_ok(ctx);
prep_status(ctx, "Checking old bin directory (%s)", ctx->old.bindir);
- check_bin_dir(ctx, &ctx->old);
+ check_bin_dir(ctx, &ctx->old, CLUSTER_OLD);
check_ok(ctx);
prep_status(ctx, "Checking new data directory (%s)", ctx->new.pgdata);
@@ -107,7 +107,7 @@
check_ok(ctx);
prep_status(ctx, "Checking new bin directory (%s)", ctx->new.bindir);
- check_bin_dir(ctx, &ctx->new);
+ check_bin_dir(ctx, &ctx->new, CLUSTER_NEW);
check_ok(ctx);
}
@@ -158,12 +158,18 @@
* exit().
*/
static void
-check_bin_dir(migratorContext *ctx, ClusterInfo *cluster)
+check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster)
{
check_exec(ctx, cluster->bindir, "postgres");
- check_exec(ctx, cluster->bindir, "psql");
check_exec(ctx, cluster->bindir, "pg_ctl");
- check_exec(ctx, cluster->bindir, "pg_dumpall");
+ check_exec(ctx, cluster->bindir, "pg_resetxlog");
+ if (whichCluster == CLUSTER_NEW)
+ {
+ /* these are only needed in the new cluster */
+ check_exec(ctx, cluster->bindir, "pg_config");
+ check_exec(ctx, cluster->bindir, "psql");
+ check_exec(ctx, cluster->bindir, "pg_dumpall");
+ }
}
diff -Naur postgresql-9.0.2.orig/contrib/pg_upgrade/option.c postgresql-9.0.2/contrib/pg_upgrade/option.c
--- postgresql-9.0.2.orig/contrib/pg_upgrade/option.c 2010-12-13 21:55:50.000000000 -0500
+++ postgresql-9.0.2/contrib/pg_upgrade/option.c 2010-12-28 16:53:44.730531216 -0500
@@ -308,7 +308,11 @@
static void
get_pkglibdirs(migratorContext *ctx)
{
- ctx->old.libpath = get_pkglibdir(ctx, ctx->old.bindir);
+ /*
+ * we do not need to know the libpath in the old cluster, and might not
+ * have a working pg_config to ask for it anyway.
+ */
+ ctx->old.libpath = NULL;
ctx->new.libpath = get_pkglibdir(ctx, ctx->new.bindir);
}

View File

@ -53,7 +53,7 @@
Summary: PostgreSQL client programs Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 9.0 %global majorversion 9.0
Version: 9.0.2 Version: 9.0.3
Release: 1%{?dist} Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI # The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well. # recognizes it as an independent license, so we do as well.
@ -86,7 +86,6 @@ Source16: filter-requires-perl-Pg.sh
Patch1: rpm-pgsql.patch Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-upgrade-fixes.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel BuildRequires: perl(ExtUtils::Embed), perl-devel
@ -306,7 +305,6 @@ system, including regression tests and benchmarks.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# We used to run autoconf here, but there's no longer any real need to, # We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script. # since Postgres ships with a reasonably modern configure script.
@ -825,6 +823,12 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Tue Feb 1 2011 Tom Lane <tgl@redhat.com> 9.0.3-1
- Update to PostgreSQL 9.0.3, for various fixes described at
http://www.postgresql.org/docs/9.0/static/release-9-0-3.html
including the fix for CVE-2010-4015
Resolves: #674296
* Tue Dec 28 2010 Tom Lane <tgl@redhat.com> 9.0.2-1 * Tue Dec 28 2010 Tom Lane <tgl@redhat.com> 9.0.2-1
- Update to PostgreSQL 9.0.2 (major version bump) - Update to PostgreSQL 9.0.2 (major version bump)
- Create infrastructure for in-place database upgrade using pg_upgrade - Create infrastructure for in-place database upgrade using pg_upgrade

View File

@ -1,3 +1,3 @@
fc79ef32b602f75f2ccd37647bc008e9 postgresql-9.0.2.tar.bz2 928df8c40bb012ad10756e58b70516fb postgresql-9.0.3.tar.bz2
7b72c6603a9567c356dedb7bfb658a36 postgresql-9.0.2-US.pdf d3168a6304a4e1b44af1619ba2a2dc82 postgresql-9.0.3-US.pdf
fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2 fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2