Attachment 96163 Details for Bug 134729 – file.diff

[patch] file.diff

file.diff (text/plain), 3.78 KB, created by john.c.prather on 2009-05-19 23:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: john.c.prather

Created: 2009-05-19 23:20:01 UTC

Size: 3.78 KB

patch

obsolete

>diff -ruN pidgin-sipe.bak/Makefile pidgin-sipe/Makefile
>--- pidgin-sipe.bak/Makefile	2009-05-19 14:55:47.000000000 -0700
>+++ pidgin-sipe/Makefile	2009-05-18 13:36:04.000000000 -0700
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	pidgin-sipe
>-PORTVERSION=	1.3.4
>+PORTVERSION=	1.4.0
> CATEGORIES=	net-im
> MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	sipe
>@@ -30,6 +30,6 @@
> CONFIGURE_ENV += 	CFLAGS="${CFLAGS}" \
> 			LIBS="${LIBS}" \
> 			COM_ERR_CFLAGS="-I/usr/include" \
>-			COM_ERR_LIBS="-L/usr/include -lcom_err"
>+			COM_ERR_LIBS="-L/usr/lib -lcom_err"
> 
> .include <bsd.port.mk>
>diff -ruN pidgin-sipe.bak/distinfo pidgin-sipe/distinfo
>--- pidgin-sipe.bak/distinfo	2009-05-19 14:55:47.000000000 -0700
>+++ pidgin-sipe/distinfo	2009-05-18 13:30:58.000000000 -0700
>@@ -1,3 +1,3 @@
>-MD5 (pidgin-sipe-1.3.4.tar.bz2) = 54648ac3acf2d79f6a77bec8a4a447e4
>-SHA256 (pidgin-sipe-1.3.4.tar.bz2) = b3148f85aa007d2bdb21245b6e8c6aed6f23a445d519b9089e5883562050ec36
>-SIZE (pidgin-sipe-1.3.4.tar.bz2) = 332453
>+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
>diff -ruN pidgin-sipe.bak/files/patch-src-sipe.c pidgin-sipe/files/patch-src-sipe.c
>--- pidgin-sipe.bak/files/patch-src-sipe.c	1969-12-31 16:00:00.000000000 -0800
>+++ pidgin-sipe/files/patch-src-sipe.c	2009-05-19 11:31:28.000000000 -0700
>@@ -0,0 +1,38 @@
>+*** 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);
>diff -ruN pidgin-sipe.bak/files/patch-src-uuid.c pidgin-sipe/files/patch-src-uuid.c
>--- pidgin-sipe.bak/files/patch-src-uuid.c	2009-05-19 14:55:46.000000000 -0700
>+++ pidgin-sipe/files/patch-src-uuid.c	2009-05-18 13:45:50.000000000 -0700
>@@ -1,5 +1,5 @@
>-*** src/uuid.c.orig	Mon Apr 13 09:48:29 2009
>---- src/uuid.c	Thu May  7 12:40:23 2009
>+*** src/uuid.c.orig	Sun May 17 19:09:00 2009
>+--- src/uuid.c	Mon May 18 13:43:53 2009
> ***************
> *** 28,34 ****
> --- 28,38 ----
>@@ -15,8 +15,8 @@
>   #ifdef _DLL
>   #define _WS2TCPIP_H_
> ***************
>-*** 135,141 ****
>---- 139,149 ----
>+*** 133,139 ****
>+--- 137,147 ----
>           strcpy(ifr.ifr_name, IFR->ifr_name);
>           if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) {
>               if (! (ifr.ifr_flags & IFF_LOOPBACK)) {
>@@ -29,8 +29,8 @@
>                       break;
>                   }
> ***************
>-*** 145,151 ****
>---- 153,163 ----
>+*** 143,149 ****
>+--- 151,161 ----
>   
>       close(s);
>       if (ok) {

Actions: View | Diff

Attachments on bug 134729: 96163 | 96164 | 96165