[Frugalware-darcs] frugalware-0.6: openoffice.org-2.1.0-6terminus2-i686

VMiklos vmiklos at frugalware.org
Fri Jun 29 11:02:48 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070629090023-e2957-8b95f499b19ccdc5ee3c2f89a0299527de73d9d1.gz;

[openoffice.org-2.1.0-6terminus2-i686
VMiklos <vmiklos at frugalware.org>**20070629090023
 added sw.rtf.prtdata.diff and use_system_freetype.diff
 closes #2196
] {
hunk ./source/xapps/openoffice.org/FrugalBuild 12
-	pkgrel=6terminus1
+	pkgrel=6terminus2
hunk ./source/xapps/openoffice.org/FrugalBuild 38
-		hyperlinks-quotes.diff starcalc-file-format-parser-2.2.diff use_system_libwpd.diff)
-#	$pkgname-$pkgver-frugalware.diff)
-	signatures=($source.asc '' '' '' '')
+		hyperlinks-quotes.diff starcalc-file-format-parser-2.2.diff use_system_libwpd.diff \
+		sw.rtf.prtdata.diff use_system_freetype.diff)
+	signatures=($source.asc '' '' '' '' '' '')
addfile ./source/xapps/openoffice.org/sw.rtf.prtdata.diff
hunk ./source/xapps/openoffice.org/sw.rtf.prtdata.diff 1
+diff -Naur patches/src680/apply patches/src680/apply
+--- patches/src680/apply	2007-06-28 02:27:15.000000000 +0200
++++ patches/src680/apply	2007-06-28 02:28:42.000000000 +0200
+@@ -385,6 +385,7 @@
+ # Security issue with hyper links, CVE-2007-0239, n#241636
+ hyperlinks-2.1.diff
+ cws-obr04-quotes.diff
++sw.rtf.prtdata.diff
+ 
+ # Critical vulnerability in OpenOffice StarCalc file format parser, CVE-2007-0238, n#241652
+ starcalc-file-format-parser-2.2.diff
+diff -Naur patches/src680/sw.rtf.prtdata.diff patches/src680/sw.rtf.prtdata.diff
+--- patches/src680/sw.rtf.prtdata.diff	1970-01-01 01:00:00.000000000 +0100
++++ patches/src680/sw.rtf.prtdata.diff	2007-06-28 02:29:00.000000000 +0200
+@@ -0,0 +1,40 @@
++Index: source/filter/rtf/swparrtf.cxx
++===================================================================
++RCS file: /cvs/sw/sw/source/filter/rtf/swparrtf.cxx,v
++retrieving revision 1.64.36.1
++diff -u -r1.64.36.1 swparrtf.cxx
++--- sw/source/filter/rtf/swparrtf.cxx	1 Feb 2007 18:23:13 -0000	1.64.36.1
+++++ sw/source/filter/rtf/swparrtf.cxx	7 Apr 2007 11:03:07 -0000
++@@ -3684,25 +3684,12 @@
++ 
++ void SwRTFParser::ReadPrtData()
++ {
++-	// der Eingabe Stream steht auf der aktuellen Position
++-	USHORT nLen = USHORT( nTokenValue ), nCnt = 0;
++-	BYTE * pData = new BYTE[ nLen ];
++-
++-	while( IsParserWorking() ) 			// lese bis zur schliessenden Klammer
++-	{
++-		int nToken = GetNextToken();
++-		if( RTF_TEXTTOKEN == nToken )
++-		{
++-			xub_StrLen nTknLen = HexToBin( aToken );
++-			if( STRING_NOTFOUND != nTknLen )
++-			{
++-				memcpy( pData + nCnt, (sal_Char*)aToken.GetBuffer(), nTknLen );
++-				nCnt += nTknLen;
++-			}
++-		}
++-		else if( '}' == nToken )
++-			break;
++-	}
+++	while( IsParserWorking() )
+++    {
+++        int nToken = GetNextToken();
+++        if( (RTF_TEXTTOKEN != nToken) && ('}' == nToken) )
+++            break;
+++    }
++ 
++     SkipToken( -1 );        // schliessende Klammer wieder zurueck!!
++ }
++
addfile ./source/xapps/openoffice.org/use_system_freetype.diff
hunk ./source/xapps/openoffice.org/use_system_freetype.diff 1
+diff -Naur distro-configs/Frugalware.conf.in distro-configs/Frugalware.conf.in
+--- distro-configs/Frugalware.conf.in	2007-06-28 02:44:54.000000000 +0200
++++ distro-configs/Frugalware.conf.in	2007-06-28 02:45:27.000000000 +0200
+@@ -10,6 +10,7 @@
+ --with-system-odbc-headers
+ --with-system-nas
+ --with-firefox
++--with-system-freetype
+ --with-system-xalan
+ --with-serializer-jar=/usr/share/java/serializer.jar
+ --with-system-xerces
}


More information about the Frugalware-darcs mailing list