Merge ~dbungert/ubuntu/+source/irssi:merge-lp1915558-hirsute into ubuntu/+source/irssi:debian/sid
- Git
- lp:~dbungert/ubuntu/+source/irssi
- merge-lp1915558-hirsute
- Merge into debian/sid
Proposed by
Dan Bungert
Status: | Needs review |
---|---|
Proposed branch: | ~dbungert/ubuntu/+source/irssi:merge-lp1915558-hirsute |
Merge into: | ubuntu/+source/irssi:debian/sid |
Diff against target: |
935 lines (+675/-6) 4 files modified
debian/changelog (+669/-0) debian/control (+2/-1) debian/patches/03firsttimer_text (+3/-3) debian/patches/series (+1/-2) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Langasek (community) | Abstain | ||
Julian Andres Klode (community) | Approve | ||
Canonical Server packageset reviewers | Pending | ||
Review via email: mp+398140@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote : | # |
FWIW, I actually did grab-merge irssi, resolved the conflicts, build .dsc out of that and the git tree and then did a debdiff, and the only difference was changelog.
Unmerged commits
- 722f7af... by Dan Bungert
-
update-maintainer
- a2a6ee1... by Dan Bungert
-
reconstruct-
changelog - f6c629f... by Dan Bungert
-
merge-changelogs
- 62c0c6d... by Julian Andres Klode
-
Adapt d/p/03firsttime
r_text for Ubuntu Adapt 03firsttimer_text so it tells you about connecting to freenode and
joining #ubuntu. - b177e7b... by Julian Andres Klode
-
Re-enabled 20fix_ssl_
proxy_hostname_ check. When we have a proxy setting, we expect the CN to match
the proxy hostname, not the server hostname.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog | |||
2 | index 2b72506..173db58 100644 | |||
3 | --- a/debian/changelog | |||
4 | +++ b/debian/changelog | |||
5 | @@ -1,3 +1,15 @@ | |||
6 | 1 | irssi (1.2.2-2ubuntu1) hirsute; urgency=medium | ||
7 | 2 | |||
8 | 3 | * Merge with Debian unstable (LP: #1915558). Remaining changes: | ||
9 | 4 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
10 | 5 | + When we have a proxy setting, we expect the CN to match | ||
11 | 6 | the proxy hostname, not the server hostname. | ||
12 | 7 | - d/p/03firsttimer_text: | ||
13 | 8 | + Adapt 03firsttimer_text so it tells you about | ||
14 | 9 | connecting to freenode and joining #ubuntu. | ||
15 | 10 | |||
16 | 11 | -- Dan Bungert <daniel.bungert@canonical.com> Fri, 12 Feb 2021 15:51:38 -0700 | ||
17 | 12 | |||
18 | 1 | irssi (1.2.2-2) unstable; urgency=medium | 13 | irssi (1.2.2-2) unstable; urgency=medium |
19 | 2 | 14 | ||
20 | 3 | [ Debian Janitor ] | 15 | [ Debian Janitor ] |
21 | @@ -15,6 +27,32 @@ irssi (1.2.2-2) unstable; urgency=medium | |||
22 | 15 | 27 | ||
23 | 16 | -- Rhonda D'Vine <rhonda@debian.org> Wed, 20 Jan 2021 09:19:06 +0100 | 28 | -- Rhonda D'Vine <rhonda@debian.org> Wed, 20 Jan 2021 09:19:06 +0100 |
24 | 17 | 29 | ||
25 | 30 | irssi (1.2.2-1ubuntu3) hirsute; urgency=medium | ||
26 | 31 | |||
27 | 32 | * No-change rebuild for the perl update. | ||
28 | 33 | |||
29 | 34 | -- Matthias Klose <doko@ubuntu.com> Mon, 09 Nov 2020 10:51:16 +0100 | ||
30 | 35 | |||
31 | 36 | irssi (1.2.2-1ubuntu2) groovy; urgency=medium | ||
32 | 37 | |||
33 | 38 | * debian/patches/1183.patch: [PATCH] manually handle NUL unicode in | ||
34 | 39 | g_utf8_get_next_char_validated. Thanks to ailin-nemui <ailin- | ||
35 | 40 | nemui@users.noreply.github.com>. Closes LP: #1882401. | ||
36 | 41 | |||
37 | 42 | -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 06 Aug 2020 15:56:50 -0700 | ||
38 | 43 | |||
39 | 44 | irssi (1.2.2-1ubuntu1) focal; urgency=low | ||
40 | 45 | |||
41 | 46 | * Merge from Debian unstable. Remaining changes: | ||
42 | 47 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
43 | 48 | - When we have a proxy setting, we expect the CN to match | ||
44 | 49 | the proxy hostname, not the server hostname. | ||
45 | 50 | - d/p/03firsttimer_text: | ||
46 | 51 | + Adapt 03firsttimer_text so it tells you about | ||
47 | 52 | connecting to freenode and joining #ubuntu. | ||
48 | 53 | |||
49 | 54 | -- Julian Andres Klode <juliank@ubuntu.com> Tue, 28 Jan 2020 12:26:29 +0100 | ||
50 | 55 | |||
51 | 18 | irssi (1.2.2-1) unstable; urgency=high | 56 | irssi (1.2.2-1) unstable; urgency=high |
52 | 19 | 57 | ||
53 | 20 | * New upstream bugfix release: | 58 | * New upstream bugfix release: |
54 | @@ -25,6 +63,35 @@ irssi (1.2.2-1) unstable; urgency=high | |||
55 | 25 | 63 | ||
56 | 26 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 12 Sep 2019 16:11:43 +0200 | 64 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 12 Sep 2019 16:11:43 +0200 |
57 | 27 | 65 | ||
58 | 66 | irssi (1.2.1-1ubuntu3) focal; urgency=medium | ||
59 | 67 | |||
60 | 68 | * No-change rebuild for the perl update. | ||
61 | 69 | |||
62 | 70 | -- Matthias Klose <doko@ubuntu.com> Fri, 18 Oct 2019 19:28:07 +0000 | ||
63 | 71 | |||
64 | 72 | irssi (1.2.1-1ubuntu2) eoan; urgency=medium | ||
65 | 73 | |||
66 | 74 | * SECURITY UPDATE: Use after free | ||
67 | 75 | - debian/patches/CVE-2019-15717.patch: fix use after free receiving caps | ||
68 | 76 | in src/irc/core/irc-cap.c. | ||
69 | 77 | - CVE-2019-15717 | ||
70 | 78 | |||
71 | 79 | -- Leonidas S. Barbosa <leo.barbosa@canonical.com> Mon, 02 Sep 2019 16:49:49 -0300 | ||
72 | 80 | |||
73 | 81 | irssi (1.2.1-1ubuntu1) devel; urgency=medium | ||
74 | 82 | |||
75 | 83 | * Merge from Debian. Remaining changes: | ||
76 | 84 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
77 | 85 | - When we have a proxy setting, we expect the CN to match | ||
78 | 86 | the proxy hostname, not the server hostname. | ||
79 | 87 | - d/p/03firsttimer_text: | ||
80 | 88 | + Adapt 03firsttimer_text so it tells you about | ||
81 | 89 | connecting to freenode and joining #ubuntu. | ||
82 | 90 | * Changes no longer needed: | ||
83 | 91 | - d/p/CVE-2019-13045.patch: Drop upstream patch. | ||
84 | 92 | |||
85 | 93 | -- Unit 193 <unit193@ubuntu.com> Mon, 08 Jul 2019 17:21:57 -0400 | ||
86 | 94 | |||
87 | 28 | irssi (1.2.1-1) unstable; urgency=high | 95 | irssi (1.2.1-1) unstable; urgency=high |
88 | 29 | 96 | ||
89 | 30 | * New upstream bugfix release (closes: #931264) | 97 | * New upstream bugfix release (closes: #931264) |
90 | @@ -33,6 +100,29 @@ irssi (1.2.1-1) unstable; urgency=high | |||
91 | 33 | 100 | ||
92 | 34 | -- Rhonda D'Vine <rhonda@debian.org> Fri, 28 Jun 2019 14:10:16 +0200 | 101 | -- Rhonda D'Vine <rhonda@debian.org> Fri, 28 Jun 2019 14:10:16 +0200 |
93 | 35 | 102 | ||
94 | 103 | irssi (1.2.0-2ubuntu2) eoan; urgency=medium | ||
95 | 104 | |||
96 | 105 | * SECURITY UPDATE: User after free | ||
97 | 106 | - debian/patches/CVE-2019-13045.patch: copy sasl username | ||
98 | 107 | and password values in src/irc/core/irc-core.c, | ||
99 | 108 | src/irc/core/irc-servers-reconnect.c, | ||
100 | 109 | src/irc/core/irc-servers-setup.c. | ||
101 | 110 | - CVE-2019-13045 | ||
102 | 111 | |||
103 | 112 | -- Leonidas S. Barbosa <leo.barbosa@canonical.com> Tue, 02 Jul 2019 11:14:44 -0300 | ||
104 | 113 | |||
105 | 114 | irssi (1.2.0-2ubuntu1) devel; urgency=medium | ||
106 | 115 | |||
107 | 116 | * Merge from Debian. Remaining changes: | ||
108 | 117 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
109 | 118 | - When we have a proxy setting, we expect the CN to match | ||
110 | 119 | the proxy hostname, not the server hostname. | ||
111 | 120 | - d/p/03firsttimer_text: | ||
112 | 121 | + Adapt 03firsttimer_text so it tells you about | ||
113 | 122 | connecting to freenode and joining #ubuntu. | ||
114 | 123 | |||
115 | 124 | -- Unit 193 <unit193@ubuntu.com> Wed, 13 Feb 2019 15:57:42 -0500 | ||
116 | 125 | |||
117 | 36 | irssi (1.2.0-2) unstable; urgency=medium | 126 | irssi (1.2.0-2) unstable; urgency=medium |
118 | 37 | 127 | ||
119 | 38 | [ Rhonda D'Vine ] | 128 | [ Rhonda D'Vine ] |
120 | @@ -58,6 +148,18 @@ irssi (1.2.0-1) unstable; urgency=medium | |||
121 | 58 | 148 | ||
122 | 59 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 12 Feb 2019 09:33:05 +0100 | 149 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 12 Feb 2019 09:33:05 +0100 |
123 | 60 | 150 | ||
124 | 151 | irssi (1.1.2-1ubuntu1) devel; urgency=medium | ||
125 | 152 | |||
126 | 153 | * Merge from Debian. Remaining changes: | ||
127 | 154 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
128 | 155 | - When we have a proxy setting, we expect the CN to match | ||
129 | 156 | the proxy hostname, not the server hostname. | ||
130 | 157 | - d/p/03firsttimer_text: | ||
131 | 158 | + Adapt 03firsttimer_text so it tells you about | ||
132 | 159 | connecting to freenode and joining #ubuntu. | ||
133 | 160 | |||
134 | 161 | -- Unit 193 <unit193@ubuntu.com> Sat, 12 Jan 2019 05:09:57 -0500 | ||
135 | 162 | |||
136 | 61 | irssi (1.1.2-1) unstable; urgency=high | 163 | irssi (1.1.2-1) unstable; urgency=high |
137 | 62 | 164 | ||
138 | 63 | [ Daniel Kahn Gillmor ] | 165 | [ Daniel Kahn Gillmor ] |
139 | @@ -69,6 +171,28 @@ irssi (1.1.2-1) unstable; urgency=high | |||
140 | 69 | 171 | ||
141 | 70 | -- Rhonda D'Vine <rhonda@debian.org> Fri, 21 Sep 2018 16:57:51 +0200 | 172 | -- Rhonda D'Vine <rhonda@debian.org> Fri, 21 Sep 2018 16:57:51 +0200 |
142 | 71 | 173 | ||
143 | 174 | irssi (1.1.1-1ubuntu2) disco; urgency=medium | ||
144 | 175 | |||
145 | 176 | * No-change rebuild for the perl 5.28 transition. | ||
146 | 177 | |||
147 | 178 | -- Adam Conrad <adconrad@ubuntu.com> Fri, 02 Nov 2018 18:08:41 -0600 | ||
148 | 179 | |||
149 | 180 | irssi (1.1.1-1ubuntu1) devel; urgency=medium | ||
150 | 181 | |||
151 | 182 | * Merge from Debian. Remaining changes: | ||
152 | 183 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
153 | 184 | - When we have a proxy setting, we expect the CN to match | ||
154 | 185 | the proxy hostname, not the server hostname. | ||
155 | 186 | - d/p/03firsttimer_text: | ||
156 | 187 | + Adapt 03firsttimer_text so it tells you about | ||
157 | 188 | connecting to freenode and joining #ubuntu. | ||
158 | 189 | * Changes no longer needed: | ||
159 | 190 | - d/p/90irc-ubuntu-com: | ||
160 | 191 | + irc.ubuntu.com was a CNAME to irc.freenode.net, but this prevents us | ||
161 | 192 | from recommending and verifying TLS connections. (LP: #1456778) | ||
162 | 193 | |||
163 | 194 | -- Unit 193 <unit193@ubuntu.com> Fri, 27 Jul 2018 07:01:51 -0400 | ||
164 | 195 | |||
165 | 72 | irssi (1.1.1-1) unstable; urgency=medium | 196 | irssi (1.1.1-1) unstable; urgency=medium |
166 | 73 | 197 | ||
167 | 74 | [ Rhonda D'Vine ] | 198 | [ Rhonda D'Vine ] |
168 | @@ -86,6 +210,23 @@ irssi (1.1.1-1) unstable; urgency=medium | |||
169 | 86 | 210 | ||
170 | 87 | -- Rhonda D'Vine <rhonda@debian.org> Wed, 25 Jul 2018 10:09:40 +0800 | 211 | -- Rhonda D'Vine <rhonda@debian.org> Wed, 25 Jul 2018 10:09:40 +0800 |
171 | 88 | 212 | ||
172 | 213 | irssi (1.0.7-1ubuntu1) cosmic; urgency=medium | ||
173 | 214 | |||
174 | 215 | * Merge from Debian (LP: #1754781). Remaining changes: | ||
175 | 216 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
176 | 217 | - When we have a proxy setting, we expect the CN to match | ||
177 | 218 | the proxy hostname, not the server hostname. | ||
178 | 219 | - d/p/90irc-ubuntu-com: | ||
179 | 220 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
180 | 221 | which is currently a CNAME for chat.freenode.net. | ||
181 | 222 | - d/p/03firsttimer_text: | ||
182 | 223 | + Adapt 03firsttimer_text so it tells you about | ||
183 | 224 | connecting to Ubuntu and joining #ubuntu. | ||
184 | 225 | * Changes no longer needed: | ||
185 | 226 | - d/p/CVE-2018-xxxx.patch: Applied upstream. | ||
186 | 227 | |||
187 | 228 | -- Unit 193 <unit193@ubuntu.com> Fri, 09 Mar 2018 17:54:53 -0500 | ||
188 | 229 | |||
189 | 89 | irssi (1.0.7-1) unstable; urgency=high | 230 | irssi (1.0.7-1) unstable; urgency=high |
190 | 90 | 231 | ||
191 | 91 | * New upstream bugfix release (closes: #886475): | 232 | * New upstream bugfix release (closes: #886475): |
192 | @@ -128,6 +269,73 @@ irssi (1.0.7-1) unstable; urgency=high | |||
193 | 128 | 269 | ||
194 | 129 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 06 Mar 2018 14:42:44 +0100 | 270 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 06 Mar 2018 14:42:44 +0100 |
195 | 130 | 271 | ||
196 | 272 | irssi (1.0.5-1ubuntu4) bionic; urgency=medium | ||
197 | 273 | |||
198 | 274 | * SECURITY UPDATE: Null pointer dereference | ||
199 | 275 | - debian/patches/CVE-2018-7050.patch: check if | ||
200 | 276 | nick is Null in src/fe-common/core/chat-completion.c. | ||
201 | 277 | - CVE-2018-7050 | ||
202 | 278 | * SECURITY UPDATE: Certain nick names result in out-of-bounds | ||
203 | 279 | access | ||
204 | 280 | - debian/patches/CVE-2018-7051.patch: don't read beyond end of | ||
205 | 281 | escaped string in src/fe-common/core/themes.c. | ||
206 | 282 | - CVE-2018-7051 | ||
207 | 283 | * SECURITY UPDATE: Null pointer dereference | ||
208 | 284 | - debian/patches/CVE-2018-7052.patch: check if window parent | ||
209 | 285 | is Null in src/fe-text/mainwindows.c. | ||
210 | 286 | - CVE-2018-7052 | ||
211 | 287 | * SECURITY UPDATE: use-after-free | ||
212 | 288 | - debian/patches/CVE-2018-7053.patch: avoiding | ||
213 | 289 | reuse sasl timeout in src/irc/core/sasl.c. | ||
214 | 290 | - CVE-2018-7073 | ||
215 | 291 | |||
216 | 292 | -- Leonidas S. Barbosa <leo.barbosa@canonical.com> Tue, 06 Mar 2018 11:03:13 -0300 | ||
217 | 293 | |||
218 | 294 | irssi (1.0.5-1ubuntu3) bionic; urgency=high | ||
219 | 295 | |||
220 | 296 | * No change rebuild against openssl1.1. | ||
221 | 297 | |||
222 | 298 | -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 05 Feb 2018 16:50:07 +0000 | ||
223 | 299 | |||
224 | 300 | irssi (1.0.5-1ubuntu2) bionic; urgency=medium | ||
225 | 301 | |||
226 | 302 | * SECURITY UPDATE: buffer overread via incomplete escape codes | ||
227 | 303 | - debian/patches/CVE-2018-5205.patch: check for complete char in | ||
228 | 304 | src/core/misc.c. | ||
229 | 305 | - CVE-2018-5205 | ||
230 | 306 | * SECURITY UPDATE: NULL dereference via setting channel topic without | ||
231 | 307 | specifying a sender | ||
232 | 308 | - debian/patches/CVE-2018-5206.patch: do not record topic change time | ||
233 | 309 | when sender is blank in src/irc/core/channel-events.c. | ||
234 | 310 | - CVE-2018-5206 | ||
235 | 311 | * SECURITY UPDATE: buffer overread via incomplete variable argument | ||
236 | 312 | - debian/patches/CVE-2018-5207.patch: disable variable arguments code | ||
237 | 313 | in src/core/special-vars.c. | ||
238 | 314 | - CVE-2018-5207 | ||
239 | 315 | * SECURITY UPDATE: heap overflow in completion code | ||
240 | 316 | - debian/patches/CVE-2018-5208.patch: check for direct match of | ||
241 | 317 | separator in src/fe-common/core/completion.c. | ||
242 | 318 | - CVE-2018-5208 | ||
243 | 319 | |||
244 | 320 | -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 08 Jan 2018 14:30:45 -0500 | ||
245 | 321 | |||
246 | 322 | irssi (1.0.5-1ubuntu1) devel; urgency=medium | ||
247 | 323 | |||
248 | 324 | * Merge from Debian. Remaining changes: | ||
249 | 325 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
250 | 326 | - When we have a proxy setting, we expect the CN to match | ||
251 | 327 | the proxy hostname, not the server hostname. | ||
252 | 328 | - d/p/90irc-ubuntu-com: | ||
253 | 329 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
254 | 330 | which is currently a CNAME for chat.freenode.net. | ||
255 | 331 | - d/p/03firsttimer_text: | ||
256 | 332 | + Adapt 03firsttimer_text so it tells you about | ||
257 | 333 | connecting to Ubuntu and joining #ubuntu. | ||
258 | 334 | * Changes no longer needed: | ||
259 | 335 | - d/p/CVE-2017-15xxx.patch: Applied upstream. | ||
260 | 336 | |||
261 | 337 | -- Unit 193 <unit193@ubuntu.com> Sat, 02 Dec 2017 17:18:54 -0500 | ||
262 | 338 | |||
263 | 131 | irssi (1.0.5-1) unstable; urgency=high | 339 | irssi (1.0.5-1) unstable; urgency=high |
264 | 132 | 340 | ||
265 | 133 | * New upstream bugfix release (closes: #879521): | 341 | * New upstream bugfix release (closes: #879521): |
266 | @@ -154,6 +362,49 @@ irssi (1.0.5-1) unstable; urgency=high | |||
267 | 154 | 362 | ||
268 | 155 | -- Rhonda D'Vine <rhonda@debian.org> Mon, 06 Nov 2017 16:24:38 +0100 | 363 | -- Rhonda D'Vine <rhonda@debian.org> Mon, 06 Nov 2017 16:24:38 +0100 |
269 | 156 | 364 | ||
270 | 365 | irssi (1.0.4-1ubuntu4) bionic; urgency=medium | ||
271 | 366 | |||
272 | 367 | * No-change rebuild against perlapi-5.26.1 | ||
273 | 368 | |||
274 | 369 | -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 Nov 2017 05:36:03 +0000 | ||
275 | 370 | |||
276 | 371 | irssi (1.0.4-1ubuntu3) bionic; urgency=medium | ||
277 | 372 | |||
278 | 373 | * SECURITY UPDATE: multiple security issues | ||
279 | 374 | - debian/patches/CVE-2017-15xxx.patch: address security issues in | ||
280 | 375 | src/core/recode.c, src/fe-common/core/themes.c, | ||
281 | 376 | src/irc/core/channel-events.c, src/irc/core/channels-query.c, | ||
282 | 377 | src/irc/core/irc-servers.c, src/irc/dcc/dcc-chat.c, | ||
283 | 378 | src/irc/dcc/dcc-get.c, src/irc/dcc/dcc-send.c. | ||
284 | 379 | - CVE-2017-15227 | ||
285 | 380 | - CVE-2017-15228 | ||
286 | 381 | - CVE-2017-15721 | ||
287 | 382 | - CVE-2017-15722 | ||
288 | 383 | - CVE-2017-15723 | ||
289 | 384 | |||
290 | 385 | -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 30 Oct 2017 09:38:11 -0400 | ||
291 | 386 | |||
292 | 387 | irssi (1.0.4-1ubuntu2) artful; urgency=medium | ||
293 | 388 | |||
294 | 389 | * No-change rebuild for perl 5.26.0. | ||
295 | 390 | |||
296 | 391 | -- Matthias Klose <doko@ubuntu.com> Wed, 26 Jul 2017 20:03:17 +0000 | ||
297 | 392 | |||
298 | 393 | irssi (1.0.4-1ubuntu1) artful; urgency=medium | ||
299 | 394 | |||
300 | 395 | * Merge from Debian. Remaining changes: | ||
301 | 396 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
302 | 397 | - When we have a proxy setting, we expect the CN to match | ||
303 | 398 | the proxy hostname, not the server hostname. | ||
304 | 399 | - d/p/90irc-ubuntu-com: | ||
305 | 400 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
306 | 401 | which is currently a CNAME for chat.freenode.net. | ||
307 | 402 | - d/p/03firsttimer_text: | ||
308 | 403 | + Adapt 03firsttimer_text so it tells you about | ||
309 | 404 | connecting to Ubuntu and joining #ubuntu. | ||
310 | 405 | |||
311 | 406 | -- Unit 193 <unit193@ubuntu.com> Wed, 12 Jul 2017 04:20:11 -0400 | ||
312 | 407 | |||
313 | 157 | irssi (1.0.4-1) unstable; urgency=high | 408 | irssi (1.0.4-1) unstable; urgency=high |
314 | 158 | 409 | ||
315 | 159 | * New upstream bugfix release (closes: #867598): | 410 | * New upstream bugfix release (closes: #867598): |
316 | @@ -170,12 +421,49 @@ irssi (1.0.4-1) unstable; urgency=high | |||
317 | 170 | 421 | ||
318 | 171 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 11 Jul 2017 07:17:19 +0200 | 422 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 11 Jul 2017 07:17:19 +0200 |
319 | 172 | 423 | ||
320 | 424 | irssi (1.0.3-1ubuntu1) artful; urgency=medium | ||
321 | 425 | |||
322 | 426 | * Merge from Debian. Remaining changes: | ||
323 | 427 | - Refresh and re-enabled 20fix_ssl_proxy_hostname_check. | ||
324 | 428 | - When we have a proxy setting, we expect the CN to match | ||
325 | 429 | the proxy hostname, not the server hostname. | ||
326 | 430 | - d/p/90irc-ubuntu-com: | ||
327 | 431 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
328 | 432 | which is currently a CNAME for chat.freenode.net. | ||
329 | 433 | - d/p/03firsttimer_text: | ||
330 | 434 | + Adapt 03firsttimer_text so it tells you about | ||
331 | 435 | connecting to Ubuntu and joining #ubuntu. | ||
332 | 436 | |||
333 | 437 | -- Unit 193 <unit193@ubuntu.com> Thu, 08 Jun 2017 16:52:36 -0400 | ||
334 | 438 | |||
335 | 173 | irssi (1.0.3-1) unstable; urgency=high | 439 | irssi (1.0.3-1) unstable; urgency=high |
336 | 174 | 440 | ||
337 | 175 | * New upstream pure bugfix release. | 441 | * New upstream pure bugfix release. |
338 | 176 | 442 | ||
339 | 177 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 08 Jun 2017 10:08:46 +0200 | 443 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 08 Jun 2017 10:08:46 +0200 |
340 | 178 | 444 | ||
341 | 445 | irssi (1.0.2-1ubuntu2) artful; urgency=medium | ||
342 | 446 | |||
343 | 447 | * debian/patches/90-irc-ubuntu-com: update to use the right use_tls | ||
344 | 448 | option, and add tls_verify. Thanks to Unit193 for noticing! | ||
345 | 449 | |||
346 | 450 | -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Fri, 05 May 2017 07:32:23 -0400 | ||
347 | 451 | |||
348 | 452 | irssi (1.0.2-1ubuntu1) artful; urgency=medium | ||
349 | 453 | |||
350 | 454 | * Merge from Debian. Remaining changes: | ||
351 | 455 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
352 | 456 | - When we have a proxy setting, we expect the CN to match | ||
353 | 457 | the proxy hostname, not the server hostname. | ||
354 | 458 | - d/p/90irc-ubuntu-com: | ||
355 | 459 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
356 | 460 | which is currently a CNAME for chat.freenode.net. | ||
357 | 461 | - d/p/03firsttimer_text: | ||
358 | 462 | + Adapt 03firsttimer_text so it tells you about | ||
359 | 463 | connecting to Ubuntu and joining #ubuntu. | ||
360 | 464 | |||
361 | 465 | -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 04 May 2017 07:59:52 -0400 | ||
362 | 466 | |||
363 | 179 | irssi (1.0.2-1) unstable; urgency=high | 467 | irssi (1.0.2-1) unstable; urgency=high |
364 | 180 | 468 | ||
365 | 181 | * New upstream pure bugfix release: | 469 | * New upstream pure bugfix release: |
366 | @@ -224,6 +512,34 @@ irssi (0.8.21-1) unstable; urgency=medium | |||
367 | 224 | 512 | ||
368 | 225 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 05 Jan 2017 10:26:08 +0100 | 513 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 05 Jan 2017 10:26:08 +0100 |
369 | 226 | 514 | ||
370 | 515 | irssi (0.8.20-2ubuntu2) zesty; urgency=medium | ||
371 | 516 | |||
372 | 517 | * SECURITY UPDATE: multiple security issues | ||
373 | 518 | - debian/patches/CVE-2017-5xxx.patch: properly handle strings in | ||
374 | 519 | src/fe-common/core/formats.c, handle utf8 errors in | ||
375 | 520 | src/fe-text/term-terminfo.c, properly handle invalid nicks in | ||
376 | 521 | src/irc/core/irc-nicklist.c, make sure nick is valid in | ||
377 | 522 | src/irc/core/irc-queries.c. | ||
378 | 523 | - CVE-2017-5193 | ||
379 | 524 | - CVE-2017-5194 | ||
380 | 525 | - CVE-2017-5195 | ||
381 | 526 | - CVE-2017-5196 | ||
382 | 527 | - CVE-2017-5356 | ||
383 | 528 | |||
384 | 529 | -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 25 Jan 2017 12:52:09 -0500 | ||
385 | 530 | |||
386 | 531 | irssi (0.8.20-2ubuntu1) zesty; urgency=low | ||
387 | 532 | |||
388 | 533 | * Merge from Debian. Remaining changes: | ||
389 | 534 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
390 | 535 | - When we have a proxy setting, we expect the CN to match | ||
391 | 536 | the proxy hostname, not the server hostname. | ||
392 | 537 | - d/p/90irc-ubuntu-com: | ||
393 | 538 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
394 | 539 | which is currently a CNAME for chat.freenode.net. | ||
395 | 540 | |||
396 | 541 | -- Iain Lane <iain@orangesquash.org.uk> Wed, 07 Dec 2016 16:26:11 +0000 | ||
397 | 542 | |||
398 | 227 | irssi (0.8.20-2) unstable; urgency=high | 543 | irssi (0.8.20-2) unstable; urgency=high |
399 | 228 | 544 | ||
400 | 229 | * New patch 23fix-buf.pl to fix an information exposure issue involved with | 545 | * New patch 23fix-buf.pl to fix an information exposure issue involved with |
401 | @@ -248,6 +564,37 @@ irssi (0.8.19-2) unstable; urgency=low | |||
402 | 248 | 564 | ||
403 | 249 | -- Rhonda D'Vine <rhonda@debian.org> Wed, 20 Apr 2016 10:32:45 +0200 | 565 | -- Rhonda D'Vine <rhonda@debian.org> Wed, 20 Apr 2016 10:32:45 +0200 |
404 | 250 | 566 | ||
405 | 567 | irssi (0.8.19-1ubuntu3) zesty; urgency=medium | ||
406 | 568 | |||
407 | 569 | * No-change rebuild for perl 5.24 transition | ||
408 | 570 | |||
409 | 571 | -- Iain Lane <iain@orangesquash.org.uk> Mon, 24 Oct 2016 10:09:47 +0100 | ||
410 | 572 | |||
411 | 573 | irssi (0.8.19-1ubuntu2) yakkety; urgency=medium | ||
412 | 574 | |||
413 | 575 | * SECURITY UPDATE: Fix color format decoding (LP: #1624068): | ||
414 | 576 | - Add debian/patches/91fix-color-formatting: | ||
415 | 577 | + fix unformat_24bit_color (CVE-2016-7044) | ||
416 | 578 | + fix format_send_to_gui (CVE-2016-7045) | ||
417 | 579 | |||
418 | 580 | -- Kees Cook <kees@ubuntu.com> Thu, 15 Sep 2016 11:43:53 -0700 | ||
419 | 581 | |||
420 | 582 | irssi (0.8.19-1ubuntu1) xenial; urgency=medium | ||
421 | 583 | |||
422 | 584 | * Merge from Debian. Remaining changes: | ||
423 | 585 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
424 | 586 | - When we have a proxy setting, we expect the CN to match | ||
425 | 587 | the proxy hostname, not the server hostname. | ||
426 | 588 | - d/p/90irc-ubuntu-com: | ||
427 | 589 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
428 | 590 | which is currently a CNAME for chat.freenode.net. | ||
429 | 591 | - d/p/03firsttimer_text: | ||
430 | 592 | + Adapt 03firsttimer_text so it tells you about | ||
431 | 593 | connecting to Ubuntu and joining #ubuntu. | ||
432 | 594 | - d/control, d/rules: Drop libval-dev, not in Ubuntu main. | ||
433 | 595 | |||
434 | 596 | -- Unit 193 <unit193@ubuntu.com> Thu, 24 Mar 2016 19:28:09 -0400 | ||
435 | 597 | |||
436 | 251 | irssi (0.8.19-1) unstable; urgency=medium | 598 | irssi (0.8.19-1) unstable; urgency=medium |
437 | 252 | 599 | ||
438 | 253 | * New upstream release. | 600 | * New upstream release. |
439 | @@ -261,6 +608,22 @@ irssi (0.8.19-1) unstable; urgency=medium | |||
440 | 261 | 608 | ||
441 | 262 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 24 Mar 2016 15:43:12 +0100 | 609 | -- Rhonda D'Vine <rhonda@debian.org> Thu, 24 Mar 2016 15:43:12 +0100 |
442 | 263 | 610 | ||
443 | 611 | irssi (0.8.18-1ubuntu1) xenial; urgency=medium | ||
444 | 612 | |||
445 | 613 | * Merge from Debian testing (LP: #1423499). Remaining changes: | ||
446 | 614 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
447 | 615 | - When we have a proxy setting, we expect the CN to match | ||
448 | 616 | the proxy hostname, not the server hostname. | ||
449 | 617 | - d/p/90irc-ubuntu-com: | ||
450 | 618 | + Add the Ubuntu network with irc.ubuntu.com as the server, | ||
451 | 619 | which is currently a CNAME for chat.freenode.net. | ||
452 | 620 | - d/p/03firsttimer_text: | ||
453 | 621 | + Adapt 03firsttimer_text so it tells you about | ||
454 | 622 | connecting to Ubuntu and joining #ubuntu. | ||
455 | 623 | - d/control, d/rules: Drop libval-dev, not in Ubuntu main. | ||
456 | 624 | |||
457 | 625 | -- Unit 193 <unit193@ubuntu.com> Fri, 04 Mar 2016 00:46:08 -0500 | ||
458 | 626 | |||
459 | 264 | irssi (0.8.18-1) unstable; urgency=medium | 627 | irssi (0.8.18-1) unstable; urgency=medium |
460 | 265 | 628 | ||
461 | 266 | * New upstream release. | 629 | * New upstream release. |
462 | @@ -288,6 +651,22 @@ irssi (0.8.18~beta1-1) experimental; urgency=medium | |||
463 | 288 | 651 | ||
464 | 289 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 22 Dec 2015 16:36:10 +0100 | 652 | -- Rhonda D'Vine <rhonda@debian.org> Tue, 22 Dec 2015 16:36:10 +0100 |
465 | 290 | 653 | ||
466 | 654 | irssi (0.8.17-1ubuntu2) xenial; urgency=medium | ||
467 | 655 | |||
468 | 656 | * Rebuild for Perl 5.22.1. | ||
469 | 657 | |||
470 | 658 | -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 Dec 2015 12:50:33 +0000 | ||
471 | 659 | |||
472 | 660 | irssi (0.8.17-1ubuntu1) vivid; urgency=low | ||
473 | 661 | |||
474 | 662 | * Merge from Debian testing (LP: #1423499). Remaining changes: | ||
475 | 663 | - Refreshed 03firsttimer_text to follow upstream changes to formatting. | ||
476 | 664 | - Re-enabled 20fix_ssl_proxy_hostname_check. | ||
477 | 665 | - Refreshed 90irc-ubuntu-com to follow upstream changes to config file | ||
478 | 666 | formatting. | ||
479 | 667 | |||
480 | 668 | -- Daniel Watkins <daniel@daniel-watkins.co.uk> Sun, 12 Oct 2014 09:44:38 +0000 | ||
481 | 669 | |||
482 | 291 | irssi (0.8.17-1) unstable; urgency=medium | 670 | irssi (0.8.17-1) unstable; urgency=medium |
483 | 292 | 671 | ||
484 | 293 | * The AdaCamp Berlin upload, new upstream stable release. | 672 | * The AdaCamp Berlin upload, new upstream stable release. |
485 | @@ -308,6 +687,36 @@ irssi (0.8.17~rc1-1) experimental; urgency=medium | |||
486 | 308 | 687 | ||
487 | 309 | -- Rhonda D'Vine <rhonda@debian.org> Mon, 28 Jul 2014 16:29:23 +0200 | 688 | -- Rhonda D'Vine <rhonda@debian.org> Mon, 28 Jul 2014 16:29:23 +0200 |
488 | 310 | 689 | ||
489 | 690 | irssi (0.8.16-1ubuntu4) utopic; urgency=medium | ||
490 | 691 | |||
491 | 692 | * Refresh and re-enable 20fix_ssl_proxy_hostname_check. | ||
492 | 693 | |||
493 | 694 | -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 06 Sep 2014 23:15:51 -0700 | ||
494 | 695 | |||
495 | 696 | irssi (0.8.16-1ubuntu3) utopic; urgency=medium | ||
496 | 697 | |||
497 | 698 | * Rebuild for Perl 5.20.0. | ||
498 | 699 | |||
499 | 700 | -- Colin Watson <cjwatson@ubuntu.com> Thu, 21 Aug 2014 12:44:56 +0100 | ||
500 | 701 | |||
501 | 702 | irssi (0.8.16-1ubuntu2) utopic; urgency=medium | ||
502 | 703 | |||
503 | 704 | * Build witout libval-dev, it's in universe. | ||
504 | 705 | |||
505 | 706 | -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 07 Aug 2014 14:32:37 +0200 | ||
506 | 707 | |||
507 | 708 | irssi (0.8.16-1ubuntu1) utopic; urgency=medium | ||
508 | 709 | |||
509 | 710 | * Merge from Debian unstable (LP: #1350364), remaining changes: | ||
510 | 711 | - debian/patches/03firsttimer_text: | ||
511 | 712 | + Adapt it so it tells you about connecting to Freenode and | ||
512 | 713 | joining #ubuntu instead of irc.debian.org and #debian. | ||
513 | 714 | - debian/patches/90irc-ubuntu-com: | ||
514 | 715 | + Refreshed and added network config. | ||
515 | 716 | + Set to connect over SSL. (LP: #978424) | ||
516 | 717 | |||
517 | 718 | -- Unit 193 <unit193@ubuntu.com> Wed, 06 Aug 2014 15:51:59 -0400 | ||
518 | 719 | |||
519 | 311 | irssi (0.8.16-1) unstable; urgency=medium | 720 | irssi (0.8.16-1) unstable; urgency=medium |
520 | 312 | 721 | ||
521 | 313 | [ Rhonda D'Vine ] | 722 | [ Rhonda D'Vine ] |
522 | @@ -347,6 +756,28 @@ irssi (0.8.16~rc1-1) experimental; urgency=low | |||
523 | 347 | 756 | ||
524 | 348 | -- Gerfried Fuchs <rhonda@debian.org> Wed, 18 Sep 2013 12:20:27 +0200 | 757 | -- Gerfried Fuchs <rhonda@debian.org> Wed, 18 Sep 2013 12:20:27 +0200 |
525 | 349 | 758 | ||
526 | 759 | irssi (0.8.15-5ubuntu3) trusty; urgency=low | ||
527 | 760 | |||
528 | 761 | * Rebuild for Perl 5.18. | ||
529 | 762 | |||
530 | 763 | -- Colin Watson <cjwatson@ubuntu.com> Mon, 21 Oct 2013 13:39:24 +0100 | ||
531 | 764 | |||
532 | 765 | irssi (0.8.15-5ubuntu2) saucy; urgency=low | ||
533 | 766 | |||
534 | 767 | * Use dh_autotools-dev to update config.{sub,guess} for AArch64. | ||
535 | 768 | |||
536 | 769 | -- Matthias Klose <doko@ubuntu.com> Wed, 09 Oct 2013 21:48:53 +0200 | ||
537 | 770 | |||
538 | 771 | irssi (0.8.15-5ubuntu1) quantal; urgency=low | ||
539 | 772 | |||
540 | 773 | * Merge from Debian unstable, remaining changes: | ||
541 | 774 | - debian/patches/03firsttimer_text: | ||
542 | 775 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
543 | 776 | joining #ubuntu instead of irc.debian.org and #debian. | ||
544 | 777 | - debian/patches/90irc-ubuntu-com | ||
545 | 778 | |||
546 | 779 | -- Stéphane Graber <stgraber@ubuntu.com> Fri, 04 May 2012 15:44:37 -0400 | ||
547 | 780 | |||
548 | 350 | irssi (0.8.15-5) unstable; urgency=low | 781 | irssi (0.8.15-5) unstable; urgency=low |
549 | 351 | 782 | ||
550 | 352 | * Updated bind_utf8-fix patch from upstream bug tracker again | 783 | * Updated bind_utf8-fix patch from upstream bug tracker again |
551 | @@ -356,6 +787,31 @@ irssi (0.8.15-5) unstable; urgency=low | |||
552 | 356 | 787 | ||
553 | 357 | -- Gerfried Fuchs <rhonda@debian.org> Tue, 24 Apr 2012 17:59:05 +0200 | 788 | -- Gerfried Fuchs <rhonda@debian.org> Tue, 24 Apr 2012 17:59:05 +0200 |
554 | 358 | 789 | ||
555 | 790 | irssi (0.8.15-4ubuntu3) precise; urgency=low | ||
556 | 791 | |||
557 | 792 | * Swap 18bind_utf8-fix from Debian's to the new one proposed upstream. | ||
558 | 793 | This fixes alt-backspace not working in irssi. | ||
559 | 794 | http://bugs.irssi.org/index.php?do=details&task_id=553 | ||
560 | 795 | (LP: #874144) | ||
561 | 796 | |||
562 | 797 | -- Stéphane Graber <stgraber@ubuntu.com> Wed, 04 Apr 2012 10:04:46 -0400 | ||
563 | 798 | |||
564 | 799 | irssi (0.8.15-4ubuntu2) precise; urgency=low | ||
565 | 800 | |||
566 | 801 | * Rebuild for Perl 5.14. | ||
567 | 802 | |||
568 | 803 | -- Colin Watson <cjwatson@ubuntu.com> Tue, 15 Nov 2011 23:38:11 +0000 | ||
569 | 804 | |||
570 | 805 | irssi (0.8.15-4ubuntu1) oneiric; urgency=low | ||
571 | 806 | |||
572 | 807 | * Merge from Debian unstable (LP: #796148), remaining changes: | ||
573 | 808 | - debian/patches/03firsttimer_text: | ||
574 | 809 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
575 | 810 | joining #ubuntu instead of irc.debian.org and #debian. | ||
576 | 811 | - debian/patches/90irc-ubuntu-com | ||
577 | 812 | |||
578 | 813 | -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Sun, 12 Jun 2011 11:22:36 +0200 | ||
579 | 814 | |||
580 | 359 | irssi (0.8.15-4) unstable; urgency=medium | 815 | irssi (0.8.15-4) unstable; urgency=medium |
581 | 360 | 816 | ||
582 | 361 | * Update bind_utf8-fix patch from upstream bug tracker to fix issue with now | 817 | * Update bind_utf8-fix patch from upstream bug tracker to fix issue with now |
583 | @@ -363,6 +819,16 @@ irssi (0.8.15-4) unstable; urgency=medium | |||
584 | 363 | 819 | ||
585 | 364 | -- Gerfried Fuchs <rhonda@debian.org> Fri, 10 Jun 2011 20:13:15 +0200 | 820 | -- Gerfried Fuchs <rhonda@debian.org> Fri, 10 Jun 2011 20:13:15 +0200 |
586 | 365 | 821 | ||
587 | 822 | irssi (0.8.15-3ubuntu1) oneiric; urgency=low | ||
588 | 823 | |||
589 | 824 | * Merge from Debian unstable (LP: #776615), remaining changes: | ||
590 | 825 | - debian/patches/03firsttimer_text: | ||
591 | 826 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
592 | 827 | joining #ubuntu instead of irc.debian.org and #debian. | ||
593 | 828 | - debian/patches/90irc-ubuntu-com | ||
594 | 829 | |||
595 | 830 | -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Tue, 03 May 2011 19:56:26 +0200 | ||
596 | 831 | |||
597 | 366 | irssi (0.8.15-3) unstable; urgency=low | 832 | irssi (0.8.15-3) unstable; urgency=low |
598 | 367 | 833 | ||
599 | 368 | * Add patch bind_utf8-fix extracted from upstream bug #553 to enable binding | 834 | * Add patch bind_utf8-fix extracted from upstream bug #553 to enable binding |
600 | @@ -374,6 +840,20 @@ irssi (0.8.15-3) unstable; urgency=low | |||
601 | 374 | 840 | ||
602 | 375 | -- Gerfried Fuchs <rhonda@debian.org> Tue, 03 May 2011 11:47:58 +0200 | 841 | -- Gerfried Fuchs <rhonda@debian.org> Tue, 03 May 2011 11:47:58 +0200 |
603 | 376 | 842 | ||
604 | 843 | irssi (0.8.15-2ubuntu1) natty; urgency=low | ||
605 | 844 | |||
606 | 845 | * Merge from Debian unstable (LP: #691448), remaining changes: | ||
607 | 846 | - debian/patches/03firsttimer_text: | ||
608 | 847 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
609 | 848 | joining #ubuntu instead of irc.debian.org and #debian. | ||
610 | 849 | - debian/patches/90irc-ubuntu-com | ||
611 | 850 | - debian/patches/91_disable_sslv2.patch: do not use SSLv2 protocol. | ||
612 | 851 | This can be dropped in 0.8.16. | ||
613 | 852 | - debian/patches/91_ssl_proxy.patch: when we have a proxy setting, | ||
614 | 853 | we expect the CN to match the proxy hostname, not the server hostname. | ||
615 | 854 | |||
616 | 855 | -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Fri, 17 Dec 2010 22:38:11 +0100 | ||
617 | 856 | |||
618 | 377 | irssi (0.8.15-2) unstable; urgency=low | 857 | irssi (0.8.15-2) unstable; urgency=low |
619 | 378 | 858 | ||
620 | 379 | * Switch Vcs-* field values to git.deb.at. | 859 | * Switch Vcs-* field values to git.deb.at. |
621 | @@ -382,6 +862,23 @@ irssi (0.8.15-2) unstable; urgency=low | |||
622 | 382 | 862 | ||
623 | 383 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 14 Dec 2010 21:57:29 +0100 | 863 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 14 Dec 2010 21:57:29 +0100 |
624 | 384 | 864 | ||
625 | 865 | irssi (0.8.15-1ubuntu1) maverick; urgency=low | ||
626 | 866 | |||
627 | 867 | * Merge from Debian unstable (LP: #589209), remaining changes: | ||
628 | 868 | - debian/patches/03firsttimer_text: | ||
629 | 869 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
630 | 870 | joining #ubuntu instead of irc.debian.org and #debian. | ||
631 | 871 | - debian/patches/90irc-ubuntu-com | ||
632 | 872 | - debian/patches/91_disable_sslv2.patch: do not use SSLv2 protocol. | ||
633 | 873 | This can be dropped in 0.8.16. | ||
634 | 874 | - debian/patches/91_ssl_proxy.patch: when we have a proxy setting, | ||
635 | 875 | we expect the CN to match the proxy hostname, not the server hostname. | ||
636 | 876 | * Dropped changes, superseded upstream; | ||
637 | 877 | - debian/patches/91_CVE-2010-1155.patch | ||
638 | 878 | - debian/patches/91_CVE-2010-1156.patch | ||
639 | 879 | |||
640 | 880 | -- Lorenzo De Liso <blackzldl@gmail.com> Thu, 03 Jun 2010 16:30:52 +0200 | ||
641 | 881 | |||
642 | 385 | irssi (0.8.15-1) unstable; urgency=low | 882 | irssi (0.8.15-1) unstable; urgency=low |
643 | 386 | 883 | ||
644 | 387 | * New Upstream version, prepared with current autotools (closes: #575295) | 884 | * New Upstream version, prepared with current autotools (closes: #575295) |
645 | @@ -403,6 +900,46 @@ irssi (0.8.15~rc1-1) unstable; urgency=low | |||
646 | 403 | 900 | ||
647 | 404 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 23 Mar 2010 21:33:44 +0100 | 901 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 23 Mar 2010 21:33:44 +0100 |
648 | 405 | 902 | ||
649 | 903 | irssi (0.8.14-1ubuntu4) lucid; urgency=low | ||
650 | 904 | |||
651 | 905 | * 91_ssl_proxy.patch: when we have a proxy setting, we expect the CN to | ||
652 | 906 | match the proxy hostname, not the server hostname. LP: #565182 | ||
653 | 907 | |||
654 | 908 | -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 17 Apr 2010 04:18:10 +0000 | ||
655 | 909 | |||
656 | 910 | irssi (0.8.14-1ubuntu3) lucid; urgency=low | ||
657 | 911 | |||
658 | 912 | * SECURITY UPDATE: perform certificate host validation | ||
659 | 913 | - debian/patches/91_CVE-2010-1155.patch: adjust to verify hostname against | ||
660 | 914 | CN. Also use one SSL_CTX per connection and use default trusted CAs if | ||
661 | 915 | nothing specified. This can be dropped in 0.8.15. | ||
662 | 916 | - CVE-2010-1155 | ||
663 | 917 | * SECURITY UPDATE: fix crash when checking for fuzzy nick match when not on | ||
664 | 918 | the channel | ||
665 | 919 | - debian/patches/91_CVE-2010-1156.patch: verify channel is non-NULL in | ||
666 | 920 | src/core/nicklist.c. This can be dropped in 0.8.15. | ||
667 | 921 | - CVE-2010-1156 | ||
668 | 922 | * Do not use SSLv2 protocol. This can be dropped in 0.8.16. | ||
669 | 923 | |||
670 | 924 | -- Jamie Strandboge <jamie@ubuntu.com> Wed, 14 Apr 2010 13:36:33 -0500 | ||
671 | 925 | |||
672 | 926 | irssi (0.8.14-1ubuntu2) lucid; urgency=low | ||
673 | 927 | |||
674 | 928 | * rebuild rest of main for armel armv7/thumb2 optimization; | ||
675 | 929 | UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 | ||
676 | 930 | |||
677 | 931 | -- Alexander Sack <asac@ubuntu.com> Sat, 06 Mar 2010 13:28:50 +0100 | ||
678 | 932 | |||
679 | 933 | irssi (0.8.14-1ubuntu1) karmic; urgency=low | ||
680 | 934 | |||
681 | 935 | * Merge from debian unstable, remaining changes: LP: #406890 | ||
682 | 936 | - debian/patches: 03firsttimer_text | ||
683 | 937 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
684 | 938 | joining #ubuntu instead of irc.debian.org and #debian. | ||
685 | 939 | - debian/patches: 90irc-ubuntu-com | ||
686 | 940 | |||
687 | 941 | -- Bhavani Shankar <right2bhavi@gmail.com> Thu, 30 Jul 2009 19:12:55 +0530 | ||
688 | 942 | |||
689 | 406 | irssi (0.8.14-1) unstable; urgency=low | 943 | irssi (0.8.14-1) unstable; urgency=low |
690 | 407 | 944 | ||
691 | 408 | * New upstream release, dropping wallops-fix patch. | 945 | * New upstream release, dropping wallops-fix patch. |
692 | @@ -411,6 +948,16 @@ irssi (0.8.14-1) unstable; urgency=low | |||
693 | 411 | 948 | ||
694 | 412 | -- Gerfried Fuchs <rhonda@debian.at> Wed, 29 Jul 2009 12:55:04 +0200 | 949 | -- Gerfried Fuchs <rhonda@debian.at> Wed, 29 Jul 2009 12:55:04 +0200 |
695 | 413 | 950 | ||
696 | 951 | irssi (0.8.13-2ubuntu1) karmic; urgency=low | ||
697 | 952 | |||
698 | 953 | * Merge from debian unstable, remaining changes: LP: #389748 | ||
699 | 954 | - debian/patches: 03firsttimer_text | ||
700 | 955 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
701 | 956 | joining #ubuntu instead of irc.debian.org and #debian. | ||
702 | 957 | - debian/patches: 90irc-ubuntu-com | ||
703 | 958 | |||
704 | 959 | -- Bhavani Shankar <right2bhavi@gmail.com> Sat, 20 Jun 2009 05:51:09 +0530 | ||
705 | 960 | |||
706 | 414 | irssi (0.8.13-2) unstable; urgency=medium | 961 | irssi (0.8.13-2) unstable; urgency=medium |
707 | 415 | 962 | ||
708 | 416 | * New patch: | 963 | * New patch: |
709 | @@ -419,6 +966,17 @@ irssi (0.8.13-2) unstable; urgency=medium | |||
710 | 419 | 966 | ||
711 | 420 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 16 Jun 2009 11:03:06 +0200 | 967 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 16 Jun 2009 11:03:06 +0200 |
712 | 421 | 968 | ||
713 | 969 | irssi (0.8.13-1ubuntu1) karmic; urgency=low | ||
714 | 970 | |||
715 | 971 | * Merge from debian unstable (LP: #372411), remaining changes: | ||
716 | 972 | - debian/patches: 03firsttimer_text | ||
717 | 973 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
718 | 974 | joining #ubuntu instead of irc.debian.org and #debian. | ||
719 | 975 | - debian/patches: 90irc-ubuntu-com | ||
720 | 976 | * Fixed debian/patches/90irc-ubuntu-com for new irssi.conf. | ||
721 | 977 | |||
722 | 978 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 05 May 2009 15:50:50 -0500 | ||
723 | 979 | |||
724 | 422 | irssi (0.8.13-1) unstable; urgency=low | 980 | irssi (0.8.13-1) unstable; urgency=low |
725 | 423 | 981 | ||
726 | 424 | * New upstream release. | 982 | * New upstream release. |
727 | @@ -441,6 +999,17 @@ irssi (0.8.13~rc1-1) unstable; urgency=low | |||
728 | 441 | 999 | ||
729 | 442 | -- Gerfried Fuchs <rhonda@debian.at> Thu, 19 Mar 2009 11:12:17 +0100 | 1000 | -- Gerfried Fuchs <rhonda@debian.at> Thu, 19 Mar 2009 11:12:17 +0100 |
730 | 443 | 1001 | ||
731 | 1002 | irssi (0.8.12-6ubuntu1) jaunty; urgency=low | ||
732 | 1003 | |||
733 | 1004 | * Merge from Debian unstable (LP: #326002), Ubuntu remaining changes: | ||
734 | 1005 | - Added debian/patches/90irc-ubuntu-com.dpatch | ||
735 | 1006 | - debian/patches/03firsttimer_text: | ||
736 | 1007 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
737 | 1008 | joining #ubuntu instead of irc.debian.org and #debian. | ||
738 | 1009 | New with this merge: We now also apply this patch. | ||
739 | 1010 | |||
740 | 1011 | -- Pedro Fragoso <ember@ubuntu.com> Wed, 04 Feb 2009 21:46:19 +0000 | ||
741 | 1012 | |||
742 | 444 | irssi (0.8.12-6) unstable; urgency=low | 1013 | irssi (0.8.12-6) unstable; urgency=low |
743 | 445 | 1014 | ||
744 | 446 | * New patch: | 1015 | * New patch: |
745 | @@ -452,6 +1021,18 @@ irssi (0.8.12-6) unstable; urgency=low | |||
746 | 452 | 1021 | ||
747 | 453 | -- Gerfried Fuchs <rhonda@debian.at> Thu, 29 Jan 2009 13:29:51 +0100 | 1022 | -- Gerfried Fuchs <rhonda@debian.at> Thu, 29 Jan 2009 13:29:51 +0100 |
748 | 454 | 1023 | ||
749 | 1024 | irssi (0.8.12-5ubuntu1) jaunty; urgency=low | ||
750 | 1025 | |||
751 | 1026 | * Merge from Debian unstable (LP: #295270), Ubuntu remaining changes: | ||
752 | 1027 | - Added debian/patches/90irc-ubuntu-com.dpatch | ||
753 | 1028 | - debian/patches/03firsttimer_text: | ||
754 | 1029 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
755 | 1030 | joining #ubuntu instead of irc.debian.org and #debian. | ||
756 | 1031 | New with this merge: We now also apply this patch. | ||
757 | 1032 | - debian/irssi.perm: Don't remove alternative on upgrades. | ||
758 | 1033 | |||
759 | 1034 | -- Pedro Fragoso <ember@ubuntu.com> Wed, 05 Nov 2008 02:41:00 +0000 | ||
760 | 1035 | |||
761 | 455 | irssi (0.8.12-5) unstable; urgency=low | 1036 | irssi (0.8.12-5) unstable; urgency=low |
762 | 456 | 1037 | ||
763 | 457 | * New patches: | 1038 | * New patches: |
764 | @@ -463,6 +1044,28 @@ irssi (0.8.12-5) unstable; urgency=low | |||
765 | 463 | 1044 | ||
766 | 464 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 02 Sep 2008 13:57:52 +0200 | 1045 | -- Gerfried Fuchs <rhonda@debian.at> Tue, 02 Sep 2008 13:57:52 +0200 |
767 | 465 | 1046 | ||
768 | 1047 | irssi (0.8.12-4ubuntu2) intrepid; urgency=low | ||
769 | 1048 | |||
770 | 1049 | * debian/patches/90irc-ubuntu-com.dpatch: Changed irc.ubuntu.com's | ||
771 | 1050 | default port to 8001 to avoid DCC exploit (LP: #263259). | ||
772 | 1051 | |||
773 | 1052 | -- Jonathan Patrick Davies <jpds@ubuntu.com> Sun, 31 Aug 2008 12:28:41 +0100 | ||
774 | 1053 | |||
775 | 1054 | irssi (0.8.12-4ubuntu1) intrepid; urgency=low | ||
776 | 1055 | |||
777 | 1056 | * Merge from debian unstable (LP: #241282), remaining changes: | ||
778 | 1057 | - Added debian/patches/90irc-ubuntu-com.dpatch (LP: #52690) | ||
779 | 1058 | - debian/patches/03firsttimer_text: | ||
780 | 1059 | + Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
781 | 1060 | joining #ubuntu instead of irc.debian.org and #debian. (LP: #188590) | ||
782 | 1061 | New with this merge: We now also apply this patch. | ||
783 | 1062 | - Modify Maintainer value to match DebianMaintainerField spec. | ||
784 | 1063 | - debian/irssi.perm: Don't remove alternative on upgrades. (LP: #67698) | ||
785 | 1064 | * debian/patches/91-manpage-typo: | ||
786 | 1065 | - Dropped, merged upstream. | ||
787 | 1066 | |||
788 | 1067 | -- Pedro Fragoso <emberez@gmail.com> Wed, 11 Jun 2008 15:36:34 +0100 | ||
789 | 1068 | |||
790 | 466 | irssi (0.8.12-4) unstable; urgency=low | 1069 | irssi (0.8.12-4) unstable; urgency=low |
791 | 467 | 1070 | ||
792 | 468 | * Remove alternative handling cleanup from before etch release. | 1071 | * Remove alternative handling cleanup from before etch release. |
793 | @@ -488,6 +1091,36 @@ irssi (0.8.12-4) unstable; urgency=low | |||
794 | 488 | 1091 | ||
795 | 489 | -- Gerfried Fuchs <rhonda@debian.at> Mon, 09 Jun 2008 12:11:19 +0200 | 1092 | -- Gerfried Fuchs <rhonda@debian.at> Mon, 09 Jun 2008 12:11:19 +0200 |
796 | 490 | 1093 | ||
797 | 1094 | irssi (0.8.12-3ubuntu4) intrepid; urgency=low | ||
798 | 1095 | |||
799 | 1096 | * Rebuild for the perl 5.10 transition (LP: #230016). | ||
800 | 1097 | |||
801 | 1098 | -- Michael Bienia <geser@ubuntu.com> Sat, 24 May 2008 15:02:30 +0200 | ||
802 | 1099 | |||
803 | 1100 | irssi (0.8.12-3ubuntu3) hardy; urgency=low | ||
804 | 1101 | |||
805 | 1102 | * Replace authentification with a less amusing word | ||
806 | 1103 | |||
807 | 1104 | -- John Dong <jdong@ubuntu.com> Fri, 08 Feb 2008 20:57:33 -0500 | ||
808 | 1105 | |||
809 | 1106 | irssi (0.8.12-3ubuntu2) hardy; urgency=low | ||
810 | 1107 | |||
811 | 1108 | * debian/patches/03firsttimer_text: | ||
812 | 1109 | - Adapt it so it tells you about connecting to irc.ubuntu.com and | ||
813 | 1110 | joining #ubuntu, instead of irc.debian.org and #debian. LP: #188590. | ||
814 | 1111 | |||
815 | 1112 | -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Wed, 06 Feb 2008 00:59:54 +0100 | ||
816 | 1113 | |||
817 | 1114 | irssi (0.8.12-3ubuntu1) hardy; urgency=low | ||
818 | 1115 | |||
819 | 1116 | * Merge from debian unstable, remaining changes (LP: #181641): | ||
820 | 1117 | - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690). | ||
821 | 1118 | New with this merge: We now also apply this patch. | ||
822 | 1119 | - Modify Maintainer value to match the DebianMaintainerField spec. | ||
823 | 1120 | - debian/irssi.prerm: Don't remove alternative on upgrades (LP #67698). | ||
824 | 1121 | |||
825 | 1122 | -- Soren Hansen <soren@ubuntu.com> Tue, 05 Feb 2008 23:17:04 +0100 | ||
826 | 1123 | |||
827 | 491 | irssi (0.8.12-3) unstable; urgency=low | 1124 | irssi (0.8.12-3) unstable; urgency=low |
828 | 492 | 1125 | ||
829 | 493 | [ Gerfried Fuchs ] | 1126 | [ Gerfried Fuchs ] |
830 | @@ -508,6 +1141,22 @@ irssi (0.8.12-3) unstable; urgency=low | |||
831 | 508 | 1141 | ||
832 | 509 | -- Gerfried Fuchs <rhonda@debian.at> Thu, 17 Jan 2008 09:55:41 +0100 | 1142 | -- Gerfried Fuchs <rhonda@debian.at> Thu, 17 Jan 2008 09:55:41 +0100 |
833 | 510 | 1143 | ||
834 | 1144 | irssi (0.8.12-2ubuntu2) hardy; urgency=low | ||
835 | 1145 | |||
836 | 1146 | * debian/patches/10ping_ctcp: prevent /ping with no arguments from sending | ||
837 | 1147 | CTCP PING to a channel (backported from SVN, LP: #96758). | ||
838 | 1148 | |||
839 | 1149 | -- Pedro Fragoso <emberez@gmail.com> Tue, 04 Dec 2007 19:40:59 +0000 | ||
840 | 1150 | |||
841 | 1151 | irssi (0.8.12-2ubuntu1) hardy; urgency=low | ||
842 | 1152 | |||
843 | 1153 | * Merge with Debian, remaining Ubuntu changes: | ||
844 | 1154 | - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690). | ||
845 | 1155 | - Modify Maintainer value to match the DebianMaintainerField spec. | ||
846 | 1156 | - debian/irssi.prerm: Do not alternative. LP: #67698. | ||
847 | 1157 | |||
848 | 1158 | -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Fri, 02 Nov 2007 18:13:28 +0100 | ||
849 | 1159 | |||
850 | 511 | irssi (0.8.12-2) unstable; urgency=low | 1160 | irssi (0.8.12-2) unstable; urgency=low |
851 | 512 | 1161 | ||
852 | 513 | [ Gerfried Fuchs ] | 1162 | [ Gerfried Fuchs ] |
853 | @@ -545,6 +1194,25 @@ irssi (0.8.12-1) unstable; urgency=low | |||
854 | 545 | 1194 | ||
855 | 546 | -- Gerfried Fuchs <rhonda@debian.at> Wed, 17 Oct 2007 07:54:49 +0200 | 1195 | -- Gerfried Fuchs <rhonda@debian.at> Wed, 17 Oct 2007 07:54:49 +0200 |
856 | 547 | 1196 | ||
857 | 1197 | irssi (0.8.11-0ubuntu1) gutsy; urgency=low | ||
858 | 1198 | |||
859 | 1199 | * New upstream release: | ||
860 | 1200 | - http://www.irssi.org/news/ChangeLog | ||
861 | 1201 | * debian/{control,compat}: | ||
862 | 1202 | - Bump Standards. | ||
863 | 1203 | * debian/patches/00list: | ||
864 | 1204 | - Disable 05upgrade-check-binary.patch, applied upstream. | ||
865 | 1205 | - Disable 08doublefree.patch, applied upstream. | ||
866 | 1206 | |||
867 | 1207 | -- Christian Bjälevik <nafallo@ubuntu.com> Sat, 28 Apr 2007 02:52:01 +0200 | ||
868 | 1208 | |||
869 | 1209 | irssi (0.8.10-2ubuntu1) edgy; urgency=low | ||
870 | 1210 | |||
871 | 1211 | * Add irc.ubuntu.com as the first listed IRC server (closes: Malone | ||
872 | 1212 | #52690). | ||
873 | 1213 | |||
874 | 1214 | -- Colin Watson <cjwatson@ubuntu.com> Tue, 3 Oct 2006 17:46:55 +0100 | ||
875 | 1215 | |||
876 | 548 | irssi (0.8.10-2) unstable; urgency=low | 1216 | irssi (0.8.10-2) unstable; urgency=low |
877 | 549 | 1217 | ||
878 | 550 | * Fix Conflicts and Replaces lines to make backporting to sarge easier | 1218 | * Fix Conflicts and Replaces lines to make backporting to sarge easier |
879 | @@ -595,3 +1263,4 @@ irssi (0.8.10~rc5-1) unstable; urgency=low | |||
880 | 595 | using the deprecated g_strdown() (pushed upstream) (Closes: #232628) | 1263 | using the deprecated g_strdown() (pushed upstream) (Closes: #232628) |
881 | 596 | 1264 | ||
882 | 597 | -- David Pashley <david@davidpashley.com> Sun, 10 Jul 2005 15:11:38 +0300 | 1265 | -- David Pashley <david@davidpashley.com> Sun, 10 Jul 2005 15:11:38 +0300 |
883 | 1266 | |||
884 | diff --git a/debian/control b/debian/control | |||
885 | index 13adeed..4debba6 100644 | |||
886 | --- a/debian/control | |||
887 | +++ b/debian/control | |||
888 | @@ -1,7 +1,8 @@ | |||
889 | 1 | Source: irssi | 1 | Source: irssi |
890 | 2 | Section: net | 2 | Section: net |
891 | 3 | Priority: optional | 3 | Priority: optional |
893 | 4 | Maintainer: Rhonda D'Vine <rhonda@debian.org> | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
894 | 5 | XSBC-Original-Maintainer: Rhonda D'Vine <rhonda@debian.org> | ||
895 | 5 | Build-Depends: debhelper-compat (= 13), libglib2.0-dev, | 6 | Build-Depends: debhelper-compat (= 13), libglib2.0-dev, |
896 | 6 | perl (>= 5.8.1), libperl-dev (>= 5.8.1), libncurses5-dev, libssl-dev, | 7 | perl (>= 5.8.1), libperl-dev (>= 5.8.1), libncurses5-dev, libssl-dev, |
897 | 7 | openssl, libotr5-dev | 8 | openssl, libotr5-dev |
898 | diff --git a/debian/patches/03firsttimer_text b/debian/patches/03firsttimer_text | |||
899 | index 7552c18..f80b2ee 100644 | |||
900 | --- a/debian/patches/03firsttimer_text | |||
901 | +++ b/debian/patches/03firsttimer_text | |||
902 | @@ -8,7 +8,7 @@ Description: add hint about #debian to first time user message, BTS #393707 | |||
903 | 8 | "|___|_| /__/__/_|%:" | 8 | "|___|_| /__/__/_|%:" |
904 | 9 | "Irssi v$J - https://irssi.org", 0 }, | 9 | "Irssi v$J - https://irssi.org", 0 }, |
905 | 10 | + | 10 | + |
907 | 11 | + /* add debian informations for first time users, | 11 | + /* add Ubuntu informations for first time users, |
908 | 12 | + * see debian bug #393707 */ | 12 | + * see debian bug #393707 */ |
909 | 13 | { "welcome_firsttime", | 13 | { "welcome_firsttime", |
910 | 14 | "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n" | 14 | "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n" |
911 | @@ -18,8 +18,8 @@ Description: add hint about #debian to first time user message, BTS #393707 | |||
912 | 18 | "Use the /HELP command to get detailed information about%:" | 18 | "Use the /HELP command to get detailed information about%:" |
913 | 19 | "the available commands.%:" | 19 | "the available commands.%:" |
914 | 20 | + "%:" | 20 | + "%:" |
917 | 21 | + "For Debian specific help type \"/connect OFTC\" and%:" | 21 | + "For Ubuntu specific help type \"/connect freenode\" and%:" |
918 | 22 | + "\"/join #debian\" (without the quotes) and ask your%:" | 22 | + "\"/join #ubuntu\" (without the quotes) and ask your%:" |
919 | 23 | + "question.%:" | 23 | + "question.%:" |
920 | 24 | "- - - - - - - - - - - - - - - - - - - - - - - - - - - -", 0 }, | 24 | "- - - - - - - - - - - - - - - - - - - - - - - - - - - -", 0 }, |
921 | 25 | { "welcome_init_settings", "The following settings were initialized", 0 }, | 25 | { "welcome_init_settings", "The following settings were initialized", 0 }, |
922 | diff --git a/debian/patches/series b/debian/patches/series | |||
923 | index 30558b8..0099ba7 100644 | |||
924 | --- a/debian/patches/series | |||
925 | +++ b/debian/patches/series | |||
926 | @@ -4,8 +4,7 @@ | |||
927 | 4 | ## 06gnutls-support by David Pashley <david@davidpashley.com> | 4 | ## 06gnutls-support by David Pashley <david@davidpashley.com> |
928 | 5 | #06gnutls-support | 5 | #06gnutls-support |
929 | 6 | 12manpage-fix | 6 | 12manpage-fix |
932 | 7 | ## disabled for now, doesn't apply in new codebase, ahf takes a look | 7 | 20fix_ssl_proxy_hostname_check |
931 | 8 | #20fix_ssl_proxy_hostname_check | ||
933 | 9 | 22fix-perl-hardening | 8 | 22fix-perl-hardening |
934 | 10 | 25tls-ssl-compat-defines | 9 | 25tls-ssl-compat-defines |
935 | 11 | 26glib-2-63.patch | 10 | 26glib-2-63.patch |
Looks good to me.