Attachment #96163 for bug #134729

View | Details | Raw Unified | Return to bug 134729
Collapse All | Expand All

Lines 6-12 Link Here

(-)pidgin-sipe/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= pidgin-sipe	8	PORTNAME= pidgin-sipe
9	PORTVERSION= 1.3.4	9	PORTVERSION= 1.4.0
10	CATEGORIES= net-im	10	CATEGORIES= net-im
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= sipe	12	MASTER_SITE_SUBDIR= sipe
Lines 30-35 Link Here
30	CONFIGURE_ENV += CFLAGS="${CFLAGS}" \	30	CONFIGURE_ENV += CFLAGS="${CFLAGS}" \
31	LIBS="${LIBS}" \	31	LIBS="${LIBS}" \
32	COM_ERR_CFLAGS="-I/usr/include" \	32	COM_ERR_CFLAGS="-I/usr/include" \
33	COM_ERR_LIBS="-L/usr/include -lcom_err"	33	COM_ERR_LIBS="-L/usr/lib -lcom_err"
34		34
35	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)pidgin-sipe/distinfo (-3 / +3 lines)
1	MD5 (pidgin-sipe-1.3.4.tar.bz2) = 54648ac3acf2d79f6a77bec8a4a447e4	1	MD5 (pidgin-sipe-1.4.0.tar.bz2) = a257978b9e1c02a6816c22cb891c8d68
2	SHA256 (pidgin-sipe-1.3.4.tar.bz2) = b3148f85aa007d2bdb21245b6e8c6aed6f23a445d519b9089e5883562050ec36	2	SHA256 (pidgin-sipe-1.4.0.tar.bz2) = b9fc97ece9cb2be2c1cd2fd4c755c717f7f70b9e08d461438278e571cb0020e4
3	SIZE (pidgin-sipe-1.3.4.tar.bz2) = 332453	3	SIZE (pidgin-sipe-1.4.0.tar.bz2) = 333977




*** 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);

Lines 1-5 Link Here

(-)pidgin-sipe/files/patch-src-uuid.c (-6 / +6 lines)
1	*** src/uuid.c.orig Mon Apr 13 09:48:29 2009	1	*** src/uuid.c.orig Sun May 17 19:09:00 2009
2	--- src/uuid.c Thu May 7 12:40:23 2009	2	--- src/uuid.c Mon May 18 13:43:53 2009
3	***************	3	***************
4	* 28,34 **	4	* 28,34 **
5	--- 28,38 ----	5	--- 28,38 ----
Lines 15-22 Link Here
15	#ifdef _DLL	15	#ifdef _DLL
16	#define _WS2TCPIP_H_	16	#define _WS2TCPIP_H_
17	***************	17	***************
18	* 135,141 **	18	* 133,139 **
19	--- 139,149 ----	19	--- 137,147 ----
20	strcpy(ifr.ifr_name, IFR->ifr_name);	20	strcpy(ifr.ifr_name, IFR->ifr_name);
21	if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) {	21	if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) {
22	if (! (ifr.ifr_flags & IFF_LOOPBACK)) {	22	if (! (ifr.ifr_flags & IFF_LOOPBACK)) {
Lines 29-36 Link Here
29	break;	29	break;
30	}	30	}
31	***************	31	***************
32	* 145,151 **	32	* 143,149 **
33	--- 153,163 ----	33	--- 151,161 ----
34		34
35	close(s);	35	close(s);
36	if (ok) {	36	if (ok) {

Return to bug 134729

Line 0 Link Here

(-)pidgin-sipe/files/patch-src-sipe.c (+38 lines)
	1	*** src/sipe.c.orig Sun May 17 19:09:00 2009
	2	--- src/sipe.c Tue May 19 11:31:02 2009
	3	***************
	4	* 4734,4742 **
	5	const char *username = purple_account_get_username(account);
	6	gc = purple_account_get_connection(account);
	7
	8	! if (strpbrk(username, " \t\v\r\n") != NULL) {
	9	gc->wants_to_die = TRUE;
	10	! purple_connection_error(gc, _("SIP Exchange usernames may not contain whitespaces"));
	11	return;
	12	}
	13
	14	--- 4734,4742 ----
	15	const char *username = purple_account_get_username(account);
	16	gc = purple_account_get_connection(account);
	17
	18	! if (strpbrk(username, "\t\v\r\n") != NULL) {
	19	gc->wants_to_die = TRUE;
	20	! purple_connection_error(gc, _("SIP Exchange username contains invalid characters"));
	21	return;
	22	}
	23
	24	***************
	25	* 4757,4762 **
	26	--- 4757,4768 ----
	27	sip->username = g_strjoin("@", userserver[0], userserver[1], NULL);
	28	sip->sipdomain = g_strdup(userserver[1]);
	29
	30	+ if (strpbrk(sip->username, " \t\v\r\n") != NULL) {
	31	+ gc->wants_to_die = TRUE;
	32	+ purple_connection_error(gc, _("SIP Exchange usernames may not contain whitespaces"));
	33	+ return;
	34	+ }
	35	+
	36	domain_user = g_strsplit(signinname_login[1], "\\", 2);
	37	sip->authdomain = (domain_user && domain_user[1]) ? g_strdup(domain_user[0]) : NULL;
	38	sip->authuser = (domain_user && domain_user[1]) ? g_strdup(domain_user[1]) : (signinname_login ? g_strdup(signinname_login[1]) : NULL);