ports/112880: [PATCH] x11-wm/icewm fix TaskBarShowAPMStatus SIGSEGV

[Daniel Roethlisberger]

>Number:         112880
>Category:       ports
>Synopsis:       [PATCH] x11-wm/icewm fix TaskBarShowAPMStatus SIGSEGV
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 23 02:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: