Merge ~mitchdz/ubuntu/+source/tmux:mitch/mantic-clipboard-fix into ubuntu/+source/tmux:ubuntu/mantic-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/lp2040080-tmux-clipboard

[Mitchell Dzurick (mitchdz)]

Keeping as WIP until Noble syncs with the fix.

[Sergio Durigan Junior (sergiodj)]

Thanks, Mitchell.

Noble now has the latest tmux with the fix, so I'm going to review this MP.

I reproduced the issue (thanks for the nice reproducer) and verified that the patch fixes the problem. The SRU text also looks good; this is a very simple fix and I couldn't find much more to comment on the Regression Potential section.

My personal preference is to always list the files that are being change in the changelog entry. This makes it easier to search for specific changes in the future. But as I said, it's a personal preference so I'm fine with keeping the changelog entry as is.

I have a question about the way you backported the patch. Why did you choose to modify an existing patch instead of adding another one on top? This way, you could have added more descriptive headers explaining what the patch is about. If you think it's better to modify the existing patch, then I'd ask you to at least write a comment at the top explaining that you've applied another change on top of it.

Otherwise, this LGTM and is ready to be sponsored as soon as we're clear on the patch situation. Thanks.

review: Needs Information

[Mitchell Dzurick (mitchdz)]

Thanks Sergio! The only reason I directly modified the diff file is to make the change/commit identical to Debian. I supposed I still had my -devel mindset on so it'd be more obvious to drop for NN, but since NN is being synced, that's not needed.

If there's a preference to add another patch file to add a proper DEP3 header I'd be glad to do that.

[Mitchell Dzurick (mitchdz)]

Per conversation with Sergio, I'm going to convert this into a new, separate patch file.

[Mitchell Dzurick (mitchdz)]

Tested new change. Good to review now.

[Sergio Durigan Junior (sergiodj)]

Thanks, Mitchell.

This is great now. I've made tiny adjustments to the SRU text, and uploaded the package:

  479 Trying to upload package to ubuntu
  480 Checking signature on .changes
  481 gpg: /home/sergio/work/tmux/tmux_3.3a-4ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
  482 Checking signature on .dsc
  483 gpg: /home/sergio/work/tmux/tmux_3.3a-4ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
  484 Uploading to ubuntu (via ftp to upload.ubuntu.com):
  485 Uploading tmux_3.3a-4ubuntu1.dsc: done.
  486 Uploading tmux_3.3a-4ubuntu1.debian.tar.xz: done.
  487 Uploading tmux_3.3a-4ubuntu1_source.buildinfo: done.
  488 Uploading tmux_3.3a-4ubuntu1_source.changes: done.
  489 Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 9f490dd..2277ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tmux (3.3a-4ubuntu1) mantic; urgency=medium
+
+  * d/p/lp2040080-fix-upstream-bf636d9575-OSC52-clipboard.patch: 
+    fix upstream patch to allow OSC52 clipboard access (LP: #2040080).
+
+ -- Mitchell Dzurick <[e-mail]>  Tue, 07 Nov 2023 15:49:10 -0700
+
 tmux (3.3a-4) unstable; urgency=medium
 
   * Backport upstream changes related to ncurses tparm handling (closes: #1038269).
diff --git a/debian/control b/debian/control
index a85c340..621bbdc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tmux
 Section: admin
 Priority: optional
-Maintainer: Romain Francoise <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Romain Francoise <[e-mail]>
 Build-Depends: bison,
                debhelper-compat (= 13),
                dpkg-dev (>= 1.16.1~),
diff --git a/debian/patches/lp2040080-fix-upstream-bf636d9575-OSC52-clipboard.patch b/debian/patches/lp2040080-fix-upstream-bf636d9575-OSC52-clipboard.patch
new file mode 100644
index 0000000..7e3cf35
--- /dev/null
+++ b/debian/patches/lp2040080-fix-upstream-bf636d9575-OSC52-clipboard.patch
@@ -0,0 +1,28 @@
+Description: Fix OSC52 clipboard access
+A debian patch used tparm when it should not have been used. This patch fixes
+that by removing these extraneous tparm calls.
+This patch comes from https://salsa.debian.org/rfrancoise/tmux/-/commit/acb94347d2601965b4e46ccc48616dfb6ef6f691
+Author: Romain Francoise <[e-mail]>
+Reviewed-By: Mitchell Dzurick <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tmux/+bug/2040080
+Last-Update: 2023-11-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tty-term.c
++++ b/tty-term.c
+@@ -771,7 +771,6 @@
+ #else
+ 	s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0);
+ #endif
+-	s = tparm((char *)x, a);
+ 	if (s == NULL) {
+ 		log_debug("could not expand %s", tty_term_codes[code].name);
+ 		return ("");
+@@ -811,7 +810,6 @@
+ #else
+ 	s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0);
+ #endif
+-	s = tparm((char *)x, a, b, c);
+ 	if (s == NULL) {
+ 		log_debug("could not expand %s", tty_term_codes[code].name);
+ 		return ("");
diff --git a/debian/patches/series b/debian/patches/series
index ab389df..4b0cbec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ upstream-8f34504736.diff
 upstream-39d41d0810.diff
 upstream-168eab11a7.diff
 upstream-bf636d9575.diff
+lp2040080-fix-upstream-bf636d9575-OSC52-clipboard.patch