Merge ~pushkarnk/ubuntu/+source/criu:ubuntu/devel into ubuntu/+source/criu:ubuntu/devel

[Pushkar Kulkarni]

[Simon Quigley (tsimonq2)]

It's not appropriate to add an Ubuntu delta just to fix some GCC warnings.

Also, this is no longer an issue.

review: Disapprove

Unmerged commits

63b8a36... by Pushkar Kulkarni on 2024-11-25

update maintainer

1902065... by Pushkar Kulkarni on 2024-11-25

update changelog

fea25a1... by Pushkar Kulkarni on 2024-11-25

Disable gcc warnings on Ubuntu

diff --git a/debian/changelog b/debian/changelog
index 7ddd45a..925e04f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+criu (3.19-7ubuntu1) plucky; urgency=medium
+
+  * d/patches: Add patch to disable format-truncation
+    and stringop-overflow warnings seen reported only
+    on Ubuntu (LP: #2089588)
+ 
+ -- Pushkar Kulkarni <[e-mail]>  Sat, 30 Nov 2024 22:38:30 +0530
+
 criu (3.19-7) unstable; urgency=medium
 
   * debian/control: Fix test-name for autopkgtest-pkg-python
diff --git a/debian/control b/debian/control
index a62608a..375066a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: criu
 Section: admin
 Priority: optional
-Maintainer: Salvatore Bonaccorso <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Salvatore Bonaccorso <[e-mail]>
 Build-Depends:
  asciidoc,
  debhelper-compat (= 13),
diff --git a/debian/patches/avert_gcc_warnings_ubuntu.patch b/debian/patches/avert_gcc_warnings_ubuntu.patch
new file mode 100644
index 0000000..03bc870
--- /dev/null
+++ b/debian/patches/avert_gcc_warnings_ubuntu.patch
@@ -0,0 +1,17 @@
+Subject: Avoid GCC warnings seen on Ubuntu only
+  Warnings related to format truncation and string overflow
+  are reported only on Ubuntu, probably with _FORTIFY_SOURCE=3.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/criu/+bug/2089588
+Author: Pushkar Kulkarni <[e-mail]>
+Forwarded: no
+
+--- a/Makefile
++++ b/Makefile
+@@ -109,6 +109,7 @@
+ DEFINES			+= -D_GNU_SOURCE
+ 
+ WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement -Wstrict-prototypes
++WARNINGS		+= -Wno-format-truncation -Wno-stringop-overflow
+ 
+ # -Wdangling-pointer results in false warning when we add a list element to
+ # local list head variable. It is false positive because before leaving the
diff --git a/debian/patches/series b/debian/patches/series
index e6d0f0e..15d512f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Adjust-to-glibc-__rseq_size-semantic-change.patch
 net-fix-network-unlock-with-iptables-nft.patch
+avert_gcc_warnings_ubuntu.patch