Updated wm/fvwm to 2.4.20

fvwm-2.4.20 maintenance release for all earlier 2.4.x versions.
It contains a number of minor fixes and one important security fix.

This release is available at the home page: http://www.fvwm.org/.

Who needs to upgrade?
---------------------

Because of the security issues with fvwm-2.3.4 to fvwm-2.4.19, it
is strongly recommended to upgrade to fvwm-2.4.19.

System administrators are encouraged to install this version to
grant their users access to the latest stable version.

Bug Fixes:
----------

* The configure script now correctly appends executable file
  extensions to conditionally built binaries. Fixes building on
  Cygwin.

* FvwmConsole no longer conflicts with getline of Cygwin's stdio.

* Fixed parsing of For loops in FvwmScript.

* Fixed a possible endless loop when de-iconifying a transient
  window.

* Reject some invalid GNOME hints.

* Fixed a loop when xterm changes its "active icon" size.

* The configure script can now cope with four-part version numbers
  when detecting some libraries.

* Security fixes in

     fvwm-menu-directory. (CVE-2006-5969)
     FvwmCommand

6 files changed, 35 insertions, 53 deletions

diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 1619072d31f..25ae5f75e09 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/11/26 13:32:43 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2006/12/12 06:57:59 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	4
+#PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/ \
@@ -16,12 +16,12 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.19
+FVWM_VER=	2.4.20
 
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run tar
 
 PLIST_SUBST+=		FVWM_VER=${FVWM_VER:Q}
 
@@ -39,8 +39,8 @@ CONFIGURE_ARGS+=	--with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}
 CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 
 post-extract:
-	${MKDIR} ${WRKDIR:Q}/icons
-	cd ${WRKDIR:Q}/icons && ${TAR} -xzf ${DISTDIR:Q}/fvwm_icons.tgz
+	mkdir ${WRKDIR:Q}/icons
+	cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
 
 post-install:
 	${INSTALL_DATA} \
diff --git a/wm/fvwm/distinfo b/wm/fvwm/distinfo
index d532bf9fd62..f0bdc1bdf4a 100644
--- a/wm/fvwm/distinfo
+++ b/wm/fvwm/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.2 2006/11/26 13:32:43 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2006/12/12 06:57:59 martti Exp $
 
-SHA1 (fvwm-2.4.19.tar.gz) = 6d881473560d6ded360fc47a7cfb1b3d5d30824f
-RMD160 (fvwm-2.4.19.tar.gz) = cc6e3ceebccd50ba0404079771faa6babc041ca0
-Size (fvwm-2.4.19.tar.gz) = 1826833 bytes
+SHA1 (fvwm-2.4.20.tar.gz) = 2130a16590462cbbf15f255a46abe8b8a6cb4401
+RMD160 (fvwm-2.4.20.tar.gz) = c71f8cce0b7d7258aeef94d889c1a0346c2ae21b
+Size (fvwm-2.4.20.tar.gz) = 1844688 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = 1fbb00d0ef3fb3042537a7cdc0da0b1f506235ae
-SHA1 (patch-ab) = 9005c7e38002a44a62d2289a72f4b9ab5b4f5386
+SHA1 (patch-aa) = 3170577a6c2e13d452fb1bf970ab3299b53c3706
+SHA1 (patch-ab) = 85616cadc56fa4e061c29d21f38f074ae084b152
 SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8
-SHA1 (patch-ad) = 95b9fac03006378ce76a89a5116b783e8c88ef0a
+SHA1 (patch-ad) = 6f440b6ddf723ef5ff522e837e0b48ed03d278ac
 SHA1 (patch-ae) = 09460e67c977d261b21e75be9a790841527d4117
-SHA1 (patch-af) = 5481d725ad7e0e7cb0fb882077ccb6b9482099a1
diff --git a/wm/fvwm/patches/patch-aa b/wm/fvwm/patches/patch-aa
index 4167ce6e718..930d4a58ce9 100644
--- a/wm/fvwm/patches/patch-aa
+++ b/wm/fvwm/patches/patch-aa
@@ -1,24 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
+$NetBSD: patch-aa,v 1.2 2006/12/12 06:57:59 martti Exp $
 
