Merge ~utkarsh/ubuntu/+source/xterm:merge-xterm-impish into ubuntu/+source/xterm:debian/sid

[Utkarsh Gupta]

Hello,

This MP merges 366-1 from Debian sid to Impish. PPA could be found at:
https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump/

Build is good and autopkgtest passes.

Requesting you to please review and sponsor the upload. TIA! \o/

[Gianfranco Costamagna (costamagnagianfranco)]

I sponsored after removing the trailing newline on d/changelog and refreshing one patch
Applying patch 950_ubuntu_charclass_highlight.diff
patching file XTerm.ad
Hunk #1 succeeded at 251 (offset 14 lines).

review: Approve

[Utkarsh Gupta (utkarsh)]

Thank you, Gianfranco! :D

[Gianfranco Costamagna (costamagnagianfranco)]

This is the change:
diff --git a/debian/changelog b/debian/changelog
index 2d044cb..c6cf7a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2108,4 +2108,3 @@ xorg-x11 (6.8.2.dfsg.1-0pre1v1) experimental; urgency=low
     driver.) Thanks to Jesus Climent for spotting this problem.

  -- David Nusinow <email address hidden> Wed, 22 Jun 2005 11:24:38 -0400
-
diff --git a/debian/patches/950_ubuntu_charclass_highlight.diff b/debian/patches/950_ubuntu_charclass_highlight.diff
index 8136fd3..0eb5d17 100644
--- a/debian/patches/950_ubuntu_charclass_highlight.diff
+++ b/debian/patches/950_ubuntu_charclass_highlight.diff
@@ -2,7 +2,7 @@ Index: b/XTerm.ad
 ===================================================================
 --- a/XTerm.ad
 +++ b/XTerm.ad
-@@ -237,7 +237,7 @@
+@@ -251,7 +251,7 @@
  !*faceSize: 8

  ! Here is a pattern that is useful for double-clicking on a URL:

diff --git a/debian/changelog b/debian/changelog
index 4bf029b..2d044cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xterm (366-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add 950_ubuntu_charclass_highlight.diff:
+      + Enable URL highlighting.
+    - Add 951_uxterm_utf8_title.diff:
+      + Set utf8Titles to true by default when using uxterm, so that it
+        displays utf8 directories in titles properly.  May cause issues with
+        apps that use control sequences for updating the xterm titlebar -
+        users should use xterm or set utf8Title to false in this case.
+    - Modify debian/gbp.conf: Set "debian-branch" to "ubuntu"
+  * Dropped changes:
+    - debian/patches/CVE-2021-27135.patch: correct upper-limit for
+      selection buffer, accounting for combining characters in button.c.
+      [Included in 366-1]
+    - debian/patches/CVE-2021-27135-2.patch: check realloc return code,
+      add some casts in button.c.
+      [Included in 366-1]
+
+ -- Utkarsh Gupta <[e-mail]>  Tue, 25 May 2021 11:04:02 +0530
+
 xterm (366-1) unstable; urgency=medium
 
   * New upstream release
@@ -32,6 +53,38 @@ xterm (362-1) unstable; urgency=medium
 
  -- Sven Joachim <[e-mail]>  Sun, 15 Nov 2020 16:34:36 +0100
 
+xterm (361-1ubuntu3) hirsute; urgency=medium
+
+  * SECURITY UPDATE: crash when handling crafted unicode content
+    - debian/patches/CVE-2021-27135-2.patch: check realloc return code,
+      add some casts in button.c.
+    - CVE-2021-27135
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 22 Feb 2021 12:59:13 -0500
+
+xterm (361-1ubuntu2) hirsute; urgency=medium
+
+  * SECURITY UPDATE: crash when handling crafted unicode content
+    - debian/patches/CVE-2021-27135.patch: correct upper-limit for
+      selection buffer, accounting for combining characters in button.c.
+    - CVE-2021-27135
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 11 Feb 2021 09:11:30 -0500
+
+xterm (361-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add 950_ubuntu_charclass_highlight.diff:
+      + Enable URL highlighting.
+    - Add Add 951_uxterm_utf8_title.diff:
+      + Set utf8Titles to true by default when using uxterm, so that it
+        displays utf8 directories in titles properly.  May cause issues with
+        apps that use control sequences for updating the xterm titlebar -
+        users should use xterm or set utf8Title to false in this case.
+    - Modify debian/gbp.conf: Set "debian-branch" to "ubuntu"
+
+ -- Julian Andres Klode <[e-mail]>  Wed, 11 Nov 2020 17:59:49 +0100
+
 xterm (361-1) unstable; urgency=medium
 
   * New upstream release.
@@ -117,6 +170,20 @@ xterm (354-1) unstable; urgency=medium
 
  -- Sven Joachim <[e-mail]>  Wed, 29 Apr 2020 18:03:39 +0200
 
+xterm (353-1ubuntu1) focal; urgency=medium
+
+  * Sync with Debian, remaining changes:
+    - Add 950_ubuntu_charclass_highlight.diff:
+      + Enable URL highlighting.
+    - Add Add 951_uxterm_utf8_title.diff:
+      + Set utf8Titles to true by default when using uxterm, so that it
+        displays utf8 directories in titles properly.  May cause issues with
+        apps that use control sequences for updating the xterm titlebar -
+        users should use xterm or set utf8Title to false in this case.
+    - Modify debian/gbp.conf: Set "debian-branch" to "ubuntu"
+
+ -- Timo Aaltonen <[e-mail]>  Wed, 26 Feb 2020 11:49:57 +0200
+
 xterm (353-1) unstable; urgency=medium
 
   * New upstream release.
@@ -167,6 +234,20 @@ xterm (349-1) unstable; urgency=medium
 
  -- Sven Joachim <[e-mail]>  Mon, 30 Sep 2019 18:25:13 +0200
 
+xterm (348-2ubuntu1) eoan; urgency=medium
+
+  * Sync with Debian, remaining changes:
+    - Add 950_ubuntu_charclass_highlight.diff:
+      + Enable URL highlighting.
+    - Add Add 951_uxterm_utf8_title.diff:
+      + Set utf8Titles to true by default when using uxterm, so that it
+        displays utf8 directories in titles properly.  May cause issues with
+        apps that use control sequences for updating the xterm titlebar -
+        users should use xterm or set utf8Title to false in this case.
+    - Modify debian/gbp.conf: Set "debian-branch" to "Ubuntu"
+
+ -- Timo Aaltonen <[e-mail]>  Wed, 18 Sep 2019 15:11:35 +0300
+
 xterm (348-2) unstable; urgency=medium
 
   * Update patch 900_debian_xterm.diff:
@@ -2027,3 +2108,4 @@ xorg-x11 (6.8.2.dfsg.1-0pre1v1) experimental; urgency=low
     driver.)  Thanks to Jesus Climent for spotting this problem.
 
  -- David Nusinow <[e-mail]>  Wed, 22 Jun 2005 11:24:38 -0400
+
diff --git a/debian/control b/debian/control
index 0db47e8..d245ea5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xterm
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian X Strike Force <[e-mail]>
 Uploaders: Sven Joachim <[e-mail]>
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
diff --git a/debian/gbp.conf b/debian/gbp.conf
index bf94336..8d8c4dc 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian-unstable
+debian-branch = ubuntu
 upstream-branch = upstream-unstable
 debian-tag = xterm-%(version)s
 upstream-tag = xterm-%(version)s
diff --git a/debian/patches/950_ubuntu_charclass_highlight.diff b/debian/patches/950_ubuntu_charclass_highlight.diff
new file mode 100644
index 0000000..8136fd3
--- /dev/null
+++ b/debian/patches/950_ubuntu_charclass_highlight.diff
@@ -0,0 +1,13 @@
+Index: b/XTerm.ad
+===================================================================
+--- a/XTerm.ad
++++ b/XTerm.ad
+@@ -237,7 +237,7 @@
+ !*faceSize: 8
+ 
+ ! Here is a pattern that is useful for double-clicking on a URL:
+-!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
++*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
+ !
+ ! Alternatively,
+ !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
diff --git a/debian/patches/951_uxterm_utf8_title.diff b/debian/patches/951_uxterm_utf8_title.diff
new file mode 100644
index 0000000..2e96921
--- /dev/null
+++ b/debian/patches/951_uxterm_utf8_title.diff
@@ -0,0 +1,11 @@
+diff -Nurp xterm-253/UXTerm.ad xterm-253-working/UXTerm.ad
+--- xterm-253/UXTerm.ad	2006-02-12 17:14:58.000000000 -0800
++++ xterm-253-working/UXTerm.ad	2010-01-08 13:26:23.000000000 -0800
+@@ -39,6 +39,7 @@
+ 
+ *fontMenu.Label:  Unicode Fonts
+ *VT100.utf8:	1
++*utf8Title:     true
+ 
+ ! This includes "XTerm-color" which includes "XTerm", which defines fonts.
+ ! Why set them here?
diff --git a/debian/patches/series b/debian/patches/series
index 0a584d1..595515f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 900_debian_xterm.diff
 902_windowops.diff
 904_fontops.diff
+950_ubuntu_charclass_highlight.diff
+951_uxterm_utf8_title.diff