From c74497bde9557ce28cdbb6d2eaf111ea0dd04398 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 4 Dec 2009 11:13:08 +0000 Subject: [PATCH] 4.4.2-14 --- .cvsignore | 2 +- gcc.spec | 15 ++-- gcc44-CVE-2009-3736.patch | 154 -------------------------------------- sources | 2 +- 4 files changed, 12 insertions(+), 161 deletions(-) delete mode 100644 gcc44-CVE-2009-3736.patch diff --git a/.cvsignore b/.cvsignore index bbc3d0d..f2dfc1c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.2-20091202.tar.bz2 +gcc-4.4.2-20091204.tar.bz2 diff --git a/gcc.spec b/gcc.spec index aa08637..d86311c 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,9 +1,9 @@ -%global DATE 20091202 -%global SVNREV 154912 +%global DATE 20091204 +%global SVNREV 154977 %global gcc_version 4.4.2 # 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 13 +%global gcc_release 14 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %global include_gappletviewer 1 @@ -161,7 +161,6 @@ Patch16: gcc44-unwind-debug-hook.patch Patch17: gcc44-pr38757.patch Patch18: gcc44-libstdc++-docs.patch Patch19: gcc44-ppc64-aixdesc.patch -Patch20: gcc44-CVE-2009-3736.patch Patch1000: fastjar-0.97-segfault.patch @@ -467,7 +466,6 @@ which are required to compile with the GNAT. %patch18 -p0 -b .libstdc++-docs~ %endif %patch19 -p0 -b .ppc64-aixdesc~ -%patch20 -p0 -b .CVE-2009-3736~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -1851,6 +1849,13 @@ fi %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Fri Dec 4 2009 Jakub Jelinek 4.4.2-14 +- update from gcc-4_4-branch + - PRs libstdc++/42261, middle-end/42049 +- backport C++0x ICE fix from trunk (PR c++/42266) +- fortran !$omp workshare improvements (PR fortran/35423) +- FMA4 and XOP fixes + * Wed Dec 2 2009 Jakub Jelinek 4.4.2-13 - fix security issues in libltdl bundled within libgcj (CVE-2009-3736) diff --git a/gcc44-CVE-2009-3736.patch b/gcc44-CVE-2009-3736.patch deleted file mode 100644 index a958e7e..0000000 --- a/gcc44-CVE-2009-3736.patch +++ /dev/null @@ -1,154 +0,0 @@ -2009-12-02 Jakub Jelinek - - * acinclude.m4: Regenerated to pick: - 2007-06-22 Ralf Wildenhues - - * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: - Ignore lines in ld.so.conf starting with 'hwcap '. - - * configure: Regenerated. - - 2009-11-24 Peter O'Gorman - - Backport of libltdl changes from the 2.26b release. - * ltdl.c: Backport changes. - ---- libjava/libltdl/ltdl.c.jj 2008-09-05 12:57:53.000000000 +0200 -+++ libjava/libltdl/ltdl.c 2009-12-02 18:19:11.000000000 +0100 -@@ -2175,7 +2175,8 @@ static int trim LT_PARAMS((char * - static int try_dlopen LT_PARAMS((lt_dlhandle *handle, - const char *filename)); - static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle, -- const char *filename)); -+ const char *filename, -+ const char * useloader)); - static int unload_deplibs LT_PARAMS((lt_dlhandle handle)); - static int lt_argz_insert LT_PARAMS((char **pargz, - size_t *pargz_len, -@@ -2361,9 +2362,10 @@ lt_dlexit () - } - - static int --tryall_dlopen (handle, filename) -+tryall_dlopen (handle, filename, useloader) - lt_dlhandle *handle; - const char *filename; -+ const char *useloader; - { - lt_dlhandle cur; - lt_dlloader *loader; -@@ -2430,6 +2432,11 @@ tryall_dlopen (handle, filename) - - while (loader) - { -+ if (useloader && strcmp(loader->loader_name, useloader)) -+ { -+ loader = loader->next; -+ continue; -+ } - lt_user_data data = loader->dlloader_data; - - cur->module = loader->module_open (data, filename); -@@ -2499,7 +2506,7 @@ tryall_dlopen_module (handle, prefix, di - error += tryall_dlopen_module (handle, - (const char *) 0, prefix, filename); - } -- else if (tryall_dlopen (handle, filename) != 0) -+ else if (tryall_dlopen (handle, filename, NULL) != 0) - { - ++error; - } -@@ -2520,7 +2527,7 @@ find_module (handle, dir, libdir, dlname - /* Try to open the old library first; if it was dlpreopened, - we want the preopened version of it, even if a dlopenable - module is available. */ -- if (old_name && tryall_dlopen (handle, old_name) == 0) -+ if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0) - { - return 0; - } -@@ -2784,7 +2791,7 @@ find_handle_callback (filename, data, ig - - /* Try to dlopen the file, but do not continue searching in any - case. */ -- if (tryall_dlopen (handle, filename) != 0) -+ if (tryall_dlopen (handle, filename,NULL) != 0) - *handle = 0; - - return 1; -@@ -3072,7 +3079,7 @@ try_dlopen (phandle, filename) - /* lt_dlclose()ing yourself is very bad! Disallow it. */ - LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG); - -- if (tryall_dlopen (&newhandle, 0) != 0) -+ if (tryall_dlopen (&newhandle, 0, NULL) != 0) - { - LT_DLFREE (*phandle); - return 1; -@@ -3194,7 +3201,7 @@ try_dlopen (phandle, filename) - } - #endif - } -- if (!file) -+ else - { - file = fopen (filename, LT_READTEXT_MODE); - } -@@ -3378,7 +3385,7 @@ try_dlopen (phandle, filename) - #endif - ))) - { -- if (tryall_dlopen (&newhandle, filename) != 0) -+ if (tryall_dlopen (&newhandle, filename, NULL) != 0) - { - newhandle = NULL; - } ---- libjava/libltdl/acinclude.m4.jj 2008-09-05 12:57:53.000000000 +0200 -+++ libjava/libltdl/acinclude.m4 2009-12-02 19:47:40.000000000 +0100 -@@ -1527,7 +1527,7 @@ linux*) - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - ---- libjava/libltdl/configure.jj 2009-09-01 11:05:06.000000000 +0200 -+++ libjava/libltdl/configure 2009-12-02 19:50:23.000000000 +0100 -@@ -9160,7 +9160,7 @@ linux*) - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - -@@ -12576,7 +12576,7 @@ linux*) - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - -@@ -15489,7 +15489,7 @@ linux*) - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - -@@ -17916,7 +17916,7 @@ linux*) - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - diff --git a/sources b/sources index 69f6509..63d5e1e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -74a02ed7bf5efa323ab4113d7e5331b5 gcc-4.4.2-20091202.tar.bz2 +dcff137d5ba8e70cd5cf8fcd0b34ede6 gcc-4.4.2-20091204.tar.bz2