---- utils/Makefile.in.orig	2004-09-30 19:56:39.000000000 +0300
-+++ utils/Makefile.in	2004-10-01 12:03:56.000000000 +0300
-@@ -168,3 +168,3 @@
- 
+--- utils/Makefile.in.orig	2006-12-09 12:11:12.000000000 +0000
++++ utils/Makefile.in	2006-12-12 08:51:11.000000000 +0000
+@@ -39,4 +39,4 @@
+ host_triplet = @host@
 -bin_PROGRAMS = @XPMROOT@
+-EXTRA_PROGRAMS = xpmroot$(EXEEXT) xselection$(EXEEXT)
 +bin_PROGRAMS =
- bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory \
-@@ -173,5 +173,5 @@
- 
--EXTRA_PROGRAMS = xpmroot xselection
-+EXTRA_PROGRAMS = xselection
++EXTRA_PROGRAMS = xselection$(EXEEXT)
+ subdir = utils
+@@ -233,3 +233,3 @@
  
 -man_MANS = xpmroot.1 fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 \
 +man_MANS = fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 \
  	fvwm-menu-xlock.1 fvwm-menu-directory.1 \
-@@ -194,4 +194,4 @@
- 	fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert fvwmbug.sh
--EXTRA_PROGRAMS = xpmroot$(EXEEXT) xselection$(EXEEXT)
--bin_PROGRAMS = @XPMROOT@
-+EXTRA_PROGRAMS = xselection$(EXEEXT)
-+bin_PROGRAMS =
- PROGRAMS = $(bin_PROGRAMS)
diff --git a/wm/fvwm/patches/patch-ab b/wm/fvwm/patches/patch-ab
index 83cd38f6f8d..f00f2118d7f 100644
--- a/wm/fvwm/patches/patch-ab
+++ b/wm/fvwm/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
+$NetBSD: patch-ab,v 1.2 2006/12/12 06:57:59 martti Exp $
 
---- configure.orig	2004-09-30 19:56:42.000000000 +0300
-+++ configure	2004-10-01 12:04:46.000000000 +0300
-@@ -1541,3 +1541,3 @@
+--- configure.orig	2006-12-09 11:54:30.000000000 +0000
++++ configure	2006-12-12 08:51:55.000000000 +0000
+@@ -2121,7 +2121,7 @@
+ 
+ 
  # Define the identity of the package.
 - PACKAGE=fvwm
 + PACKAGE=fvwm2
-  VERSION=2.4.19
+  VERSION=2.4.20
+ 
+ 
diff --git a/wm/fvwm/patches/patch-ad b/wm/fvwm/patches/patch-ad
index 0504d009cfa..812d1898eb8 100644
--- a/wm/fvwm/patches/patch-ad
+++ b/wm/fvwm/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
+$NetBSD: patch-ad,v 1.2 2006/12/12 06:57:59 martti Exp $
 
---- config.h.in.orig	2005-12-06 14:33:03.000000000 +0000
-+++ config.h.in
-@@ -427,6 +427,8 @@
+--- config.h.in.orig	2006-12-09 11:54:06.000000000 +0000
++++ config.h.in	2006-12-12 08:52:22.000000000 +0000
+@@ -432,6 +432,8 @@
  #else
  #  ifdef _AIX
         #pragma alloca
diff --git a/wm/fvwm/patches/patch-af b/wm/fvwm/patches/patch-af
deleted file mode 100644
index 9050e5cab5c..00000000000
--- a/wm/fvwm/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/11/26 13:32:43 adrianp Exp $
-
---- utils/fvwm-menu-directory.in.orig	2005-07-08 21:59:00.000000000 +0100
-+++ utils/fvwm-menu-directory.in
-@@ -279,7 +279,7 @@ sub evalFolderLine ($$) {
- 	my $itemStr = $dir && $itemF_eval? &evalItem($_name, $dir): $_name;
- 	$itemStr = escapeItemName($itemStr);
- 	my $act = !$dir || $checkSubdirs && !-x $dir? "Nop": !$reuse?
--		qq(Popup ") . escapeFvwmName($dir) . qq("$submenuPos):
-+		qq(Popup ") . escapeFileName($dir) . qq("$submenuPos):
- 		qq(PipeRead 'echo ") . escapeFileName($dir) . qq(" >$dirFile; )
- 		. qq(echo Menu ") . escapeFvwmName($name) . qq(" WarpTitle');
- 	return qq(+ "$iconDStr$itemStr" $act\n);