From olive@pasteur.fr  Mon Nov 25 03:21:06 2002
Return-Path: <olive@pasteur.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5B33A37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Nov 2002 03:21:06 -0800 (PST)
Received: from electre.pasteur.fr (electre.pasteur.fr [157.99.64.120])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8C29B43E3B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Nov 2002 03:21:02 -0800 (PST)
	(envelope-from olive@pasteur.fr)
Received: from mafate.sis.pasteur.fr (mafate.sis.pasteur.fr [157.99.64.42])
	by electre.pasteur.fr (8.12.6/8.12.6) with ESMTP id gAPBKld1369801;
	Mon, 25 Nov 2002 12:20:53 +0100 (CET)
Received: by mafate.sis.pasteur.fr (Postfix, from userid 3494)
	id A12113F639; Mon, 25 Nov 2002 12:21:09 +0100 (CET)
Message-Id: <20021125112109.A12113F639@mafate.sis.pasteur.fr>
Date: Mon, 25 Nov 2002 12:21:09 +0100 (CET)
From: Olivier Tharan <olive@oban.frmug.org>
Reply-To: Olivier Tharan <olive@oban.frmug.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: olive@oban.frmug.org, rasmus@kaj.se
Subject: mail/gbuffy update to 0.2.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45711
>Category:       ports
>Synopsis:       mail/gbuffy update to 0.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 25 03:30:01 PST 2002
>Closed-Date:    Thu Mar 27 08:06:25 PST 2003
>Last-Modified:  Thu Mar 27 08:06:25 PST 2003
>Originator:     Olivier Tharan
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD mafate.sis.pasteur.fr 4.7-STABLE FreeBSD 4.7-STABLE #3: Mon Oct 14 10:05:23 CEST 2002 root@mafate.sis.pasteur.fr:/usr/obj/usr/src/sys/MAFATE i386


	
>Description:
	Gbuffy is now at version 0.2.4. This new version fixes several bugs.

	This is a non-maintainer update, I Cc: the maintainer so he can
	approve it.

	files/patch-imap can be removed from the CVS repository, as the patch
	was included in the upstream sources.
>How-To-Repeat:
	
>Fix:

diff -urN gbuffy.orig/Makefile gbuffy/Makefile
--- gbuffy.orig/Makefile	Mon Nov 25 12:13:58 2002
+++ gbuffy/Makefile	Mon Nov 25 11:50:13 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gbuffy
-PORTVERSION=	0.2.2
+PORTVERSION=	0.2.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/
 
diff -urN gbuffy.orig/distinfo gbuffy/distinfo
--- gbuffy.orig/distinfo	Mon Nov 25 12:13:58 2002
+++ gbuffy/distinfo	Mon Nov 25 11:53:11 2002
@@ -1 +1 @@
-MD5 (gbuffy-0.2.2.tar.gz) = eaad334173654185ef9560f47ba54d74
+MD5 (gbuffy-0.2.4.tar.gz) = aae7b2b88edb6e1a0969346b355fce68
diff -urN gbuffy.orig/files/patch-imap gbuffy/files/patch-imap
--- gbuffy.orig/files/patch-imap	Mon Nov 25 12:13:58 2002
+++ gbuffy/files/patch-imap	Thu Jan  1 01:00:00 1970
@@ -1,64 +0,0 @@
---- imap.c.orig	Mon Aug  2 09:41:38 1999
-+++ imap.c	Sat Jul 15 19:49:45 2000
-@@ -318,12 +318,12 @@
- static int parse_fetch (BOX_INFO *ibox, CONNECTION *conn, GList *headers, 
-     int unseen)
- {
--  char from[STRING] = "";
--  char subject[STRING] = "";
--  char xface[STRING] = "";
-+  char from[LONG_STRING] = "";
-+  char subject[LONG_STRING] = "";
-+  char xface[LONG_STRING] = "";
-   char buf[LONG_STRING];
-   char seq[8];
--  char *s;
-+  char *s, *last_head;
-   int recent = 0;
- 
- 
-@@ -339,8 +339,7 @@
-       return (-1);
-     }
- 
--    if (buf[0] == '*') 
--    {
-+    if (buf[0] == '*') {
-       s = imap_next_word (buf);
-       if (!isdigit (*s))
- 	continue;
-@@ -377,10 +376,12 @@
- 	  if (!strncasecmp (buf, "From:", 5))
- 	  {
- 	    rfc2047_decode (from, buf, sizeof (from));
-+	    last_head = from;
- 	  }
- 	  else if (!strncasecmp (buf, "Subject:", 8))
- 	  {
- 	    rfc2047_decode (subject, buf, sizeof (subject));
-+	    last_head = subject;
- 	  }
- 	  else if (!strncasecmp (buf, "X-Face:", 7))
- 	  {
-@@ -389,6 +390,21 @@
- 	    strfcpy (xface, s, sizeof (xface));
- 	    if (strlen (s) > sizeof (xface))
- 	      g_print ("-E- xface header is larger than buffer\n");
-+	    last_head = xface;
-+	  }
-+	  else if (ISSPACE(buf[0])) {
-+	    s = buf;
-+	    while (*s && ISSPACE (*s)) s++;
-+	    if(strlen(s) + strlen(last_head) + 1 > LONG_STRING)
-+	      g_print ("-E- a continuing header is larger than buffer\n");
-+	    else {
-+	      /* If this is an X-Face line the space don't matter, but if this 
-+	       * is any other header the space is required. */
-+	      strcat(last_head, " ");
-+	      strncat(last_head, s, LONG_STRING - strlen(last_head));
-+	    }
-+	  } else {
-+	    last_head = NULL;
- 	  }
- 	}
-       } 
>Release-Note:
>Audit-Trail:

