Bug 10518

Summary: memcpy bug in windowmaker
Product: Ports & Packages Reporter: Brian Handy <handy>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Brian Handy 1999-03-10 00:30:00 UTC 
	memcpy bug mentioned on the wm-dev list.  Fix turned into a 
	patch against windowmaker-0.51.0.
	
	Patch Submitted by: Dalroi <dalroi@wit401310.student.utwente.nl>
Comment 1 Brian Handy 1999-03-10 20:30:54 UTC 
I knew this was going to happen...windowmaker upgraded while I wasn't
looking.  The following patch *supercedes* the previous patch, and
simultaneously upgrades the port to 0.51.1.


Thanks,

Brian

------------------- 8< S N I P 8< -------------------

diff -urN windowmaker.orig/Makefile windowmaker/Makefile
--- windowmaker.orig/Makefile	Wed Mar 10 12:57:01 1999
+++ windowmaker/Makefile	Wed Mar 10 12:57:14 1999
@@ -5,8 +5,8 @@
 #
 # $Id: Makefile,v 1.47 1999/02/21 21:51:01 billf Exp $
 
-DISTNAME=	WindowMaker-0.51.0
-PKGNAME=	windowmaker-0.51.0
+DISTNAME=	WindowMaker-0.51.1
+PKGNAME=	windowmaker-0.51.1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://jgo.local.net/cool_downloads/wm/
diff -urN windowmaker.orig/files/md5 windowmaker/files/md5
--- windowmaker.orig/files/md5	Wed Mar 10 12:57:01 1999
+++ windowmaker/files/md5	Wed Mar 10 12:58:35 1999
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.51.0.tar.gz) = c88b940437efe9a0c4f7535f836ce984
+MD5 (WindowMaker-0.51.1.tar.gz) = 0b081817bdb28d5780ebad781273365d
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff -urN windowmaker.orig/patches/patch-aa windowmaker/patches/patch-aa
--- windowmaker.orig/patches/patch-aa	Wed Dec 31 17:00:00 1969
+++ windowmaker/patches/patch-aa	Wed Mar 10 13:01:41 1999
@@ -0,0 +1,14 @@
+--- wmlib/app.c.orig	Wed Mar 10 13:01:11 1999
++++ wmlib/app.c	Wed Mar 10 13:01:20 1999
+@@ -65,9 +65,9 @@
+     if (!win)
+       return False;
+ 
+-    free(app->windows);
+-
+     memcpy(win, app->windows, sizeof(Window)*app->win_count);
++
++    free(app->windows);
+ 
+     win[app->win_count] = window;
+     app->windows = win;
diff -urN windowmaker.orig/pkg/PLIST windowmaker/pkg/PLIST
--- windowmaker.orig/pkg/PLIST	Wed Mar 10 12:57:01 1999
+++ windowmaker/pkg/PLIST	Wed Mar 10 13:19:28 1999
@@ -145,17 +145,12 @@
 lib/libwraster.a
 lib/libwraster.la
 lib/libwraster.so
-lib/libwraster.so.1
+lib/libwraster.so.2
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/Defaults/WMGLOBAL
-share/WindowMaker/Defaults/WMRootMenu
-share/WindowMaker/Defaults/WMState
-share/WindowMaker/Defaults/WMWindowAttributes
-share/WindowMaker/Defaults/WindowMaker
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
@@ -299,10 +294,20 @@
 share/WindowMaker/Themes/Checker.themed/checker.xpm
 share/WindowMaker/Themes/Checker.themed/style
 share/WindowMaker/Themes/Default.style
+share/WindowMaker/Themes/LeetWM.themed/LeetWM.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb2.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMTile1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMtb1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMtb2.jpg
+share/WindowMaker/Themes/LeetWM.themed/style
 share/WindowMaker/Themes/Night.themed/SeaNight.jpeg
 share/WindowMaker/Themes/Night.themed/style
 share/WindowMaker/Themes/OpenStep.style
 share/WindowMaker/Themes/Pastel.style
