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

Commit 34654a5

Browse files
vbwagnervbwagner
committed
Merge branch 'REL_10_STABLE' into PGPRO10
PGPRO10 is now 10.2
2 parents 1c4b43a + 2840d20 commit 34654a5

File tree

76 files changed

+68753
-8796
lines changed

Some content is hidden

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

76 files changed

+68753
-8796
lines changed

‎configure

Lines changed: 14 additions & 14 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.1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 10.2.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -11,8 +11,8 @@
1111
# This configure script is free software; the Free Software Foundation
1212
# gives unlimited permission to copy, distribute and modify it.
1313
#
14-
# Copyright (c) 1996-2017, PostgreSQL Global Development Group
15-
# Copyright (c) 2015-2017, Postgres Professional
14+
# Copyright (c) 1996-2018, PostgreSQL Global Development Group
15+
# Copyright (c) 2015-2018, Postgres Professional
1616
## -------------------- ##
1717
## M4sh Initialization. ##
1818
## -------------------- ##
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='10.1'
587-
PACKAGE_STRING='PostgreSQL 10.1'
586+
PACKAGE_VERSION='10.2'
587+
PACKAGE_STRING='PostgreSQL 10.2'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1425,7 +1425,7 @@ if test "$ac_init_help" = "long"; then
14251425
# Omit some internal or obsolete options to make the list less imposing.
14261426
# This message is too long to be a string in the A/UX 3.1 sh.
14271427
cat <<_ACEOF
1428-
\`configure' configures PostgreSQL 10.1 to adapt to many kinds of systems.
1428+
\`configure' configures PostgreSQL 10.2 to adapt to many kinds of systems.
14291429
14301430
Usage: $0 [OPTION]... [VAR=VALUE]...
14311431
@@ -1491,7 +1491,7 @@ fi
14911491

14921492
if test -n "$ac_init_help"; then
14931493
case $ac_init_help in
1494-
short | recursive ) echo "Configuration of PostgreSQL 10.1:";;
1494+
short | recursive ) echo "Configuration of PostgreSQL 10.2:";;
14951495
esac
14961496
cat <<\_ACEOF
14971497
@@ -1650,15 +1650,15 @@ fi
16501650
test -n "$ac_init_help" && exit $ac_status
16511651
if $ac_init_version; then
16521652
cat <<\_ACEOF
1653-
PostgreSQL configure 10.1
1653+
PostgreSQL configure 10.2
16541654
generated by GNU Autoconf 2.69
16551655
16561656
Copyright (C) 2012 Free Software Foundation, Inc.
16571657
This configure script is free software; the Free Software Foundation
16581658
gives unlimited permission to copy, distribute and modify it.
16591659
1660-
Copyright (c) 1996-2017, PostgreSQL Global Development Group
1661-
Copyright (c) 2015-2017, Postgres Professional
1660+
Copyright (c) 1996-2018, PostgreSQL Global Development Group
1661+
Copyright (c) 2015-2018, Postgres Professional
16621662
_ACEOF
16631663
exit
16641664
fi
@@ -2362,7 +2362,7 @@ cat >config.log <<_ACEOF
23622362
This file contains any messages produced by compilers while
23632363
running configure, to aid debugging if configure makes a mistake.
23642364
2365-
It was created by PostgreSQL $as_me 10.1, which was
2365+
It was created by PostgreSQL $as_me 10.2, which was
23662366
generated by GNU Autoconf 2.69. Invocation command line was
23672367
23682368
$ $0 $@
@@ -2779,7 +2779,7 @@ else
27792779
fi
27802780

27812781

2782-
PGPRO_VERSION="$PACKAGE_VERSION.2"
2782+
PGPRO_VERSION="$PACKAGE_VERSION.1"
27832783
PGPRO_PACKAGE_NAME="PostgresPro"
27842784
PGPRO_EDITION="standard"
27852785
PRODUCT_NAME="Postgres Pro Standard"
@@ -17590,7 +17590,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1759017590
# report actual input values of CONFIG_FILES etc. instead of their
1759117591
# values after options handling.
1759217592
ac_log="
17593-
This file was extended by PostgreSQL $as_me 10.1, which was
17593+
This file was extended by PostgreSQL $as_me 10.2, which was
1759417594
generated by GNU Autoconf 2.69. Invocation command line was
1759517595
1759617596
CONFIG_FILES = $CONFIG_FILES
@@ -17660,7 +17660,7 @@ _ACEOF
1766017660
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1766117661
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1766217662
ac_cs_version="\\
17663-
PostgreSQL config.status 10.1
17663+
PostgreSQL config.status 10.2
1766417664
configured by $0, generated by GNU Autoconf 2.69,
1766517665
with options \\"\$ac_cs_config\\"
1766617666

‎configure.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ 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.1], [bugs@postgrespro.ru], [postgrespro])
20+
AC_INIT([PostgreSQL], [10.2], [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.
2424
Untested combinations of 'autoconf' and PostgreSQL versions are not
2525
recommended. You can remove the check from 'configure.in' but it is then
2626
your responsibility whether the result works or not.])])
27-
AC_COPYRIGHT([Copyright (c) 1996-2017, PostgreSQL Global Development Group
28-
Copyright (c) 2015-2017, Postgres Professional])
27+
AC_COPYRIGHT([Copyright (c) 1996-2018, PostgreSQL Global Development Group
28+
Copyright (c) 2015-2018, Postgres Professional])
2929
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
3030
AC_CONFIG_AUX_DIR(config)
3131
AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -38,7 +38,7 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3838
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
41-
PGPRO_VERSION="$PACKAGE_VERSION.2"
41+
PGPRO_VERSION="$PACKAGE_VERSION.1"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="standard"
4444
PRODUCT_NAME="Postgres Pro Standard"

‎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.1): PostgreSQL 10.1
30+
PostgreSQL version (example: PostgreSQL 10.2): PostgreSQL 10.2
3131

3232
Compiler used (example: gcc 3.3.5) :
3333

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,55 @@
4141

4242
<listitem>
4343
<!--
44+
Author: Tom Lane <tgl@sss.pgh.pa.us>
45+
Branch: master [3492a0af0] 2018-02-05 10:37:30 -0500
46+
Branch: REL_10_STABLE [fe921a360] 2018-02-05 10:37:30 -0500
47+
-->
48+
<para>
49+
Fix processing of partition keys containing multiple expressions
50+
(&Aacute;lvaro Herrera, David Rowley)
51+
</para>
52+
53+
<para>
54+
This error led to crashes or, with carefully crafted input, disclosure
55+
of arbitrary backend memory.
56+
(CVE-2018-1052)
57+
</para>
58+
</listitem>
59+
60+
<listitem>
61+
<!--
62+
Author: Tom Lane <tgl@sss.pgh.pa.us>
63+
Branch: master [a926eb84e] 2018-02-05 10:58:27 -0500
64+
Branch: REL_10_STABLE [6ba52aeb2] 2018-02-05 10:58:27 -0500
65+
Branch: REL9_6_STABLE [1341e017d] 2018-02-05 10:58:27 -0500
66+
Branch: REL9_5_STABLE [17aa02368] 2018-02-05 10:58:27 -0500
67+
Branch: REL9_4_STABLE [c3456208d] 2018-02-05 10:58:27 -0500
68+
Branch: REL9_3_STABLE [9c59e48a2] 2018-02-05 10:58:27 -0500
69+
-->
70+
<para>
71+
Ensure that all temporary files made
72+
by <application>pg_upgrade</application> are non-world-readable
73+
(Tom Lane, Noah Misch)
74+
</para>
75+
76+
<para>
77+
<application>pg_upgrade</application> normally restricts its
78+
temporary files to be readable and writable only by the calling user.
79+
But the temporary file containing <literal>pg_dumpall -g</literal>
80+
output would be group- or world-readable, or even writable, if the
81+
user's <literal>umask</literal> setting allows. In typical usage on
82+
multi-user machines, the <literal>umask</literal> and/or the working
83+
directory's permissions would be tight enough to prevent problems;
84+
but there may be people using <application>pg_upgrade</application>
85+
in scenarios where this oversight would permit disclosure of database
86+
passwords to unfriendly eyes.
87+
(CVE-2018-1053)
88+
</para>
89+
</listitem>
90+
91+
<listitem>
92+
<!--
4493
Author: Andres Freund <andres@anarazel.de>
4594
Branch: master [9c2f0a6c3] 2017-12-14 18:20:47 -0800
4695
Branch: REL_10_STABLE [1224383e8] 2017-12-14 18:20:48 -0800

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,28 @@
3333

3434
<itemizedlist>
3535

36+
<listitem>
37+
<para>
38+
Ensure that all temporary files made
39+
by <application>pg_upgrade</application> are non-world-readable
40+
(Tom Lane, Noah Misch)
41+
</para>
42+
43+
<para>
44+
<application>pg_upgrade</application> normally restricts its
45+
temporary files to be readable and writable only by the calling user.
46+
But the temporary file containing <literal>pg_dumpall -g</literal>
47+
output would be group- or world-readable, or even writable, if the
48+
user's <literal>umask</literal> setting allows. In typical usage on
49+
multi-user machines, the <literal>umask</literal> and/or the working
50+
directory's permissions would be tight enough to prevent problems;
51+
but there may be people using <application>pg_upgrade</application>
52+
in scenarios where this oversight would permit disclosure of database
53+
passwords to unfriendly eyes.
54+
(CVE-2018-1053)
55+
</para>
56+
</listitem>
57+
3658
<listitem>
3759
<para>
3860
Fix vacuuming of tuples that were updated while key-share locked

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,28 @@
3333

3434
<itemizedlist>
3535

36+
<listitem>
37+
<para>
38+
Ensure that all temporary files made
39+
by <application>pg_upgrade</application> are non-world-readable
40+
(Tom Lane, Noah Misch)
41+
</para>
42+
43+
<para>
44+
<application>pg_upgrade</application> normally restricts its
45+
temporary files to be readable and writable only by the calling user.
46+
But the temporary file containing <literal>pg_dumpall -g</literal>
47+
output would be group- or world-readable, or even writable, if the
48+
user's <literal>umask</literal> setting allows. In typical usage on
49+
multi-user machines, the <literal>umask</literal> and/or the working
50+
directory's permissions would be tight enough to prevent problems;
51+
but there may be people using <application>pg_upgrade</application>
52+
in scenarios where this oversight would permit disclosure of database
53+
passwords to unfriendly eyes.
54+
(CVE-2018-1053)
55+
</para>
56+
</listitem>
57+
3658
<listitem>
3759
<para>
3860
Fix vacuuming of tuples that were updated while key-share locked

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,28 @@
3333

3434
<itemizedlist>
3535

36+
<listitem>
37+
<para>
38+
Ensure that all temporary files made
39+
by <application>pg_upgrade</application> are non-world-readable
40+
(Tom Lane, Noah Misch)
41+
</para>
42+
43+
<para>
44+
<application>pg_upgrade</application> normally restricts its
45+
temporary files to be readable and writable only by the calling user.
46+
But the temporary file containing <literal>pg_dumpall -g</literal>
47+
output would be group- or world-readable, or even writable, if the
48+
user's <literal>umask</literal> setting allows. In typical usage on
49+
multi-user machines, the <literal>umask</literal> and/or the working
50+
directory's permissions would be tight enough to prevent problems;
51+
but there may be people using <application>pg_upgrade</application>
52+
in scenarios where this oversight would permit disclosure of database
53+
passwords to unfriendly eyes.
54+
(CVE-2018-1053)
55+
</para>
56+
</listitem>
57+
3658
<listitem>
3759
<para>
3860
Fix vacuuming of tuples that were updated while key-share locked

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,28 @@
3939

4040
<itemizedlist>
4141

42+
<listitem>
43+
<para>
44+
Ensure that all temporary files made
45+
by <application>pg_upgrade</application> are non-world-readable
46+
(Tom Lane, Noah Misch)
47+
</para>
48+
49+
<para>
50+
<application>pg_upgrade</application> normally restricts its
51+
temporary files to be readable and writable only by the calling user.
52+
But the temporary file containing <literal>pg_dumpall -g</literal>
53+
output would be group- or world-readable, or even writable, if the
54+
user's <literal>umask</literal> setting allows. In typical usage on
55+
multi-user machines, the <literal>umask</literal> and/or the working
56+
directory's permissions would be tight enough to prevent problems;
57+
but there may be people using <application>pg_upgrade</application>
58+
in scenarios where this oversight would permit disclosure of database
59+
passwords to unfriendly eyes.
60+
(CVE-2018-1053)
61+
</para>
62+
</listitem>
63+
4264
<listitem>
4365
<para>
4466
Fix vacuuming of tuples that were updated while key-share locked

‎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 zh_CN
3+
AVAIL_LANGUAGES = de es fr it 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)