[Pkg-voip-commits] [linphone] 07/07: Import Debian patch 3.6.1-2.6

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch jessie
in repository linphone.

commit dfa33d1344181048f022286ed20ae229728b91c3
Author: Cyril Brulebois <kibi at debian.org>
Date:   Mon May 23 02:00:59 2016 +0200

    Import Debian patch 3.6.1-2.6
---
 debian/changelog                           | 10 ++++++++++
 debian/patches/series                      |  2 ++
 debian/patches/wizard-relax-domain.patch   | 19 +++++++++++++++++++
 debian/patches/wizard-relax-username.patch | 19 +++++++++++++++++++
 4 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a2e690c..8850ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+linphone (3.6.1-2.6) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply upstream patches to relax domain and username checks in the
+    setup wizard (Closes: #700045, #703282):
+     - wizard-relax-domain.patch: Allow [A-Z] on the left.
+     - wizard-relax-username.patch: Allow [0-9] on the left.
+
+ -- Cyril Brulebois <kibi at debian.org>  Mon, 23 May 2016 02:00:59 +0200
+
 linphone (3.6.1-2.5) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/series b/debian/patches/series
index 2df0079..8f36294 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ libav9.patch
 libav10.patch
 libav11.patch
 ffmpeg_2.9.patch
+wizard-relax-domain.patch
+wizard-relax-username.patch
diff --git a/debian/patches/wizard-relax-domain.patch b/debian/patches/wizard-relax-domain.patch
new file mode 100644
index 0000000..8cd97c3
--- /dev/null
+++ b/debian/patches/wizard-relax-domain.patch
@@ -0,0 +1,19 @@
+commit 5b8cb6465098730f0de1910e3f009b798d4ff941
+Author: Ghislain MARY <ghislain.mary at belledonne-communications.com>
+Date:   Tue Jul 2 13:18:13 2013 +0200
+
+    Regular expression on domain in the account assistant was too strict.
+
+diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
+index f4374c5..0c15e60 100644
+--- a/gtk/setupwizard.c
++++ b/gtk/setupwizard.c
+@@ -60,7 +60,7 @@ static int all_account_information_entered(GtkWidget *w) {
+ 	if (gtk_entry_get_text_length(username) > 0 &&
+ 	gtk_entry_get_text_length(domain) > 0 &&
+ 	g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{2,}$", gtk_entry_get_text(username), 0, 0) &&
+-	g_regex_match_simple("^(sip:)?([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$", gtk_entry_get_text(domain), 0, 0)) {
++	g_regex_match_simple("^(sip:)?([a-zA-Z0-9]+([\\.-][a-zA-Z0-9]+)*)$", gtk_entry_get_text(domain), 0, 0)) {
+ 		return 1;
+ 	}
+ 	return 0;
diff --git a/debian/patches/wizard-relax-username.patch b/debian/patches/wizard-relax-username.patch
new file mode 100644
index 0000000..0bfd1fb
--- /dev/null
+++ b/debian/patches/wizard-relax-username.patch
@@ -0,0 +1,19 @@
+commit eb9886df65cb7f9c5cc513b98e3844c385779af6
+Author: Margaux Clerc <clercmargo at gmail.com>
+Date:   Wed Oct 16 12:20:14 2013 +0200
+
+    accept in Wizzard usernames with digits
+
+diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
+index 47a9074..6b596dc 100644
+--- a/gtk/setupwizard.c
++++ b/gtk/setupwizard.c
+@@ -59,7 +59,7 @@ static int all_account_information_entered(GtkWidget *w) {
+ 
+ 	if (gtk_entry_get_text_length(username) > 0 &&
+ 	gtk_entry_get_text_length(domain) > 0 &&
+-	g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{2,}$", gtk_entry_get_text(username), 0, 0) &&
++	g_regex_match_simple("^[a-zA-Z0-9]+[a-zA-Z0-9.\\-_]{2,}$", gtk_entry_get_text(username), 0, 0) &&
+ 	g_regex_match_simple("^(sip:)?([a-zA-Z0-9]+([\\.-][a-zA-Z0-9]+)*)$", gtk_entry_get_text(domain), 0, 0)) {
+ 		return 1;
+ 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/linphone.git