Merge version 2.0.15-1.1+rpi1 and 2.3.1+dfsg1-1 to produce 2.3.1+dfsg1-1+rpi1

diff --cc debian/changelog
index 0bd35cc42e300586f6b1f2cfa9d722f66371e86f,377a45a8586f790ca93dbe6d1e993f2030298da2..84dd6842c0f8614a01e055b424aa1337d85bb114
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,31 +1,38 @@@
- 389-ds-base (2.0.15-1.1+rpi1) bookworm-staging; urgency=medium
++389-ds-base (2.3.1+dfsg1-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Oct 2022 12:34:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 03:00:31 +0000
 +
- 389-ds-base (2.0.15-1.1) unstable; urgency=medium
+ 389-ds-base (2.3.1+dfsg1-1) unstable; urgency=medium
  
-   * Non-maintainer upload.
-   * CVE-2022-0918: unauthenticated attacker with network access to
-     the LDAP port could cause a denial of service (Closes: #1016445)
+   * Repackage the source, filter vendored crates and allow building with
+     packaged crates.
+   * d/vendor: Add concread 0.2.21 and uuid 0.8.
+   * allow-newer-crates.diff, control: Add a bunch of rust crates to
+     build-deps, and patch toml files to allow newer crates.
+   * concread: Mark tcache as non-default, fix checksums and ease a dep.
+   * Update copyright for vendored bits.
  
-  -- Adrian Bunk <bunk@debian.org>  Tue, 13 Sep 2022 22:10:45 +0300
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 24 Jan 2023 13:21:19 +0200
+ 
+ 389-ds-base (2.3.1-1) unstable; urgency=medium
+ 
+   * New upstream release. (Closes: #1028177)
+     - CVE-2022-1949 (Closes: #1016446)
+     - CVE-2022-2850 (Closes: #1018054)
+   * watch: Updated to use releases instead of tags.
+   * control: Add liblmdb-dev to build-depends.
+   * control: Add libjson-c-dev to build-depends.
+   * control: Build-depend on libpcre2-dev. (Closes: #1000017)
+   * Build with rust enabled.
+   * rules: Don't use a separate builddir for now.
+   * 5610-fix-linking.diff: Fix linking libslapd.so.
+   * dont-run-rpm.diff: Use dpkg-query to check for cockpit/firewalld.
+     (Closes: #1010136)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 20 Jan 2023 23:15:49 +0200
  
  389-ds-base (2.0.15-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge