diff --git a/.cvsignore b/.cvsignore index cb276db..f13fa87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.4-20100608.tar.bz2 +gcc-4.4.4-20100611.tar.bz2 diff --git a/fastjar-0.97-filename0.patch b/fastjar-0.97-filename0.patch index a9a8929..34a02a7 100644 --- a/fastjar-0.97-filename0.patch +++ b/fastjar-0.97-filename0.patch @@ -2,8 +2,8 @@ * jartool.c (read_entries): Properly zero-terminate filename. ---- fastjar/jartool.c 6 Sep 2009 22:16:00 -0000 1.59 -+++ fastjar/jartool.c 1 Mar 2010 15:38:43 -0000 1.60 +--- fastjar-0.97/jartool.c 6 Sep 2009 22:16:00 -0000 1.59 ++++ fastjar-0.97/jartool.c 1 Mar 2010 15:38:43 -0000 1.60 @@ -790,6 +790,7 @@ int read_entries (int fd) progname, jarfile); return 1; diff --git a/fastjar-CVE-2010-0831.patch b/fastjar-CVE-2010-0831.patch index 006a257..2c6e23c 100644 --- a/fastjar-CVE-2010-0831.patch +++ b/fastjar-CVE-2010-0831.patch @@ -5,8 +5,8 @@ directories, disallow absolute paths, make the code slightly more efficient. ---- fastjar-0.98/jartool.c.jj 2009-09-07 00:10:47.000000000 +0200 -+++ fastjar-0.98/jartool.c 2010-06-08 20:00:29.000000000 +0200 +--- fastjar-0.97/jartool.c.jj 2009-09-07 00:10:47.000000000 +0200 ++++ fastjar-0.97/jartool.c 2010-06-08 20:00:29.000000000 +0200 @@ -1730,7 +1730,17 @@ int extract_jar(int fd, const char **fil struct stat sbuf; int depth = 0; diff --git a/gcc.spec b/gcc.spec index 1f27ec4..a2e8320 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,9 +1,9 @@ -%global DATE 20100608 -%global SVNREV 160426 +%global DATE 20100611 +%global SVNREV 160596 %global gcc_version 4.4.4 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%global gcc_release 7 +%global gcc_release 8 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 @@ -178,6 +178,8 @@ Patch20: gcc44-no-add-needed.patch Patch1000: fastjar-0.97-segfault.patch Patch1001: fastjar-0.97-len1.patch +Patch1002: fastjar-0.97-filename0.patch +Patch1003: fastjar-CVE-2010-0831.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -519,6 +521,8 @@ tar xzf %{SOURCE4} %patch1000 -p0 -b .fastjar-0.97-segfault~ %patch1001 -p0 -b .fastjar-0.97-len1~ +%patch1002 -p0 -b .fastjar-0.97-filename0~ +%patch1003 -p0 -b .fastjar-CVE-2010-0831~ %if %{bootstrap_java} tar xjf %{SOURCE10} @@ -1994,6 +1998,15 @@ fi %endif %changelog +* Fri Jun 11 2010 Jakub Jelinek 4.4.4-8 +- update from gcc-4_4-branch + - fix demangler (PR other/43838) +- VTA backports + - further var-tracking speedup (#598310, PR debug/41371) +- for typedefs in non-template classes adjust underlying type to + emit proper debug info (#601893) +- fix up fastjar directory traversal bugs (CVE-2010-0831) + * Tue Jun 8 2010 Jakub Jelinek 4.4.4-7 - update from gcc-4_4-branch - PRs c++/43555, fortran/42900, fortran/44360, libfortran/41169, diff --git a/sources b/sources index ff452d4..bae7310 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -e1a2819e9a9daad24662476f4a29d704 gcc-4.4.4-20100608.tar.bz2 +a896e6090fb9f4ef74a8b292fda42af4 gcc-4.4.4-20100611.tar.bz2