Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 16ba609

Browse files
dmpgprodmpgpro
committed
Merge branch 'REL_10_STABLE' into PGPRO10
2 parents ee4e86d + ab5e9ca commit 16ba609

File tree

52 files changed

+43980
-14018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+43980
-14018
lines changed

‎configure

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 10.3.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 10.4.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='10.3'
587-
PACKAGE_STRING='PostgreSQL 10.3'
586+
PACKAGE_VERSION='10.4'
587+
PACKAGE_STRING='PostgreSQL 10.4'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1427,7 +1427,7 @@ if test "$ac_init_help" = "long"; then
14271427
# Omit some internal or obsolete options to make the list less imposing.
14281428
# This message is too long to be a string in the A/UX 3.1 sh.
14291429
cat <<_ACEOF
1430-
\`configure' configures PostgreSQL 10.3 to adapt to many kinds of systems.
1430+
\`configure' configures PostgreSQL 10.4 to adapt to many kinds of systems.
14311431
14321432
Usage: $0 [OPTION]... [VAR=VALUE]...
14331433
@@ -1493,7 +1493,7 @@ fi
14931493

14941494
if test -n "$ac_init_help"; then
14951495
case $ac_init_help in
1496-
short | recursive ) echo "Configuration of PostgreSQL 10.3:";;
1496+
short | recursive ) echo "Configuration of PostgreSQL 10.4:";;
14971497
esac
14981498
cat <<\_ACEOF
14991499
@@ -1652,7 +1652,7 @@ fi
16521652
test -n "$ac_init_help" && exit $ac_status
16531653
if $ac_init_version; then
16541654
cat <<\_ACEOF
1655-
PostgreSQL configure 10.3
1655+
PostgreSQL configure 10.4
16561656
generated by GNU Autoconf 2.69
16571657
16581658
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2364,7 +2364,7 @@ cat >config.log <<_ACEOF
23642364
This file contains any messages produced by compilers while
23652365
running configure, to aid debugging if configure makes a mistake.
23662366
2367-
It was created by PostgreSQL $as_me 10.3, which was
2367+
It was created by PostgreSQL $as_me 10.4, which was
23682368
generated by GNU Autoconf 2.69. Invocation command line was
23692369
23702370
$ $0 $@
@@ -2782,7 +2782,7 @@ fi
27822782

27832783

27842784

2785-
PGPRO_VERSION="$PACKAGE_VERSION.2"
2785+
PGPRO_VERSION="$PACKAGE_VERSION.1"
27862786
PGPRO_PACKAGE_NAME="PostgresPro"
27872787
PGPRO_EDITION="standard"
27882788
PGPRO_EDN="std"
@@ -17603,7 +17603,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1760317603
# report actual input values of CONFIG_FILES etc. instead of their
1760417604
# values after options handling.
1760517605
ac_log="
17606-
This file was extended by PostgreSQL $as_me 10.3, which was
17606+
This file was extended by PostgreSQL $as_me 10.4, which was
1760717607
generated by GNU Autoconf 2.69. Invocation command line was
1760817608
1760917609
CONFIG_FILES = $CONFIG_FILES
@@ -17673,7 +17673,7 @@ _ACEOF
1767317673
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1767417674
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1767517675
ac_cs_version="\\
17676-
PostgreSQL config.status 10.3
17676+
PostgreSQL config.status 10.4
1767717677
configured by $0, generated by GNU Autoconf 2.69,
1767817678
with options \\"\$ac_cs_config\\"
1767917679

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [10.3], [bugs@postgrespro.ru], [postgrespro])
20+
AC_INIT([PostgreSQL], [10.4], [bugs@postgrespro.ru], [postgrespro])
2121
PACKAGE_TARNAME=postgrespro
2222

2323
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
@@ -39,7 +39,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
4141

42-
PGPRO_VERSION="$PACKAGE_VERSION.2"
42+
PGPRO_VERSION="$PACKAGE_VERSION.1"
4343
PGPRO_PACKAGE_NAME="PostgresPro"
4444
PGPRO_EDITION="standard"
4545
PGPRO_EDN="std"

‎contrib/adminpack/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ OBJS = adminpack.o $(WIN32RES)
55
PG_CPPFLAGS = -I$(libpq_srcdir)
66

77
EXTENSION = adminpack
8-
DATA = adminpack--1.0.sql
8+
DATA = adminpack--1.0.sql adminpack--1.0--1.1.sql
99
PGFILEDESC = "adminpack - support functions for pgAdmin"
1010

1111
ifdef USE_PGXS

‎contrib/adminpack/adminpack--1.0--1.1.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* contrib/adminpack/adminpack--1.0--1.1.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION adminpack UPDATE TO '1.1'" to load this file. \quit
5+
6+
REVOKE EXECUTE ON FUNCTION pg_catalog.pg_logfile_rotate() FROM PUBLIC;

‎contrib/adminpack/adminpack.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# adminpack extension
22
comment = 'administrative functions for PostgreSQL'
3-
default_version = '1.0'
3+
default_version = '1.1'
44
module_pathname = '$libdir/adminpack'
55
relocatable = false
66
schema = pg_catalog

‎doc/bug.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ System Configuration:
2727

2828
Operating System (example: Linux 2.4.18) :
2929

30-
PostgreSQL version (example: PostgreSQL 10.3): PostgreSQL 10.3
30+
PostgreSQL version (example: PostgreSQL 10.4): PostgreSQL 10.4
3131

3232
Compiler used (example: gcc 3.3.5) :
3333

‎doc/src/sgml/release-10.sgml

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</para>
2424

2525
<para>
26-
However, if the function marking mistakes mentioned in the first two
27-
changelog entries below affect you, you will want to take steps to
28-
correct your database catalogs.
26+
However, if you use the <filename>adminpack</filename> extension,
27+
you should update it as per the first changelog entry below.
28+
</para>
29+
30+
<para>
31+
Also, if the function marking mistakes mentioned in the second and
32+
third changelog entries below affect you, you will want to take steps
33+
to correct your database catalogs.
2934
</para>
3035

3136
<para>
@@ -41,6 +46,39 @@
4146

4247
<listitem>
4348
<!--
49+
Author: Stephen Frost <sfrost@snowman.net>
50+
Branch: master [7b347409f] 2018-05-07 10:10:33 -0400
51+
Branch: REL_10_STABLE [20f01fc45] 2018-05-07 10:10:41 -0400
52+
Branch: REL9_6_STABLE [53b79ab4f] 2018-05-07 10:10:45 -0400
53+
-->
54+
<para>
55+
Remove public execute privilege
56+
from <filename>contrib/adminpack</filename>'s
57+
<function>pg_logfile_rotate()</function> function (Stephen Frost)
58+
</para>
59+
60+
<para>
61+
<function>pg_logfile_rotate()</function> is a deprecated wrapper
62+
for the core function <function>pg_rotate_logfile()</function>.
63+
When that function was changed to rely on SQL privileges for access
64+
control rather than a hard-coded superuser
65+
check, <function>pg_logfile_rotate()</function> should have been
66+
updated as well, but the need for this was missed. Hence,
67+
if <filename>adminpack</filename> is installed, any user could
68+
request a logfile rotation, creating a minor security issue.
69+
</para>
70+
71+
<para>
72+
After installing this update, administrators should
73+
update <filename>adminpack</filename> by performing
74+
<literal>ALTER EXTENSION adminpack UPDATE</literal> in each
75+
database in which <filename>adminpack</filename> is installed.
76+
(CVE-2018-1115)
77+
</para>
78+
</listitem>
79+
80+
<listitem>
81+
<!--
4482
Author: Tom Lane <tgl@sss.pgh.pa.us>
4583
Branch: master [11002f8af] 2018-03-30 18:14:51 -0400
4684
Branch: REL_10_STABLE [283262cd9] 2018-03-30 18:14:51 -0400
@@ -68,10 +106,12 @@ Branch: REL9_3_STABLE [485857d44] 2018-03-30 18:14:51 -0400
68106
installations will continue to contain the incorrect markings.
69107
Practical use of these functions seems to pose little hazard, but in
70108
case of trouble, it can be fixed by manually updating these
71-
functions' <structname>pg_proc</structname> entries. (Note that that
72-
will need to be done in each database of the installation.) Another
73-
option is to <application>pg_upgrade</application> the database to a
74-
version containing the corrected initial data.
109+
functions' <structname>pg_proc</structname> entries, for example
110+
<literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
111+
boolean, text) VOLATILE</literal>. (Note that that will need to be
112+
done in each database of the installation.) Another option is
113+
to <application>pg_upgrade</application> the database to a version
114+
containing the corrected initial data.
75115
</para>
76116
</listitem>
77117

@@ -108,10 +148,12 @@ Branch: REL9_6_STABLE [91d82317d] 2018-03-30 18:14:51 -0400
108148
incorrect markings. Practical use of these functions seems to pose
109149
little hazard unless <varname>force_parallel_mode</varname> is turned
110150
on. In case of trouble, it can be fixed by manually updating these
111-
functions' <structname>pg_proc</structname> entries. (Note that that
112-
will need to be done in each database of the installation.) Another
113-
option is to <application>pg_upgrade</application> the database to a
114-
version containing the corrected initial data.
151+
functions' <structname>pg_proc</structname> entries, for example
152+
<literal>ALTER FUNCTION pg_catalog.brin_summarize_new_values(regclass)
153+
PARALLEL UNSAFE</literal>. (Note that that will need to be done in
154+
each database of the installation.) Another option is
155+
to <application>pg_upgrade</application> the database to a version
156+
containing the corrected initial data.
115157
</para>
116158
</listitem>
117159

‎doc/src/sgml/release-9.3.sgml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@
5959
installations will continue to contain the incorrect markings.
6060
Practical use of these functions seems to pose little hazard, but in
6161
case of trouble, it can be fixed by manually updating these
62-
functions' <structname>pg_proc</structname> entries. (Note that that
63-
will need to be done in each database of the installation.) Another
64-
option is to <application>pg_upgrade</application> the database to a
65-
version containing the corrected initial data.
62+
functions' <structname>pg_proc</structname> entries, for example
63+
<literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
64+
boolean, text) VOLATILE</literal>. (Note that that will need to be
65+
done in each database of the installation.) Another option is
66+
to <application>pg_upgrade</application> the database to a version
67+
containing the corrected initial data.
6668
</para>
6769
</listitem>
6870

‎doc/src/sgml/release-9.4.sgml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@
5959
installations will continue to contain the incorrect markings.
6060
Practical use of these functions seems to pose little hazard, but in
6161
case of trouble, it can be fixed by manually updating these
62-
functions' <structname>pg_proc</structname> entries. (Note that that
63-
will need to be done in each database of the installation.) Another
64-
option is to <application>pg_upgrade</application> the database to a
65-
version containing the corrected initial data.
62+
functions' <structname>pg_proc</structname> entries, for example
63+
<literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
64+
boolean, text) VOLATILE</literal>. (Note that that will need to be
65+
done in each database of the installation.) Another option is
66+
to <application>pg_upgrade</application> the database to a version
67+
containing the corrected initial data.
6668
</para>
6769
</listitem>
6870

‎doc/src/sgml/release-9.5.sgml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@
5959
installations will continue to contain the incorrect markings.
6060
Practical use of these functions seems to pose little hazard, but in
6161
case of trouble, it can be fixed by manually updating these
62-
functions' <structname>pg_proc</structname> entries. (Note that that
63-
will need to be done in each database of the installation.) Another
64-
option is to <application>pg_upgrade</application> the database to a
65-
version containing the corrected initial data.
62+
functions' <structname>pg_proc</structname> entries, for example
63+
<literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
64+
boolean, text) VOLATILE</literal>. (Note that that will need to be
65+
done in each database of the installation.) Another option is
66+
to <application>pg_upgrade</application> the database to a version
67+
containing the corrected initial data.
6668
</para>
6769
</listitem>
6870

‎doc/src/sgml/release-9.6.sgml

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</para>
2424

2525
<para>
26-
However, if the function marking mistakes mentioned in the first two
27-
changelog entries below affect you, you will want to take steps to
28-
correct your database catalogs.
26+
However, if you use the <filename>adminpack</filename> extension,
27+
you should update it as per the first changelog entry below.
28+
</para>
29+
30+
<para>
31+
Also, if the function marking mistakes mentioned in the second and
32+
third changelog entries below affect you, you will want to take steps
33+
to correct your database catalogs.
2934
</para>
3035

3136
<para>
@@ -39,6 +44,33 @@
3944

4045
<itemizedlist>
4146

47+
<listitem>
48+
<para>
49+
Remove public execute privilege
50+
from <filename>contrib/adminpack</filename>'s
51+
<function>pg_logfile_rotate()</function> function (Stephen Frost)
52+
</para>
53+
54+
<para>
55+
<function>pg_logfile_rotate()</function> is a deprecated wrapper
56+
for the core function <function>pg_rotate_logfile()</function>.
57+
When that function was changed to rely on SQL privileges for access
58+
control rather than a hard-coded superuser
59+
check, <function>pg_logfile_rotate()</function> should have been
60+
updated as well, but the need for this was missed. Hence,
61+
if <filename>adminpack</filename> is installed, any user could
62+
request a logfile rotation, creating a minor security issue.
63+
</para>
64+
65+
<para>
66+
After installing this update, administrators should
67+
update <filename>adminpack</filename> by performing
68+
<literal>ALTER EXTENSION adminpack UPDATE</literal> in each
69+
database in which <filename>adminpack</filename> is installed.
70+
(CVE-2018-1115)
71+
</para>
72+
</listitem>
73+
4274
<listitem>
4375
<para>
4476
Fix incorrect volatility markings on a few built-in functions
@@ -59,10 +91,12 @@
5991
installations will continue to contain the incorrect markings.
6092
Practical use of these functions seems to pose little hazard, but in
6193
case of trouble, it can be fixed by manually updating these
62-
functions' <structname>pg_proc</structname> entries. (Note that that
63-
will need to be done in each database of the installation.) Another
64-
option is to <application>pg_upgrade</application> the database to a
65-
version containing the corrected initial data.
94+
functions' <structname>pg_proc</structname> entries, for example
95+
<literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
96+
boolean, text) VOLATILE</literal>. (Note that that will need to be
97+
done in each database of the installation.) Another option is
98+
to <application>pg_upgrade</application> the database to a version
99+
containing the corrected initial data.
66100
</para>
67101
</listitem>
68102

@@ -75,15 +109,12 @@
75109
<para>
76110
The functions
77111
<function>brin_summarize_new_values</function>,
78-
<function>brin_summarize_range</function>,
79-
<function>brin_desummarize_range</function>,
80112
<function>gin_clean_pending_list</function>,
81113
<function>cursor_to_xml</function>,
82114
<function>cursor_to_xmlschema</function>,
83115
<function>ts_rewrite</function>,
84-
<function>ts_stat</function>,
85-
<function>binary_upgrade_create_empty_extension</function>, and
86-
<function>pg_import_system_collations</function>
116+
<function>ts_stat</function>, and
117+
<function>binary_upgrade_create_empty_extension</function>
87118
should be marked parallel-unsafe; some because they perform database
88119
modifications directly, and others because they execute user-supplied
89120
queries that might do so. They were marked parallel-restricted
@@ -93,10 +124,12 @@
93124
incorrect markings. Practical use of these functions seems to pose
94125
little hazard unless <varname>force_parallel_mode</varname> is turned
95126
on. In case of trouble, it can be fixed by manually updating these
96-
functions' <structname>pg_proc</structname> entries. (Note that that
97-
will need to be done in each database of the installation.) Another
98-
option is to <application>pg_upgrade</application> the database to a
99-
version containing the corrected initial data.
127+
functions' <structname>pg_proc</structname> entries, for example
128+
<literal>ALTER FUNCTION pg_catalog.brin_summarize_new_values(regclass)
129+
PARALLEL UNSAFE</literal>. (Note that that will need to be done in
130+
each database of the installation.) Another option is
131+
to <application>pg_upgrade</application> the database to a version
132+
containing the corrected initial data.
100133
</para>
101134
</listitem>
102135

‎src/backend/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# src/backend/nls.mk
22
CATALOG_NAME = postgres
3-
AVAIL_LANGUAGES = de es fr it ko pl ru sv tr zh_CN
3+
AVAIL_LANGUAGES = de es fr it ja ko pl ru sv tr zh_CN
44
GETTEXT_FILES = + gettext-files
55
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
66
GUC_check_errmsg GUC_check_errdetail GUC_check_errhint \

0 commit comments

Comments
 (0)