+share/WindowMaker/Themes/STEP2000.themed/BlueImage2.jpeg
+share/WindowMaker/Themes/STEP2000.themed/style
+share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
@@ -328,6 +333,7 @@
 share/WindowMaker/menu.se
 share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
+share/WindowMaker/menu.zh_TW.Big5
 share/WindowMaker/plmenu
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
@@ -335,13 +341,14 @@
 share/WindowMaker/xtree.dat
 @exec mkdir -p %B/Sounds
 @dirrm share/WindowMaker/Themes/Checker.themed
+@dirrm share/WindowMaker/Themes/LeetWM.themed
 @dirrm share/WindowMaker/Themes/Night.themed
+@dirrm share/WindowMaker/Themes/STEP2000.themed
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Pixmaps
 @dirrm share/WindowMaker/Icons
 @dirrm share/WindowMaker/IconSets
-@dirrm share/WindowMaker/Defaults
 @dirrm share/WindowMaker/Backgrounds
 @dirrm share/WindowMaker
 @dirrm share/WINGs
Comment 2 Brian Handy 1999-03-13 17:56:04 UTC 
May I present the WindowMaker port-of-the-day.  This is against the
current port in the tree, not the already-submitted patches.  The memcpy
bug went into the main tree and the patch has again disappeared from the
list that follows.  I have tested 0.51.1, but I'm doing 0.51.2 remotely,
so I'd appreciated it if the committer-of-choice would run this for a
couple minutes and make sure it actually runs.

Have fun,

Brian
--
diff -urN windowmaker.orig/Makefile windowmaker/Makefile
--- windowmaker.orig/Makefile	Sat Mar 13 10:18:36 1999
+++ windowmaker/Makefile	Sat Mar 13 10:19:28 1999
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.51.0
+# Version required:	0.51.2
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
 # $Id: Makefile,v 1.47 1999/02/21 21:51:01 billf Exp $
 
-DISTNAME=	WindowMaker-0.51.0
-PKGNAME=	windowmaker-0.51.0
+DISTNAME=	WindowMaker-0.51.2
+PKGNAME=	windowmaker-0.51.2
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://jgo.local.net/cool_downloads/wm/
diff -urN windowmaker.orig/files/md5 windowmaker/files/md5
--- windowmaker.orig/files/md5	Sat Mar 13 10:18:36 1999
+++ windowmaker/files/md5	Sat Mar 13 10:51:29 1999
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.51.1.tar.gz) = 0b081817bdb28d5780ebad781273365d
+MD5 (WindowMaker-0.51.2.tar.gz) = 041b07bf4771cc91bc8ddd29d2a392a2
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff -urN windowmaker.orig/pkg/PLIST windowmaker/pkg/PLIST
--- windowmaker.orig/pkg/PLIST	Sat Mar 13 10:18:36 1999
+++ windowmaker/pkg/PLIST	Sat Mar 13 10:46:12 1999
@@ -44,7 +44,11 @@
 GNUstep/Apps/WPrefs.app/tiff/speed3s.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed4.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed4s.tiff
+GNUstep/Apps/WPrefs.app/tiff/tdel.tiff
+GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
 GNUstep/Apps/WPrefs.app/tiff/temp.tiff
+GNUstep/Apps/WPrefs.app/tiff/textr.tiff
+GNUstep/Apps/WPrefs.app/tiff/tnew.tiff
 GNUstep/Apps/WPrefs.app/tiff/theme.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff
@@ -123,11 +127,13 @@
 GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm
 GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
+bin/get-wraster-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
 bin/setstyle
 bin/wdwrite
+bin/wkdemenu.pl
 bin/wm-oldmenu2new
 bin/wmaker
 bin/wmaker.inst
Comment 3 Steve Price freebsd_committer freebsd_triage 1999-03-22 02:43:43 UTC 
State Changed
From-To: open->closed

Update committed, thanks!