From: Giorgos Keramidas <keramida@freebsd.org>
To: Olivier Tharan <olive@oban.frmug.org>
Cc: bug-followup@freebsd.org, rasmus@kaj.se
Subject: Re: ports/45711: mail/gbuffy update to 0.2.4
Date: Mon, 2 Dec 2002 10:44:19 +0200

 Adding to the audit trail:
 
 : Message-Id: <rqc7kf1pb1b.fsf@gladiusit.e.kth.se>
 : Date: 25 Nov 2002 22:57:52 +0100
 : From: Rasmus Kaj <kaj@e.kth.se>
 :
 : However, I don't actually use gbuffy myself anymore, as it doesent
 : support encrypted / non-plaintext authenticated imap, which is what I
 : use for mail access.  If you want maintainership for gbuffy, I'm all
 : for it.
 :
 :=====================================================================
 :
 : Message-Id: <20021126082555.GD57263@weirdos.oban.frmug.org>
 : Date: Tue, 26 Nov 2002 09:25:56 +0100
 : From: Olivier Tharan <olive@oban.frmug.org>
 :
 : * Rasmus Kaj <kaj@e.kth.se> (20021125 22:57):
 : > As maintainer (but not comitter), I approve.
 :
 : Thank you.
 :
 : > However, I don't actually use gbuffy myself anymore, as it doesent
 : > support encrypted / non-plaintext authenticated imap, which is what I
 : > use for mail access.  If you want maintainership for gbuffy, I'm all
 : > for it.
 :
 : Ok? So (committers) please apply the following patch after the first
 : one (maintainer change):
 :
 : %%%
 : --- gbuffy.orig/Makefile        Mon Nov 25 12:13:58 2002
 : +++ gbuffy/Makefile     Tue Nov 26 09:21:10 2002
 : @@ -10,7 +10,7 @@
 :  CATEGORIES=    mail
 :  MASTER_SITES=  http://www.fiction.net/blong/programs/gbuffy/
 :  
 : -MAINTAINER=    rasmus@kaj.se
 : +MAINTAINER=    olive@oban.frmug.org
 :  
 :  LIB_DEPENDS=   PropList.2:${PORTSDIR}/devel/libPropList \
 :                 compface.1:${PORTSDIR}/mail/faces
 : %%%
State-Changed-From-To: open->feedback 
State-Changed-By: foxfair 
State-Changed-When: Wed Mar 26 02:18:41 PST 2003 
State-Changed-Why:  
According to your suggesiton, I have made a patch. Please review it 
and let me know if you have further idea. 

diff -ruN /usr/ports/mail/gbuffy/Makefile ./Makefile 
--- /usr/ports/mail/gbuffy/Makefile	Fri Mar 21 01:20:48 2003 
+++ ./Makefile	Tue Mar 25 17:28:50 2003 
@@ -6,11 +6,11 @@ 
# 

