Changes 2.4.5:

Almost completely rewrote the DocBook export filter, gaining substantial more functionality in the process
Fixed a security bug pointed out to us by Joxean Koret
Fixed a massive amount of bugs in the OpenDocument import and export filters
Fixed the unstability on x86_64 architectures

7 files changed, 15 insertions, 38 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 69f426a457e..4ed94aae537 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/06/30 09:45:19 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/10 21:40:49 adam Exp $
 
 .include "../../editors/abiword/Makefile.common"
 
 PKGNAME=	abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION=	1
 COMMENT=	Plugins enhancing Abiword's capabilities
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abiword-plugins
diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
index 2dc9072b30a..8a49ce12f48 100644
--- a/editors/abiword-plugins/distinfo
+++ b/editors/abiword-plugins/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2006/05/09 10:09:06 joerg Exp $
+$NetBSD: distinfo,v 1.19 2006/07/10 21:40:50 adam Exp $
 
-SHA1 (abiword-2.4.4.tar.bz2) = e2afde95a408f011a1877bc6647799777845dd18
-RMD160 (abiword-2.4.4.tar.bz2) = 5fad618b07b13a543f55321dd3e8114105cefd5d
-Size (abiword-2.4.4.tar.bz2) = 24687425 bytes
+SHA1 (abiword-2.4.5.tar.bz2) = bca02a8beb490246f785518fc82c6c557a77a88d
+RMD160 (abiword-2.4.5.tar.bz2) = f0de27f97135f8fff9b4400b05d74a27eee348cd
+Size (abiword-2.4.5.tar.bz2) = 24930028 bytes
 SHA1 (patch-aa) = 20250039a86753574046a3d94712c7e8a56d8f11
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index f1b304ab05d..e2c4b7b6dac 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2006/05/04 12:59:04 sketch Exp $
+# $NetBSD: Makefile,v 1.102 2006/07/10 21:40:49 adam Exp $
 
 .include "Makefile.common"
 COMMENT=	Open Source cross-platform word processor
-PKGREVISION=	2
 
 # GTK1 version and previous name of the GTK2 version
 CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index fb466622f78..115b86e55b3 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.33 2006/05/09 02:54:10 hira Exp $
+# $NetBSD: Makefile.common,v 1.34 2006/07/10 21:40:49 adam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
-ABIWORD_VERSION=	2.4.4
+ABIWORD_VERSION=	2.4.5
 DISTNAME=	abiword-${ABIWORD_VERSION}
 
 CATEGORIES=	editors
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index c29968fe278..3c6150f2cbb 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2006/04/15 10:47:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2006/07/10 21:40:49 adam Exp $
 bin/AbiWord-2.4
 bin/abiword
 bin/ttfadmin.sh
@@ -298,6 +298,7 @@ share/AbiSuite-2.4/AbiWord/strings/fr-FR.strings
 share/AbiSuite-2.4/AbiWord/strings/ga-IE.strings
 share/AbiSuite-2.4/AbiWord/strings/gl-ES.strings
 share/AbiSuite-2.4/AbiWord/strings/he-IL.strings
+share/AbiSuite-2.4/AbiWord/strings/hr-HR.strings
 share/AbiSuite-2.4/AbiWord/strings/hu-HU.strings
 share/AbiSuite-2.4/AbiWord/strings/id-ID.strings
 share/AbiSuite-2.4/AbiWord/strings/it-IT.strings
@@ -311,6 +312,7 @@ share/AbiSuite-2.4/AbiWord/strings/mh-MH.strings
 share/AbiSuite-2.4/AbiWord/strings/mk-MK.strings
 share/AbiSuite-2.4/AbiWord/strings/ms-MY.strings
 share/AbiSuite-2.4/AbiWord/strings/nb-NO.strings
+share/AbiSuite-2.4/AbiWord/strings/ne-NP.strings
 share/AbiSuite-2.4/AbiWord/strings/nl-NL.strings
 share/AbiSuite-2.4/AbiWord/strings/nn-NO.strings
 share/AbiSuite-2.4/AbiWord/strings/pl-PL.strings
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 09080797af8..fbf3c092706 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.52 2006/06/07 23:24:00 rillig Exp $
+$NetBSD: distinfo,v 1.53 2006/07/10 21:40:49 adam Exp $
 
-SHA1 (abiword-2.4.4.tar.bz2) = e2afde95a408f011a1877bc6647799777845dd18
-RMD160 (abiword-2.4.4.tar.bz2) = 5fad618b07b13a543f55321dd3e8114105cefd5d
-Size (abiword-2.4.4.tar.bz2) = 24687425 bytes
+SHA1 (abiword-2.4.5.tar.bz2) = bca02a8beb490246f785518fc82c6c557a77a88d
+RMD160 (abiword-2.4.5.tar.bz2) = f0de27f97135f8fff9b4400b05d74a27eee348cd
+Size (abiword-2.4.5.tar.bz2) = 24930028 bytes
 SHA1 (patch-aa) = b305b8a5dcf16c76e4bc858b6b484592b68aaca1
 SHA1 (patch-ab) = 94191b278b6c5d0a37231efde9dc11097d6c1590
 SHA1 (patch-ac) = 8fe244939c96a322a4db61463b8f66af0fc61e35
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
-SHA1 (patch-ae) = a86681d29691fdfcd15b5c5e47f07ad5f5dc23d6
 SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d
 SHA1 (patch-ag) = a4d4569e2bb67110aa160f2f596c32bbd5bac9c4
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
deleted file mode 100644
index 5fba499a03f..00000000000
--- a/editors/abiword/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.17 2006/06/07 23:24:01 rillig Exp $
-
---- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	2005-10-16 04:50:52.000000000 +0200
-+++ src/af/xap/unix/xap_UnixEncodingManager.cpp	2006-06-08 01:19:17.842815432 +0200
-@@ -546,7 +546,7 @@ void  XAP_UnixEncodingManager::initializ
- 				MYLANG += LanguageISOName;
- 				MYLANG += "_";
- 				MYLANG += LanguageISOTerritory;
--				putenv(MYLANG.utf8_str());
-+				putenv(const_cast<char*>(MYLANG.utf8_str()));
- #else
- 				UT_UTF8String MYLANG (LanguageISOName);
- 				MYLANG += "_";
-@@ -569,7 +569,7 @@ void  XAP_UnixEncodingManager::initializ
- #if defined(SETENV_MISSING)
- 				MYLANG = "LANG=";
- 				MYLANG += OLDLANG;
--				putenv(MYLANG.utf8_str());
-+				putenv(const_cast<char*>(MYLANG.utf8_str()));
- #else
- 				setenv("LANG", OLDLANG.utf8_str(), 1);
- #endif