From b63090a81d4a9be88ac704c0c78bd6b63c6e5468 Mon Sep 17 00:00:00 2001
From: martti <martti@pkgsrc.org>
Date: Mon, 22 Mar 2004 08:26:44 +0000
Subject: fvwm-2.4.18 maintenance release for all earlier 2.4.x versions. It
 contains important security fixes in several scripts.

* Corrected rebooting the machine in FvwmScript-Quit.

* Fixed the FlickeringMoveWorkaround option to the BugOpts command.

* Security patch in fvwmbug.sh.
  See http://securitytracker.com/alerts/2004/Jan/1008781.html

* Security fixes in
  fvwm-menu-directory (BugTraq id 9161)
  fvwm_make_directory_menu.sh
  fvwm_make_browse_menu.sh
---
 wm/fvwm2/Makefile         |  4 ++--
 wm/fvwm2/distinfo         |  8 ++++----
 wm/fvwm2/patches/patch-ab | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'wm')

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index ab66cf122fd..24422276078 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/10/13 15:21:19 martti Exp $
+# $NetBSD: Makefile,v 1.37 2004/03/22 08:26:44 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -18,7 +18,7 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm1-* fvwm>=1
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.17
+FVWM_VER=	2.4.18
 
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index fd48962a140..97a79924f44 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2003/10/13 15:21:19 martti Exp $
+$NetBSD: distinfo,v 1.22 2004/03/22 08:26:44 martti Exp $
 
-SHA1 (fvwm-2.4.17.tar.gz) = 44bc8d8d739092e29cacf2829481bd322839fb46
-Size (fvwm-2.4.17.tar.gz) = 1795326 bytes
+SHA1 (fvwm-2.4.18.tar.gz) = 03360e859dfc8c4def08adec6f57408ad02dc7a7
+Size (fvwm-2.4.18.tar.gz) = 1792978 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
 SHA1 (patch-aa) = 6721d48d720a242ec80dd7b50aa934f13ff26ddf
-SHA1 (patch-ab) = 42052984c5b359fc19c117940ea30963d0b22944
+SHA1 (patch-ab) = 7c1111f4d6d405edb0ffc91ea25704a13e2ab0d3
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index 2a24f14b8f7..e3cf1e05a3e 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.19 2003/10/13 15:21:19 martti Exp $
+$NetBSD: patch-ab,v 1.20 2004/03/22 08:26:44 martti Exp $
 
---- configure.orig	Fri Oct 10 23:12:43 2003
-+++ configure	Mon Oct 13 18:10:33 2003
-@@ -1562,7 +1562,7 @@
+--- configure.orig	2004-03-19 16:18:12.000000000 +0000
++++ configure	2004-03-22 10:23:35.000000000 +0000
+@@ -1487,7 +1487,7 @@
  fi
  
  # Define the identity of the package.
 - PACKAGE=fvwm
 + PACKAGE=fvwm2
-  VERSION=2.4.17
+  VERSION=2.4.18
  
  
-- 
cgit v1.2.3