From daniel@roe.ch  Wed May 23 02:31:03 2007
Return-Path: <daniel@roe.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9338C16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 May 2007 02:31:03 +0000 (UTC)
	(envelope-from daniel@roe.ch)
Received: from calvin.roe.ch (calvin.roe.ch [213.144.141.26])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D35A13C45A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 May 2007 02:31:03 +0000 (UTC)
	(envelope-from daniel@roe.ch)
Received: from marvin.roe ([10.23.42.11])
	by calvin.roe.ch (envelope-from <roe@marvin.roe>)
	with ESMTPS (TLSv1:AES256-SHA:256) id 1HqGiM-0000JP-Vr
	for FreeBSD-gnats-submit@freebsd.org; Tue, 22 May 2007 00:50:54 +0200
Received: from marvin.roe (localhost [127.0.0.1])
	by marvin.roe (8.13.8/8.13.6) with ESMTP id l4LMfGWD019294;
	Tue, 22 May 2007 00:41:16 +0200 (CEST)
	(envelope-from roe@localhost.roe)
Received: (from roe@localhost)
	by marvin.roe (8.13.8/8.13.6/Submit) id l4LMfGD0019293;
	Tue, 22 May 2007 00:41:16 +0200 (CEST)
	(envelope-from roe)
Message-Id: <200705212241.l4LMfGD0019293@marvin.roe>
Date: Tue, 22 May 2007 00:41:16 +0200 (CEST)
From: Daniel Roethlisberger <daniel@roe.ch>
Reply-To: Daniel Roethlisberger <daniel@roe.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: daniel@roe.ch
Subject: [PATCH] x11-wm/icewm fix TaskBarShowAPMStatus SIGSEGV
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         112880
>Category:       ports
>Synopsis:       [PATCH] x11-wm/icewm fix TaskBarShowAPMStatus SIGSEGV
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    alepulver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 23 02:40:04 GMT 2007
>Closed-Date:    Tue Jun 05 02:03:05 GMT 2007
>Last-Modified:  Tue Jun  5 02:10:05 GMT 2007
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 6.2-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD marvin.roe 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Fixes SIGSEGV in TaskBarShowAPMStatus code, as per tracker #1629022:

https://sourceforge.net/tracker/?func=detail&atid=100031&aid=1629022&group_id=31

>How-To-Repeat:
Set TaskBarShowAPMStatus = 1 and run IceWM.  It will dump core.
>Fix:
--- icewm-apm-fix.diff begins here ---
diff -ruN icewm.old/Makefile icewm/Makefile
--- icewm.old/Makefile	Thu May  3 23:10:00 2007
+++ icewm/Makefile	Tue May 22 00:29:24 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
diff -ruN icewm.old/files/patch-src_aapm.cc icewm/files/patch-src_aapm.cc
--- icewm.old/files/patch-src_aapm.cc	Thu Jan  1 01:00:00 1970
+++ icewm/files/patch-src_aapm.cc	Tue May 22 00:17:56 2007
@@ -0,0 +1,11 @@
+--- src/aapm.cc.orig	2006/12/24 15:56:15	1.18.2.3
++++ src/aapm.cc	2007/04/22 16:38:49	1.18.2.4
+@@ -632,7 +632,7 @@
+ 
+     //estimate applet's size
+     for (i = 0; i < batteryNum; i++) {
+-        if (acpiBatteries[i]->present == BAT_ABSENT)
++        if (mode == ACPI && acpiBatteries[i]->present == BAT_ABSENT)
+             continue;
+         if (taskBarShowApmTime)
+             strcat(buf, "0:00");
--- icewm-apm-fix.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->alepulver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed May 23 02:40:12 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112880 
State-Changed-From-To: open->closed 
State-Changed-By: alepulver 
State-Changed-When: Tue Jun 5 02:03:03 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112880: commit references a PR
Date: Tue,  5 Jun 2007 02:02:40 +0000 (UTC)

 alepulver    2007-06-05 02:02:35 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/icewm         Makefile 
   Added files:
     x11-wm/icewm/files   patch-src_aapm.cc 
   Log:
   - Fix SIGSEGV in TaskBarShowAPMStatus code, as per tracker #1629022:
   
   https://sourceforge.net/tracker/?func=detail&atid=100031&aid=1629022&group_id=31
   
   PR:             ports/112880
   Submitted by:   Daniel Roethlisberger <daniel@roe.ch>
   
   Revision  Changes    Path
   1.128     +1 -1      ports/x11-wm/icewm/Makefile
   1.1       +11 -0     ports/x11-wm/icewm/files/patch-src_aapm.cc (new)
 _______________________________________________
 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:
