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

Proposed by Utkarsh Gupta
Status: Merged
Merge reported by: Utkarsh Gupta
Merged at revision: 152cd209e21aa5e80f7910f839bee7db8781db4d
Proposed branch: ~utkarsh/ubuntu/+source/xterm:merge-xterm-impish
Merge into: ubuntu/+source/xterm:debian/sid
Diff against target: 187 lines (+111/-2)
6 files modified
debian/changelog (+82/-0)
debian/control (+2/-1)
debian/gbp.conf (+1/-1)
debian/patches/950_ubuntu_charclass_highlight.diff (+13/-0)
debian/patches/951_uxterm_utf8_title.diff (+11/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Gianfranco Costamagna (community) Approve
Utkarsh Gupta Pending
Ubuntu Server Dev import team Pending
Review via email: mp+403238@code.launchpad.net

Description of the change

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/

To post a comment you must log in.
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

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
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Thank you, Gianfranco! :D

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

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:

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 4bf029b..2d044cb 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,24 @@
6+xterm (366-1ubuntu1) impish; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - Add 950_ubuntu_charclass_highlight.diff:
10+ + Enable URL highlighting.
11+ - Add 951_uxterm_utf8_title.diff:
12+ + Set utf8Titles to true by default when using uxterm, so that it
13+ displays utf8 directories in titles properly. May cause issues with
14+ apps that use control sequences for updating the xterm titlebar -
15+ users should use xterm or set utf8Title to false in this case.
16+ - Modify debian/gbp.conf: Set "debian-branch" to "ubuntu"
17+ * Dropped changes:
18+ - debian/patches/CVE-2021-27135.patch: correct upper-limit for
19+ selection buffer, accounting for combining characters in button.c.
20+ [Included in 366-1]
21+ - debian/patches/CVE-2021-27135-2.patch: check realloc return code,
22+ add some casts in button.c.
23+ [Included in 366-1]
24+
25+ -- Utkarsh Gupta <utkarsh@debian.org> Tue, 25 May 2021 11:04:02 +0530
26+
27 xterm (366-1) unstable; urgency=medium
28
29 * New upstream release
30@@ -32,6 +53,38 @@ xterm (362-1) unstable; urgency=medium
31
32 -- Sven Joachim <svenjoac@gmx.de> Sun, 15 Nov 2020 16:34:36 +0100
33
34+xterm (361-1ubuntu3) hirsute; urgency=medium
35+
36+ * SECURITY UPDATE: crash when handling crafted unicode content
37+ - debian/patches/CVE-2021-27135-2.patch: check realloc return code,
38+ add some casts in button.c.
39+ - CVE-2021-27135
40+
41+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 22 Feb 2021 12:59:13 -0500
42+
43+xterm (361-1ubuntu2) hirsute; urgency=medium
44+
45+ * SECURITY UPDATE: crash when handling crafted unicode content
46+ - debian/patches/CVE-2021-27135.patch: correct upper-limit for
47+ selection buffer, accounting for combining characters in button.c.
48+ - CVE-2021-27135
49+
50+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 11 Feb 2021 09:11:30 -0500
51+
52+xterm (361-1ubuntu1) hirsute; urgency=low
53+
54+ * Merge from Debian unstable. Remaining changes:
55+ - Add 950_ubuntu_charclass_highlight.diff:
56+ + Enable URL highlighting.
57+ - Add Add 951_uxterm_utf8_title.diff:
58+ + Set utf8Titles to true by default when using uxterm, so that it
59+ displays utf8 directories in titles properly. May cause issues with
60+ apps that use control sequences for updating the xterm titlebar -
61+ users should use xterm or set utf8Title to false in this case.
62+ - Modify debian/gbp.conf: Set "debian-branch" to "ubuntu"
63+
64+ -- Julian Andres Klode <juliank@ubuntu.com> Wed, 11 Nov 2020 17:59:49 +0100
65+
66 xterm (361-1) unstable; urgency=medium
67
68 * New upstream release.
69@@ -117,6 +170,20 @@ xterm (354-1) unstable; urgency=medium
70
71 -- Sven Joachim <svenjoac@gmx.de> Wed, 29 Apr 2020 18:03:39 +0200
72
73+xterm (353-1ubuntu1) focal; urgency=medium
74+
75+ * Sync with Debian, remaining changes:
76+ - Add 950_ubuntu_charclass_highlight.diff:
77+ + Enable URL highlighting.
78+ - Add Add 951_uxterm_utf8_title.diff:
79+ + Set utf8Titles to true by default when using uxterm, so that it
80+ displays utf8 directories in titles properly. May cause issues with
81+ apps that use control sequences for updating the xterm titlebar -
82+ users should use xterm or set utf8Title to false in this case.
83+ - Modify debian/gbp.conf: Set "debian-branch" to "ubuntu"
84+
85+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 26 Feb 2020 11:49:57 +0200
86+
87 xterm (353-1) unstable; urgency=medium
88
89 * New upstream release.
90@@ -167,6 +234,20 @@ xterm (349-1) unstable; urgency=medium
91
92 -- Sven Joachim <svenjoac@gmx.de> Mon, 30 Sep 2019 18:25:13 +0200
93
94+xterm (348-2ubuntu1) eoan; urgency=medium
95+
96+ * Sync with Debian, remaining changes:
97+ - Add 950_ubuntu_charclass_highlight.diff:
98+ + Enable URL highlighting.
99+ - Add Add 951_uxterm_utf8_title.diff:
100+ + Set utf8Titles to true by default when using uxterm, so that it
101+ displays utf8 directories in titles properly. May cause issues with
102+ apps that use control sequences for updating the xterm titlebar -
103+ users should use xterm or set utf8Title to false in this case.
104+ - Modify debian/gbp.conf: Set "debian-branch" to "Ubuntu"
105+
106+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 18 Sep 2019 15:11:35 +0300
107+
108 xterm (348-2) unstable; urgency=medium
109
110 * Update patch 900_debian_xterm.diff:
111@@ -2027,3 +2108,4 @@ xorg-x11 (6.8.2.dfsg.1-0pre1v1) experimental; urgency=low
112 driver.) Thanks to Jesus Climent for spotting this problem.
113
114 -- David Nusinow <dnusinow@debian.org> Wed, 22 Jun 2005 11:24:38 -0400
115+
116diff --git a/debian/control b/debian/control
117index 0db47e8..d245ea5 100644
118--- a/debian/control
119+++ b/debian/control
120@@ -1,7 +1,8 @@
121 Source: xterm
122 Section: x11
123 Priority: optional
124-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
125+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
126+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
127 Uploaders: Sven Joachim <svenjoac@gmx.de>
128 Standards-Version: 4.5.1
129 Rules-Requires-Root: no
130diff --git a/debian/gbp.conf b/debian/gbp.conf
131index bf94336..8d8c4dc 100644
132--- a/debian/gbp.conf
133+++ b/debian/gbp.conf
134@@ -1,6 +1,6 @@
135 [DEFAULT]
136 pristine-tar = True
137-debian-branch = debian-unstable
138+debian-branch = ubuntu
139 upstream-branch = upstream-unstable
140 debian-tag = xterm-%(version)s
141 upstream-tag = xterm-%(version)s
142diff --git a/debian/patches/950_ubuntu_charclass_highlight.diff b/debian/patches/950_ubuntu_charclass_highlight.diff
143new file mode 100644
144index 0000000..8136fd3
145--- /dev/null
146+++ b/debian/patches/950_ubuntu_charclass_highlight.diff
147@@ -0,0 +1,13 @@
148+Index: b/XTerm.ad
149+===================================================================
150+--- a/XTerm.ad
151++++ b/XTerm.ad
152+@@ -237,7 +237,7 @@
153+ !*faceSize: 8
154+
155+ ! Here is a pattern that is useful for double-clicking on a URL:
156+-!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
157++*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
158+ !
159+ ! Alternatively,
160+ !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
161diff --git a/debian/patches/951_uxterm_utf8_title.diff b/debian/patches/951_uxterm_utf8_title.diff
162new file mode 100644
163index 0000000..2e96921
164--- /dev/null
165+++ b/debian/patches/951_uxterm_utf8_title.diff
166@@ -0,0 +1,11 @@
167+diff -Nurp xterm-253/UXTerm.ad xterm-253-working/UXTerm.ad
168+--- xterm-253/UXTerm.ad 2006-02-12 17:14:58.000000000 -0800
169++++ xterm-253-working/UXTerm.ad 2010-01-08 13:26:23.000000000 -0800
170+@@ -39,6 +39,7 @@
171+
172+ *fontMenu.Label: Unicode Fonts
173+ *VT100.utf8: 1
174++*utf8Title: true
175+
176+ ! This includes "XTerm-color" which includes "XTerm", which defines fonts.
177+ ! Why set them here?
178diff --git a/debian/patches/series b/debian/patches/series
179index 0a584d1..595515f 100644
180--- a/debian/patches/series
181+++ b/debian/patches/series
182@@ -1,3 +1,5 @@
183 900_debian_xterm.diff
184 902_windowops.diff
185 904_fontops.diff
186+950_ubuntu_charclass_highlight.diff
187+951_uxterm_utf8_title.diff

Subscribers

People subscribed via source and target branches