Merge ~athos-ribeiro/ubuntu/+source/postgresql-14:MRE-jammy-14.3 into ubuntu/+source/postgresql-14:ubuntu/devel

[Athos Ribeiro]

MRE for LP: #1973627

Note that this should be pushed through the security pocket.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1973627-postgres-202205-mre/+packages

Local autopkgtest run result summary:

autopkgtest [18:05:58]: @@@@@@@@@@@@@@@@@@@@ summary
run-testsuite PASS
installcheck PASS

[Sergio Durigan Junior (sergiodj)]

https://bileto.ubuntu.com/#/ticket/4851

[Sergio Durigan Junior (sergiodj)]

I'm reviewing this one.

Unmerged commits

f0f65d5... by Athos Ribeiro on 2022-05-16

Changelog for 14.3-0ubuntu0.22.04.1

578b270... by Athos Ribeiro on 2022-05-16

d/p/llvm14-support.patch: drop patch applied upstream

c2b3776... by Athos Ribeiro on 2022-05-16

New Upstream release 14.3

Signed-off-by: Athos Ribeiro <email address hidden>

bcfd9ca... by Andreas Hasenack on 2022-03-25

update-maintainer

36d096a... by Andreas Hasenack on 2022-03-25

changelog

9bff38d... by Andreas Hasenack on 2022-03-25

  * d/p/llvm14-support.patch: fix FTBFS with llvm-14 (LP: #1966319)

diff --git a/debian/changelog b/debian/changelog
index fa1ed2a..12801c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 postgresql-14 (14.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -7,6 +8,26 @@ postgresql-14 (14.3-1) unstable; urgency=medium
 
       Autovacuum, CLUSTER, CREATE INDEX, REINDEX, REFRESH MATERIALIZED VIEW,
       and pg_amcheck activated the security restricted operation protection
+=======
+postgresql-14 (14.3-0ubuntu0.22.04.1) jammy; urgency=medium
+
+  * New upstream version (LP: #1973627).
+
+    + A dump/restore is not required for those running 14.X.
+
+    + However, if you have any GiST indexes on columns of type ltree (supplied
+      by the contrib/ltree extension), you should re-index them after updating.
+      See the upstream changelog linked below for further information.
+
+    + Also, if you are upgrading from a version earlier than 14.2, see
+      those release notes as well please.
+
+    + Confine additional operations within "security restricted operation"
+      sandboxes (Sergey Shinderuk, Noah Misch).
+
+      Autovacuum, CLUSTER, CREATE INDEX, REINDEX, REFRESH MATERIALIZED VIEW,
+      and pg_amcheck activated the “security restricted operation” protection
+>>>>>>> debian/changelog
       mechanism too late, or even not at all in some code paths. A user having
       permission to create non-temporary objects within a database could
       define an object that would execute arbitrary SQL code with superuser
@@ -14,6 +35,7 @@ postgresql-14 (14.3-1) unstable; urgency=medium
       some superuser ran one of the affected commands against it.
 
       The PostgreSQL Project thanks Alexander Lakhin for reporting this
+<<<<<<< debian/changelog
       problem. (CVE-2022-1552)
 
     * Fix default signature length for gist_ltree_ops indexes
@@ -30,6 +52,23 @@ postgresql-14 (14.3-1) unstable; urgency=medium
       indexes on ltree[] columns, that is arrays of ltree, are not affected.)
 
  -- Christoph Berg <[e-mail]>  Tue, 10 May 2022 10:34:28 +0200
+=======
+      problem.
+      (CVE-2022-1552)
+
+    + Details about these and many further changes can be found at:
+      https://www.postgresql.org/docs/14/release-14-3.html
+
+  * d/p/llvm14-support.patch: drop patch applied upstream.
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 16 May 2022 16:17:01 -0300
+
+postgresql-14 (14.2-1ubuntu1) jammy; urgency=medium
+
+  * d/p/llvm14-support.patch: fix FTBFS with llvm-14 (LP: #1966319)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 25 Mar 2022 11:34:41 -0300
+>>>>>>> debian/changelog
 
 postgresql-14 (14.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0d6c863..a622aed 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-14
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders:
  Martin Pitt <[e-mail]>,
  Peter Eisentraut <[e-mail]>,