openSUSE Commits July 2012

commit@lists.opensuse.org

1 participants
1252 discussions

commit java-1_7_0-openjdk.zero for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package java-1_7_0-openjdk.zero for openSUSE:Factory checked in at 2012-07-31 19:42:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk.zero (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.zero.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk.zero", Maintainer is "" Changes: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.YWqvmY/_old 2012-07-31 19:46:25.000000000 +0200 +++ /var/tmp/diff_new_pack.YWqvmY/_new 2012-07-31 19:46:25.000000000 +0200 @@ -554,6 +554,13 @@ export ARCH_DATA_MODEL=64 %endif +%if 0%{?qemu_user_space_build:1} +( while true; do + sleep 1h + echo "I just take forever to build. Please don't kill me." + done ) & +%endif + # XXX: The quilt setup series fails with existing patches dir ... do not want to # export an another patches dir, as this will not be in chroot, which is the # reason I use quilt - to be able edit patches directly in chroot -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit java-1_7_0-openjdk.zero for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package java-1_7_0-openjdk.zero for openSUSE:12.2 checked in at 2012-07-31 19:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/java-1_7_0-openjdk.zero (Old) and /work/SRC/openSUSE:12.2/.java-1_7_0-openjdk.zero.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk.zero", Maintainer is "" Changes: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.DPt7FO/_old 2012-07-31 19:44:35.000000000 +0200 +++ /var/tmp/diff_new_pack.DPt7FO/_new 2012-07-31 19:44:35.000000000 +0200 @@ -554,6 +554,13 @@ export ARCH_DATA_MODEL=64 %endif +%if 0%{?qemu_user_space_build:1} +( while true; do + sleep 1h + echo "I just take forever to build. Please don't kill me." + done ) & +%endif + # XXX: The quilt setup series fails with existing patches dir ... do not want to # export an another patches dir, as this will not be in chroot, which is the # reason I use quilt - to be able edit patches directly in chroot -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit xulrunner for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package xulrunner for openSUSE:12.2 checked in at 2012-07-31 14:05:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/xulrunner (Old) and /work/SRC/openSUSE:12.2/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/xulrunner/xulrunner.changes 2012-07-30 02:38:14.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.xulrunner.new/xulrunner.changes 2012-07-31 14:19:08.000000000 +0200 @@ -2 +2 @@ -Fri Jun 15 12:40:23 UTC 2012 - wr(a)rosenauer.org +Sat Jul 14 19:33:44 UTC 2012 - wr(a)rosenauer.org @@ -4,2 +4,38 @@ -- update to 13.0.1 - * bugfix release +- update to 14.0.1 (bnc#771583) + * MFSA 2012-42/CVE-2012-1949/CVE-2012-1948 + Miscellaneous memory safety hazards + * MFSA 2012-43/CVE-2012-1950 + Incorrect URL displayed in addressbar through drag and drop + * MFSA 2012-44/CVE-2012-1951/CVE-2012-1954/CVE-2012-1953/CVE-2012-1952 + Gecko memory corruption + * MFSA 2012-45/CVE-2012-1955 (bmo#757376) + Spoofing issue with location + * MFSA 2012-46/CVE-2012-1966 (bmo#734076) + XSS through data: URLs + * MFSA 2012-47/CVE-2012-1957 (bmo#750096) + Improper filtering of javascript in HTML feed-view + * MFSA 2012-48/CVE-2012-1958 (bmo#750820) + use-after-free in nsGlobalWindow::PageHidden + * MFSA 2012-49/CVE-2012-1959 (bmo#754044, bmo#737559) + Same-compartment Security Wrappers can be bypassed + * MFSA 2012-50/CVE-2012-1960 (bmo#761014) + Out of bounds read in QCMS + * MFSA 2012-51/CVE-2012-1961 (bmo#761655) + X-Frame-Options header ignored when duplicated + * MFSA 2012-52/CVE-2012-1962 (bmo#764296) + JSDependentString::undepend string conversion results in memory + corruption + * MFSA 2012-53/CVE-2012-1963 (bmo#767778) + Content Security Policy 1.0 implementation errors cause data + leakage + * MFSA 2012-55/CVE-2012-1965 (bmo#758990) + feed: URLs with an innerURI inherit security context of page + * MFSA 2012-56/CVE-2012-1967 (bmo#758344) + Code execution through javascript: URLs +- license change from tri license to MPL-2.0 +- require NSS 3.13.5 +- PPC fixes: + * reenabled mozilla-yarr-pcre.patch to fix build for PPC + * add patches for bmo#750620 and bmo#746112 + * fix xpcshell segfault on ppc +- build plugin-container on every arch Old: ---- l10n-13.0.1.tar.bz2 mozilla-disable-neon-option.patch mozilla-libnotify.patch mozilla-linux3.patch mozilla-nsSound.patch mozilla-revert_621446.patch mozilla-system-nspr.patch xulrunner-13.0.1-source.tar.bz2 New: ---- l10n-14.0.1.tar.bz2 mozilla-ppc.patch xulrunner-14.0.1-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -43,15 +43,15 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.9.0 -BuildRequires: mozilla-nss-devel >= 3.13.4 -Version: 13.0.1 +BuildRequires: mozilla-nss-devel >= 3.13.5 +Version: 14.0.1 Release: 0 -%define releasedate 2012061400 -%define version_internal 13.0.1 -%define apiversion 13 -%define uaweight 1300001 +%define releasedate 2012071300 +%define version_internal 14.0.1 +%define apiversion 14 +%define uaweight 1400001 Summary: Mozilla Runtime Environment -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +License: MPL-2.0 Group: Productivity/Other Url: http://www.mozilla.org/ Provides: gecko @@ -77,14 +77,9 @@ Patch7: mozilla-ntlm-full-path.patch Patch8: mozilla-dump_syms-static.patch Patch9: mozilla-sle11.patch -Patch10: mozilla-linux3.patch -Patch11: mozilla-disable-neon-option.patch -Patch12: mozilla-system-nspr.patch -Patch13: mozilla-revert_621446.patch -Patch14: mozilla-yarr-pcre.patch -Patch15: mozilla-libnotify.patch -Patch16: mozilla-gcc47.patch -Patch17: mozilla-nsSound.patch +Patch11: mozilla-yarr-pcre.patch +Patch12: mozilla-gcc47.patch +Patch13: mozilla-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -94,12 +89,10 @@ %define has_system_nss 1 %define has_system_cairo 0 %define localize 0 -%ifarch ppc ppc64 s390 s390x ia64 %arm +%ifarch ppc ppc64 s390 s390x ia64 %define crashreporter 0 -%define plugincontainer 0 %else %define crashreporter 1 -%define plugincontainer 1 %endif ### configuration end ### %define _use_internal_dependency_generator 0 @@ -166,7 +159,7 @@ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -201,14 +194,9 @@ %if %suse_version < 1120 %patch9 -p1 %endif -%patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 -#%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 %build # no need to add build time to binaries @@ -289,11 +277,6 @@ ac_add_options --disable-crashreporter EOF %endif -%if ! %plugincontainer -cat << EOF >> $MOZCONFIG -ac_add_options --disable-ipc -EOF -%endif # S/390 %ifarch s390 s390x cat << EOF >> $MOZCONFIG @@ -303,7 +286,17 @@ # ARM %ifarch %arm cat << EOF >> $MOZCONFIG -ac_add_options --disable-neon +%ifarch armv7l +ac_add_options --with-arch=armv7-a +ac_add_options --with-float-abi=hard +ac_add_options --with-fpu=vfpv3-d16 +ac_add_options --with-thumb=yes +%endif +%ifarch armv5tel +ac_add_options --with-arch=armv5te +ac_add_options --with-float-abi=soft +ac_add_options --with-thumb=no +%endif EOF %endif make -f client.mk build @@ -464,15 +457,13 @@ %{_libdir}/xulrunner-%{version_internal}/chrome.manifest %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list %{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client -%if %plugincontainer %{_libdir}/xulrunner-%{version_internal}/plugin-container -%endif -%{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh %{_libdir}/xulrunner-%{version_internal}/xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner-bin %{_libdir}/xulrunner-%{version_internal}/xulrunner-stub %{_libdir}/xulrunner-%{version_internal}/platform.ini %{_libdir}/xulrunner-%{version_internal}/omni.ja +%{_libdir}/xulrunner-%{version_internal}/README.xulrunner # crashreporter files %if %crashreporter %{_libdir}/xulrunner-%{version_internal}/crashreporter @@ -499,7 +490,6 @@ %files devel %defattr(-,root,root) -%{_libdir}/xulrunner-%{version_internal}/xpcshell %{_libdir}/xulrunner-devel-%{version_internal}/ # FIXME symlink dynamic libs below sdk/lib %attr(644,root,root) %{_libdir}/pkgconfig/* ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_13_0_1_RELEASE" -VERSION="13.0.1" +RELEASE_TAG="FIREFOX_14_0_1_RELEASE" +VERSION="14.0.1" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-13.0.1.tar.bz2 -> l10n-14.0.1.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/xulrunner/l10n-13.0.1.tar.bz2 /work/SRC/openSUSE:12.2/.xulrunner.new/l10n-14.0.1.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -1,113 +1,14 @@ # HG changeset patch -# Parent 7bc8f0e5bed8cb2212e27228e628861737256459 -Patch to make Mozilla build with gcc 4.7, including -- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) -- Bug 741348 - Work around crashreporter client build failure with gcc 4.7 (TM: Mozilla15) +# User Mike Hommey <mh+mozilla(a)glandium.org> +# Date 1336991062 -7200 +# Node ID 234d34706ea1a0e9a9d2c61561c4441590712df0 +# Parent 0f2f145158b595f5242bf0d79b2de413373730c1 +Bug 741348 - Work around crashreporter client build failure with gcc 4.7 -diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp ---- a/layout/base/tests/TestPoisonArea.cpp -+++ b/layout/base/tests/TestPoisonArea.cpp -@@ -392,53 +392,53 @@ ReservePoisonArea() - { - if (sizeof(uintptr_t) == 8) { - // Use the hardware-inaccessible region. - // We have to avoid 64-bit constants and shifts by 32 bits, since this - // code is compiled in 32-bit mode, although it is never executed there. - uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | - uintptr_t(0xF0DEAFFFu)) & - ~uintptr_t(PAGESIZE-1)); -- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); -+ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); - return result; - } else { - // First see if we can allocate the preferred poison address from the OS. - uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); - void *result = ReserveRegion(candidate, false); - if (result == (void *)candidate) { - // success - inaccessible page allocated -- printf("INFO | poison area allocated at 0x%.*"PRIxPTR -+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR - " (preferred addr)\n", SIZxPTR, (uintptr_t)result); - return candidate; - } - - // That didn't work, so see if the preferred address is within a range - // of permanently inacessible memory. - if (ProbeRegion(candidate)) { - // success - selected page cannot be usable memory - if (result != MAP_FAILED) - ReleaseRegion(result); -- printf("INFO | poison area assumed at 0x%.*"PRIxPTR -+ printf("INFO | poison area assumed at 0x%.*" PRIxPTR - " (preferred addr)\n", SIZxPTR, candidate); - return candidate; - } - - // The preferred address is already in use. Did the OS give us a - // consolation prize? - if (result != MAP_FAILED) { -- printf("INFO | poison area allocated at 0x%.*"PRIxPTR -+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR - " (consolation prize)\n", SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - // It didn't, so try to allocate again, without any constraint on - // the address. - result = ReserveRegion(0, false); - if (result != MAP_FAILED) { -- printf("INFO | poison area allocated at 0x%.*"PRIxPTR -+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR - " (fallback)\n", SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - printf("ERROR | no usable poison area found\n"); - return 0; - } - } -@@ -450,17 +450,17 @@ static uintptr_t - ReservePositiveControl() - { - - void *result = ReserveRegion(0, false); - if (result == MAP_FAILED) { - printf("ERROR | allocating positive control | %s\n", LastErrMsg()); - return 0; - } -- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", -+ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", - SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - /* The "negative control" area confirms that our probe logic does detect a - * page that is readable, writable, or executable. - */ - static uintptr_t -@@ -481,17 +481,17 @@ ReserveNegativeControl() - // Now mark it executable as well as readable and writable. - // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) - - if (MakeRegionExecutable(result)) { - printf("ERROR | making negative control executable | %s\n", LastErrMsg()); - return 0; - } - -- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", -+ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", - SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - static void - JumpTo(uintptr_t opaddr) - { - #ifdef __ia64 diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in -@@ -61,8 +61,11 @@ HOST_CPPSRCS = \ +@@ -65,8 +65,11 @@ HOST_CPPSRCS = \ file_id.cc \ guid_creator.cc \ $(NULL) ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -14,7 +14,7 @@ # Add pkg-config files to the install:: target +# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-13 ++apilibdir = $(dir $(installdir))xulrunner-14 + pkg_config_files = \ libxul.pc \ ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 67e6f1e1d06ca3d54cea1d26877c2a68f0c096e5 # User Wolfgang Rosenauer <wr(a)rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h --- a/js/src/yarr/YarrInterpreter.h +++ b/js/src/yarr/YarrInterpreter.h @@ -162,17 +162,17 @@ struct ByteTerm { , m_invert(invert) { atom.characterClass = characterClass; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; } - ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) + ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(false) { atom.subpatternId = subpatternId; atom.parenthesesDisjunction = parenthesesInfo; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; @@ -183,17 +183,17 @@ struct ByteTerm { : type(type) , m_capture(false) , m_invert(invert) { atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; } - ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) + ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { atom.subpatternId = subpatternId; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h --- a/js/src/yarr/YarrPattern.h +++ b/js/src/yarr/YarrPattern.h @@ -166,17 +166,17 @@ struct PatternTerm { , m_capture(false) , m_invert(invert) { characterClass = charClass; quantityType = QuantifierFixedCount; quantityCount = 1; } - PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) + PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { parentheses.disjunction = disjunction; parentheses.subpatternId = subpatternId; parentheses.isCopy = false; parentheses.isTerminal = false; diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c --- a/memory/jemalloc/jemalloc.c +++ b/memory/jemalloc/jemalloc.c @@ -1086,17 +1086,19 @@ struct arena_s { static unsigned ncpus; #endif /* * When MALLOC_STATIC_SIZES is defined most of the parameters * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */ +#if !(defined(__powerpc__)) #define MALLOC_STATIC_SIZES 1 +#endif #ifdef MALLOC_STATIC_SIZES /* * VM page size. It must divide the runtime CPU page size or the code * will abort. */ #define pagesize_2pow ((size_t) 12) diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h --- a/mfbt/double-conversion/utils.h +++ b/mfbt/double-conversion/utils.h @@ -49,17 +49,18 @@ // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then // the result is equal to 89255e-22. // The best way to test this, is to create a division-function and to compare // the output of the division with the expected result. (Inlining must be // disabled.) // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) #if defined(_M_X64) || defined(__x86_64__) || \ defined(__ARMEL__) || \ - defined(_MIPS_ARCH_MIPS32R2) + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__powerpc__) || defined(__powerpc64__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #else #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS #endif // _WIN32 ++++++ mozilla-prefer_plugin_pref.patch ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -4,7 +4,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1580,17 +1580,48 @@ nsPluginHost::FindPluginForType(const ch +@@ -1561,17 +1561,45 @@ nsPluginHost::FindPluginForType(const ch bool aCheckEnabled) { if (!aMimeType) { @@ -13,18 +13,15 @@ LoadPlugins(); -+ nsresult res; -+ nsCOMPtr<nsIPrefBranch> prefB (do_QueryInterface(mPrefService)); -+ + char *preferredPluginPath = NULL; + nsCAutoString mimetypePrefString ("modules.plugins.mimetype."); + mimetypePrefString.Append(aMimeType); + const char *mimetypePrefChar = mimetypePrefString.get(); -+ res = prefB->GetCharPref(mimetypePrefChar, &preferredPluginPath); -+ -+ if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL; ++ nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar); ++ preferredPluginPath = (char*) pluginPath.get(); + nsPluginTag *plugin = mPlugins; ++ + if(preferredPluginPath) { + while (nsnull != plugin) { + if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) || ++++++ mozilla-yarr-pcre.patch ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -1,15 +1,21 @@ +# HG changeset patch +# Parent 831eeca7b7cfa9ae2458d9efafe168027259965f +# User Landry Breuil <landry(a)openbsd.org> +Bug 691898 - Use YARR regexp interpreter instead of PCRE on platforms where YARR JIT is not supported r=dmandelin +PCRE doesn't build anyway. + diff --git a/js/src/Makefile.in b/js/src/Makefile.in --- a/js/src/Makefile.in +++ b/js/src/Makefile.in -@@ -332,30 +332,33 @@ CPPSRCS += checks.cc \ - platform.cc \ - utils.cc \ - $(NONE) - +@@ -315,30 +315,33 @@ ifeq (mips, $(findstring mips,$(TARGET_C + CPPSRCS += TrampolineMIPS.cpp + endif # - # END enclude sources for V8 dtoa + # END enclude sources for the method JIT ############################################# + endif + -# For architectures without YARR JIT, PCRE is faster than the YARR -# interpreter (bug 684559). - @@ -70,7 +76,7 @@ diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h --- a/js/src/vm/RegExpObject-inl.h +++ b/js/src/vm/RegExpObject-inl.h -@@ -132,16 +132,17 @@ RegExpObject::setMultiline(bool enabled) +@@ -132,26 +132,28 @@ RegExpObject::setMultiline(bool enabled) } inline void @@ -88,10 +94,21 @@ return cx->methodJitEnabled; #else return true; + #endif + } ++#endif + + inline bool + RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g) + { + JS_ASSERT(ObjectClassIs(obj, ESClass_RegExp, cx)); + if (obj.isRegExp()) + return obj.asRegExp().getShared(cx, g); + return Proxy::regexp_toShared(cx, &obj, g); diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp --- a/js/src/vm/RegExpObject.cpp +++ b/js/src/vm/RegExpObject.cpp -@@ -162,17 +162,16 @@ MatchPairs::checkAgainst(size_t inputLen +@@ -163,17 +163,16 @@ MatchPairs::checkAgainst(size_t inputLen continue; JS_ASSERT(size_t(p.limit) <= inputLength); } @@ -109,7 +126,7 @@ JS_NOT_REACHED("Called reportYarrError with value for no error"); return; #define COMPILE_EMSG(__code, __msg) \ -@@ -194,52 +193,16 @@ RegExpCode::reportYarrError(JSContext *c +@@ -195,73 +194,36 @@ RegExpCode::reportYarrError(JSContext *c COMPILE_EMSG(QuantifierTooLarge, JSMSG_BAD_QUANTIFIER); COMPILE_EMSG(EscapeUnterminated, JSMSG_TRAILING_SLASH); #undef COMPILE_EMSG @@ -157,16 +174,100 @@ bool RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags) { - #if ENABLE_YARR_JIT +-#if ENABLE_YARR_JIT /* Parse the pattern. */ ErrorCode yarrError; YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag), &yarrError); + if (yarrError) { + reportYarrError(cx, NULL, yarrError); + return false; + } + *parenCount = yarrPattern.m_numSubpatterns; + + /* + * The YARR JIT compiler attempts to compile the parsed pattern. If + * it cannot, it informs us via |codeBlock.isFallBack()|, in which + * case we have to bytecode compile it. + */ + +-#ifdef JS_METHODJIT ++#if ENABLE_YARR_JIT && defined(JS_METHODJIT) + if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) { + JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx); + if (!execAlloc) { + js_ReportOutOfMemory(cx); + return false; + } + + JSGlobalData globalData(execAlloc); +@@ -272,58 +234,41 @@ RegExpCode::compile(JSContext *cx, JSLin + #endif + + WTF::BumpPointerAllocator *bumpAlloc = cx->runtime->getBumpPointerAllocator(cx); + if (!bumpAlloc) { + js_ReportOutOfMemory(cx); + return false; + } + ++#if ENABLE_YARR_JIT + codeBlock.setFallBack(true); ++#endif + byteCode = byteCompile(yarrPattern, bumpAlloc).get(); + return true; +-#else /* !defined(ENABLE_YARR_JIT) */ +- int error = 0; +- compiled = jsRegExpCompile(pattern.chars(), pattern.length(), +- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase, +- multiline() ? JSRegExpMultiline : JSRegExpSingleLine, +- parenCount, &error); +- if (error) { +- reportPCREError(cx, error); +- return false; +- } +- return true; +-#endif + } + + RegExpRunStatus + RegExpCode::execute(JSContext *cx, const jschar *chars, size_t length, size_t start, + int *output, size_t outputCount) + { + int result; + #if ENABLE_YARR_JIT + (void) cx; /* Unused. */ + if (codeBlock.isFallBack()) + result = JSC::Yarr::interpret(byteCode, chars, start, length, output); + else + result = JSC::Yarr::execute(codeBlock, chars, start, length, output); + #else +- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount); ++ result = JSC::Yarr::interpret(byteCode, chars, start, length, output); + #endif + + if (result == -1) + return RegExpRunStatus_Success_NotFound; + +-#if !ENABLE_YARR_JIT +- if (result < 0) { +- reportPCREError(cx, result); +- return RegExpRunStatus_Error; +- } +-#endif +- + JS_ASSERT(result >= 0); + return RegExpRunStatus_Success; + } + + /* RegExpObject */ + + static void + regexp_trace(JSTracer *trc, JSObject *obj) diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h --- a/js/src/vm/RegExpObject.h +++ b/js/src/vm/RegExpObject.h -@@ -46,20 +46,18 @@ - #include <stddef.h> +@@ -47,20 +47,18 @@ + #include "jscntxt.h" #include "jsobj.h" #include "js/TemplateLib.h" @@ -187,6 +288,91 @@ * * RegExpObject - The JS-visible object whose .[[Class]] equals "RegExp" * +@@ -108,78 +106,61 @@ class RegExpObjectBuilder + + JSObject * + CloneRegExpObject(JSContext *cx, JSObject *obj, JSObject *proto); + + namespace detail { + + class RegExpCode + { +-#if ENABLE_YARR_JIT + typedef JSC::Yarr::BytecodePattern BytecodePattern; + typedef JSC::Yarr::ErrorCode ErrorCode; ++ typedef JSC::Yarr::YarrPattern YarrPattern; ++#if ENABLE_YARR_JIT + typedef JSC::Yarr::JSGlobalData JSGlobalData; + typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock; +- typedef JSC::Yarr::YarrPattern YarrPattern; + + /* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */ + YarrCodeBlock codeBlock; ++#endif + BytecodePattern *byteCode; +-#else +- JSRegExp *compiled; +-#endif + + public: + RegExpCode() + : + #if ENABLE_YARR_JIT + codeBlock(), ++#endif + byteCode(NULL) +-#else +- compiled(NULL) +-#endif + { } + + ~RegExpCode() { + #if ENABLE_YARR_JIT + codeBlock.release(); ++#endif + if (byteCode) + Foreground::delete_<BytecodePattern>(byteCode); +-#else +- if (compiled) +- jsRegExpFree(compiled); +-#endif + } + + static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) { +-#if ENABLE_YARR_JIT + ErrorCode error = JSC::Yarr::checkSyntax(*source); + if (error == JSC::Yarr::NoError) + return true; + + reportYarrError(cx, tokenStream, error); + return false; +-#else +-# error "Syntax checking not implemented for !ENABLE_YARR_JIT" +-#endif + } + + #if ENABLE_YARR_JIT + static inline bool isJITRuntimeEnabled(JSContext *cx); ++#endif + static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); +-#else +- static void reportPCREError(JSContext *cx, int error); +-#endif + + static size_t getOutputSize(size_t pairCount) { +-#if ENABLE_YARR_JIT + return pairCount * 2; +-#else +- return pairCount * 3; /* Should be x2, but PCRE has... needs. */ +-#endif + } + + bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags); + + + RegExpRunStatus + execute(JSContext *cx, const jschar *chars, size_t length, size_t start, + int *output, size_t outputCount); diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h --- a/js/src/yarr/wtfbridge.h +++ b/js/src/yarr/wtfbridge.h ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.5puy4F/_old 2012-07-31 14:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5puy4F/_new 2012-07-31 14:23:27.000000000 +0200 @@ -1,2 +1,2 @@ -REV=2b643ea8edf9 +REV=e5728a4e106c REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ xulrunner-13.0.1-source.tar.bz2 -> xulrunner-14.0.1-source.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/xulrunner/xulrunner-13.0.1-source.tar.bz2 /work/SRC/openSUSE:12.2/.xulrunner.new/xulrunner-14.0.1-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit xorg-x11-driver-video-nouveau for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package xorg-x11-driver-video-nouveau for openSUSE:12.2 checked in at 2012-07-31 14:05:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/xorg-x11-driver-video-nouveau (Old) and /work/SRC/openSUSE:12.2/.xorg-x11-driver-video-nouveau.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-driver-video-nouveau", Maintainer is "MHopf(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:12.2/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2012-07-30 02:37:56.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.xorg-x11-driver-video-nouveau.new/xorg-x11-driver-video-nouveau.changes 2012-07-31 14:19:02.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 17 12:24:27 UTC 2012 - fcrozat(a)suse.com + +- Add U_xf86-video-nouveau_dri-debug-spam.patch: reduce debug spam. + +------------------------------------------------------------------- New: ---- U_xf86-video-nouveau_dri-debug-spam.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-nouveau.spec ++++++ --- /var/tmp/diff_new_pack.P7U0bu/_old 2012-07-31 14:19:06.000000000 +0200 +++ /var/tmp/diff_new_pack.P7U0bu/_new 2012-07-31 14:19:06.000000000 +0200 @@ -36,6 +36,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: xf86-video-nouveau-%{version}.tar.bz2 Patch0: N_xf86-video-nouveau_nva3-noaccel-info.patch +Patch1: U_xf86-video-nouveau_dri-debug-spam.patch Supplements: modalias(xorg-x11-server:pci:v000012D2d*sv*sd*bc03sc*i*) Supplements: modalias(xorg-x11-server:pci:v000010DEd*sv*sd*bc03sc*i*) @@ -48,6 +49,7 @@ %prep %setup -n xf86-video-nouveau %patch0 -p1 -b .nva3info +%patch1 -p1 -b .reduce_dri2_debug_spam %build autoreconf -fi ++++++ U_xf86-video-nouveau_dri-debug-spam.patch ++++++ >From 36d3f8c28c55c05ccf4efa985831d2d249bad2fe Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs(a)redhat.com> Date: Wed, 13 Jun 2012 12:41:58 +0000 Subject: dri2: kill debug spam Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> --- diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 27627e6..0b3cc38 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -607,7 +607,6 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec, ScreenPtr screen; ScrnInfoPtr scrn; int status; - PixmapPtr pixmap; status = dixLookupDrawable(&draw, flip->draw, serverClient, M_ANY, DixWriteAccess); @@ -619,12 +618,6 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec, screen = draw->pScreen; scrn = xf86Screens[screen->myNum]; - pixmap = screen->GetScreenPixmap(screen); - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, 4, - "%s: flipevent : width %d x height %d : msc %d : ust = %d.%06d\n", - __func__, pixmap->drawable.width, pixmap->drawable.height, - frame, tv_sec, tv_usec); - /* We assume our flips arrive in order, so we don't check the frame */ switch (flip->action) { case SWAP: -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit texmaker for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package texmaker for openSUSE:12.2 checked in at 2012-07-31 14:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/texmaker (Old) and /work/SRC/openSUSE:12.2/.texmaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texmaker", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/texmaker/texmaker.changes 2012-06-25 15:55:49.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.texmaker.new/texmaker.changes 2012-07-31 14:18:38.000000000 +0200 @@ -1,0 +2,39 @@ +Fri Jul 20 00:37:06 UTC 2012 - badshah400(a)gmail.com + +- Update to version 3.4.1: + + Enhancement: On the GNOME desktop, themed icons are used for + standard actions + + Bug fixed: A bad layout of the buttons for the configuration + of the commands has been fixed + +------------------------------------------------------------------- +Mon Jul 16 06:37:05 UTC 2012 - badshah400(a)gmail.com + +- Update to version 3.4: + + Enhancements : + - Option "Use a 'build' subdirectory for output files" has + been added for the (pdf)latex command + - A words counter has been added to the internal pdf viewer + (contextual menu) + - An "Open Terminal" command has been added to the "Tool" menu + - Regular expression support has been added in the + "find/replace" dialogs + - A pdf page can now be exported to a png image in the + internal pdf viewer (contextual menu) + - A "Save a copy" command has been added to the "File" menu + - The optionals fields for the biblatex entries has been + added ("Bibliography" menu) + - The labels list in the structure view stays opened or closed + as the user sets it while saving the document or adding a + new label item + - Standard output is displayed only for the asymptote command + - The "sectioning", "size", "references" combo boxes (main + toolbar) has been replaced by icons in the editor vertical + toolbar. + - Support for macosx lion fullscreen mode has been added + + Bugs fixed : + - A critical bug while restoring a session with a file which + has been deleted has been fixed + - The bug about double-indentation of user tags has been fixed + +------------------------------------------------------------------- Old: ---- texmaker-3.3.4.tar.bz2 New: ---- texmaker-3.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texmaker.spec ++++++ --- /var/tmp/diff_new_pack.Xd11tr/_old 2012-07-31 14:19:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Xd11tr/_new 2012-07-31 14:19:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: texmaker -Version: 3.3.4 +Version: 3.4.1 Release: 0 Summary: Free cross-platform LaTeX editor License: GPL-2.0 ++++++ texmaker-3.3.4.tar.bz2 -> texmaker-3.4.1.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/texmaker/texmaker-3.3.4.tar.bz2 /work/SRC/openSUSE:12.2/.texmaker.new/texmaker-3.4.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit sysconfig for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package sysconfig for openSUSE:12.2 checked in at 2012-07-31 14:05:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/sysconfig (Old) and /work/SRC/openSUSE:12.2/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/sysconfig/sysconfig.changes 2012-06-25 15:54:31.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.sysconfig.new/sysconfig.changes 2012-07-31 14:18:35.000000000 +0200 @@ -1,0 +2,25 @@ +Fri Jul 20 14:38:16 UTC 2012 - mt(a)suse.com + +- Applied patch blacklisting uas driver confirmed by Intel as + a hopeless case (bnc#770301). + +------------------------------------------------------------------- +Thu Jul 19 13:58:01 UTC 2012 - mt(a)suse.com + +- /etc/init.d/network: do not check the renamed-flag when udev + daemon is not running as in LXC containers. It caused to wait + until the udev rename finished with a not started network and + failure result (bnc#771615). + +------------------------------------------------------------------- +Mon Jun 11 10:10:10 UTC 2012 - mt(a)suse.com + +- version 0.76.3 +- Fixed ifrenew-dhcp to use built-in dhcpcd --renew (bnc#763533). +- Moved the X-Systemd-RemainAfterExit LSB tag before Description + in /etc/init.d/network scripts as workaround for the case that + a not yet fixed systemd is in use (bnc#763533). +- Fixed to differentiate ib/ibchild/bond types and stop ib-bond + interfaces correctly. + +------------------------------------------------------------------- Old: ---- sysconfig-0.76.2.tar.bz2 New: ---- 0001-Do-not-check-renamed-flag-when-udev-is-not-running.patch 0002-blacklist-uas-driver.patch sysconfig-0.76.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.qZSwdH/_old 2012-07-31 14:18:38.000000000 +0200 +++ /var/tmp/diff_new_pack.qZSwdH/_new 2012-07-31 14:18:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.76.2 +Version: 0.76.3 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ @@ -35,6 +35,8 @@ BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch1: 0001-Do-not-check-renamed-flag-when-udev-is-not-running.patch +Patch2: 0002-blacklist-uas-driver.patch %description This package provides the SuSE system configuration scheme and the @@ -54,6 +56,8 @@ %prep %setup -n sysconfig-%{version} +%patch1 -p1 +%patch2 -p1 %build autoreconf --force --install ++++++ 0001-Do-not-check-renamed-flag-when-udev-is-not-running.patch ++++++ >From dbdc2e2a2b0288deefc74f838f5c3fa0b466a4f6 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <mt(a)suse.com> Date: Thu, 19 Jul 2012 15:43:11 +0200 Subject: [PATCH] Do not check renamed-flag when udev is not running When udev is not running as in LXC containers, do not check for the interface renamed-flag set by udev rules and causing to wait until udev rename finished or report a network start failure. The reintroduced FORCE_PERSISTENT_NAMES network/config variable allows an explicit behavior configuration (bnc#771615). --- config/sysconfig.config-network | 9 +++++++++ scripts/network | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/config/sysconfig.config-network b/config/sysconfig.config-network index 38e3eb1..725f3c5 100644 --- a/config/sysconfig.config-network +++ b/config/sysconfig.config-network @@ -143,6 +143,15 @@ MANDATORY_DEVICES="" # WAIT_FOR_INTERFACES="30" +## Type: list("",yes,no) +## Default: "" +# +# Forces all interfaces eth* ath* wlan* and ra* to be persistent via udev +# or disables the persistent rename flag check. Default is to check if udev +# is running -- it may be not used, e.g. inside of LXC containers. +# +FORCE_PERSISTENT_NAMES="" + ## Type: integer ## Default: 0 # diff --git a/scripts/network b/scripts/network index 9928da6..3f4fe2c 100755 --- a/scripts/network +++ b/scripts/network @@ -507,13 +507,24 @@ done # is ready to be set up. If an it is not ready now, it will be set up via # udev/ifup (because network is started now). We will just have to wait for it # later in the start section if it is considered mandatory (see next section). +# +# When udev is not in use / started, e.g. inside of LXC container, then the +# 'renamed' flag will be never set and we don't need to check it -- except +# when there is an explicit configuration telling how to behave here. +# +if /sbin/checkproc /sbin/udevd &>/dev/null ; then + FORCE_PERSISTENT_NAMES=${FORCE_PERSISTENT_NAMES:-yes} +else + FORCE_PERSISTENT_NAMES=${FORCE_PERSISTENT_NAMES:-no} +fi for a in $(type_filter `ls -A /sys/class/net/`); do test -d /sys/class/net/$a || continue t=`get_iface_type $a` case "$t" in eth|tr|ib|wlan) STAMPFILE=$STAMPFILE_STUB`cat /sys/class/net/$a/ifindex` - if [ "$MODE" = onboot -a "$ACTION" = start ] ; then + if [ "$MODE" = onboot -a "$ACTION" = start -a \ + "${FORCE_PERSISTENT_NAMES}" = yes ] ; then # skip interfaces (with active drivers) # but not yet prepared by an # ifup -o hotplug -- 1.7.7 ++++++ 0002-blacklist-uas-driver.patch ++++++ >From 1576ab1c722c494e0494c02bc5827d08580ff624 Mon Sep 17 00:00:00 2001 From: Oliver Neukum <oliver(a)neukum.org> Date: Fri, 20 Jul 2012 16:14:30 +0200 Subject: [PATCH] blacklist uas driver Intel has confirmed that uas is a hopeless case (bnc#770301) --- config/hardware/50-blacklist.conf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/config/hardware/50-blacklist.conf b/config/hardware/50-blacklist.conf index 4e0b033..3f27984 100644 --- a/config/hardware/50-blacklist.conf +++ b/config/hardware/50-blacklist.conf @@ -227,3 +227,6 @@ blacklist i82875p_edac # Blacklist the IBM s390 module for I/O dynamic configuration support # Bug bnc#478601 blacklist chsc_sch +# uas has been confirmed to be hopelessly broken +# Bug bnc#770301 +blacklist uas -- 1.7.7 ++++++ sysconfig-0.76.2.tar.bz2 -> sysconfig-0.76.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/ChangeLog new/sysconfig-0.76.3/ChangeLog --- old/sysconfig-0.76.2/ChangeLog 2012-04-10 13:27:25.000000000 +0200 +++ new/sysconfig-0.76.3/ChangeLog 2012-06-11 12:24:20.000000000 +0200 @@ -1,4 +1,35 @@ -commit 37d231fd2118c241da16ba183b25779f8ac23bb3 (HEAD, tag: version-0.76.2, origin/master, master) +commit f30d10af618cf9471a33adfa4bfbdb1530ff2da6 (HEAD, master) +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Mon Jun 11 12:23:28 2012 +0200 + + version 0.76.3, updated changes file + +commit a40c8750fda429149a2f2e2daa2fbfb8928349d8 +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Mon Jun 11 12:01:39 2012 +0200 + + Fixed to differentiate ib/ibchild/bond types + + A bonding using infiniband interfaces (ib or ibchild) were not + stopped correctly, because it were handled as ib, not as bond. + +commit fa96b8bfd28fea295ffda162c5cb9632ddfcc1e8 +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Thu May 24 11:01:29 2012 +0200 + + X-Systemd-RemainAfterExit LSB tag before Description + + Moved X-Systemd-RemainAfterExit LSB tag before Description as + workaround for a LSB parsing bug in systemd for the case that + a not yet fixed systemd is stil in use (bnc#763533). + +commit d8c0759bb718c6ee2421a1945eb7441b546ebd20 +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Wed May 23 16:39:56 2012 +0200 + + Fixed ifrenew-dhcp to use built-in dhcpcd --renew + +commit 37d231fd2118c241da16ba183b25779f8ac23bb3 (tag: version-0.76.2, origin/master) Author: Marius Tomaschewski <mt(a)suse.com> Date: Tue Apr 10 13:24:45 2012 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/VERSION new/sysconfig-0.76.3/VERSION --- old/sysconfig-0.76.2/VERSION 2012-04-10 13:17:30.000000000 +0200 +++ new/sysconfig-0.76.3/VERSION 2012-06-11 12:20:44.000000000 +0200 @@ -1 +1 @@ -0.76.2 +0.76.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/configure new/sysconfig-0.76.3/configure --- old/sysconfig-0.76.2/configure 2012-04-10 13:27:15.000000000 +0200 +++ new/sysconfig-0.76.3/configure 2012-06-11 12:23:57.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for sysconfig 0.76.2. +# Generated by GNU Autoconf 2.68 for sysconfig 0.76.3. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.76.2' -PACKAGE_STRING='sysconfig 0.76.2' +PACKAGE_VERSION='0.76.3' +PACKAGE_STRING='sysconfig 0.76.3' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' PACKAGE_URL='' @@ -1301,7 +1301,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.76.2 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.76.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1371,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.76.2:";; + short | recursive ) echo "Configuration of sysconfig 0.76.3:";; esac cat <<\_ACEOF @@ -1473,7 +1473,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.76.2 +sysconfig configure 0.76.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1842,7 +1842,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.76.2, which was +It was created by sysconfig $as_me 0.76.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2661,7 +2661,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.76.2' + VERSION='0.76.3' cat >>confdefs.h <<_ACEOF @@ -12079,7 +12079,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.76.2, which was +This file was extended by sysconfig $as_me 0.76.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12136,7 +12136,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysconfig config.status 0.76.2 +sysconfig config.status 0.76.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/scripts/functions new/sysconfig-0.76.3/scripts/functions --- old/sysconfig-0.76.2/scripts/functions 2012-04-10 13:13:15.000000000 +0200 +++ new/sysconfig-0.76.3/scripts/functions 2012-06-11 12:22:44.000000000 +0200 @@ -267,9 +267,13 @@ ;; 24) TYPE=eth ;; # firewire ;; # IEEE 1394 IPv4 - RFC 2734 32) # InfiniBand - case $IF in - *.*) TYPE=ibchild ;; *) TYPE=ib ;; - esac + if test -d /sys/class/net/$IF/bonding ; then + TYPE=bond + elif test -d /sys/class/net/$IF/create_child ; then + TYPE=ib + else + TYPE=ibchild + fi ;; 512) TYPE=ppp ;; 768) TYPE=ipip ;; # IPIP tunnel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/scripts/ifup-dhcp new/sysconfig-0.76.3/scripts/ifup-dhcp --- old/sysconfig-0.76.2/scripts/ifup-dhcp 2012-04-10 13:13:15.000000000 +0200 +++ new/sysconfig-0.76.3/scripts/ifup-dhcp 2012-06-11 12:22:32.000000000 +0200 @@ -287,6 +287,8 @@ start_dhcp4_dhcpcd() { + renew=$1 + # # Using netconfig, we can request all options and # netconfig takes care to apply them properlly... @@ -337,10 +339,10 @@ args="$args${DHCLIENT_VENDOR_CLASS_ID:+ -i \"$DHCLIENT_VENDOR_CLASS_ID\"}" args="$args${DHCLIENT_LEASE_TIME:+ -l \"$DHCLIENT_LEASE_TIME\"}" args="$args${DHCLIENT_HOSTNAME_OPTION:+ -h \"$DHCLIENT_HOSTNAME_OPTION\"}" - debug "Starting dhcp client: $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $args $INTERFACE" + debug "Starting dhcp client: $DHCLIENT_BIN $renew $DHCPCD_USER_OPTIONS $args $INTERFACE" # now start dhcpcd - $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $DHCLIENT_ARGS \ + $DHCLIENT_BIN $renew $DHCPCD_USER_OPTIONS $DHCLIENT_ARGS \ ${DHCLIENT_TIMEOUT:+-t "$DHCLIENT_TIMEOUT"} \ ${DHCLIENT_CLIENT_ID:+-I "$DHCLIENT_CLIENT_ID"} \ ${DHCLIENT_VENDOR_CLASS_ID:+-i "$DHCLIENT_VENDOR_CLASS_ID"} \ @@ -637,14 +639,17 @@ # reset dhcp4 status DHCP4_STATUS="" case "$DHCLIENT" in - (dhcpcd|dhclient) + (dhcpcd) ;; + (dhclient) + DHCP4_STATUS="" $DHCLIENT_BIN -x $INTERFACE + sleep 1 + for i in `dhcpc4_on_iface`; do + kill -TERM $i &>/dev/null + done + sleep 1 ;; esac - for i in `dhcpc4_on_iface`; do - kill -TERM $i &>/dev/null - done - sleep 1 ;; (dhcp6) # reset dhcp6 status @@ -715,7 +720,8 @@ case "$DHCLIENT" in (dhcpcd) test -n "$DHCP4_STATUS" || { - start_dhcp4_dhcpcd && { + test "$ACTION" = renew && renew='--renew' || renew='' + start_dhcp4_dhcpcd $renew && { DHCP4_STARTED="yes" write_cached_config_data dhcp4_client $DHCLIENT $INTERFACE write_cached_config_data dhcp4_state started $INTERFACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/scripts/network new/sysconfig-0.76.3/scripts/network --- old/sysconfig-0.76.2/scripts/network 2012-04-10 13:13:15.000000000 +0200 +++ new/sysconfig-0.76.3/scripts/network 2012-06-11 12:22:38.000000000 +0200 @@ -35,10 +35,10 @@ # Should-Stop: isdn openibd SuSEfirewall2_init # Default-Start: 3 5 # Default-Stop: +# X-Systemd-RemainAfterExit: true # Short-Description: Configure the localfs depending network interfaces # Description: Configure the localfs depending network interfaces # and set up routing -# X-Systemd-RemainAfterExit: true ### END INIT INFO unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/scripts/network-remotefs new/sysconfig-0.76.3/scripts/network-remotefs --- old/sysconfig-0.76.2/scripts/network-remotefs 2012-04-10 13:13:15.000000000 +0200 +++ new/sysconfig-0.76.3/scripts/network-remotefs 2012-06-11 12:22:38.000000000 +0200 @@ -31,11 +31,11 @@ # Should-Stop: # Default-Start: 3 5 # Default-Stop: +# X-Systemd-RemainAfterExit: true # Short-Description: Configure the remote-fs depending network interfaces # Description: Configure the remote-fs depending network interfaces as # Wireless and set up routing or start the NetworkManager # (except we're running under systemd). -# X-Systemd-RemainAfterExit: true ### END INIT INFO unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.2/sysconfig.spec new/sysconfig-0.76.3/sysconfig.spec --- old/sysconfig-0.76.2/sysconfig.spec 2012-04-10 13:27:19.000000000 +0200 +++ new/sysconfig-0.76.3/sysconfig.spec 2012-06-11 12:24:00.000000000 +0200 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.76.2 +Version: 0.76.3 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit site-config for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package site-config for openSUSE:12.2 checked in at 2012-07-31 14:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/site-config (Old) and /work/SRC/openSUSE:12.2/.site-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "site-config", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/site-config/site-config.changes 2012-06-25 15:53:11.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.site-config.new/site-config.changes 2012-07-31 14:18:34.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 26 15:34:39 CEST 2012 - sbrabec(a)suse.cz + +- Added README. +- Support more products and libtool and autoconf versions. + +------------------------------------------------------------------- +Fri Jun 8 17:37:25 CEST 2012 - sbrabec(a)suse.cz + +- Rewrite heuristic to be cross-compilation wise (bnc#736143). +- Do not overwrite libexecdir specified by user (bnc#758947). + +------------------------------------------------------------------- Old: ---- site-config.libdir.biarch New: ---- site-config.README site-config.libdir1 site-config.libdir3.biarch site-config.libdir3.uniarch site-config.libdir4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ site-config.spec ++++++ --- /var/tmp/diff_new_pack.SAlnSi/_old 2012-07-31 14:18:34.000000000 +0200 +++ /var/tmp/diff_new_pack.SAlnSi/_new 2012-07-31 14:18:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package site-config # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: site-config +Version: 0.2 +Release: 0 +Summary: Site Paths Configuration for autoconf Based configure Scripts License: BSD-3-Clause Group: Development/Tools/Building -Version: 0.1 -Release: 1 -Summary: Site Paths Configuration for autoconf Based configure Scripts -Source: %{name}.libdir.biarch -Source1: %{name}.libexecdir -Source2: %{name}.AUTHORS -Source3: %{name}.COPYING +Source0: %{name}.libdir1 +Source1: %{name}.libdir3.biarch +Source2: %{name}.libdir3.uniarch +Source3: %{name}.libdir4 +Source4: %{name}.libexecdir +Source5: %{name}.AUTHORS +Source6: %{name}.COPYING +Source7: %{name}.README BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf libtool +BuildRequires: autoconf +BuildRequires: libtool +%if 0%{?suse_version} Supplements: make autoconf +%endif %description Site configuration for autoconf based configure scripts provides smart @@ -38,53 +43,92 @@ %prep %setup -q -T -c %{name}-%{version} -cp -a %{S:0} %{S:1} . -cp -a %{S:2} AUTHORS -cp -a %{S:3} COPYING -touch site-config.libdir.uniarch +cp -a %{S:0} %{S:1} %{S:2} %{S:3} %{S:4} . +cp -a %{S:5} AUTHORS +cp -a %{S:6} COPYING +cp -a %{S:7} README %build -SITE_PLATFORM=`%{_datadir}/libtool/config/config.guess` +# Call libtool to get name of our architecture as seen by GNU tools. +if test -f %{_datadir}/libtool/config/config.guess ; then + # new libtool + %{_datadir}/libtool/config/config.guess >site_platform +else + # old libtool + %{_datadir}/libtool/config.guess >site_platform +fi +SITE_PLATFORM=$(<site_platform) +if test -z "$SITE_PLATFORM" ; then + echo "ERROR: libtool implementation changed. Please update SITE_PLATFORM definition." + exit 1 +fi + # Extract fully expanded needed parts of the actual implementation of AC_SITE_LOAD. +# Create dummy configure.in to generate configure. cat >configure.in <<EOF dnl AC_SITE_LOAD is included as part of AC_INIT AC_INIT EOF autoconf -sed -n <configure >ac_site_load_files ' -s/ /\t/g -s:\$as_me:%{_datadir}/site/'$SITE_PLATFORM':g -/^elif test "x\$prefix" != xNONE/s/elif/if/ -/^if test "x\$prefix" != xNONE/,/^done/p -' +# Extract site script loading parts of configure and apply some rewrite rules. +if grep ac_site_file2 configure ; then + # new autoconf + sed -n <configure >ac_site_load_files ' + s/ /\t/g + s:\$as_me:%{_datadir}/site/'$SITE_PLATFORM':g + /^elif test "x\$prefix" != xNONE/s/elif/if/ + /^if test "x\$prefix" != xNONE/,/^done/p + ' +else + # old autoconf + sed -n <configure >ac_site_load_files ' + s:\$as_me:%{_datadir}/site/'$SITE_PLATFORM':g + s/ /\t/g + /^fi/d + /^\tif test "x\$prefix" != xNONE; then/,/^\tfi/s/^\t// + s/CONFIG_SITE/ac_site_files/ + /^if test "x\$prefix" != xNONE/,/^done/p + ' +fi if test -z "$(<ac_site_load_files)" ; then echo "ERROR: AC_SITE_LOAD implementation changed. Please update extraction logic." exit 1 fi -echo -e '#!/bin/sh\n# Site script for configure. It is resourced via \$CONFIG_SITE environment varaible.\n' >site-config + +# Now compile site-config script. +# Header. +echo -e '#!/bin/sh\n# Site script for configure. It is resourced via $CONFIG_SITE environment varaible.\n' >site-config +# libdir stuff. +cat site-config.libdir1 >>site-config +NATIVE_PLATFORM=`uname -i` if test "%{_libdir}" = "%{_prefix}/lib" ; then - cat site-config.libdir.uniarch >>site-config + echo -e "\t\t# The native platform $NATIVE_PLATFORM is not a bi-arch platform." >>site-config + cat site-config.libdir3.uniarch >>site-config else - cat site-config.libdir.biarch >>site-config + echo -e "\t\t# The native platform $NATIVE_PLATFORM is a bi-arch platform." >>site-config + cat site-config.libdir3.biarch >>site-config fi +cat site-config.libdir4 >>site-config +# libexec stuff. cat site-config.libexecdir >>site-config +# And stuff to load site scripts from default locations. echo '# Continue with the standard behavior of configure defined in AC_SITE_LOAD:' >>site-config cat ac_site_load_files >>site-config %install mkdir -p $RPM_BUILD_ROOT%{_datadir}/site $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -SITE_PLATFORM=`%{_datadir}/libtool/config/config.guess` -if test -z "$SITE_PLATFORM" ; then - echo "ERROR: libtool implementation changed. Please update SITE_PLATFORM definition." - exit 1 -fi -cp -a site-config $RPM_BUILD_ROOT%{_datadir}/site/$SITE_PLATFORM +# Install site script. +SITE_PLATFORM=$(<site_platform) +cp site-config $RPM_BUILD_ROOT%{_datadir}/site/$SITE_PLATFORM + +# Install Bourne Shell profile. cat >$RPM_BUILD_ROOT%{_sysconfdir}/profile.d/site.sh <<EOF CONFIG_SITE="%{_datadir}/site/$SITE_PLATFORM" export CONFIG_SITE EOF +# Install C Shell profile. cat >$RPM_BUILD_ROOT%{_sysconfdir}/profile.d/site.csh <<EOF set CONFIG_SITE="%{_datadir}/site/$SITE_PLATFORM" EOF @@ -94,7 +138,7 @@ %files %defattr (-,root,root) -%doc AUTHORS COPYING +%doc AUTHORS COPYING README %{_datadir}/site %{_sysconfdir}/profile.d/*.* ++++++ site-config.README ++++++ site-config: Site Paths Configuration for autoconf Based configure Scripts ========================================================================== Site configuration for autoconf based configure scripts provides smart defaults for paths that are not specified. All autoconf based configure scripts will automatically resource site script using CONFIG_SITE environment variable. It works without any explicit user interaction. Currently implemented features: Automatic libdir setup to $exec_prefix/lib or $exec_prefix/lib64 ---------------------------------------------------------------- Depending on architecture, site script should correctly and automatically switch between lib and lib64 libdir. libexecdir setup to $exec_prefix/lib ------------------------------------ Upstream libexecdir defaults to $exec_prefix/libexec. This directory is not part of FHS 2.2, so we change it to $exec_prefix/lib (yes, it is correct to set it to $exec_prefix/lib even for bi-arch platforms). Most projects add package name to this path, so you most probably get what FHS 2.2 expects. ++++++ site-config.libdir.biarch -> site-config.libdir1 ++++++ --- /work/SRC/openSUSE:12.2/site-config/site-config.libdir.biarch 2012-06-25 15:53:11.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.site-config.new/site-config.libdir1 2012-07-31 14:18:34.000000000 +0200 @@ -1,44 +1,9 @@ # If user did not specify libdir, guess the correct target: -# Use lib64 for 64 bit targets, keep the default for the rest. +# Use lib64 for 64 bit bi-arch targets, keep the default for the rest. if test "$libdir" = '${exec_prefix}/lib' ; then - # We are trying to guess 32-bit target compilation. It's not as easy as - # it sounds, as there is possible several intermediate combinations. - ac_config_site_32bit_target=NONE + ac_config_site_64bit_host=NONE - # User defined -m32 in CFLAGS or CXXFLAGS: - # (It's sufficient for 32-bit, but alone may cause mis-behavior of some checks.) - case "$CFLAGS" in - *-m32*) - ac_config_site_32bit_target=YES - ;; - esac - case "$CXXFLAGS" in - *-m32*) - ac_config_site_32bit_target=YES - ;; - esac - - # User explicitly specified counterpart --host: - # (If cross toolchain is installed, generates 32-bit, else generates native.) case "$host" in - *i[3456]86-* | ppc-* | s390-* ) - ac_config_site_32bit_target=YES - ;; - esac - - # Running with linux32: - # (Changes detected platform, but not the toolchain target.) - case "`/bin/uname -i`" in - x86_64 | ppc64 | s390x ) - ;; - * ) - ac_config_site_32bit_target=YES - ;; - esac - - if test "x$ac_config_site_32bit_target" = xNONE; then - libdir='${exec_prefix}/lib64' - fi -fi - + "" ) + # User did not specify host target. ++++++ site-config.libdir.biarch -> site-config.libdir3.biarch ++++++ --- /work/SRC/openSUSE:12.2/site-config/site-config.libdir.biarch 2012-06-25 15:53:11.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.site-config.new/site-config.libdir3.biarch 2012-07-31 14:18:34.000000000 +0200 @@ -1,44 +1,33 @@ -# If user did not specify libdir, guess the correct target: -# Use lib64 for 64 bit targets, keep the default for the rest. -if test "$libdir" = '${exec_prefix}/lib' ; then + # Try to detect cross-compilation to inferior architecture. - # We are trying to guess 32-bit target compilation. It's not as easy as - # it sounds, as there is possible several intermediate combinations. - ac_config_site_32bit_target=NONE - - # User defined -m32 in CFLAGS or CXXFLAGS: - # (It's sufficient for 32-bit, but alone may cause mis-behavior of some checks.) - case "$CFLAGS" in + # We are trying to guess 32-bit target compilation. It's not as easy as + # it sounds, as there is possible several intermediate combinations. + ac_config_site_cross_to_32bit_host=NONE + + # User defined -m32 in CFLAGS or CXXFLAGS: + # (It's sufficient for 32-bit, but alone may cause mis-behavior of some checks.) + case "$CFLAGS" in *-m32*) - ac_config_site_32bit_target=YES + ac_config_site_cross_to_32bit_host=YES ;; - esac - case "$CXXFLAGS" in + esac + case "$CXXFLAGS" in *-m32*) - ac_config_site_32bit_target=YES - ;; - esac - - # User explicitly specified counterpart --host: - # (If cross toolchain is installed, generates 32-bit, else generates native.) - case "$host" in - *i[3456]86-* | ppc-* | s390-* ) - ac_config_site_32bit_target=YES + ac_config_site_cross_to_32bit_host=YES ;; - esac + esac - # Running with linux32: - # (Changes detected platform, but not the toolchain target.) - case "`/bin/uname -i`" in + # Running with linux32: + # (Changes detected platform, but not the toolchain target.) + case "`/bin/uname -i`" in x86_64 | ppc64 | s390x ) ;; * ) - ac_config_site_32bit_target=YES + ac_config_site_cross_to_32bit_host=YES ;; - esac + esac - if test "x$ac_config_site_32bit_target" = xNONE; then - libdir='${exec_prefix}/lib64' - fi -fi + if test "x$ac_config_site_cross_to_32bit_host" = xNONE; then + ac_config_site_64bit_host=YES + fi ++++++ site-config.libdir3.uniarch ++++++ # There is no need to check for compatible sub-architecture. ac_config_site_64bit_host=NONE ++++++ site-config.libdir.biarch -> site-config.libdir4 ++++++ --- /work/SRC/openSUSE:12.2/site-config/site-config.libdir.biarch 2012-06-25 15:53:11.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.site-config.new/site-config.libdir4 2012-07-31 14:18:34.000000000 +0200 @@ -1,43 +1,10 @@ -# If user did not specify libdir, guess the correct target: -# Use lib64 for 64 bit targets, keep the default for the rest. -if test "$libdir" = '${exec_prefix}/lib' ; then - - # We are trying to guess 32-bit target compilation. It's not as easy as - # it sounds, as there is possible several intermediate combinations. - ac_config_site_32bit_target=NONE - - # User defined -m32 in CFLAGS or CXXFLAGS: - # (It's sufficient for 32-bit, but alone may cause mis-behavior of some checks.) - case "$CFLAGS" in - *-m32*) - ac_config_site_32bit_target=YES - ;; - esac - case "$CXXFLAGS" in - *-m32*) - ac_config_site_32bit_target=YES - ;; - esac - - # User explicitly specified counterpart --host: - # (If cross toolchain is installed, generates 32-bit, else generates native.) - case "$host" in - *i[3456]86-* | ppc-* | s390-* ) - ac_config_site_32bit_target=YES - ;; - esac - - # Running with linux32: - # (Changes detected platform, but not the toolchain target.) - case "`/bin/uname -i`" in - x86_64 | ppc64 | s390x ) - ;; - * ) - ac_config_site_32bit_target=YES - ;; + ;; + *x86_64* | *ppc64* | *s390x* ) + ac_config_site_64bit_host=YES + ;; esac - if test "x$ac_config_site_32bit_target" = xNONE; then + if test "x$ac_config_site_64bit_host" = xYES; then libdir='${exec_prefix}/lib64' fi fi ++++++ site-config.libexecdir ++++++ --- /var/tmp/diff_new_pack.SAlnSi/_old 2012-07-31 14:18:34.000000000 +0200 +++ /var/tmp/diff_new_pack.SAlnSi/_new 2012-07-31 14:18:34.000000000 +0200 @@ -1,5 +1,7 @@ -# If user did not specify libexecdir, guess the correct target: +# If user did not specify libexecdir, set the correct target: # Nor FHS nor openSUSE allow prefix/libexec. Let's default to prefix/lib. -libexecdir='${exec_prefix}/lib' +if test "$libexecdir" = '${exec_prefix}/libexec' ; then + libexecdir='${exec_prefix}/lib' +fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit rocksndiamonds for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package rocksndiamonds for openSUSE:12.2 checked in at 2012-07-31 14:05:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/rocksndiamonds (Old) and /work/SRC/openSUSE:12.2/.rocksndiamonds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rocksndiamonds", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/rocksndiamonds/rocksndiamonds.changes 2012-06-25 15:52:01.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.rocksndiamonds.new/rocksndiamonds.changes 2012-07-31 14:18:17.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 13 06:53:24 UTC 2012 - meissner(a)suse.com + +- do not create ~/.rocksndiamonds/ world writeable. + bnc#736261 / CVE-2011-4606 + +------------------------------------------------------------------- New: ---- rocksndiamonds-CVE-2011-4606.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocksndiamonds.spec ++++++ --- /var/tmp/diff_new_pack.nDRC9L/_old 2012-07-31 14:18:34.000000000 +0200 +++ /var/tmp/diff_new_pack.nDRC9L/_new 2012-07-31 14:18:34.000000000 +0200 @@ -39,6 +39,7 @@ Source3: %{name}.desktop Source4: Contributions-1.2.0.tar.bz2 Patch: %{name}-%{version}-smpeg.patch +Patch1: %{name}-CVE-2011-4606.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +78,7 @@ if [ ! -f /usr/%_lib/libsmpeg.a ] ; then %patch -p1 fi +%patch1 -p1 cp %{S:2} %{S:3} . pushd levels tar -xjf %{S:4} ++++++ rocksndiamonds-CVE-2011-4606.patch ++++++ diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-3.3.0.1/src/libgame/setup.c --- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 2011-12-12 14:28:30.083078680 -0500 +++ rocksndiamonds-3.3.0.1/src/libgame/setup.c 2011-12-12 14:34:36.758744753 -0500 @@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first) #define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) +#define MODE_R_PRIVATE (S_IRUSR) #define MODE_W_PRIVATE (S_IWUSR) +#define MODE_X_PRIVATE (S_IXUSR) + #define MODE_W_PUBLIC (S_IWUSR | S_IWGRP) #define MODE_W_PUBLIC_DIR (S_IWUSR | S_IWGRP | S_ISGID) -#define DIR_PERMS_PRIVATE (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE) +#define DIR_PERMS_PRIVATE (MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE) #define DIR_PERMS_PUBLIC (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR) #define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE) @@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te if (running_setgid) posix_umask(last_umask & group_umask); else - dir_mode |= MODE_W_ALL; + if (permission_class == PERMS_PUBLIC) + dir_mode |= MODE_W_ALL; if (!fileExists(dir)) if (posix_mkdir(dir, dir_mode) != 0) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit rednotebook for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package rednotebook for openSUSE:12.2 checked in at 2012-07-31 14:05:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/rednotebook (Old) and /work/SRC/openSUSE:12.2/.rednotebook.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rednotebook", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/rednotebook/rednotebook.changes 2012-06-25 15:51:53.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.rednotebook.new/rednotebook.changes 2012-07-31 14:18:14.000000000 +0200 @@ -1,0 +2,19 @@ +Sun Jul 22 14:08:55 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 1.5.0: + + New scalable logo. + + Remember possible undo/redo actions for each day separately. + + Turn all entries of old "Tags" categories into tags without + entries at startup. + + Suggest last tag when a new tag is added. + + When suggesting to use the last tag, leave focus on the tag. + + Enable copy menu item in preview mode. (lp#834473) + + Only allow hiding words from the cloud, not the tags. + + Add shortcut (Ctrl+Home) for "Go to Today". + + Fix undo for tags. + + Drop support for Python 2.5. This means that we now support + Python 2.6 and 2.7. + + Install translation files in standard directories. (lp#687349) +- Added lang package. + +------------------------------------------------------------------- Old: ---- rednotebook-1.4.0.tar.gz New: ---- rednotebook-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rednotebook.spec ++++++ --- /var/tmp/diff_new_pack.cwRj7u/_old 2012-07-31 14:18:16.000000000 +0200 +++ /var/tmp/diff_new_pack.cwRj7u/_new 2012-07-31 14:18:16.000000000 +0200 @@ -17,9 +17,8 @@ Name: rednotebook -Version: 1.4.0 +Version: 1.5.0 Release: 0 -# Note: there's no lang package as of 1.1.4 because the translations are not installed in the usual place. See lp#687349. # See note at the end of README: code is using some LGPL-3.0+ module, so the resulting work is GPL-3.0+. Summary: Graphical diary and journal License: GPL-3.0+ @@ -35,6 +34,7 @@ Requires: python-webkitgtk Requires: python-yaml Recommends: python-chardet +Recommends: %{name}-lang %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -50,6 +50,7 @@ functionality and word clouds. You can also format, tag and search your entries. +%lang_package %prep %setup -q @@ -57,6 +58,7 @@ %install %{__python} setup.py install --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --root=%{buildroot} +%find_lang %{name} %{?no_lang_C} %suse_update_desktop_file %{name} Calendar %fdupes %{buildroot}%{_datadir} @@ -86,7 +88,10 @@ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.svg %{python_sitelib}/%{name}/ %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info +%files lang -f %{name}.lang + %changelog ++++++ rednotebook-1.4.0.tar.gz -> rednotebook-1.5.0.tar.gz ++++++ ++++ 66861 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

commit qemu for openSUSE:12.2

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package qemu for openSUSE:12.2 checked in at 2012-07-31 14:05:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/qemu (Old) and /work/SRC/openSUSE:12.2/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qemu", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/qemu/qemu.changes 2012-06-29 11:34:44.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.qemu.new/qemu.changes 2012-07-31 14:17:49.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Jul 11 21:16:34 UTC 2012 - agraf(a)suse.com + +- fix segfault even better + +------------------------------------------------------------------- +Wed Jul 11 14:52:02 UTC 2012 - agraf(a)suse.com + +- linux-user: improve locking even across tb flushes + +------------------------------------------------------------------- +Tue Jul 10 18:43:31 UTC 2012 - agraf(a)suse.com + +- linux-user: pin multi-threaded applications to a single host cpu + +------------------------------------------------------------------- +Tue Jul 10 16:42:54 UTC 2012 - agraf(a)suse.com + +- linux-user: improve lock + +------------------------------------------------------------------- +Thu Jul 5 15:37:05 UTC 2012 - agraf(a)suse.com + +- linux-user: add tcg lock for multi-threaded guest programs + +------------------------------------------------------------------- New: ---- 0025-linux-user-lock-tcg.patch.patch 0026-linux-user-Run-multi-threaded-code-.patch 0027-linux-user-lock-tb-flushing-too.pat.patch 0028-XXX-merge-with-segmentation-fault-p.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.868fQv/_old 2012-07-31 14:18:14.000000000 +0200 +++ /var/tmp/diff_new_pack.868fQv/_new 2012-07-31 14:18:14.000000000 +0200 @@ -48,6 +48,10 @@ Patch0022: 0022-use-libexecdir-instead-of-ignoring-.patch Patch0023: 0023-linux-user-Ignore-broken-loop-ioctl.patch Patch0024: 0024-linux-user-fix-segmentation-fault-p.patch +Patch0025: 0025-linux-user-lock-tcg.patch.patch +Patch0026: 0026-linux-user-Run-multi-threaded-code-.patch +Patch0027: 0027-linux-user-lock-tb-flushing-too.pat.patch +Patch0028: 0028-XXX-merge-with-segmentation-fault-p.patch # this is to make lint happy Source300: rpmlintrc Source302: bridge.conf @@ -179,6 +183,10 @@ %patch0022 -p1 %patch0023 -p1 %patch0024 -p1 +%patch0025 -p1 +%patch0026 -p1 +%patch0027 -p1 +%patch0028 -p1 %build # build QEMU ++++++ 0025-linux-user-lock-tcg.patch.patch ++++++ >From 9a66bfa1a21b7429229be3d52b1d6ea08b141d36 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 5 Jul 2012 17:31:39 +0200 Subject: [PATCH] linux-user: lock tcg The tcg code generator is not thread safe. Lock its generation between different threads. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- linux-user/mmap.c | 3 +++ tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++-- tcg/tcg.h | 6 ++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 3f5e1d7..83e9eda 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -30,6 +30,7 @@ #include "qemu.h" #include "qemu-common.h" +#include "tcg.h" //#define DEBUG_MMAP @@ -41,6 +42,7 @@ void mmap_lock(void) { if (mmap_lock_count++ == 0) { pthread_mutex_lock(&mmap_mutex); + tcg_lock(); } } @@ -48,6 +50,7 @@ void mmap_unlock(void) { if (--mmap_lock_count == 0) { pthread_mutex_unlock(&mmap_mutex); + tcg_unlock(); } } diff --git a/tcg/tcg.c b/tcg/tcg.c index ab589c7..4c93acb 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -40,6 +40,8 @@ #include "cache-utils.h" #include "host-utils.h" #include "qemu-timer.h" +#include "config-host.h" +#include "qemu-thread.h" /* Note: the long term plan is to reduce the dependancies on the QEMU CPU definitions. Currently they are used for qemu_ld/st @@ -105,6 +107,29 @@ static TCGRegSet tcg_target_call_clobber_regs; uint16_t *gen_opc_ptr; TCGArg *gen_opparam_ptr; +#ifdef CONFIG_USER_ONLY +static __thread int tcg_lock_count; +#endif +void tcg_lock(void) +{ +#ifdef CONFIG_USER_ONLY + TCGContext *s = &tcg_ctx; + if (tcg_lock_count++ == 0) { + qemu_mutex_lock(&s->lock); + } +#endif +} + +void tcg_unlock(void) +{ +#ifdef CONFIG_USER_ONLY + TCGContext *s = &tcg_ctx; + if (--tcg_lock_count == 0) { + qemu_mutex_unlock(&s->lock); + } +#endif +} + static inline void tcg_out8(TCGContext *s, uint8_t v) { *s->code_ptr++ = v; @@ -245,7 +270,8 @@ void tcg_context_init(TCGContext *s) memset(s, 0, sizeof(*s)); s->temps = s->static_temps; s->nb_globals = 0; - + qemu_mutex_init(&s->lock); + /* Count total number of arguments and allocate the corresponding space */ total_args = 0; @@ -2182,11 +2208,13 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf) } #endif + tcg_lock(); tcg_gen_code_common(s, gen_code_buf, -1); /* flush instruction cache */ flush_icache_range((tcg_target_ulong)gen_code_buf, (tcg_target_ulong)s->code_ptr); + tcg_unlock(); return s->code_ptr - gen_code_buf; } @@ -2197,7 +2225,11 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf) Return -1 if not found. */ int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset) { - return tcg_gen_code_common(s, gen_code_buf, offset); + int r; + tcg_lock(); + r = tcg_gen_code_common(s, gen_code_buf, offset); + tcg_unlock(); + return r; } #ifdef CONFIG_PROFILER diff --git a/tcg/tcg.h b/tcg/tcg.h index a83bddd..e20fc82 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -46,6 +46,8 @@ typedef uint64_t tcg_target_ulong; #error unsupported #endif +#include "config-host.h" +#include "qemu-thread.h" #include "tcg-target.h" #include "tcg-runtime.h" @@ -389,6 +391,7 @@ struct TCGContext { #ifdef CONFIG_DEBUG_TCG int temps_in_use; #endif + QemuMutex lock; }; extern TCGContext tcg_ctx; @@ -568,6 +571,9 @@ void tcg_gen_shifti_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGArg *tcg_optimize(TCGContext *s, uint16_t *tcg_opc_ptr, TCGArg *args, TCGOpDef *tcg_op_def); +extern void tcg_lock(void); +extern void tcg_unlock(void); + /* only used for debugging purposes */ void tcg_register_helper(void *func, const char *name); const char *tcg_helper_get_name(TCGContext *s, void *func); ++++++ 0026-linux-user-Run-multi-threaded-code-.patch ++++++ >From f85c851986d24df8700ffe447301786fe83819d0 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 10 Jul 2012 20:40:55 +0200 Subject: [PATCH] linux-user: Run multi-threaded code on a single core Running multi-threaded code can easily expose some of the fundamental breakages in QEMU's design. It's just not a well supported scenario. So if we pin the whole process to a single host CPU, we guarantee that we will never have concurrent memory access actually happen. We can still get scheduled away at any time, so it's no complete guarantee, but apparently it reduces the odds well enough to get my test cases to pass. This gets Java 1.7 working for me again on my test box. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- linux-user/syscall.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 46e964b..b0566cd 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4298,6 +4298,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, if (nptl_flags & CLONE_SETTLS) cpu_set_tls (new_env, newtls); + /* agraf: Pin ourselves to a single CPU when running multi-threaded. + This turned out to improve stability for me. */ + { + cpu_set_t mask; + CPU_ZERO(&mask); + CPU_SET(0, &mask); + sched_setaffinity(0, sizeof(mask), &mask); + } + /* Grab a mutex so that thread setup appears atomic. */ pthread_mutex_lock(&clone_lock); ++++++ 0027-linux-user-lock-tb-flushing-too.pat.patch ++++++ >From 777d50057b576a0d829481a0cea9cd399e7a5f65 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 11 Jul 2012 16:47:42 +0200 Subject: [PATCH] linux-user: lock tb flushing too Signed-off-by: Alexander Graf <agraf(a)suse.de> --- exec.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/exec.c b/exec.c index 9ba4409..6da4b38 100644 --- a/exec.c +++ b/exec.c @@ -732,17 +732,22 @@ static TranslationBlock *tb_alloc(target_ulong pc) { TranslationBlock *tb; + tcg_lock(); if (nb_tbs >= code_gen_max_blocks || - (code_gen_ptr - code_gen_buffer) >= code_gen_buffer_max_size) + (code_gen_ptr - code_gen_buffer) >= code_gen_buffer_max_size) { + tcg_unlock(); return NULL; + } tb = &tbs[nb_tbs++]; tb->pc = pc; tb->cflags = 0; + tcg_unlock(); return tb; } void tb_free(TranslationBlock *tb) { + tcg_lock(); /* In practice this is mostly used for single use temporary TB Ignore the hard cases and just back up if this TB happens to be the last one generated. */ @@ -750,6 +755,7 @@ void tb_free(TranslationBlock *tb) code_gen_ptr = tb->tc_ptr; nb_tbs--; } + tcg_unlock(); } static inline void invalidate_page_bitmap(PageDesc *p) @@ -803,6 +809,7 @@ void tb_flush(CPUArchState *env1) nb_tbs, nb_tbs > 0 ? ((unsigned long)(code_gen_ptr - code_gen_buffer)) / nb_tbs : 0); #endif + tcg_lock(); if ((unsigned long)(code_gen_ptr - code_gen_buffer) > code_gen_buffer_size) cpu_abort(env1, "Internal error: code buffer overflow\n"); @@ -819,6 +826,7 @@ void tb_flush(CPUArchState *env1) /* XXX: flush processor icache at this point if cache flush is expensive */ tb_flush_count++; + tcg_unlock(); } #ifdef DEBUG_TB_CHECK @@ -1116,9 +1124,12 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, int current_flags = 0; #endif /* TARGET_HAS_PRECISE_SMC */ + tcg_lock(); p = page_find(start >> TARGET_PAGE_BITS); - if (!p) + if (!p) { + tcg_unlock(); return; + } if (!p->code_bitmap && ++p->code_write_count >= SMC_BITMAP_USE_THRESHOLD && is_cpu_write_access) { @@ -1202,6 +1213,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, cpu_resume_from_signal(env, NULL); } #endif + tcg_unlock(); } /* len must be <= 8 and start must be a multiple of len */ @@ -1397,12 +1409,16 @@ TranslationBlock *tb_find_pc(uintptr_t tc_ptr) { int m_min, m_max, m; uintptr_t v; - TranslationBlock *tb; + TranslationBlock *tb, *r; - if (nb_tbs <= 0) + tcg_lock(); + if (nb_tbs <= 0) { + tcg_unlock(); return NULL; + } if (tc_ptr < (uintptr_t)code_gen_buffer || tc_ptr >= (uintptr_t)code_gen_ptr) { + tcg_unlock(); return NULL; } /* binary search (cf Knuth) */ @@ -1412,15 +1428,18 @@ TranslationBlock *tb_find_pc(uintptr_t tc_ptr) m = (m_min + m_max) >> 1; tb = &tbs[m]; v = (uintptr_t)tb->tc_ptr; - if (v == tc_ptr) + if (v == tc_ptr) { + tcg_unlock(); return tb; - else if (tc_ptr < v) { + } else if (tc_ptr < v) { m_max = m - 1; } else { m_min = m + 1; } } - return &tbs[m_max]; + r = &tbs[m_max]; + tcg_unlock(); + return r; } static void tb_reset_jump_recursive(TranslationBlock *tb); ++++++ 0028-XXX-merge-with-segmentation-fault-p.patch ++++++ >From a81c9410cc3538dfeb22484d1daa95e6a5bb1e79 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 11 Jul 2012 23:15:47 +0200 Subject: [PATCH] XXX merge with segmentation fault passing patch --- user-exec.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/user-exec.c b/user-exec.c index 83d2d44..cc57bde 100644 --- a/user-exec.c +++ b/user-exec.c @@ -100,21 +100,27 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, /* Maybe we're still holding the TB fiddling lock? */ spin_unlock_safe(&tb_lock); - if (h2g_valid(address)) { - /* XXX: locking issue */ - if (is_write && page_unprotect(h2g(address), pc, puc)) { - return 1; - } + /* XXX: locking issue */ + if (h2g_valid(address) && is_write && + page_unprotect(h2g(address), pc, puc)) { + return 1; + } - /* see if it is an MMU fault */ - ret = cpu_handle_mmu_fault(env, h2g(address), is_write, MMU_USER_IDX); - if (ret < 0) { - return 0; /* not an MMU fault */ - } - if (ret == 0) { - return 1; /* the MMU fault was handled without causing real CPU fault */ - } + if (RESERVED_VA) { + /* Convert forcefully to guest address space, invalid addresses + are still valid segv ones */ + address = address - GUEST_BASE; } + + /* see if it is an MMU fault */ + ret = cpu_handle_mmu_fault(env, address, is_write, MMU_USER_IDX); + if (ret < 0) { + return 0; /* not an MMU fault */ + } + if (ret == 0) { + return 1; /* the MMU fault was handled without causing real CPU fault */ + } + /* now we have a real cpu fault */ tb = tb_find_pc(pc); if (tb) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

9 years

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits July 2012