ports/135714: [maintainer update] net-im/pidgin-sipe to 1.4.1

[John Prather]

>Number:         135714
>Category:       ports
>Synopsis:       [maintainer update] net-im/pidgin-sipe to 1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 18 18:00:14 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     John Prather
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
FreeBSD bsdlaptop.localdomain 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Jun 14 23:24:18 PDT 2009   root at bsdlaptop.localdomain:/usr/obj/usr/src/sys/GENERIC   amd64
>Description:
- Update net-im/pidgin-sipe to 1.4.1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN pidgin-sipe.orig/Makefile pidgin-sipe/Makefile
--- pidgin-sipe.orig/Makefile	2009-06-18 00:42:56.000000000 -0700
+++ pidgin-sipe/Makefile	2009-06-18 00:44:54.000000000 -0700
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pidgin-sipe
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sipe
 
diff -ruN pidgin-sipe.orig/distinfo pidgin-sipe/distinfo
--- pidgin-sipe.orig/distinfo	2009-06-18 00:42:56.000000000 -0700
+++ pidgin-sipe/distinfo	2009-06-18 00:46:20.000000000 -0700
@@ -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
diff -ruN pidgin-sipe.orig/files/patch-src-sipe-sign.c pidgin-sipe/files/patch-src-sipe-sign.c
--- pidgin-sipe.orig/files/patch-src-sipe-sign.c	2009-06-18 00:42:56.000000000 -0700
+++ pidgin-sipe/files/patch-src-sipe-sign.c	2009-06-18 10:12:21.000000000 -0700
@@ -1,5 +1,5 @@
-*** src/sipe-sign.c.orig	Thu May  7 11:58:37 2009
---- src/sipe-sign.c	Thu May  7 11:59:03 2009
+*** src/sipe-sign.c.orig	Thu Jun 18 10:10:52 2009
+--- src/sipe-sign.c	Thu Jun 18 10:11:41 2009
 ***************
 *** 26,32 ****
 --- 26,36 ----
diff -ruN pidgin-sipe.orig/files/patch-src-sipe.c pidgin-sipe/files/patch-src-sipe.c
--- pidgin-sipe.orig/files/patch-src-sipe.c	2009-06-18 00:42:56.000000000 -0700
+++ pidgin-sipe/files/patch-src-sipe.c	1969-12-31 16:00:00.000000000 -0800
@@ -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);
diff -ruN pidgin-sipe.orig/files/patch-src-sipkrb5.c pidgin-sipe/files/patch-src-sipkrb5.c
--- pidgin-sipe.orig/files/patch-src-sipkrb5.c	2009-06-18 00:42:56.000000000 -0700
+++ pidgin-sipe/files/patch-src-sipkrb5.c	2009-06-18 10:19:14.000000000 -0700
@@ -1,8 +1,8 @@
-*** src/sipkrb5.c.orig	Thu May  7 11:58:42 2009
---- src/sipkrb5.c	Thu May  7 11:59:42 2009
+*** src/sipkrb5.c.orig	Thu Jun 18 10:17:21 2009
+--- src/sipkrb5.c	Thu Jun 18 10:18:54 2009
 ***************
 *** 35,41 ****
---- 35,46 ----
+--- 35,45 ----
   #include <string.h>
   #include <errno.h>
   #include <ctype.h>
@@ -11,7 +11,6 @@
 + #else
   #include <et/com_err.h>
 + #endif
-+ 
   
   #include "debug.h"
   #include "util.h"
diff -ruN pidgin-sipe.orig/files/patch-src-uuid.c pidgin-sipe/files/patch-src-uuid.c
--- pidgin-sipe.orig/files/patch-src-uuid.c	2009-06-18 00:42:56.000000000 -0700
+++ pidgin-sipe/files/patch-src-uuid.c	2009-06-18 10:23:23.000000000 -0700
@@ -1,5 +1,5 @@
-*** src/uuid.c.orig	Sun May 17 19:09:00 2009
---- src/uuid.c	Mon May 18 13:43:53 2009
+*** src/uuid.c.orig	Thu Jun 18 10:20:06 2009
+--- src/uuid.c	Thu Jun 18 10:23:07 2009
 ***************
 *** 28,34 ****
 --- 28,38 ----


>Release-Note:
>Audit-Trail:
>Unformatted: