December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit gcc41
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package gcc41 checked in at Wed Dec 6 11:48:00 CET 2006. -------- --- gcc41/cross-alpha-gcc-icecream-backend.changes 2006-11-17 12:09:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc41/cross-alpha-gcc-icecream-backend.changes 2006-11-29 12:04:21.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 29 12:01:56 CET 2006 - rguenther(a)suse.de + +- Update to SVN branch head. +- Add patch for Fate #300738. [#159446] +- Add patch for PR29166. [#224153] + +------------------------------------------------------------------- cross-arm-gcc-icecream-backend.changes: same change cross-avr-gcc.changes: same change cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc41.changes: same change libgcj41.changes: same change Old: ---- gcc-4.1.2-20061115.tar.bz2 pr28888.patch pr29319.diff pr29753.patch pr29788.patch New: ---- Wprofile-mismatch.patch gcc-4.1.2-20061129.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-alpha-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.FHiXCY/_old 2006-12-06 11:46:42.000000000 +0100 +++ /var/tmp/diff_new_pack.FHiXCY/_new 2006-12-06 11:46:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-alpha-gcc-icecream-backend (Version 4.1.2_20061115) +# spec file for package cross-alpha-gcc-icecream-backend (Version 4.1.2_20061129) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,8 +29,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.1.2_20061115 -Release: 3 +Version: 4.1.2_20061129 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -74,9 +74,6 @@ Patch100: pr28755.patch Patch101: revert-pr28506.patch Patch104: pr28217.patch -Patch105: pr28888.patch -Patch106: pr29788.patch -Patch108: pr29753.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -97,7 +94,7 @@ Patch68: dwarf3-unwind.patch Patch69: gcc41-ssse3.patch Patch70: pr27880.diff -Patch71: pr29319.diff +Patch72: Wprofile-mismatch.patch %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -174,9 +171,6 @@ %patch101 cd gcc %patch104 -%patch105 -%patch106 -%patch108 cd .. %patch51 %patch55 @@ -198,7 +192,7 @@ %patch68 %patch69 %patch70 -%patch71 +%patch72 %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -403,6 +397,10 @@ /usr/share/icecream-envs %changelog -n cross-alpha-gcc-icecream-backend +* Wed Nov 29 2006 - rguenther(a)suse.de +- Update to SVN branch head. +- Add patch for Fate #300738. [#159446] +- Add patch for PR29166. [#224153] * Fri Nov 17 2006 - rguenther(a)suse.de - Fix gcc41-fortran-{32,64}bit and gcc41-objc-{32,64}bit dependencies. * Wed Nov 15 2006 - jw(a)suse.de cross-arm-gcc-icecream-backend.spec: same change ++++++ cross-avr-gcc.spec ++++++ --- /var/tmp/diff_new_pack.FHiXCY/_old 2006-12-06 11:46:42.000000000 +0100 +++ /var/tmp/diff_new_pack.FHiXCY/_new 2006-12-06 11:46:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc (Version 4.1.2_20061115) +# spec file for package cross-avr-gcc (Version 4.1.2_20061129) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,8 +26,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.1.2_20061115 -Release: 3 +Version: 4.1.2_20061129 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -71,9 +71,6 @@ Patch100: pr28755.patch Patch101: revert-pr28506.patch Patch104: pr28217.patch -Patch105: pr28888.patch -Patch106: pr29788.patch -Patch108: pr29753.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -94,7 +91,7 @@ Patch68: dwarf3-unwind.patch Patch69: gcc41-ssse3.patch Patch70: pr27880.diff -Patch71: pr29319.diff +Patch72: Wprofile-mismatch.patch %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -168,9 +165,6 @@ %patch101 cd gcc %patch104 -%patch105 -%patch106 -%patch108 cd .. %patch51 %patch55 @@ -192,7 +186,7 @@ %patch68 %patch69 %patch70 -%patch71 +%patch72 %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -366,6 +360,10 @@ %{_prefix} %changelog -n cross-avr-gcc +* Wed Nov 29 2006 - rguenther(a)suse.de +- Update to SVN branch head. +- Add patch for Fate #300738. [#159446] +- Add patch for PR29166. [#224153] * Fri Nov 17 2006 - rguenther(a)suse.de - Fix gcc41-fortran-{32,64}bit and gcc41-objc-{32,64}bit dependencies. * Wed Nov 15 2006 - jw(a)suse.de ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.FHiXCY/_old 2006-12-06 11:46:42.000000000 +0100 +++ /var/tmp/diff_new_pack.FHiXCY/_new 2006-12-06 11:46:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa-gcc-icecream-backend (Version 4.1.2_20061115) +# spec file for package cross-hppa-gcc-icecream-backend (Version 4.1.2_20061129) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,8 +29,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.1.2_20061115 -Release: 3 +Version: 4.1.2_20061129 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -74,9 +74,6 @@ Patch100: pr28755.patch Patch101: revert-pr28506.patch Patch104: pr28217.patch -Patch105: pr28888.patch -Patch106: pr29788.patch -Patch108: pr29753.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -97,7 +94,7 @@ Patch68: dwarf3-unwind.patch Patch69: gcc41-ssse3.patch Patch70: pr27880.diff -Patch71: pr29319.diff +Patch72: Wprofile-mismatch.patch %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -174,9 +171,6 @@ %patch101 cd gcc %patch104 -%patch105 -%patch106 -%patch108 cd .. %patch51 %patch55 @@ -198,7 +192,7 @@ %patch68 %patch69 %patch70 -%patch71 +%patch72 %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -403,6 +397,10 @@ /usr/share/icecream-envs %changelog -n cross-hppa-gcc-icecream-backend +* Wed Nov 29 2006 - rguenther(a)suse.de +- Update to SVN branch head. +- Add patch for Fate #300738. [#159446] +- Add patch for PR29166. [#224153] * Fri Nov 17 2006 - rguenther(a)suse.de - Fix gcc41-fortran-{32,64}bit and gcc41-objc-{32,64}bit dependencies. * Wed Nov 15 2006 - jw(a)suse.de cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change ++++++ gcc41.spec ++++++ --- /var/tmp/diff_new_pack.FHiXCY/_old 2006-12-06 11:46:42.000000000 +0100 +++ /var/tmp/diff_new_pack.FHiXCY/_new 2006-12-06 11:46:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gcc41 (Version 4.1.2_20061115) +# spec file for package gcc41 (Version 4.1.2_20061129) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -110,8 +110,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: GNU General Public License (GPL) -Version: 4.1.2_20061115 -Release: 3 +Version: 4.1.2_20061129 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -162,9 +162,6 @@ Patch100: pr28755.patch Patch101: revert-pr28506.patch Patch104: pr28217.patch -Patch105: pr28888.patch -Patch106: pr29788.patch -Patch108: pr29753.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -185,7 +182,7 @@ Patch68: dwarf3-unwind.patch Patch69: gcc41-ssse3.patch Patch70: pr27880.diff -Patch71: pr29319.diff +Patch72: Wprofile-mismatch.patch %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -982,9 +979,6 @@ %patch101 cd gcc %patch104 -%patch105 -%patch106 -%patch108 cd .. %patch51 %patch55 @@ -1006,7 +1000,7 @@ %patch68 %patch69 %patch70 -%patch71 +%patch72 %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -2016,6 +2010,10 @@ %endif %changelog -n gcc41 +* Wed Nov 29 2006 - rguenther(a)suse.de +- Update to SVN branch head. +- Add patch for Fate #300738. [#159446] +- Add patch for PR29166. [#224153] * Fri Nov 17 2006 - rguenther(a)suse.de - Fix gcc41-fortran-{32,64}bit and gcc41-objc-{32,64}bit dependencies. * Wed Nov 15 2006 - jw(a)suse.de ++++++ libgcj41.spec ++++++ --- /var/tmp/diff_new_pack.FHiXCY/_old 2006-12-06 11:46:42.000000000 +0100 +++ /var/tmp/diff_new_pack.FHiXCY/_new 2006-12-06 11:46:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgcj41 (Version 4.1.2_20061115) +# spec file for package libgcj41 (Version 4.1.2_20061129) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -124,8 +124,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 4.1.2_20061115 -Release: 3 +Version: 4.1.2_20061129 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -176,9 +176,6 @@ Patch100: pr28755.patch Patch101: revert-pr28506.patch Patch104: pr28217.patch -Patch105: pr28888.patch -Patch106: pr29788.patch -Patch108: pr29753.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -199,7 +196,7 @@ Patch68: dwarf3-unwind.patch Patch69: gcc41-ssse3.patch Patch70: pr27880.diff -Patch71: pr29319.diff +Patch72: Wprofile-mismatch.patch %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -511,9 +508,6 @@ %patch101 cd gcc %patch104 -%patch105 -%patch106 -%patch108 cd .. %patch51 %patch55 @@ -535,7 +529,7 @@ %patch68 %patch69 %patch70 -%patch71 +%patch72 %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -1059,6 +1053,10 @@ %endif %changelog -n libgcj41 +* Wed Nov 29 2006 - rguenther(a)suse.de +- Update to SVN branch head. +- Add patch for Fate #300738. [#159446] +- Add patch for PR29166. [#224153] * Fri Nov 17 2006 - rguenther(a)suse.de - Fix gcc41-fortran-{32,64}bit and gcc41-objc-{32,64}bit dependencies. * Wed Nov 15 2006 - jw(a)suse.de ++++++ Wprofile-mismatch.patch ++++++ 2006-11-23 Richard Guenther <rguenther(a)suse.de> * doc/invoke.texi (-Wcoverage-mismatch): Document. * common.opt (-Wcoverage-mismatch): New warning option. * coverage.c (get_coverage_counts): Ignore coverage mismatch if -Wcoverage-mismatch is given. Index: gcc/doc/invoke.texi =================================================================== *** gcc/doc/invoke.texi (revision 119120) --- gcc/doc/invoke.texi (working copy) *************** Objective-C and Objective-C++ Dialects}. *** 220,226 **** @gccoptlist{-fsyntax-only -pedantic -pedantic-errors @gol -w -Wextra -Wall -Waggregate-return -Wno-attributes @gol -Wc++-compat -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol ! -Wconversion -Wno-deprecated-declarations @gol -Wdisabled-optimization -Wno-div-by-zero -Wno-endif-labels @gol -Werror -Werror-implicit-function-declaration @gol -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol --- 220,226 ---- @gccoptlist{-fsyntax-only -pedantic -pedantic-errors @gol -w -Wextra -Wall -Waggregate-return -Wno-attributes @gol -Wc++-compat -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment @gol ! -Wconversion -Wcoverage-mismatch -Wno-deprecated-declarations @gol -Wdisabled-optimization -Wno-div-by-zero -Wno-endif-labels @gol -Werror -Werror-implicit-function-declaration @gol -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol *************** Make all warnings into errors. *** 3400,3405 **** --- 3400,3417 ---- This option is only active when @option{-fstack-protector} is active. It warns about functions that will not be protected against stack smashing. + @item -Wcoverage-mismatch + @opindex Wcoverage-mismatch + Warn if feedback profiles do not match when using the + @option{-fprofile-use} option. + If a source file was changed between @option{-fprofile-gen} and + @option{-fprofile-use}, the files with the profile feedback do not + match the source file and GCC can not use the profile feedback + information. By default, GCC emits an error message in this case. + The option @option{-Wcoverage-mismatch} emits a warning instead of an + error. GCC does not use appropriate feedback profiles, but the + compilation runs without errors. + @end table @node Debugging Options *************** The following options are enabled: @code *** 5395,5400 **** --- 5407,5415 ---- @code{-funroll-loops}, @code{-fpeel-loops}, @code{-ftracer}, @code{-fno-loop-optimize}. + By default, GCC emits an error message if the feedback profiles do not + match. The error abort can be avoided by using + @option{-Wcoverage-mismatch}. @end table The following options control compiler behavior regarding floating Index: gcc/coverage.c =================================================================== *** gcc/coverage.c (revision 119120) --- gcc/coverage.c (working copy) *************** get_coverage_counts (unsigned counter, u *** 351,370 **** } checksum = compute_checksum (); ! if (entry->checksum != checksum) { ! error ("coverage mismatch for function %qs while reading counter %qs", ! IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)), ! ctr_names[counter]); ! error ("checksum is %x instead of %x", entry->checksum, checksum); ! return 0; ! } ! else if (entry->summary.num != expected) ! { ! error ("coverage mismatch for function %qs while reading counter %qs", ! IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)), ! ctr_names[counter]); ! error ("number of counters is %d instead of %d", entry->summary.num, expected); return 0; } --- 351,381 ---- } checksum = compute_checksum (); ! if (entry->checksum != checksum ! || entry->summary.num != expected) { ! const char *id = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME ! (current_function_decl)); ! ! if (warn_coverage_mismatch) ! warning (OPT_Wcoverage_mismatch, "coverage mismatch for function " ! "%qs while reading counter %qs", id, ctr_names[counter]); ! else ! error ("coverage mismatch for function %qs while reading counter %qs", ! id, ctr_names[counter]); ! ! if (entry->checksum != checksum) ! inform ("checksum is %x instead of %x", entry->checksum, checksum); ! else ! inform ("number of counters is %d instead of %d", ! entry->summary.num, expected); ! ! if (warn_coverage_mismatch) ! { ! inform ("coverage mismatch ignored due to -Wcoverage-mismatch"); ! inform ("execution counts assumed to be zero"); ! } ! return 0; } Index: gcc/common.opt =================================================================== *** gcc/common.opt (revision 119120) --- gcc/common.opt (working copy) *************** Wvolatile-register-var *** 177,182 **** --- 177,186 ---- Common Var(warn_register_var) Warn when a register variable is declared volatile + Wcoverage-mismatch + Common Var(warn_coverage_mismatch) + Warn when profiles in -fprofile-use do not match + aux-info Common Separate -aux-info <file> Emit declaration information into <file> ++++++ gcc-4.1.2-20061115.tar.bz2 -> gcc-4.1.2-20061129.tar.bz2 ++++++ gcc41/gcc-4.1.2-20061115.tar.bz2 /mounts/work_src_done/STABLE/gcc41/gcc-4.1.2-20061129.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- gcc41/gcc.spec.in 2006-11-17 12:09:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc41/gcc.spec.in 2006-11-29 12:07:55.000000000 +0100 @@ -133,7 +133,7 @@ URL: http://gcc.gnu.org/ License: GPL -Version: 4.1.2_20061115 +Version: 4.1.2_20061129 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -187,9 +187,6 @@ Patch100: pr28755.patch Patch101: revert-pr28506.patch Patch104: pr28217.patch -Patch105: pr28888.patch -Patch106: pr29788.patch -Patch108: pr29753.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -210,7 +207,7 @@ Patch68: dwarf3-unwind.patch Patch69: gcc41-ssse3.patch Patch70: pr27880.diff -Patch71: pr29319.diff +Patch72: Wprofile-mismatch.patch %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: @@ -760,9 +757,6 @@ %patch101 cd gcc %patch104 -%patch105 -%patch106 -%patch108 cd .. %patch51 %patch55 @@ -784,7 +778,7 @@ %patch68 %patch69 %patch70 -%patch71 +%patch72 %if "%{gcc_target_arch}" == "avr" %patch1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Fri Dec 1 12:25:43 CET 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-11-24 19:39:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-12-01 11:34:51.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 1 11:32:49 CET 2006 - jplack(a)suse.de + +- signal change of boot loader location so that the boot loader can + be rewritten if needed (#225023) +- 2.14.14 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.14.13.tar.bz2 New: ---- yast2-bootloader-2.14.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.cR9sCm/_old 2006-12-01 12:24:38.000000000 +0100 +++ /var/tmp/diff_new_pack.cR9sCm/_new 2006-12-01 12:24:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.14.13) +# spec file for package yast2-bootloader (Version 2.14.14) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.14.13 +Version: 2.14.14 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.14.13.tar.bz2 +Source0: yast2-bootloader-2.14.14.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.14.13 +%setup -n yast2-bootloader-2.14.14 %build %{prefix}/bin/y2tool y2autoconf @@ -112,6 +112,10 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Fri Dec 01 2006 - jplack(a)suse.de +- signal change of boot loader location so that the boot loader can + be rewritten if needed (#225023) +- 2.14.14 * Fri Nov 24 2006 - aosthof(a)suse.de - fixed usage of function remove() - added FIXME ++++++ yast2-bootloader-2.14.13.tar.bz2 -> yast2-bootloader-2.14.14.tar.bz2 ++++++ ++++ 12766 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/Makefile.am new/yast2-bootloader-2.14.14/Makefile.am --- old/yast2-bootloader-2.14.13/Makefile.am 2006-11-21 20:07:47.000000000 +0100 +++ new/yast2-bootloader-2.14.14/Makefile.am 2006-04-03 21:41:46.000000000 +0200 @@ -7,7 +7,7 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -66,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in config.status +$(RPMNAME).pc: $(RPMNAME).pc.in ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -95,7 +95,7 @@ done pot: - $(Y2TOOL) y2makepot -s $(srcdir) + y2tool y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +116,7 @@ fi spellcheck: pot - $(Y2TOOL) pot-spellcheck + y2tool pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +143,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(Y2TOOL); then \ - echo "$(Y2TOOL): not found."; \ + if ! test -x $(PREFIX)/bin/y2tool; then \ + echo "$(PREFIX)/bin/y2tool: not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(Y2TOOL) tagversion +TAGVERSION = $(PREFIX)/bin/y2tool tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +200,12 @@ fi check-textdomain: - $(Y2TOOL) check-textdomain $(srcdir) + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(Y2TOOL) checkin-stable + $(PREFIX)/bin/y2tool checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/Makefile.am.common new/yast2-bootloader-2.14.14/Makefile.am.common --- old/yast2-bootloader-2.14.13/Makefile.am.common 2006-11-21 20:07:47.000000000 +0100 +++ new/yast2-bootloader-2.14.14/Makefile.am.common 2006-04-03 21:41:46.000000000 +0200 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/VERSION new/yast2-bootloader-2.14.14/VERSION --- old/yast2-bootloader-2.14.13/VERSION 2006-11-24 19:35:17.000000000 +0100 +++ new/yast2-bootloader-2.14.14/VERSION 2006-12-01 11:34:58.000000000 +0100 @@ -1 +1 @@ -2.14.13 +2.14.14 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/autodocs-ycp.ami new/yast2-bootloader-2.14.14/autodocs-ycp.ami --- old/yast2-bootloader-2.14.13/autodocs-ycp.ami 2006-11-21 20:07:47.000000000 +0100 +++ new/yast2-bootloader-2.14.14/autodocs-ycp.ami 2006-04-03 21:41:46.000000000 +0200 @@ -1,27 +1,18 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc # PARAMETERS: # AUTODOCS_YCP: Files that the ycp autodocs is built from # Optional - the default is $(srcdir)/../../src/*.ycp -# AUTODOCS_PM: Files that the perl autodocs is built from -# Optional - the default is $(srcdir)/../../src/*.pm htmldir = $(docdir)/autodocs html_DATA = index.html $(wildcard *.html) -CLEANFILES = $(html_DATA) pod2htm*.tmp +CLEANFILES = $(html_DATA) -AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) -AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) - -index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) -#including *.pm, for the index +AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp +index.html: $(AUTODOCS_YCP) ${YCPDOC} -d. $^ - for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ - pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ - done + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/config.h.in new/yast2-bootloader-2.14.14/config.h.in --- old/yast2-bootloader-2.14.13/config.h.in 2006-11-21 20:08:00.000000000 +0100 +++ new/yast2-bootloader-2.14.14/config.h.in 2006-04-03 21:42:06.000000000 +0200 @@ -65,7 +65,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. + automatically deduced at run-time. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/configure.in new/yast2-bootloader-2.14.14/configure.in --- old/yast2-bootloader-2.14.13/configure.in 2006-11-21 20:07:47.000000000 +0100 +++ new/yast2-bootloader-2.14.14/configure.in 2006-04-03 21:41:46.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.14.8, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.13.36, http://www.suse.de/feedback, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.8" +VERSION="2.13.36" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od(a)suse.de>" @@ -111,8 +111,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -145,9 +143,6 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/src/generic/boot_loader_locations_widget.ycp new/yast2-bootloader-2.14.14/src/generic/boot_loader_locations_widget.ycp --- old/yast2-bootloader-2.14.13/src/generic/boot_loader_locations_widget.ycp 2006-11-21 19:34:20.000000000 +0100 +++ new/yast2-bootloader-2.14.14/src/generic/boot_loader_locations_widget.ycp 2006-12-01 12:02:55.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <jplack(a)suse.de> * - * $Id: boot_loader_locations_widget.ycp 34177 2006-11-08 17:16:21Z odabrunz $ + * $Id: boot_loader_locations_widget.ycp 34692 2006-12-01 11:02:52Z jplack $ * */ @@ -74,6 +74,9 @@ * @return symbol always nil */ symbol BLL_Handle (string key, map event) { + if (event["EventReason"]:"" == "ValueChanged") { + BootCommon::location_changed = true; + } return generic_Handle (key, event); } @@ -125,6 +128,14 @@ ]; } - - } // include end + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.13/src/modules/BootGRUB.ycp new/yast2-bootloader-2.14.14/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.14.13/src/modules/BootGRUB.ycp 2006-11-21 19:34:18.000000000 +0100 +++ new/yast2-bootloader-2.14.14/src/modules/BootGRUB.ycp 2006-12-01 12:02:55.000000000 +0100 @@ -13,7 +13,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Joachim Plack <jplack(a)suse.de> * - * $Id: BootGRUB.ycp 34514 2006-11-21 09:17:32Z jplack $ + * $Id: BootGRUB.ycp 34692 2006-12-01 11:02:52Z jplack $ * */ @@ -217,6 +217,10 @@ }); if (_add) { + // FIXME: fallback to vmlinux and initrd symlink if + // present in the chroot environment of the other + // Linux System ... #224481 + s["__devs"] = devs; out = add (out, s); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-x11
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package yast2-x11 checked in at Fri Dec 1 12:02:04 CET 2006. -------- --- yast2-x11/yast2-x11.changes 2006-09-26 16:49:52.000000000 +0200 +++ /mounts/work_src_done/NOARCH/NOARCH/yast2-x11/yast2-x11.changes 2006-12-01 11:26:23.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 1 10:46:23 CET 2006 - ms(a)suse.de + +- added fbdev handling according to driver restrictions (#224924) + +------------------------------------------------------------------- +Wed Sep 27 17:08:47 CEST 2006 - ms(a)suse.de + +- version update to 2.14.1 + +------------------------------------------------------------------- Old: ---- yast2-x11-2.13.8.tar.bz2 New: ---- yast2-x11-2.14.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.F48Swh/_old 2006-12-01 12:01:52.000000000 +0100 +++ /var/tmp/diff_new_pack.F48Swh/_new 2006-12-01 12:01:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-x11 (Version 2.13.8) +# spec file for package yast2-x11 (Version 2.14.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-x11 -Version: 2.13.8 -Release: 8 -License: GPL +Version: 2.14.1 +Release: 1 +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-x11-2.13.8.tar.bz2 +Source0: yast2-x11-2.14.1.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite %ifnarch s390 s390x @@ -44,7 +44,7 @@ Thomas Roelz %prep -%setup -n yast2-x11-2.13.8 +%setup -n yast2-x11-2.14.1 %build %{prefix}/bin/y2tool y2autoconf @@ -81,6 +81,10 @@ %doc %{prefix}/share/doc/packages/yast2-x11 %changelog -n yast2-x11 +* Fri Dec 01 2006 - ms(a)suse.de +- added fbdev handling according to driver restrictions (#224924) +* Wed Sep 27 2006 - ms(a)suse.de +- version update to 2.14.1 * Tue Sep 26 2006 - ms(a)suse.de - added support for fvwm in autoyast part of x11 module (#207928) * Thu Aug 10 2006 - lslezak(a)suse.cz ++++++ yast2-x11-2.13.8.tar.bz2 -> yast2-x11-2.14.1.tar.bz2 ++++++ ++++ 13403 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/Makefile.am new/yast2-x11-2.14.1/Makefile.am --- old/yast2-x11-2.13.8/Makefile.am 2006-09-26 14:53:22.000000000 +0200 +++ new/yast2-x11-2.14.1/Makefile.am 2006-12-01 11:24:02.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/Makefile.am.common new/yast2-x11-2.14.1/Makefile.am.common --- old/yast2-x11-2.13.8/Makefile.am.common 2006-09-26 14:53:22.000000000 +0200 +++ new/yast2-x11-2.14.1/Makefile.am.common 2006-12-01 11:24:02.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/VERSION new/yast2-x11-2.14.1/VERSION --- old/yast2-x11-2.13.8/VERSION 2006-09-26 14:51:25.000000000 +0200 +++ new/yast2-x11-2.14.1/VERSION 2006-12-01 11:00:05.000000000 +0100 @@ -1 +1 @@ -2.13.8 +2.14.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/config.h.in new/yast2-x11-2.14.1/config.h.in --- old/yast2-x11-2.13.8/config.h.in 2006-09-26 14:53:38.000000000 +0200 +++ new/yast2-x11-2.14.1/config.h.in 2006-12-01 11:24:17.000000000 +0100 @@ -65,7 +65,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/configure.in new/yast2-x11-2.14.1/configure.in --- old/yast2-x11-2.13.8/configure.in 2006-09-26 14:53:22.000000000 +0200 +++ new/yast2-x11-2.14.1/configure.in 2006-12-01 11:24:02.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-x11 dnl -dnl -- This file is generated by y2autoconf 2.13.25 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-x11, 2.13.8, http://bugs.opensuse.org/, yast2-x11) +AC_INIT(yast2-x11, 2.14.1, http://bugs.opensuse.org/, yast2-x11) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.8" +VERSION="2.14.1" RPMNAME="yast2-x11" MAINTAINER="Marcus Schaefer <ms(a)suse.de>" @@ -111,6 +111,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -170,6 +172,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile scripts/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/src/XLib.pm new/yast2-x11-2.14.1/src/XLib.pm --- old/yast2-x11-2.13.8/src/XLib.pm 2006-09-26 14:51:25.000000000 +0200 +++ new/yast2-x11-2.14.1/src/XLib.pm 2006-12-01 11:17:42.000000000 +0100 @@ -376,6 +376,20 @@ return 1; } #========================================== +# isFbdevBased +#------------------------------------------ +BEGIN{ $TYPEINFO{isFbdevBased} = ["function", "boolean"]; } +sub isFbdevBased { + my $class = shift; + my $mCard = new SaX::SaXManipulateCard ( + $section{Card} + ); + if ($mCard -> getCardDriver() eq "fbdev") { + return 1; + } + return 0; +} +#========================================== # getCardName #------------------------------------------ BEGIN{ $TYPEINFO{getCardName} = ["function", "string"]; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/src/proposal/x11_proposal.ycp new/yast2-x11-2.14.1/src/proposal/x11_proposal.ycp --- old/yast2-x11-2.13.8/src/proposal/x11_proposal.ycp 2006-09-26 14:51:25.000000000 +0200 +++ new/yast2-x11-2.14.1/src/proposal/x11_proposal.ycp 2006-12-01 11:17:42.000000000 +0100 @@ -108,6 +108,7 @@ string cardName = (string) XLib::getCardName(); string monitorName = (string) XLib::getMonitorName(); boolean has3D = (boolean) XLib::hasOpenGLFeatures(); + boolean isFbdevBased= (boolean) XLib::isFbdevBased(); boolean is3DCard = (boolean) XLib::has3DCapabilities(); boolean isNoteBook = (boolean) XLib::isExternalVGANoteBook(); boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware(); @@ -153,34 +154,64 @@ //====================================== // Monitor name and resolution... //-------------------------------------- - if (monitorInch == "undef") { + if (! isFbdevBased) { + if (monitorInch == "undef") { + proposal = proposal + + LI + + XMessages::monitor + "<a href=\"sax-monitor\">" + + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" + + XMessages::Aspect + " " + XMessages::unconfigured + "</a>)" + + " - (<a href=\"sax-resolution\">" + resolution + "</a>)" + + IL; + } else { + proposal = proposal + + LI + + XMessages::monitor + "<a href=\"sax-monitor\">" + + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" + + monitorSize[0]:"" + " " + XMessages::Inches + ", " + + XMessages::Aspect + " " + monitorSize[1]:"" + ":" + + monitorSize[2]:"" + "</a>)" + + " - (<a href=\"sax-resolution\">" + resolution + "</a>)" + + IL; + } + } else { + if (monitorInch == "undef") { + proposal = proposal + + LI + + XMessages::monitor + "<a href=\"sax-monitor\">" + + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" + + XMessages::Aspect + " " + XMessages::unconfigured + "</a>)" + + " - (" + resolution + ")" + + IL; + } else { + proposal = proposal + + LI + + XMessages::monitor + "<a href=\"sax-monitor\">" + + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" + + monitorSize[0]:"" + " " + XMessages::Inches + ", " + + XMessages::Aspect + " " + monitorSize[1]:"" + ":" + + monitorSize[2]:"" + "</a>)" + + " - (" + resolution + ")" + + IL; + } + } + //====================================== + // Colordepth and number of colors... + //-------------------------------------- + if (! isFbdevBased) { proposal = proposal + LI - + XMessages::monitor + "<a href=\"sax-monitor\">" - + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" - + XMessages::Aspect + " " + XMessages::unconfigured + "</a>)" - + " - (<a href=\"sax-resolution\">" + resolution + "</a>)" + + XMessages::colorDepth + "<a href=\"sax-colors\">" + + colorDepth + "</a> Bit (" + colorCount + ")" + IL; } else { proposal = proposal + LI - + XMessages::monitor + "<a href=\"sax-monitor\">" - + monitorName + "</a> " + "(<a href=\"sax-displaysize\">" - + monitorSize[0]:"" + " " + XMessages::Inches + ", " - + XMessages::Aspect + " " + monitorSize[1]:"" + ":" - + monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">" - + resolution + "</a>)" + + XMessages::colorDepth + + colorDepth + " Bit (" + colorCount + ")" + IL; } //====================================== - // Colordepth and number of colors... - //-------------------------------------- - proposal = proposal - + LI - + XMessages::colorDepth + "<a href=\"sax-colors\">" - + colorDepth + "</a> Bit (" + colorCount + ")" - + IL; - //====================================== // 3D acceleration status/availability //-------------------------------------- if (is3DCard) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-client
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package yast2-samba-client checked in at Fri Dec 1 12:01:46 CET 2006. -------- --- yast2-samba-client/yast2-samba-client.changes 2006-11-06 11:16:32.000000000 +0100 +++ /mounts/work_src_done/NOARCH/NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-12-01 11:52:36.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 30 13:41:31 CET 2006 - jsuchome(a)suse.cz + +- install architecture-specific packages (#224418) +- prevent 'net' asking for root's pw (#225224) +- 2.14.4 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.14.3.tar.bz2 New: ---- yast2-samba-client-2.14.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.WBOuzt/_old 2006-12-01 12:01:39.000000000 +0100 +++ /var/tmp/diff_new_pack.WBOuzt/_new 2006-12-01 12:01:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.14.3) +# spec file for package yast2-samba-client (Version 2.14.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-samba-client -Version: 2.14.3 +Version: 2.14.4 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.14.3.tar.bz2 +Source0: yast2-samba-client-2.14.4.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2 yast2-kerberos-client @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-samba-client-2.14.3 +%setup -n yast2-samba-client-2.14.4 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,10 @@ %doc %{prefix}/share/doc/packages/yast2-samba-client %changelog -n yast2-samba-client +* Thu Nov 30 2006 - jsuchome(a)suse.cz +- install architecture-specific packages (#224418) +- prevent 'net' asking for root's pw (#225224) +- 2.14.4 * Mon Nov 06 2006 - jsuchome(a)suse.cz - use correct AD domain name for joining (#214463, #214641) - give NTP client module information about server (#215645) ++++++ yast2-samba-client-2.14.3.tar.bz2 -> yast2-samba-client-2.14.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/VERSION new/yast2-samba-client-2.14.4/VERSION --- old/yast2-samba-client-2.14.3/VERSION 2006-11-06 09:14:16.000000000 +0100 +++ new/yast2-samba-client-2.14.4/VERSION 2006-12-01 11:13:11.000000000 +0100 @@ -1 +1 @@ -2.14.3 +2.14.4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/src/Samba.ycp new/yast2-samba-client-2.14.4/src/Samba.ycp --- old/yast2-samba-client-2.14.3/src/Samba.ycp 2006-10-30 13:42:02.000000000 +0100 +++ new/yast2-samba-client-2.14.4/src/Samba.ycp 2006-11-30 13:45:02.000000000 +0100 @@ -15,6 +15,7 @@ module "Samba"; textdomain "samba-client"; +import "Arch"; import "Autologin"; import "FileUtils"; import "Mode"; @@ -88,6 +89,44 @@ global string shares_separator = "\\"; +// packages to install for specific arhitectures (#224418) +global map arch_packages = $[ + "krb5" : $[ + "ia64" : [ "krb5-x86" ], + "ppc64" : [ "krb5-64bit" ], + "s390_64" : [ "krb5-32bit" ], + "x86_64" : [ "krb5-32bit" ], + ], + "samba-client" : $[ + "ia64" : [ "samba-client-x86" ], + "ppc64" : [ "samba-client-64bit" ], + "s390_64" : [ "samba-client-32bit" ], + "x86_64" : [ "samba-client-32bit" ], + ], + "samba-winbind" : $[ + "ia64" : [ "samba-winbind-x86" ], + "ppc64" : [ "samba-winbind-64bit" ], + "s390_64" : [ "samba-winbind-32bit" ], + "x86_64" : [ "samba-winbind-32bit" ], + ], +]; + +/** + * Return list of architecture specific packages (derived from package list + * given as parameter) merged with the packages in parameter + */ +global define list<string> UpdatedArchPackages (list<string> packages) { + + list<string> ret = packages; + string arch = Arch::architecture (); + + foreach (string package, packages, { + ret = (list<string>) union (ret, arch_packages[package,arch]:[]); + }); + return ret; +} + + /** * Data was modified? * @return true if modified @@ -346,7 +385,9 @@ SambaConfig::Read(false); // check installed packages - if (!PackageSystem::CheckAndInstallPackagesInteractive(["samba-client"])) { + if (!PackageSystem::CheckAndInstallPackagesInteractive( + UpdatedArchPackages (["samba-client"]))) + { y2warning("package samba-client not installed"); return false; } @@ -492,8 +533,8 @@ ret = false; } if (!SambaWinbind::AdjustPam(winbind_enabled)) { - // translators: error message, %1 is filename - Report::Error(sformat(_("Cannot write settings to %1."), "/etc/security/pam_unix2.conf")); + // translators: error message + Report::Error (_("Cannot write PAM settings.")); ret = false; } @@ -731,10 +772,13 @@ * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ - list to_install = ["samba-client", "samba-winbind"]; + list<string> to_install = ["samba-client", "samba-winbind"]; if (SambaAD::ADS () != "") - to_install = union (to_install, ["krb5", "krb5-client"]); - return $["install": to_install, "remove": []]; + to_install = (list<string>) union (to_install, ["krb5", "krb5-client"]); + return $[ + "install" : UpdatedArchPackages (to_install), + "remove" : [] + ]; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/src/SambaAD.pm new/yast2-samba-client-2.14.4/src/SambaAD.pm --- old/yast2-samba-client-2.14.3/src/SambaAD.pm 2006-10-30 16:06:41.000000000 +0100 +++ new/yast2-samba-client-2.14.4/src/SambaAD.pm 2006-12-01 11:46:59.000000000 +0100 @@ -121,7 +121,7 @@ } } if ($server ne "" && - SCR->Execute (".target.bash", "net ads lookup -S $server") ne 0) { + SCR->Execute (".target.bash", "net ads lookup -U% -S $server") ne 0) { $server = ""; } return $server; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/src/dialogs.ycp new/yast2-samba-client-2.14.4/src/dialogs.ycp --- old/yast2-samba-client-2.14.3/src/dialogs.ycp 2006-11-06 10:47:32.000000000 +0100 +++ new/yast2-samba-client-2.14.4/src/dialogs.ycp 2006-11-30 13:46:06.000000000 +0100 @@ -3,7 +3,7 @@ * Summary: Dialogs definitions * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: dialogs.ycp 33866 2006-10-30 15:33:51Z jsuchome $ + * $Id: dialogs.ycp 34057 2006-11-06 10:17:24Z jsuchome $ */ { @@ -300,6 +300,7 @@ { packages = (list<string>)merge(packages,["krb5","krb5-client"]); } + packages = Samba::UpdatedArchPackages (packages); if (!Package::InstalledAll (packages)) Package::InstallAll (packages); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zmd
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package zmd checked in at Fri Dec 1 10:59:41 CET 2006. -------- --- zmd/zmd.changes 2006-11-29 14:36:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/zmd/zmd.changes 2006-11-30 16:48:08.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 16:47:27 CET 2006 - jpr(a)suse.de + +- Remove zmd.db deletion, it works fine with the older sqlite version +and can cause a hang when self updating. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.ifQTd5/_old 2006-12-01 10:59:34.000000000 +0100 +++ /var/tmp/diff_new_pack.ifQTd5/_new 2006-12-01 10:59:34.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono libzypp-zmd-backend log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.100.0 -Release: 42 +Release: 45 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -125,7 +125,6 @@ rm -rf $RPM_BUILD_ROOT %post -rm -f var/lib/zmd/zmd.db %{restart_on_update novell-zmd} %{insserv_force_if_yast novell-zmd} %{fillup_only} @@ -193,6 +192,9 @@ %{_libdir}/pkgconfig/rpm-sharp.pc %changelog -n zmd +* Thu Nov 30 2006 - jpr(a)suse.de +- Remove zmd.db deletion, it works fine with the older sqlite version + and can cause a hang when self updating. * Wed Nov 29 2006 - bvenugopal(a)suse.de - New source drop (r37496) - Fixes for some of the recent issues (#224168) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xine-lib
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package xine-lib checked in at Fri Dec 1 10:59:29 CET 2006. -------- --- xine-lib/xine-lib.changes 2006-11-21 18:22:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/xine-lib/xine-lib.changes 2006-11-30 12:13:52.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 30 12:11:22 CET 2006 - mhopf(a)suse.de + +- Security fix for #224813: Potential buffer overflow for real media. + SF tracker #1603458: + https://sf.net/tracker/index.php?func=detail&aid=1603458&group_id=9655&atid… + +------------------------------------------------------------------- New: ---- xine-lib-sf-1603458-COMMITTED.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.gq3smI/_old 2006-12-01 10:59:22.000000000 +0100 +++ /var/tmp/diff_new_pack.gq3smI/_new 2006-12-01 10:59:22.000000000 +0100 @@ -15,7 +15,7 @@ %define DISTRIBUTABLE 1 Summary: Video Player with Plug-Ins Version: 1.1.2 -Release: 36 +Release: 39 License: GNU General Public License (GPL), Other License(s), see package Group: Productivity/Multimedia/Video/Players URL: http://xine.sourceforge.net @@ -32,6 +32,7 @@ Patch4: xine-lib-configure.diff #Patch19: xine-lib-used-constants.diff Patch22: xine-lib-cve-2006-4799.diff +Patch23: xine-lib-sf-1603458-COMMITTED.diff Patch24: xine-lib-mms-fixes-COMMITTED.diff Patch25: xine-lib-buildfixed-COMMITTED.diff Patch26: xine-lib-doc-fix-X11R6.diff @@ -142,6 +143,7 @@ %patch1 %patch4 %patch22 +%patch23 -p1 %patch24 %patch25 %patch26 @@ -392,6 +394,10 @@ /usr/include/xine.h %changelog -n xine-lib +* Thu Nov 30 2006 - mhopf(a)suse.de +- Security fix for #224813: Potential buffer overflow for real media. + SF tracker #1603458: + https://sf.net/tracker/index.php?func=detail&aid=1603458&group_id=9655&atid… * Tue Nov 21 2006 - mhopf(a)suse.de - Security fix for #222892: Insufficient validation of AVI headers. CVE-2006-4799 and CVE-2006-4800. ++++++ xine-lib-sf-1603458-COMMITTED.diff ++++++ --- xine-lib-1.1.1/src/input/libreal/asmrp.c.jdw 2004-08-28 04:34:16.000000000 +1000 +++ xine-lib-1.1.1/src/input/libreal/asmrp.c 2006-11-27 14:03:58.000000000 +1100 @@ -604,7 +604,7 @@ return ret; } -static int asmrp_eval (asmrp_t *p, int *matches) { +static int asmrp_eval (asmrp_t *p, int *matches, int matchsize) { int rule_num, num_matches; @@ -613,7 +613,7 @@ asmrp_get_sym (p); rule_num = 0; num_matches = 0; - while (p->sym != ASMRP_SYM_EOF) { + while (p->sym != ASMRP_SYM_EOF && num_matches < matchsize - 1) { if (asmrp_rule (p)) { lprintf ("rule #%d is true\n", rule_num); @@ -629,7 +629,7 @@ return num_matches; } -int asmrp_match (const char *rules, int bandwidth, int *matches) { +int asmrp_match (const char *rules, int bandwidth, int *matches, int matchsize) { asmrp_t *p; int num_matches; @@ -641,7 +641,7 @@ asmrp_set_id (p, "Bandwidth", bandwidth); asmrp_set_id (p, "OldPNMPlayer", 0); - num_matches = asmrp_eval (p, matches); + num_matches = asmrp_eval (p, matches, matchsize); asmrp_dispose (p); --- xine-lib-1.1.1/src/input/libreal/asmrp.h.jdw 2003-12-09 11:02:30.000000000 +1100 +++ xine-lib-1.1.1/src/input/libreal/asmrp.h 2006-11-27 14:03:03.000000000 +1100 @@ -37,6 +37,6 @@ #ifndef HAVE_ASMRP_H #define HAVE_ASMRP_H -int asmrp_match (const char *rules, int bandwidth, int *matches) ; +int asmrp_match (const char *rules, int bandwidth, int *matches, int matchesizxe) ; #endif --- xine-lib-1.1.1/src/input/libreal/real.c.jdw 2005-06-25 23:21:30.000000000 +1000 +++ xine-lib-1.1.1/src/input/libreal/real.c 2006-11-27 14:04:49.000000000 +1100 @@ -482,7 +482,7 @@ lprintf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth); - n=asmrp_match(desc->stream[i]->asm_rule_book, bandwidth, rulematches); + n=asmrp_match(desc->stream[i]->asm_rule_book, bandwidth, rulematches, sizeof(rulematches)/sizeof(rulematches[0])); for (j=0; j<n; j++) { lprintf("asmrp rule match: %u for stream %u\n", rulematches[j], desc->stream[i]->stream_id); sprintf(b,"stream=%u;rule=%u,", desc->stream[i]->stream_id, rulematches[j]); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xgl-hardware-list
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package xgl-hardware-list checked in at Fri Dec 1 10:59:17 CET 2006. -------- --- xgl-hardware-list/xgl-hardware-list.changes 2006-11-24 13:38:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/xgl-hardware-list/xgl-hardware-list.changes 2006-11-30 15:45:40.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 15:44:19 CET 2006 - sndirsch(a)suse.de + +- added another ATI card usable with radeon driver (ssommer) + * U 1002:4e50 # MOBILITY RADEON 9600/9700 (M10/M11 4E50) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl-hardware-list.spec ++++++ --- /var/tmp/diff_new_pack.JhJo0i/_old 2006-12-01 10:59:13.000000000 +0100 +++ /var/tmp/diff_new_pack.JhJo0i/_new 2006-12-01 10:59:13.000000000 +0100 @@ -16,7 +16,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 060526 -Release: 30 +Release: 33 Conflicts: compiz < cvs_060519 BuildArchitectures: noarch Summary: Xgl hardware compatibility list @@ -52,6 +52,9 @@ /etc/X11/xgl-intel-setup.sh %changelog -n xgl-hardware-list +* Thu Nov 30 2006 - sndirsch(a)suse.de +- added another ATI card usable with radeon driver (ssommer) + * U 1002:4e50 # MOBILITY RADEON 9600/9700 (M10/M11 4E50) * Fri Nov 24 2006 - sndirsch(a)suse.de - added some more ATI cards usable with radeon driver * 1002:4e44 # RADEON 9700 PRO (R300 4E44) ++++++ xgl-hardware-list ++++++ --- xgl-hardware-list/xgl-hardware-list 2006-11-24 13:36:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/xgl-hardware-list/xgl-hardware-list 2006-11-30 15:44:10.000000000 +0100 @@ -278,6 +278,7 @@ # Unrecognized ATI cards U 1002:4c57 # Radeon LW +U 1002:4e50 # MOBILITY RADEON 9600/9700 (M10/M11 4E50) U 1002:5b60 # RADEON X300/X550 (RV370 5B60) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rug
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package rug checked in at Fri Dec 1 10:58:37 CET 2006. -------- --- rug/rug.changes 2006-11-27 06:31:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/rug/rug.changes 2006-12-01 10:21:46.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 1 10:20:59 CET 2006 - aj(a)suse.de + +- Fix random memory corruption (#224818). Thanks Miguel and team! + +------------------------------------------------------------------- New: ---- rug-no-signal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.d3m9jP/_old 2006-12-01 10:58:33.000000000 +0100 +++ /var/tmp/diff_new_pack.d3m9jP/_new 2006-12-01 10:58:33.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.100.0 -Release: 30 +Release: 33 License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -22,6 +22,7 @@ Source: rug-%{version}.tar.bz2 Patch: rug-manpage_perms.patch Patch1: fix-ld-library-path.patch +Patch2: rug-no-signal.patch Requires: zmd Autoreqprov: on @@ -40,6 +41,7 @@ %setup -q -n rug-%{version} %patch %patch1 +%patch2 %build export PKG_CONFIG_PATH="$PWD/build-install/%{_prefix}/%_lib/pkgconfig:$PKG_CONFIG_PATH" \ @@ -81,6 +83,8 @@ %_mandir/*/*/*.gz %changelog -n rug +* Fri Dec 01 2006 - aj(a)suse.de +- Fix random memory corruption (#224818). Thanks Miguel and team! * Mon Nov 27 2006 - aj(a)suse.de - Fix typo introduced with my last patch (#187055). * Sun Nov 26 2006 - aj(a)suse.de ++++++ rug-no-signal.patch ++++++ --- src/CommandLineParser.cs +++ src/CommandLineParser.cs @@ -311,7 +311,6 @@ } if (command != null) { - UnixSignal.RegisterHandler (Signum.SIGINT, new SignalHandler (command.Command.Terminate)); command.Command.Execute ((string[]) extra.ToArray (typeof (string))); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opensuse-updater
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package opensuse-updater checked in at Fri Dec 1 10:58:29 CET 2006. -------- --- KDE/opensuse-updater/opensuse-updater.changes 2006-11-27 20:27:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/opensuse-updater/opensuse-updater.changes 2006-11-30 16:29:53.000000000 +0100 @@ -2 +2 @@ -Mon Nov 27 20:27:14 CET 2006 - meissner(a)suse.de +Thu Nov 30 16:01:41 CET 2006 - dmacvicar(a)suse.de @@ -4 +4,5 @@ -- fix build +- Use xfg-su copy to launch yast (#224566) +- disable selection of updates for backends + which don't support it (ie: zypp) +- fix iconname in specfile +- r490 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-updater.spec ++++++ --- /var/tmp/diff_new_pack.EHAvcV/_old 2006-12-01 10:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.EHAvcV/_new 2006-12-01 10:58:23.000000000 +0100 @@ -15,7 +15,7 @@ Group: System/Management Summary: KDE updater applet for OpenSUSE Version: 0.4 -Release: 27 +Release: 31 URL: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: opensuseupdater-%{version}.tar.bz2 @@ -71,8 +71,12 @@ /opt/kde3/share/config.kcfg/opensuseupdater_settings.kcfg %changelog -n opensuse-updater -* Mon Nov 27 2006 - meissner(a)suse.de -- fix build +* Thu Nov 30 2006 - dmacvicar(a)suse.de +- Use xfg-su copy to launch yast (#224566) +- disable selection of updates for backends + which don't support it (ie: zypp) +- fix iconname in specfile +- r490 * Mon Nov 27 2006 - dmacvicar(a)suse.de - enable install button when updates are available (#218182) - provide icon in various sizes, they doesn't look bad scaled now. ++++++ opensuseupdater-0.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/opensuse-updater.spec.in new/opensuseupdater-0.4/opensuse-updater.spec.in --- old/opensuseupdater-0.4/opensuse-updater.spec.in 2006-11-27 15:48:27.000000000 +0100 +++ new/opensuseupdater-0.4/opensuse-updater.spec.in 2006-11-28 11:25:53.000000000 +0100 @@ -61,8 +61,7 @@ %dir /opt/kde3/share/apps/opensuseupdater/ %dir /opt/kde3/share/apps/opensuseupdater/pics /opt/kde3/share/apps/opensuseupdater/pics/* -%dir /opt/kde3/share/apps/opensuseupdater/icons -/opt/kde3/share/apps/opensuseupdater/icons/crystalsvg/* +/opt/kde3/share/apps/opensuseupdater /opt/kde3/share/icons/hicolor/* /opt/kde3/share/applnk/* /opt/kde3/share/autostart/*.desktop diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/Constants.h new/opensuseupdater-0.4/updater/Constants.h --- old/opensuseupdater-0.4/updater/Constants.h 2006-11-27 12:23:45.000000000 +0100 +++ new/opensuseupdater-0.4/updater/Constants.h 2006-11-30 12:58:27.000000000 +0100 @@ -21,7 +21,7 @@ #define _CONSTANTS_H_ #define PROGRAM_NAME "opensuseupdater" -#define VERSION "0.333" +#define VERSION "0.4" #define TRAY_ICON_GREEN "opensuseupdater_green" #define TRAY_ICON_RED "opensuseupdater_red" @@ -37,7 +37,7 @@ BACKEND_SMART, /** SMART **/ }; -//ZYPP and SMART don't actually exist at this point by the way... +// SMART doesn't actually exist at this point by the way... #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/MainWindow.cpp new/opensuseupdater-0.4/updater/MainWindow.cpp --- old/opensuseupdater-0.4/updater/MainWindow.cpp 2006-11-27 13:07:11.000000000 +0100 +++ new/opensuseupdater-0.4/updater/MainWindow.cpp 2006-11-30 13:35:11.000000000 +0100 @@ -17,14 +17,15 @@ Boston, MA 02110-1301, USA. */ +#include <kglobal.h> +#include <kiconloader.h> + #include <kaction.h> #include <kstdaction.h> -#include <kiconloader.h> #include <klocale.h> #include <kprocess.h> #include <kpopupmenu.h> #include <kapp.h> -#include <kglobal.h> #include <kconfig.h> #include <kdebug.h> #include <ksystemtray.h> @@ -106,7 +107,9 @@ //Build GUI, setup system tray and hide GUI initially. void MainWindow::initGUI() { - + KIconLoader *loader = KGlobal::iconLoader(); + setIcon(loader->loadIcon(PROGRAM_NAME, KIcon::Small)); + mainBox = new QVBoxLayout(this); header = new HeaderWidget(this); updateList = new QListView(this); @@ -114,7 +117,8 @@ configureButton = new KPushButton(i18n("Add/Remove Update Sources..."), this); cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - installButton = new KPushButton(i18n("Install"), this); + installButton = new KPushButton(KStdGuiItem::ok(), this); + installButton->setText(i18n("Install")); if ( _caps.canSelectIndividualUpdates ) { @@ -125,6 +129,7 @@ { selectAllButton = 0L; clearSelectionButton = 0L; + updateList->setSelectionMode ( QListView::NoSelection ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/Makefile.am new/opensuseupdater-0.4/updater/Makefile.am --- old/opensuseupdater-0.4/updater/Makefile.am 2006-11-20 18:25:38.000000000 +0100 +++ new/opensuseupdater-0.4/updater/Makefile.am 2006-11-30 16:25:01.000000000 +0100 @@ -36,6 +36,8 @@ desktopdir = $(kde_appsdir)/Utilities desktop_DATA = opensuseupdater.desktop +bin_SCRIPTS = opensuseupdater-su + install-data-local: $(mkinstalldirs) $(DESTDIR)/$(prefix)/bin $(INSTALL_DATA) $(srcdir)/zmd/kzmd-auth-user.sh \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/Makefile.in new/opensuseupdater-0.4/updater/Makefile.in --- old/opensuseupdater-0.4/updater/Makefile.in 2006-11-27 16:05:10.000000000 +0100 +++ new/opensuseupdater-0.4/updater/Makefile.in 2006-11-30 16:28:31.000000000 +0100 @@ -17,6 +17,7 @@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -52,8 +53,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(kde_kcfgdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(kde_kcfgdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_opensuseupdater_OBJECTS = main.$(OBJEXT) MainWindow.$(OBJEXT) \ @@ -75,6 +76,8 @@ $(top_builddir)/kxmlrpcclient/libkxmlrpcclient.la \ $(top_builddir)/updater/zmd/libopensuseupdater_zmd.la \ $(top_builddir)/updater/zypp/libopensuseupdater_zypp.la +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -406,6 +409,7 @@ # this is where the desktop file will go desktopdir = $(kde_appsdir)/Utilities desktop_DATA = opensuseupdater.desktop +bin_SCRIPTS = opensuseupdater-su #>- all: all-recursive #>+ 1 all: docs-am all-recursive @@ -485,6 +489,25 @@ opensuseupdater$(EXEEXT): $(opensuseupdater_OBJECTS) $(opensuseupdater_DEPENDENCIES) @rm -f opensuseupdater$(EXEEXT) $(CXXLINK) $(opensuseupdater_LDFLAGS) $(opensuseupdater_OBJECTS) $(opensuseupdater_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -742,10 +765,10 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(kde_kcfgdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(kde_kcfgdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -802,7 +825,7 @@ install-data-am: install-kde-icons install-data-local install-desktopDATA \ install-kde_kcfgDATA -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-info: install-info-recursive @@ -828,11 +851,13 @@ ps-am: -#>- uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ -#>- uninstall-info-am uninstall-kde_kcfgDATA uninstall-local -#>+ 2 -uninstall-am: uninstall-kde-icons uninstall-binPROGRAMS uninstall-desktopDATA \ - uninstall-info-am uninstall-kde_kcfgDATA uninstall-local +#>- uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ +#>- uninstall-desktopDATA uninstall-info-am uninstall-kde_kcfgDATA \ +#>- uninstall-local +#>+ 3 +uninstall-am: uninstall-kde-icons uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-desktopDATA uninstall-info-am uninstall-kde_kcfgDATA \ + uninstall-local uninstall-info: uninstall-info-recursive @@ -842,16 +867,18 @@ distclean-compile distclean-generic distclean-libtool \ distclean-recursive distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-data-local \ - install-desktopDATA install-exec install-exec-am install-info \ - install-info-am install-kde_kcfgDATA install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-desktopDATA uninstall-info-am \ - uninstall-kde_kcfgDATA uninstall-local + install-binSCRIPTS install-data install-data-am \ + install-data-local install-desktopDATA install-exec \ + install-exec-am install-info install-info-am \ + install-kde_kcfgDATA install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-desktopDATA uninstall-info-am uninstall-kde_kcfgDATA \ + uninstall-local messages: rc.cpp @@ -1002,7 +1029,7 @@ -rm -f Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp osupdaterpopup.moc.cpp TrayIcon.moc.cpp #>+ 2 -KDE_DIST=hi64-app-opensuse-updater.png updatersettingswidget_base.ui hi16-app-opensuse-updater.png Constants.h updatersettingswidget_base.h opensuseupdater_settings.h hi32-app-opensuse-updater.png opensuseupdater.desktop hi128-app-opensuse-updater.png opensusestart.desktop Makefile.in opensuseupdater_settings.kcfgc opensuseupdater_settings.kcfg hi48-app-opensuse-updater.png opensuseupdater Makefile.am +KDE_DIST=updatersettingswidget_base.ui hi128-app-opensuseupdater.png Constants.h updatersettingswidget_base.h hi16-app-opensuseupdater.png hi64-app-opensuseupdater.png opensuseupdater_settings.h hi32-app-opensuseupdater.png opensuseupdater.desktop opensusestart.desktop Makefile.in opensuseupdater_settings.kcfgc opensuseupdater_settings.kcfg hi48-app-opensuseupdater.png opensuseupdater-su opensuseupdater Makefile.am #>+ 4 clean-ui: @@ -1019,23 +1046,23 @@ #>+ 19 install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/opensuse - $(INSTALL_DATA) $(srcdir)/hi64-app-opensuse-updater.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/opensuse/updater.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/opensuse - $(INSTALL_DATA) $(srcdir)/hi48-app-opensuse-updater.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/opensuse/updater.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/opensuse - $(INSTALL_DATA) $(srcdir)/hi128-app-opensuse-updater.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/opensuse/updater.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/opensuse - $(INSTALL_DATA) $(srcdir)/hi32-app-opensuse-updater.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/opensuse/updater.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/opensuse - $(INSTALL_DATA) $(srcdir)/hi16-app-opensuse-updater.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/opensuse/updater.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps + $(INSTALL_DATA) $(srcdir)/hi64-app-opensuseupdater.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/opensuseupdater.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/hi16-app-opensuseupdater.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/opensuseupdater.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps + $(INSTALL_DATA) $(srcdir)/hi128-app-opensuseupdater.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/opensuseupdater.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/hi32-app-opensuseupdater.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/opensuseupdater.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps + $(INSTALL_DATA) $(srcdir)/hi48-app-opensuseupdater.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/opensuseupdater.png uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/opensuse/updater.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/opensuse/updater.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/opensuse/updater.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/opensuse/updater.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/opensuse/updater.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/opensuseupdater.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/opensuseupdater.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/opensuseupdater.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/opensuseupdater.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/opensuseupdater.png #>+ 15 force-reedit: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/TrayIcon.cpp new/opensuseupdater-0.4/updater/TrayIcon.cpp --- old/opensuseupdater-0.4/updater/TrayIcon.cpp 2006-11-27 12:56:50.000000000 +0100 +++ new/opensuseupdater-0.4/updater/TrayIcon.cpp 2006-11-30 13:29:38.000000000 +0100 @@ -31,7 +31,7 @@ appletState(APPLET_NO_UPDATES) { KIconLoader iconLoader(PROGRAM_NAME); - setPixmap(UserIcon(TRAY_ICON_GREEN)); + setPixmap(loadIcon(TRAY_ICON_GREEN)); setScaledContents(true); setState(APPLET_NO_UPDATES); kdDebug() << "Tray Icon ready" << endl; Binary files old/opensuseupdater-0.4/updater/hi128-app-opensuse-updater.png and new/opensuseupdater-0.4/updater/hi128-app-opensuse-updater.png differ Binary files old/opensuseupdater-0.4/updater/hi128-app-opensuseupdater.png and new/opensuseupdater-0.4/updater/hi128-app-opensuseupdater.png differ Binary files old/opensuseupdater-0.4/updater/hi16-app-opensuse-updater.png and new/opensuseupdater-0.4/updater/hi16-app-opensuse-updater.png differ Binary files old/opensuseupdater-0.4/updater/hi16-app-opensuseupdater.png and new/opensuseupdater-0.4/updater/hi16-app-opensuseupdater.png differ Binary files old/opensuseupdater-0.4/updater/hi32-app-opensuse-updater.png and new/opensuseupdater-0.4/updater/hi32-app-opensuse-updater.png differ Binary files old/opensuseupdater-0.4/updater/hi32-app-opensuseupdater.png and new/opensuseupdater-0.4/updater/hi32-app-opensuseupdater.png differ Binary files old/opensuseupdater-0.4/updater/hi48-app-opensuse-updater.png and new/opensuseupdater-0.4/updater/hi48-app-opensuse-updater.png differ Binary files old/opensuseupdater-0.4/updater/hi48-app-opensuseupdater.png and new/opensuseupdater-0.4/updater/hi48-app-opensuseupdater.png differ Binary files old/opensuseupdater-0.4/updater/hi64-app-opensuse-updater.png and new/opensuseupdater-0.4/updater/hi64-app-opensuse-updater.png differ Binary files old/opensuseupdater-0.4/updater/hi64-app-opensuseupdater.png and new/opensuseupdater-0.4/updater/hi64-app-opensuseupdater.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/opensusestart.desktop new/opensuseupdater-0.4/updater/opensusestart.desktop --- old/opensuseupdater-0.4/updater/opensusestart.desktop 2006-11-23 15:12:33.000000000 +0100 +++ new/opensuseupdater-0.4/updater/opensusestart.desktop 2006-11-30 13:07:36.000000000 +0100 @@ -3,7 +3,7 @@ Exec=opensuseupdater Terminal=false Name=OpenSUSE Updater -Icon=www +Icon=opensuseupdater X-KDE-StartupNotify=false X-KDE-autostart-condition=opensuseupdaterrc:General:Autostart:true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/opensuseupdater-su new/opensuseupdater-0.4/updater/opensuseupdater-su --- old/opensuseupdater-0.4/updater/opensuseupdater-su 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.4/updater/opensuseupdater-su 2006-11-30 16:24:43.000000000 +0100 @@ -0,0 +1,434 @@ +#!/bin/sh +#--------------------------------------------- +# xdg-su +# +# Utility script to run a command as an alternate user, generally +# the root user, with a graphical prompt for the root +# password if needed +# +# Refer to the usage() function below for usage. +# +# Copyright 2006, Jeremy White <jwhite(a)codeweavers.com> +# Copyright 2006, Kevin Krammer <kevin.krammer(a)gmx.at> +# +# LICENSE: +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# +#--------------------------------------------- + +manualpage() +{ +cat << _MANUALPAGE +Name + +xdg-su - run a GUI program as root after prompting for the root password + +Synopsis + +xdg-su [-u user] -c command + +xdg-su { --help | --manual | --version } + +Description + +xdg-su provides a graphical dialog that prompts the user for a password to run +command as user or as root if no user was specified. + +xdg-su is for use inside a desktop session only. + +xdg-su discards any stdout and stderr output from command. + +Options + +-u user + run command as user. The default is to run as root. +--help + Show command synopsis. +--manual + Show this manualpage. +--version + Show the xdg-utils version information. + +Exit Codes + +An exit code of 0 indicates success while a non-zero exit code indicates +failure. The following failure codes can be returned: + +1 + Error in command line syntax. +2 + One of the files passed on the command line did not exist. +3 + A required tool could not be found. +4 + The action failed. + +See Also + +su(1) + +Examples + +xdg-su -u root -c "/opt/shinythings/bin/install-GUI --install fast" + +Runs the /opt/shinythings/bin/install-GUI command with root permissions. + +_MANUALPAGE +} + +usage() +{ +cat << _USAGE +xdg-su - run a GUI program as root after prompting for the root password + +Synopsis + +xdg-su [-u user] -c command + +xdg-su { --help | --manual | --version } + +_USAGE +} + +#@xdg-utils-common@ + +#---------------------------------------------------------------------------- +# Common utility functions included in all XDG wrapper scripts +#---------------------------------------------------------------------------- + +DEBUG() +{ + [ ${XDG_UTILS_DEBUG_LEVEL-0} -lt $1 ] && return 0; + shift + echo "$@" >&2 +} + +#------------------------------------------------------------- +# Exit script on successfully completing the desired operation + +exit_success() +{ + if [ $# -gt 0 ]; then + echo "$@" + echo + fi + + exit 0 +} + + +#----------------------------------------- +# Exit script on malformed arguments, not enough arguments +# or missing required option. +# prints usage information + +exit_failure_syntax() +{ + if [ $# -gt 0 ]; then + echo "xdg-su: $@" >&2 + echo "Try 'xdg-su --help' for more information." >&2 + else + usage + echo "Use 'man xdg-su' or 'xdg-su --manual' for additional info." + fi + + exit 1 +} + +#------------------------------------------------------------- +# Exit script on missing file specified on command line + +exit_failure_file_missing() +{ + if [ $# -gt 0 ]; then + echo "xdg-su: $@" >&2 + fi + + exit 2 +} + +#------------------------------------------------------------- +# Exit script on failure to locate necessary tool applications + +exit_failure_operation_impossible() +{ + if [ $# -gt 0 ]; then + echo "xdg-su: $@" >&2 + fi + + exit 3 +} + +#------------------------------------------------------------- +# Exit script on failure returned by a tool application + +exit_failure_operation_failed() +{ + if [ $# -gt 0 ]; then + echo "xdg-su: $@" >&2 + fi + + exit 4 +} + +#------------------------------------------------------------ +# Exit script on insufficient permission to read a specified file + +exit_failure_file_permission_read() +{ + if [ $# -gt 0 ]; then + echo "xdg-su: $@" >&2 + fi + + exit 5 +} + +#------------------------------------------------------------ +# Exit script on insufficient permission to read a specified file + +exit_failure_file_permission_write() +{ + if [ $# -gt 0 ]; then + echo "xdg-su: $@" >&2 + fi + + exit 6 +} + +check_input_file() +{ + if [ ! -e "$1" ]; then + exit_failure_file_missing "file '$1' does not exist" + fi + if [ ! -r "$1" ]; then + exit_failure_file_permission_read "no permission to read file '$1'" + fi +} + +check_vendor_prefix() +{ + file=`basename "$1"` + case "$file" in + [a-zA-Z]*-*) + return + ;; + esac + + echo "xdg-su: filename '$file' does not have a proper vendor prefix" >&2 + echo 'A vendor prefix consists of alpha characters ([a-zA-Z]) and is terminated' >&2 + echo 'with a dash ("-"). An example filename is '"'example-$file'" >&2 + echo "Use --novendor to override or 'xdg-su --manual' for additional info." >&2 + exit 1 +} + +check_output_file() +{ + # if the file exists, check if it is writeable + # if it does not exists, check if we are allowed to write on the directory + if [ -e "$1" ]; then + if [ ! -w "$1" ]; then + exit_failure_file_permission_write "no permission to write to file '$1'" + fi + else + DIR=`dirname "$1"` + if [ ! -w "$DIR" -o ! -x "$DIR" ]; then + exit_failure_file_permission_write "no permission to create file '$1'" + fi + fi +} + +#---------------------------------------- +# Checks for shared commands, e.g. --help + +check_common_commands() +{ + while [ $# -gt 0 ] ; do + parm="$1" + shift + + case "$parm" in + --help) + usage + echo "Use 'man xdg-su' or 'xdg-su --manual' for additional info." + exit_success + ;; + + --manual) + manualpage + exit_success + ;; + + --version) + echo "xdg-su 1.0beta2" + exit_success + ;; + esac + done +} + +check_common_commands "$@" +if [ ${XDG_UTILS_DEBUG_LEVEL-0} -lt 1 ]; then + # Be silent + xdg_redirect_output=" > /dev/null 2> /dev/null" +else + # All output to stderr + xdg_redirect_output=" >&2" +fi + +#-------------------------------------- +# Checks for known desktop environments +# set variable DE to the desktop environments name, lowercase + +detectDE() +{ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + fi +} + +#---------------------------------------------------------------------------- + + + +su_kde() +{ + KDESU=`which kdesu 2>/dev/null` + if [ $? -eq 0 ] ; then + if [ -z "$user" ] ; then + $KDESU -c "$cmd" + else + $KDESU -u "$user" -c "$cmd" + fi + + if [ $? -eq 0 ]; then + exit_success + else + exit_failure_operation_failed + fi + else + su_generic + fi +} + +su_gnome() +{ + GSU=`which gnomesu 2>/dev/null` + if [ $? -ne 0 ] ; then + GSU=`which xsu 2>/dev/null` + fi + if [ $? -eq 0 ] ; then + if [ -z "$user" ] ; then + $GSU -c "$cmd" + else + $GSU -u "$user" -c "$cmd" + fi + + if [ $? -eq 0 ]; then + exit_success + else + exit_failure_operation_failed + fi + else + su_generic + fi +} + +su_generic() +{ + if [ -z "$user" ] ; then + xterm -geom 60x5 -T "xdg-su: $cmd" -e su -c "$cmd" + else + xterm -geom 60x5 -T "xdg-su: $cmd" -e su -u "$user" -c "$cmd" + fi + + if [ $? -eq 0 ]; then + exit_success + else + exit_failure_operation_failed + fi +} + +[ x"$1" != x"" ] || exit_failure_syntax + +user= +cmd= +while [ $# -gt 0 ] ; do + parm="$1" + shift + + case "$parm" in + -u) + if [ -z "$1" ] ; then + exit_failure_syntax "user argument missing for -u" + fi + user="$1" + shift + ;; + + -c) + if [ -z "$1" ] ; then + exit_failure_syntax "command argument missing for -c" + fi + cmd="$1" + shift + ;; + + -*) + exit_failure_syntax "unexpected option '$parm'" + ;; + + *) + exit_failure_syntax "unexpected argument '$parm'" + ;; + esac +done + +if [ -z "${cmd}" ] ; then + exit_failure_syntax "command missing" +fi + +detectDE + +if [ x"$DE" = x"" ]; then + XSU=`which xsu 2>/dev/null` + if [ $? -eq 0 ] ; then + DE=generic + fi +fi + +case "$DE" in + kde) + su_kde + ;; + + gnome) + su_gnome + ;; + + generic) + su_generic + ;; + + *) + [ x"$user" = x"" ] && user=root + exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'" + ;; +esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/opensuseupdater.desktop new/opensuseupdater-0.4/updater/opensuseupdater.desktop --- old/opensuseupdater-0.4/updater/opensuseupdater.desktop 2006-11-23 15:12:30.000000000 +0100 +++ new/opensuseupdater-0.4/updater/opensuseupdater.desktop 2006-11-30 13:07:29.000000000 +0100 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=openSUSE Updater Applet Exec=opensuseupdater %i %m -caption "%c" -Icon=www +Icon=opensuseupdater Type=Application Terminal=0 Categories=Qt;KDE;System;Desktop Applet diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp --- old/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp 2006-11-27 13:09:29.000000000 +0100 +++ new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp 2006-11-30 16:22:51.000000000 +0100 @@ -326,7 +326,7 @@ } _you_process = new KProcess; - *_you_process << "kdesu" << "yast2" << "online_update"; + *_you_process << "opensuseupdater-su" << "-c" << "yast2 online_update"; connect( _you_process, SIGNAL( processExited( KProcess * ) ), SLOT( slotYOUProcessExited( KProcess * ) ) ); @@ -341,7 +341,7 @@ void ZYppUpdater::configureUpdater() { KProcess *inst_source = new KProcess; - *inst_source << "kdesu" << "yast2" << "inst_source"; + *inst_source << "opensuseupdater-su" << "-c" << "yast2 inst_source"; connect( inst_source, SIGNAL( processExited( KProcess * ) ), SLOT( slotInstSourceProcessExited( KProcess * ) ) ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-core
by root＠suse.de 01 Dec '06

01 Dec '06

Hello community, here is the log from the commit of package mono-core checked in at Fri Dec 1 10:58:19 CET 2006. -------- --- mono-core/mono-core.changes 2006-11-14 16:58:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/mono-core/mono-core.changes 2006-12-01 10:53:01.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 1 04:50:20 CET 2006 - wberrier(a)suse.de + +- Thread safety fixes for rug/zmd (bnc #221277) +- System.Web Source fix (bnc #225179) + +------------------------------------------------------------------- New: ---- mono-system.web_fix_r68790.patch mono-thread_safety_r68789.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-core.spec ++++++ --- /var/tmp/diff_new_pack.paoCVa/_old 2006-12-01 10:58:01.000000000 +0100 +++ /var/tmp/diff_new_pack.paoCVa/_new 2006-12-01 10:58:01.000000000 +0100 @@ -17,7 +17,7 @@ Summary: A .NET Runtime Environment URL: http://go-mono.org/ Version: 1.1.18.1 -Release: 6 +Release: 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.gz # kdepatch patch won't work with the new relocatable Mono (Miguel) @@ -26,6 +26,8 @@ Patch21: mono-monodis_cast.patch Patch25: mono-supportw.patch Patch26: mono-ppc.patch +Patch27: mono-thread_safety_r68789.patch +Patch28: mono-system.web_fix_r68790.patch ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -827,6 +829,8 @@ %patch21 %patch25 %patch26 +%patch27 +%patch28 %build rm -f libgc/libtool.m4 @@ -921,6 +925,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog -n mono-core +* Fri Dec 01 2006 - wberrier(a)suse.de +- Thread safety fixes for rug/zmd (bnc #221277) +- System.Web Source fix (bnc #225179) * Tue Nov 14 2006 - meissner(a)suse.de - Disable executable stack option. #65536 * Sat Oct 21 2006 - wberrier(a)suse.de ++++++ mono-system.web_fix_r68790.patch ++++++ Index: mcs/class/System.Web/System.Web/HttpRequest.cs =================================================================== --- mcs/class/System.Web/System.Web/HttpRequest.cs (revision 68789) +++ mcs/class/System.Web/System.Web/HttpRequest.cs (revision 68790) @@ -923,8 +923,10 @@ if (worker_request == null) return String.Empty; // don't check security with an empty string! - if (physical_path == null) - physical_path = MapPath (CurrentExecutionFilePath); + if (physical_path == null) { + // Don't call HttpRequest.MapPath here, as that one *trims* the input + physical_path = worker_request.GetFilePathTranslated (); + } if (SecurityManager.SecurityEnabled) { new FileIOPermission (FileIOPermissionAccess.PathDiscovery, physical_path).Demand (); ++++++ mono-thread_safety_r68789.patch ++++++ Index: mono/metadata/metadata.c =================================================================== --- mono/metadata/metadata.c (revision 68788) +++ mono/metadata/metadata.c (revision 68789) @@ -1490,6 +1490,7 @@ int count = 0; gboolean found; + mono_loader_lock (); /* * According to the spec, custom modifiers should come before the byref * flag, but the IL produced by ilasm from the following signature: @@ -1561,6 +1562,7 @@ if (!do_mono_metadata_parse_type (type, m, container, ptr, &ptr)) { if (type != &stype) g_free (type); + mono_loader_unlock (); return NULL; } @@ -1590,12 +1592,16 @@ LOCKING: even though we don't explicitly hold a lock, in the problematic case 'ret' is a field of a MonoClass which currently holds the loader lock. 'type' is local. */ - if (ret->data.klass == type->data.klass) + if (ret->data.klass == type->data.klass) { + mono_loader_unlock (); return ret; + } } /* No need to use locking since nobody is modifying the hash table */ - if ((cached = g_hash_table_lookup (type_cache, type))) + if ((cached = g_hash_table_lookup (type_cache, type))) { + mono_loader_unlock (); return cached; + } } /* printf ("%x %x %c %s\n", type->attrs, type->num_mods, type->pinned ? 'p' : ' ', mono_type_full_name (type)); */ @@ -1604,6 +1610,7 @@ type = mono_mempool_alloc (m->mempool, sizeof (MonoType)); memcpy (type, &stype, sizeof (MonoType)); } + mono_loader_unlock (); return type; } @@ -1716,9 +1723,11 @@ { MonoMethodSignature *sig; + mono_loader_lock (); sig = mono_mempool_alloc0 (m->mempool, sizeof (MonoMethodSignature) + ((gint32)nparams - MONO_ZERO_LEN_ARRAY) * sizeof (MonoType*)); sig->param_count = nparams; sig->sentinelpos = -1; + mono_loader_unlock (); return sig; } @@ -2389,6 +2398,7 @@ g_return_val_if_fail (ptr != NULL, NULL); + mono_loader_lock (); switch (format) { case METHOD_HEADER_TINY_FORMAT: mh = mono_mempool_alloc0 (m->mempool, sizeof (MonoMethodHeader)); @@ -2397,6 +2407,7 @@ local_var_sig_tok = 0; mh->code_size = flags >> 2; mh->code = ptr; + mono_loader_unlock (); return mh; case METHOD_HEADER_TINY_FORMAT1: mh = mono_mempool_alloc0 (m->mempool, sizeof (MonoMethodHeader)); @@ -2410,6 +2421,7 @@ */ mh->code_size = flags >> 2; mh->code = ptr; + mono_loader_unlock (); return mh; case METHOD_HEADER_FAT_FORMAT: fat_flags = read16 (ptr); @@ -2438,6 +2450,7 @@ ptr = code + code_size; break; default: + mono_loader_unlock (); return NULL; } @@ -2460,6 +2473,7 @@ mh->locals [i] = mono_metadata_parse_type_full ( m, container, MONO_PARSE_LOCAL, 0, locals_ptr, &locals_ptr); if (!mh->locals [i]) { + mono_loader_unlock (); return NULL; } } @@ -2472,6 +2486,7 @@ mh->init_locals = init_locals; if (fat_flags & METHOD_HEADER_MORE_SECTS) parse_section_data (m, mh, (const unsigned char*)ptr); + mono_loader_unlock (); return mh; } @@ -2924,7 +2939,9 @@ ++pos; } + mono_loader_lock (); result = mono_mempool_alloc0 (meta->mempool, sizeof (MonoClass*) * (pos - start)); + mono_loader_unlock (); pos = start; while (pos < tdef->rows) { Index: mono/metadata/marshal.c =================================================================== --- mono/metadata/marshal.c (revision 68788) +++ mono/metadata/marshal.c (revision 68789) @@ -1014,6 +1014,7 @@ mp = mb->method->klass->image->mempool; + mono_loader_lock (); if (mb->dynamic) { method = mb->method; @@ -1086,6 +1087,7 @@ printf ("%s\n", mono_disasm_code (&marshal_dh, method, mb->code, mb->code + mb->pos)); #endif + mono_loader_unlock (); return method; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0