/hg/icedtea6: Add latest security patches

Xerxes Rånby xerxes at zafena.se
Fri Nov 6 04:46:46 PST 2009


i mean
patches/security/icedtea-6657026.patch

breaks build.

sorry for the copy n paste error.

Xerxes Rånby skrev:
> Hi Martin!
>
> the patch
>
> patches/security/icedtea-6822057.patch
>
>  unfortunally breaks the build of icedtea6.
>
> cheers
> Xerxes
>
> mmatejov at icedtea.classpath.org skrev:
>   
>> changeset d966ce93b58b in /hg/icedtea6
>> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d966ce93b58b
>> author: Martin Matejovic <mmatejov at redhat.com>
>> date: Thu Nov 05 23:24:59 2009 +0100
>>
>> 	Add latest security patches 2009-11-05 Martin Matejovic
>> 	<mmatejov at redhat.com>
>> 		* patches/security/icedtea-6631533.patch
>> 		* patches/security/icedtea-6632445.patch
>> 		* patches/security/icedtea-6636650.patch
>> 		* patches/security/icedtea-6631533.patch
>> 		* patches/security/icedtea-6657026.patch
>> 		* patches/security/icedtea-6657138.patch
>> 		* patches/security/icedtea-6822057.patch
>> 		* patches/security/icedtea-6824265.patch
>> 		* patches/security/icedtea-6861062.patch
>> 		* patches/security/icedtea-6872358.patch
>> 		* Makefile.am: apply the above
>>
>>
>>
>>
>> diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6657026.patch
>> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>> +++ b/patches/security/icedtea-6657026.patch	Thu Nov 05 23:24:59 2009 +0100
>> @@ -0,0 +1,1608 @@
>> +--- old/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:32.501050200 +0400
>> ++++ openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:31.670050200 +0400
>> +@@ -1,5 +1,5 @@
>> + /*
>> +- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
>> ++ * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
>> +  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>> +  *
>> +  * This code is free software; you can redistribute it and/or modify it
>> +@@ -27,10 +27,7 @@
>> + package javax.swing;
>> + 
>> + import java.awt.event.*;
>> +-import java.applet.*;
>> + import java.awt.*;
>> +-import java.io.Serializable;
>> +-import sun.swing.UIAction;
>>   
>>     
> Applying patches/security/icedtea-6636650.patch
> patching file openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
> Hunk #1 succeeded at 163 (offset 16 lines).
> Hunk #2 succeeded at 188 (offset 16 lines).
> Hunk #3 succeeded at 220 (offset 16 lines).
> Hunk #4 succeeded at 239 (offset 16 lines).
> Hunk #5 succeeded at 623 (offset 16 lines).
> Hunk #6 succeeded at 704 (offset 16 lines).
> Hunk #7 succeeded at 851 (offset 16 lines).
> Hunk #8 succeeded at 881 (offset 16 lines).
> Hunk #9 succeeded at 893 (offset 16 lines).
> Hunk #10 succeeded at 901 (offset 16 lines).
> Hunk #11 succeeded at 916 (offset 16 lines).
> Hunk #12 succeeded at 936 (offset 16 lines).
> Checking patches/security/icedtea-6657026.patch
> misordered hunks! output would be garbled
> 9 out of 12 hunks FAILED -- saving rejects to file
> openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java.rej
> ERROR patch patches/security/icedtea-6657026.patch FAILED!
> WARNING make clean-patch before retrying a fix
> make: *** [stamps/patch.stamp] Fel 2
>
> real    5m50.212s
> user    0m4.400s
> sys    0m4.260s
>
>   




More information about the distro-pkg-dev mailing list