Merge ~paelzer/ubuntu/+source/postgresql-12:MRE-focal-12.4 into ubuntu/+source/postgresql-12:ubuntu/groovy-devel

Proposed by Christian Ehrhardt 
Status: Merged
Merge reported by: Christian Ehrhardt 
Merged at revision: 8492482ebab2e4d4b214ccc8cf73f55fd3b1db26
Proposed branch: ~paelzer/ubuntu/+source/postgresql-12:MRE-focal-12.4
Merge into: ubuntu/+source/postgresql-12:ubuntu/groovy-devel
Diff against target: 74 lines (+26/-1) (has conflicts)
2 files modified
debian/changelog (+24/-0)
debian/control (+2/-1)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Canonical Server packageset reviewers Pending
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+389590@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

released through -security

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index ea91c28..8249cf1 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,7 +1,14 @@
6+<<<<<<< debian/changelog
7 postgresql-12 (12.4-1) unstable; urgency=medium
8
9 * New upstream version.
10 + Set a secure search_path in logical replication walsenders and apply
11+=======
12+postgresql-12 (12.4-0ubuntu0.20.04.1) focal; urgency=medium
13+
14+ * New upstream release (LP: #1892335).
15+ - Set a secure search_path in logical replication walsenders and apply
16+>>>>>>> debian/changelog
17 workers (Noah Misch)
18
19 A malicious user of either the publisher or subscriber database could
20@@ -13,9 +20,16 @@ postgresql-12 (12.4-1) unstable; urgency=medium
21 might cause problems for under-qualified names used in replicated
22 tables' DDL.) Other risks are inherent in replicating objects that
23 belong to untrusted roles; the most we can do is document that there is
24+<<<<<<< debian/changelog
25 a hazard to consider. (CVE-2020-14349)
26
27 + Make contrib modules' installation scripts more secure (Tom Lane)
28+=======
29+ a hazard to consider.
30+ CVE-2020-14349
31+
32+ - Make contrib modules' installation scripts more secure (Tom Lane)
33+>>>>>>> debian/changelog
34
35 Attacks similar to those described in CVE-2018-1058 could be carried out
36 against an extension installation script, if the attacker can create
37@@ -29,6 +43,7 @@ postgresql-12 (12.4-1) unstable; urgency=medium
38 third-party extension authors make their installation scripts secure.
39 This is not a complete solution; extensions that depend on other
40 extensions can still be at risk if installed carelessly.
41+<<<<<<< debian/changelog
42 (CVE-2020-14350)
43
44 * DH 13.
45@@ -40,6 +55,15 @@ postgresql-12 (12.3-1) unstable; urgency=medium
46 * New upstream version.
47
48 -- Christoph Berg <myon@debian.org> Wed, 13 May 2020 09:49:16 +0200
49+=======
50+ CVE-2020-14350
51+
52+ - Details about these and many further changes can be found at:
53+ https://www.postgresql.org/docs/10/static/release-12-3.html
54+ https://www.postgresql.org/docs/10/static/release-12-4.htm
55+
56+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 20 Aug 2020 11:29:14 +0200
57+>>>>>>> debian/changelog
58
59 postgresql-12 (12.2-4) unstable; urgency=medium
60
61diff --git a/debian/control b/debian/control
62index 5dd50de..cd530b5 100644
63--- a/debian/control
64+++ b/debian/control
65@@ -1,7 +1,8 @@
66 Source: postgresql-12
67 Section: database
68 Priority: optional
69-Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
70+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
71+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
72 Uploaders:
73 Martin Pitt <mpitt@debian.org>,
74 Peter Eisentraut <petere@debian.org>,

Subscribers

People subscribed via source and target branches