PORTNAME=	gbuffy 
-PORTVERSION=	0.2.2 
+PORTVERSION=	0.2.4 
CATEGORIES=	mail 
MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/ 

-MAINTAINER=	rasmus@kaj.se 
+MAINTAINER=	olive@oban.frmug.org 
COMMENT=	A GTK+ multiple mailbox "biff" program 

LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList  
diff -ruN /usr/ports/mail/gbuffy/distinfo ./distinfo 
--- /usr/ports/mail/gbuffy/distinfo	Mon Oct  4 05:48:47 1999 
+++ ./distinfo	Tue Mar 25 17:28:08 2003 
@@ -1 +1 @@ 
-MD5 (gbuffy-0.2.2.tar.gz) = eaad334173654185ef9560f47ba54d74 
+MD5 (gbuffy-0.2.4.tar.gz) = aae7b2b88edb6e1a0969346b355fce68 
diff -ruN /usr/ports/mail/gbuffy/files/patch-imap ./files/patch-imap 
--- /usr/ports/mail/gbuffy/files/patch-imap	Sun Jul 16 21:28:54 2000 
+++ ./files/patch-imap	Thu Jan  1 08:00:00 1970 
@@ -1,64 +0,0 @@ 
---- imap.c.orig	Mon Aug  2 09:41:38 1999 
-+++ imap.c	Sat Jul 15 19:49:45 2000 
-@@ -318,12 +318,12 @@ 
- static int parse_fetch (BOX_INFO *ibox, CONNECTION *conn, GList *headers,  
-     int unseen) 
- { 
--  char from[STRING] = ""; 
--  char subject[STRING] = ""; 
--  char xface[STRING] = ""; 
-+  char from[LONG_STRING] = ""; 
-+  char subject[LONG_STRING] = ""; 
-+  char xface[LONG_STRING] = ""; 
-   char buf[LONG_STRING]; 
-   char seq[8]; 
--  char *s; 
-+  char *s, *last_head; 
-   int recent = 0; 
-  
-  
-@@ -339,8 +339,7 @@ 
-       return (-1); 
-     } 
-  
--    if (buf[0] == '*')  
--    { 
-+    if (buf[0] == '*') { 
-       s = imap_next_word (buf); 
-       if (!isdigit (*s)) 
- 	continue; 
-@@ -377,10 +376,12 @@ 
- 	  if (!strncasecmp (buf, "From:", 5)) 
- 	  { 
- 	    rfc2047_decode (from, buf, sizeof (from)); 
-+	    last_head = from; 
- 	  } 
- 	  else if (!strncasecmp (buf, "Subject:", 8)) 
- 	  { 
- 	    rfc2047_decode (subject, buf, sizeof (subject)); 
-+	    last_head = subject; 
- 	  } 
- 	  else if (!strncasecmp (buf, "X-Face:", 7)) 
- 	  { 
-@@ -389,6 +390,21 @@ 
- 	    strfcpy (xface, s, sizeof (xface)); 
- 	    if (strlen (s) > sizeof (xface)) 
- 	      g_print ("-E- xface header is larger than buffern"); 
-+	    last_head = xface; 
-+	  } 
-+	  else if (ISSPACE(buf[0])) { 
-+	    s = buf; 
-+	    while (*s && ISSPACE (*s)) s++; 
-+	    if(strlen(s) + strlen(last_head) + 1 > LONG_STRING) 
-+	      g_print ("-E- a continuing header is larger than buffern"); 
-+	    else { 
-+	      /* If this is an X-Face line the space don't matter, but if this  
-+	       * is any other header the space is required. */ 
-+	      strcat(last_head, " "); 
-+	      strncat(last_head, s, LONG_STRING - strlen(last_head)); 
-+	    } 
-+	  } else { 
-+	    last_head = NULL; 
- 	  } 
- 	} 
-       }  

http://www.freebsd.org/cgi/query-pr.cgi?pr=45711 
State-Changed-From-To: feedback->closed 
State-Changed-By: foxfair 
State-Changed-When: Thu Mar 27 08:05:51 PST 2003 
State-Changed-Why:  
Patch committed, thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=45711 
>Unformatted:
