Merge ~pushkarnk/ubuntu/+source/cura-engine:merge-2089724-cura-engine into ubuntu/+source/cura-engine:debian/sid

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

I did a test build in ppa:pushkarnk/plusone and here are the autopkgtest results

* Results:
  - cura-engine: plucky/cura-engine/1:5.0.0-5ubuntu1 [amd64]
    + ✅ cura-engine on plucky for amd64 @ 28.11.24 04:57:13
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/amd64/c/cura-engine/20241128_045713_3c135@/log.gz
  - cura-engine: plucky/cura-engine/1:5.0.0-5ubuntu1 [arm64]
    + ✅ cura-engine on plucky for arm64 @ 28.11.24 04:57:15
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/arm64/c/cura-engine/20241128_045715_e3178@/log.gz
  - cura-engine: plucky/cura-engine/1:5.0.0-5ubuntu1 [armhf]
    + ✅ cura-engine on plucky for armhf @ 28.11.24 04:44:03
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/armhf/c/cura-engine/20241128_044403_16df9@/log.gz
  - cura-engine: plucky/cura-engine/1:5.0.0-5ubuntu1 [ppc64el]
    + ✅ cura-engine on plucky for ppc64el @ 28.11.24 05:12:37
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/ppc64el/c/cura-engine/20241128_051237_283c3@/log.gz
  - cura-engine: plucky/cura-engine/1:5.0.0-5ubuntu1 [s390x]
    + ✅ cura-engine on plucky for s390x @ 28.11.24 04:41:41
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/s390x/c/cura-engine/20241128_044141_17148@/log.gz

[Simon Quigley (tsimonq2)]

review: Needs Information

Unmerged commits

1feeae4... by Pushkar Kulkarni on 2024-11-27

update changelog

44aa08b... by Pushkar Kulkarni on 2024-11-27

update-maintainer

f618ab7... by Pushkar Kulkarni on 2024-11-27

reconstruct-changelog

0d94427... by Pushkar Kulkarni on 2024-11-27

merge-changelogs

d5f64b8... by Pushkar Kulkarni on 2024-06-27

Add a patch to fix a buffer overflow

diff --git a/debian/changelog b/debian/changelog
index 6c39554..25287bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cura-engine (1:5.0.0-5ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2089724). Remaining changes:
+    - Add a patch to fix a buffer overflow
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 27 Nov 2024 11:08:00 +0530
+
 cura-engine (1:5.0.0-5) unstable; urgency=medium
 
   * Replace deprecated pkg-config dependency.
@@ -6,6 +13,25 @@ cura-engine (1:5.0.0-5) unstable; urgency=medium
 
  -- Gregor Riepl <[e-mail]>  Tue, 30 Jul 2024 20:25:00 +0300
 
+cura-engine (1:5.0.0-4ubuntu1) oracular; urgency=medium
+
+  * d/patches: Add patch to fix a buffer overflow
+    (LP: #2059171)
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 27 Jun 2024 14:24:41 +0530
+
+cura-engine (1:5.0.0-4build2) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <[e-mail]>  Mon, 01 Apr 2024 16:44:34 +1100
+
+cura-engine (1:5.0.0-4build1) noble; urgency=high
+
+  * No change rebuild against libprotobuf32t64.
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 22 Mar 2024 16:38:23 +0100
+
 cura-engine (1:5.0.0-4) unstable; urgency=medium
 
   * Fix failing unit test. Closes: #1040252
diff --git a/debian/control b/debian/control
index 98c84e6..eab2c10 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: cura-engine
 Priority: optional
-Maintainer: Debian 3-D Printing Packages <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian 3-D Printing Packages <[e-mail]>
 Uploaders: Gregor Riepl <[e-mail]>,
  Christoph Berg <[e-mail]>,
 Build-Depends: debhelper-compat (= 12), cmake,
diff --git a/debian/patches/0018-fix-buffer-overflow.patch b/debian/patches/0018-fix-buffer-overflow.patch
new file mode 100644
index 0000000..57eef7a
--- /dev/null
+++ b/debian/patches/0018-fix-buffer-overflow.patch
@@ -0,0 +1,23 @@
+Description: Fixes a buffer-overflow in strcpy() because the
+    destination buffer does not have space to accommodate
+    the null character. This patch is irrelevant to the latest
+    upstream.
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cura-engine/+bug/2059171
+Author: Pushkar Kulkarni <[e-mail]> 
+--- a/src/utils/getpath.cpp
++++ b/src/utils/getpath.cpp
+@@ -28,10 +28,10 @@
+     DWORD dir_path_size = path_size - (path_size - (file_name_start - buffer));
+     std::string folder_name{buffer, dir_path_size};
+ #else
+-    char buffer[filePath.size()];
++    char buffer[filePath.size()+1];
+     std::strcpy(buffer, filePath.c_str()); // copy the string because dirname(.) changes the input string!!!
+     std::string folder_name{dirname(buffer)};
+ #endif
+     return folder_name;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index e1f132a..e910154 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,5 @@
 0015-Add-missing-cstdint.patch
 0016-Use-leaf-settings-in-favor-of-adhesion_extruder_nr.patch
 0017-Round-from-double-to-cInt-explicitly-when-applying-m.patch
+0018-fix-buffer-overflow.patch
 1001-fix-setprecision-header.patch