From olivleh1@kartoffel.salatschuessel.net  Thu Mar  1 17:01:39 2007
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9CA1F16A401;
	Thu,  1 Mar 2007 17:01:39 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (p5084DD5B.dip.t-dialin.net [80.132.221.91])
	by mx1.freebsd.org (Postfix) with ESMTP id A7E2E13C4BC;
	Thu,  1 Mar 2007 17:01:37 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.13.8/8.13.8) with ESMTP id l21FTaaW011668;
	Thu, 1 Mar 2007 16:29:36 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.13.8/8.13.8/Submit) id l21FTZxu011667;
	Thu, 1 Mar 2007 16:29:35 +0100 (CET)
	(envelope-from olivleh1)
Message-Id: <200703011529.l21FTZxu011667@kartoffel.salatschuessel.net>
Date: Thu, 1 Mar 2007 16:29:35 +0100 (CET)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: update-port x11/xfce4-taskmanager
X-Send-Pr-Version: 3.113
X-GNATS-Notify: DaJoob@dajoob.com

>Number:         109725
>Category:       ports
>Synopsis:       update-port x11/xfce4-taskmanager
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    oliver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 01 17:10:06 GMT 2007
>Closed-Date:    Wed Apr 04 18:39:51 GMT 2007
>Last-Modified:  Wed Apr  4 18:40:05 GMT 2007
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Feb 21 20:10:29 CET 2007 root@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.2/usr/src/sys/KARTOFFEL amd64


>Description:
	this is for fixing a memory leak
	Submitted by:	Xavier Otazu <xotazu@cvc.uab.es>

>How-To-Repeat:
>Fix:


--- xfce4-taskmanager.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/ports/x11/xfce4-taskmanager/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	1 Feb 2007 16:24:52 -0000	1.6
+++ Makefile	1 Mar 2007 15:27:59 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-taskmanager
 PORTVERSION=	0.4.0.r2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://xfce4-taskmanager.nebulon.de/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
Index: files/patch-src-interface.c
===================================================================
RCS file: files/patch-src-interface.c
diff -N files/patch-src-interface.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-interface.c	1 Mar 2007 15:27:59 -0000
@@ -0,0 +1,62 @@
+--- src/interface.c.orig	Wed Aug 23 20:55:38 2006
++++ src/interface.c	Thu Mar  1 16:20:58 2007
+@@ -359,12 +359,9 @@
+ 
+ gint compare_int_list_item(GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer column)
+ {	
+-	gchar *s1 = NULL;
+-	gchar *s2 = NULL;
+-	
+-        s1 = (gchar*)malloc(sizeof(char) * 100);
+-	s2 = (gchar*)malloc(sizeof(char) * 100);
+-        
++ 	gchar s1[256];
++	gchar s2[256];      
++
+ 	gint ret = 0;
+ 
+ 	gtk_tree_model_get(model, iter1, column, &s1, -1);
+@@ -380,40 +377,19 @@
+ 		i2 = atoi(s2);
+ 		
+ 	ret = i1 - i2;
+-	
+-	if(s1 != NULL)
+-		g_free(s1);
+-	if(s2 != NULL)
+-		g_free(s2);
+-	
+ 	return ret;
+ }
+ 
+ gint compare_string_list_item(GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer column)
+ {	
+-	gchar *s1 = NULL;
+-	gchar *s2 = NULL;
+-	
+-        s1 = (gchar*)malloc(sizeof(gchar) * 100);
+-	s2 = (gchar*)malloc(sizeof(gchar) * 100);
+-        
++	gchar s1[256];
++	gchar s2[256];
++       
+ 	gint ret = 0;
+ 
+ 	gtk_tree_model_get(model, iter1, GPOINTER_TO_INT(column), &s1, -1);
+ 	gtk_tree_model_get(model, iter2, GPOINTER_TO_INT(column), &s2, -1);
+-
+-	if(s1 == NULL)
+-		s1 = "";
+-	if(s2 == NULL)
+-		s2 = "";
+-
+ 	ret = strcmp(s1, s2);
+-	
+-	if(s1 != NULL)
+-		g_free(s1);
+-	if(s2 != NULL)
+-		g_free(s2);
+-	
+ 	return ret;
+ }
+ 
Index: files/patch-src-xfce-taskmanager-freebsd.c
===================================================================
RCS file: /usr/local/cvsroot/ports/x11/xfce4-taskmanager/files/patch-src-xfce-taskmanager-freebsd.c,v
retrieving revision 1.2
diff -u -r1.2 patch-src-xfce-taskmanager-freebsd.c
--- files/patch-src-xfce-taskmanager-freebsd.c	1 Feb 2007 16:24:53 -0000	1.2
+++ files/patch-src-xfce-taskmanager-freebsd.c	1 Mar 2007 15:27:59 -0000
@@ -1,6 +1,6 @@
---- src/xfce-taskmanager-freebsd.c.orig	Thu Jan  1 01:00:00 1970
-+++ src/xfce-taskmanager-freebsd.c	Thu Feb  1 12:17:27 2007
-@@ -0,0 +1,171 @@
+--- src/xfce-taskmanager-freebsd.c.orig	Thu Mar  1 16:17:09 2007
++++ src/xfce-taskmanager-freebsd.c	Thu Mar  1 16:18:01 2007
+@@ -0,0 +1,172 @@
 +/*
 + Copyright (c) 2006 Oliver Lehmann <oliver@FreeBSD.org>
 + All rights reserved.
@@ -170,5 +170,6 @@
 +		}
 +
 +	}
++	kvm_close(kd);
 +	return task_list;
 +}
--- xfce4-taskmanager.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->oliver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Mar 1 17:10:17 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109725 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Mar 1 17:10:25 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109725 
State-Changed-From-To: feedback->closed 
State-Changed-By: oliver 
State-Changed-When: Wed Apr 4 18:37:43 UTC 2007 
State-Changed-Why:  
committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109725 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109725: commit references a PR
Date: Wed,  4 Apr 2007 18:39:57 +0000 (UTC)

 oliver      2007-04-04 18:39:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11/xfce4-taskmanager Makefile 
     x11/xfce4-taskmanager/files 
                                 patch-src-xfce-taskmanager-freebsd.c 
   Added files:
     x11/xfce4-taskmanager/files patch-src-interface.c 
   Log:
   fix a memory leak
   bump PORTREVISION
   
   PR:             109725
   Submitted by:   oliver
   Patch by:       Xavier Otazu <xotazu@cvc.uab.es>
   Approved by:    maintainer timeout (35 days)
   
   Revision  Changes    Path
   1.8       +1 -1      ports/x11/xfce4-taskmanager/Makefile
   1.1       +62 -0     ports/x11/xfce4-taskmanager/files/patch-src-interface.c (new)
   1.3       +4 -3      ports/x11/xfce4-taskmanager/files/patch-src-xfce-taskmanager-freebsd.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
