Bug#1036552: unblock: twinkle/1:1.10.2+dfsg-2

[Bastian Germann]

Package: release.debian.org
Control: affects -1 + src:twinkle
X-Debbugs-Cc: twinkle at packages.debian.org
User: release.debian.org at packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package twinkle.

[ Reason ]
Fix for RC bug #1034661.

[ Impact ]
User's browser might end up opening a spam (and maybe web exploiting) website.

[ Tests ]
Opening the About section's manual will open https://mfnboer.home.xs4all.nl/twinkle/ instead of the spam website.

[ Risks ]
None.

[ Checklist ]
   [x] all changes are documented in the d/changelog
   [x] I reviewed all changes and I approve them
   [x] attach debdiff against the package in testing

unblock twinkle/1:1.10.2+dfsg-2
-------------- next part --------------
diff -Nru twinkle-1.10.2+dfsg/debian/changelog twinkle-1.10.2+dfsg/debian/changelog
--- twinkle-1.10.2+dfsg/debian/changelog	2020-12-03 15:47:34.000000000 +0100
+++ twinkle-1.10.2+dfsg/debian/changelog	2023-05-20 17:12:46.000000000 +0200
@@ -1,3 +1,10 @@
+twinkle (1:1.10.2+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Change upstream URL taken over by hostile actors (Closes: #1034661)
+
+ -- Bernhard Schmidt <berni at debian.org>  Sat, 20 May 2023 17:12:46 +0200
+
 twinkle (1:1.10.2+dfsg-1) unstable; urgency=medium
 
   * New upstream version 1.10.2+dfsg
diff -Nru twinkle-1.10.2+dfsg/debian/patches/remove-malicious-homepage.patch twinkle-1.10.2+dfsg/debian/patches/remove-malicious-homepage.patch
--- twinkle-1.10.2+dfsg/debian/patches/remove-malicious-homepage.patch	1970-01-01 01:00:00.000000000 +0100
+++ twinkle-1.10.2+dfsg/debian/patches/remove-malicious-homepage.patch	2023-05-20 17:12:46.000000000 +0200
@@ -0,0 +1,63 @@
+From da274607aa835a2735dcf9b9a7ba550910f9d03e Mon Sep 17 00:00:00 2001
+From: matchi <hansi77 at yandex.com>
+Date: Wed, 1 Dec 2021 09:54:39 +0100
+Subject: [PATCH] changed references to http(s)://twinklephone.com to
+ https://mfnboer.home.xs4all.nl/twinkle/
+
+(cherry picked from commit 165c43d8a1574946e7704c639c56cea3d5264606)
+---
+ AUTHORS                    | 2 +-
+ src/gui/lang/twinkle_de.ts | 2 +-
+ src/gui/mphoneform.cpp     | 2 +-
+ twinkle.spec.in            | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index 88cbeadb..ec1ad55c 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -33,4 +33,4 @@ Russian Michail Chodorenko
+ Swedish Daniel Nylander
+ 
+ Michel de Boer
+-www.twinklephone.com
++https://mfnboer.home.xs4all.nl/twinkle/
+diff --git a/src/gui/lang/twinkle_de.ts b/src/gui/lang/twinkle_de.ts
+index 8ab0b014..a5b38916 100644
+--- a/src/gui/lang/twinkle_de.ts
++++ b/src/gui/lang/twinkle_de.ts
+@@ -5620,7 +5620,7 @@ The values of all SIP headers in the incoming INVITE message are passed in envir
+ TWINKLE_TRIGGER=in_call. SIPREQUEST_METHOD=INVITE. The request-URI of the INVITE will be passed in <b>SIPREQUEST_URI</b>. The name of the user profile will be passed in <b>TWINKLE_USER_PROFILE</b>.</source>
+         <translation><p>
+ Dieses Script wird gerufen, wenn ein INVITE (Anruf) ankommt. <br>
+-Bitte lesen Sie im Handbuch unter "/usr/share/doc/packages/twinkle/..." oder "http://twinklephone.com"  die ausführliche Beschreibung!
++Bitte lesen Sie im Handbuch unter "/usr/share/doc/packages/twinkle/..." oder "https://mfnboer.home.xs4all.nl/twinkle/" die ausführliche Beschreibung!
+ </p>
+ <h3>Rückgabewerte</h3> -   print nach STDOUT (z.B. `echo "action=dnd"`), ein Wert pro Zeile: <br>
+ <tt>action=[ continue | reject | dnd | redirect | autoanswer ]<br></tt>
+diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp
+index c4e3c1d9..abca70d0 100644
+--- a/src/gui/mphoneform.cpp
++++ b/src/gui/mphoneform.cpp
+@@ -2290,7 +2290,7 @@ void MphoneForm::aboutQt()
+ 
+ void MphoneForm::manual()
+ {
+-	((t_gui *)ui)->open_url_in_browser("http://www.twinklephone.com");
++	((t_gui *)ui)->open_url_in_browser("https://mfnboer.home.xs4all.nl/twinkle/");
+ }
+ 
+ void MphoneForm::editUserProfile()
+diff --git a/twinkle.spec.in b/twinkle.spec.in
+index 989c4514..7c014167 100644
+--- a/twinkle.spec.in
++++ b/twinkle.spec.in
+@@ -10,7 +10,7 @@ BuildArch:	i586
+ #BuildArch:	x86_64
+ BuildRoot:	%{_tmppath}/making_of_%{name}_%{version}
+ Packager:
+-URL:		http://www.twinklephone.com
++URL:		https://mfnboer.home.xs4all.nl/twinkle/
+ Requires:	alsa
+ Requires:	ucommon
+ Requires:	ccrtp >= 1.6.0
diff -Nru twinkle-1.10.2+dfsg/debian/patches/series twinkle-1.10.2+dfsg/debian/patches/series
--- twinkle-1.10.2+dfsg/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ twinkle-1.10.2+dfsg/debian/patches/series	2023-05-20 17:12:46.000000000 +0200
@@ -0,0 +1 @@
+remove-malicious-homepage.patch