1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- Update to 1.4.1

PR:		ports/135714
Submitted by:	John Prather <john.c.prather AT gmail.com> (maintainer)
This commit is contained in:
Beat Gaetzi 2009-06-20 14:49:45 +00:00
parent e882955bfd
commit db96ff1b51
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=236366
3 changed files with 4 additions and 42 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= pidgin-sipe
PORTVERSION= 1.4.0
PORTVERSION= 1.4.1
CATEGORIES= net-im
MASTER_SITES= SF/sipe

View File

@ -1,3 +1,3 @@
MD5 (pidgin-sipe-1.4.0.tar.bz2) = a257978b9e1c02a6816c22cb891c8d68
SHA256 (pidgin-sipe-1.4.0.tar.bz2) = b9fc97ece9cb2be2c1cd2fd4c755c717f7f70b9e08d461438278e571cb0020e4
SIZE (pidgin-sipe-1.4.0.tar.bz2) = 333977
MD5 (pidgin-sipe-1.4.1.tar.bz2) = d1300018eb74008a48e55653086f24e1
SHA256 (pidgin-sipe-1.4.1.tar.bz2) = d613471b0d19441b162ea64679d7b2961a7d9d42f0007cf63400f04517f56f58
SIZE (pidgin-sipe-1.4.1.tar.bz2) = 334875

View File

@ -1,38 +0,0 @@
*** src/sipe.c.orig Sun May 17 19:09:00 2009
--- src/sipe.c Tue May 19 11:31:02 2009
***************
*** 4734,4742 ****
const char *username = purple_account_get_username(account);
gc = purple_account_get_connection(account);
! if (strpbrk(username, " \t\v\r\n") != NULL) {
gc->wants_to_die = TRUE;
! purple_connection_error(gc, _("SIP Exchange usernames may not contain whitespaces"));
return;
}
--- 4734,4742 ----
const char *username = purple_account_get_username(account);
gc = purple_account_get_connection(account);
! if (strpbrk(username, "\t\v\r\n") != NULL) {
gc->wants_to_die = TRUE;
! purple_connection_error(gc, _("SIP Exchange username contains invalid characters"));
return;
}
***************
*** 4757,4762 ****
--- 4757,4768 ----
sip->username = g_strjoin("@", userserver[0], userserver[1], NULL);
sip->sipdomain = g_strdup(userserver[1]);
+ if (strpbrk(sip->username, " \t\v\r\n") != NULL) {
+ gc->wants_to_die = TRUE;
+ purple_connection_error(gc, _("SIP Exchange usernames may not contain whitespaces"));
+ return;
+ }
+
domain_user = g_strsplit(signinname_login[1], "\\", 2);
sip->authdomain = (domain_user && domain_user[1]) ? g_strdup(domain_user[0]) : NULL;
sip->authuser = (domain_user && domain_user[1]) ? g_strdup(domain_user[1]) : (signinname_login ? g_strdup(signinname_login[1]) : NULL);