rebase: minor release update

Per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-5.html

Version: 9.3.5-1
This commit is contained in:
Pavel Raiskup 2014-07-22 09:20:05 +02:00
parent 4f1d2a0833
commit 0e0465561c
5 changed files with 27 additions and 91 deletions

8
.gitignore vendored
View File

@ -1,3 +1,5 @@
/postgresql-9.3.4-US.pdf /postgresql-9.3.5.tar.bz2
/postgresql-9.3.4.tar.bz2 /postgresql-9.3.5.tar.bz2.sha256
/postgresql-9.2.8.tar.bz2 /postgresql-9.2.9.tar.bz2
/postgresql-9.2.9.tar.bz2.sha256
/postgresql-9.3.5-US.pdf

View File

@ -1,34 +0,0 @@
The error message for undefined names *inside functions* (not for undefined
names on global level) has changed in Python 3.4 compared to 3.3.
Particularly error string "NameError: global name 'nonsense' is not defined"
has become "ERROR: NameError: name 'nonsense' is not defined" in Python 3.4.
This patch also raises an exception, but the exceptin message is the same
across Python versions.
diff -up postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out.python34 postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out
--- postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out.python34 2014-05-23 15:42:50.462783074 +0200
+++ postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out 2014-05-23 16:09:28.501654085 +0200
@@ -4,9 +4,9 @@ CONTEXT: PL/Python anonymous code block
DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
NOTICE: This is plpython2u.
CONTEXT: PL/Python anonymous code block
-DO $$ nonsense $$ LANGUAGE plpythonu;
-ERROR: NameError: global name 'nonsense' is not defined
+DO $$ raise Exception("Sample error") $$ LANGUAGE plpythonu;
+ERROR: Exception: Sample error
CONTEXT: Traceback (most recent call last):
PL/Python anonymous code block, line 1, in <module>
- nonsense
+ raise Exception("Sample error")
PL/Python anonymous code block
diff -up postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql.python34 postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql
--- postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql.python34 2014-05-23 15:42:24.240756276 +0200
+++ postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql 2014-05-23 16:10:31.363475875 +0200
@@ -2,4 +2,4 @@ DO $$ plpy.notice("This is plpythonu.")
DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
-DO $$ nonsense $$ LANGUAGE plpythonu;
+DO $$ raise Exception("Sample error") $$ LANGUAGE plpythonu;

View File

@ -12,29 +12,11 @@ server package update, without requiring any existing postgresql.conf
to be updated. (Of course, a user who dislikes this behavior can still to be updated. (Of course, a user who dislikes this behavior can still
override it via postgresql.conf.) override it via postgresql.conf.)
diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 30bc527..4e8f6a4 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -107,6 +107,12 @@ done
EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
export EXTRA_REGRESS_OPTS
+# we want the Unix sockets in $temp_root
+PGHOST=$temp_root
+export PGHOST
+
+POSTMASTER_OPTS="$POSTMASTER_OPTS -c unix_socket_directories='$PGHOST'"
+
# enable echo so the user can see what is being executed
set -x
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a055231..20b8c87 100644 index 2b6527f..8e178d4 100644
--- a/src/backend/utils/misc/guc.c --- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c
@@ -2929,7 +2929,7 @@ static struct config_string ConfigureNamesString[] = @@ -2971,7 +2971,7 @@ static struct config_string ConfigureNamesString[] =
}, },
&Unix_socket_directories, &Unix_socket_directories,
#ifdef HAVE_UNIX_SOCKETS #ifdef HAVE_UNIX_SOCKETS
@ -44,10 +26,10 @@ index a055231..20b8c87 100644
"", "",
#endif #endif
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 5fc7291..d871341 100644 index abf1586..8c01d48 100644
--- a/src/bin/initdb/initdb.c --- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c
@@ -1203,7 +1203,7 @@ setup_config(void) @@ -1204,7 +1204,7 @@ setup_config(void)
#ifdef HAVE_UNIX_SOCKETS #ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'", snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@ -57,7 +39,7 @@ index 5fc7291..d871341 100644
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''"); snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif #endif
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index 02bcd92..8aaf58b 100644 index 24c5069..aeec705 100644
--- a/src/include/pg_config_manual.h --- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
@ -69,25 +51,3 @@ index 02bcd92..8aaf58b 100644
/* /*
* The random() function is expected to yield values between 0 and * The random() function is expected to yield values between 0 and
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index b632326..943165c 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -772,7 +772,7 @@ initialize_environment(void)
if (hostname != NULL)
doputenv("PGHOST", hostname);
else
- unsetenv("PGHOST");
+ doputenv("PGHOST", "/tmp");
unsetenv("PGHOSTADDR");
if (port != -1)
{
@@ -2249,7 +2249,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
*/
header(_("starting postmaster"));
snprintf(buf, sizeof(buf),
- SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
+ SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" -c \"unix_socket_directories=/tmp\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
bindir, temp_install,
debug ? " -d 5" : "",
hostname ? hostname : "",

View File

@ -66,8 +66,8 @@
Summary: PostgreSQL client programs Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 9.3 %global majorversion 9.3
Version: 9.3.4 Version: 9.3.5
Release: 8%{?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.
@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical # in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series; # that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed. # but update when bugs affecting pg_dump output are fixed.
%global prevversion 9.2.8 %global prevversion 9.2.9
%global prevmajorversion 9.2 %global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@ -104,6 +104,9 @@ Source13: postgresql.tmpfiles.d
Source14: postgresql.pam Source14: postgresql.pam
Source15: postgresql-bashprofile Source15: postgresql-bashprofile
Source16: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256
Source17: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{prevversion}.tar.bz2.sha256
# Comments for these patches are in the patch files. # Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch Patch2: postgresql-logging.patch
@ -111,7 +114,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch Patch6: postgresql-man.patch
Patch7: postgresql-python34.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel BuildRequires: perl(ExtUtils::Embed), perl-devel
@ -340,14 +342,14 @@ benchmarks.
%endif %endif
%prep %prep
%setup -q ( cd %_sourcedir; sha256sum -c %{SOURCE16}; sha256sum -c %{SOURCE17} )
%setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -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.
@ -1150,6 +1152,10 @@ fi
%endif %endif
%changelog %changelog
* Tue Jul 22 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.5-1
- update to 9.3.5 per release notes
http://www.postgresql.org/docs/9.3/static/release-9-3-5.html
* Fri Jul 18 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.4-8 * Fri Jul 18 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.4-8
- provide postgresql-doc for postgresql-docs package (#1086420) - provide postgresql-doc for postgresql-docs package (#1086420)
- move html documentation to *-docs subpackage (#1086420) - move html documentation to *-docs subpackage (#1086420)

View File

@ -1,3 +1,5 @@
48bd3cff27b4fada760771688f1cecee postgresql-9.3.4-US.pdf 5059857c7d7e6ad83b6d55893a121b59 postgresql-9.3.5.tar.bz2
d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2 60b858fb6c7e06bf05a9c5f4dc5a8932 postgresql-9.3.5.tar.bz2.sha256
c5c65a9b45ee53ead0b659be21ca1b97 postgresql-9.2.8.tar.bz2 38b0937c86d537d5044c599273066cfc postgresql-9.2.9.tar.bz2
08b4a99710e25d7004d058997cdb1ebc postgresql-9.2.9.tar.bz2.sha256
5d8361190dd064a655b21f112daa91ec postgresql-9.3.5-US.pdf