diff -pruN 2.3.12-2/debian/changelog 2.3.12-2ubuntu2/debian/changelog
--- 2.3.12-2/debian/changelog	2024-12-17 11:34:56.000000000 +0000
+++ 2.3.12-2ubuntu2/debian/changelog	2025-09-22 11:26:00.000000000 +0000
@@ -1,3 +1,19 @@
+unixodbc (2.3.12-2ubuntu2) questing; urgency=medium
+
+  * No-change rebuild for IEEE long double on ppc64el
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 22 Sep 2025 11:26:00 +0000
+
+unixodbc (2.3.12-2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2085303, #2085815). Remaining changes:
+    - SECURITY UPDATE: Out-of-bounds write
+      + debian/patches/CVE-2024-1013.patch: PostgreSQL driver: Fix
+        incompatible pointer-to-integer types
+      + CVE-2024-1013
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Wed, 08 Jan 2025 10:17:53 -0300
+
 unixodbc (2.3.12-2) unstable; urgency=medium
 
   * debian/control:
@@ -12,6 +28,27 @@ unixodbc (2.3.12-2) unstable; urgency=me
 
  -- Hugh McMaster <hmc@debian.org>  Tue, 17 Dec 2024 22:34:56 +1100
 
+unixodbc (2.3.12-1ubuntu1) oracular; urgency=medium
+
+  * SECURITY UPDATE: Out-of-bounds write
+    - debian/patches/CVE-2024-1013.patch: PostgreSQL driver: Fix
+      incompatible pointer-to-integer types
+    - CVE-2024-1013
+
+ -- Leonidas Da Silva Barbosa <leo.barbosa@canonical.com>  Mon, 03 Jun 2024 10:27:39 -0300
+
+unixodbc (2.3.12-1build2) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 08:30:48 +0000
+
+unixodbc (2.3.12-1build1) noble; urgency=medium
+
+  * No-change rebuild for readline time64 change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 14 Mar 2024 03:02:12 +0100
+
 unixodbc (2.3.12-1) unstable; urgency=medium
 
   * New upstream version 2.3.12:
diff -pruN 2.3.12-2/debian/control 2.3.12-2ubuntu2/debian/control
--- 2.3.12-2/debian/control	2024-12-17 11:33:54.000000000 +0000
+++ 2.3.12-2ubuntu2/debian/control	2025-01-08 13:17:53.000000000 +0000
@@ -1,7 +1,8 @@
 Source: unixodbc
 Section: libs
 Priority: optional
-Maintainer: Hugh McMaster <hmc@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Hugh McMaster <hmc@debian.org>
 Build-Depends:
  debhelper-compat (= 13),
  libreadline-dev,
diff -pruN 2.3.12-2/debian/patches/CVE-2024-1013.patch 2.3.12-2ubuntu2/debian/patches/CVE-2024-1013.patch
--- 2.3.12-2/debian/patches/CVE-2024-1013.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.3.12-2ubuntu2/debian/patches/CVE-2024-1013.patch	2025-01-08 13:15:57.000000000 +0000
@@ -0,0 +1,45 @@
+From 45f501e1be2db6b017cc242c79bfb9de32b332a1 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 29 Jan 2024 08:27:29 +0100
+Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types
+
+These result in out-of-bounds stack writes on 64-bit architectures
+(caller has 4 bytes, callee writes 8 bytes), and seem to have gone
+unnoticed on little-endian architectures (although big-endian
+architectures must be broken).
+
+This change is required to avoid a build failure with GCC 14.
+---
+ Drivers/Postgre7.1/info.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c
+index 63ac91f..2216ecd 100644
+--- a/Drivers/Postgre7.1/info.c
++++ b/Drivers/Postgre7.1/info.c
+@@ -1779,14 +1779,14 @@ char *table_name;
+ char index_name[MAX_INFO_STRING];
+ short fields_vector[8];
+ char isunique[10], isclustered[10];
+-SDWORD index_name_len, fields_vector_len;
++SQLLEN index_name_len, fields_vector_len;
+ TupleNode *row;
+ int i;
+ HSTMT hcol_stmt;
+ StatementClass *col_stmt, *indx_stmt;
+ char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
+ char **column_names = 0;
+-Int4 column_name_len;
++SQLLEN column_name_len;
+ int total_columns = 0;
+ char error = TRUE;
+ ConnInfo *ci;
+@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt;
+ StatementClass *tbl_stmt;
+ char tables_query[STD_STATEMENT_LEN];
+ char attname[MAX_INFO_STRING];
+-SDWORD attname_len;
++SQLLEN attname_len;
+ char pktab[MAX_TABLE_LEN + 1];
+ Int2 result_cols;
+ 
diff -pruN 2.3.12-2/debian/patches/series 2.3.12-2ubuntu2/debian/patches/series
--- 2.3.12-2/debian/patches/series	2024-12-16 11:02:24.000000000 +0000
+++ 2.3.12-2ubuntu2/debian/patches/series	2025-01-08 13:16:57.000000000 +0000
@@ -1 +1,2 @@
 0001-configure-ac-cursor-lib.patch
+CVE-2024-1013.patch