From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 19 22:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B953B106566C for ; Tue, 19 May 2009 22:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9345E8FC1A for ; Tue, 19 May 2009 22:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4JMK1DG084659 for ; Tue, 19 May 2009 22:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4JMK1VR084658; Tue, 19 May 2009 22:20:01 GMT (envelope-from gnats) Resent-Date: Tue, 19 May 2009 22:20:01 GMT Resent-Message-Id: <200905192220.n4JMK1VR084658@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, John Prather Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27EA21065698 for ; Tue, 19 May 2009 22:13:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 140968FC2B for ; Tue, 19 May 2009 22:13:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n4JMDinT084025 for ; Tue, 19 May 2009 22:13:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n4JMDicP084022; Tue, 19 May 2009 22:13:44 GMT (envelope-from nobody) Message-Id: <200905192213.n4JMDicP084022@www.freebsd.org> Date: Tue, 19 May 2009 22:13:44 GMT From: John Prather To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/134729: [maintainer update] update net-im/pidgin-sipe to 1.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2009 22:20:02 -0000 >Number: 134729 >Category: ports >Synopsis: [maintainer update] update net-im/pidgin-sipe to 1.4.0 >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: Tue May 19 22:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: John Prather >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: FreeBSD bsdlaptop.localdomain 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Thu May 14 22:53:55 PDT 2009 root@bsdlaptop.localdomain:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Update net-im/pidgin-sipe to 1.4.0 >How-To-Repeat: >Fix: Patch attached with submission follows: 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 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) { >Release-Note: >Audit-Trail: >Unformatted: