November 2012 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-devise-i18n for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package rubygem-devise-i18n for openSUSE:Factory checked in at 2012-11-28 16:39:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-devise-i18n (Old) and /work/SRC/openSUSE:Factory/.rubygem-devise-i18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-devise-i18n", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-devise-i18n/rubygem-devise-i18n.changes 2012-11-02 19:39:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-devise-i18n.new/rubygem-devise-i18n.changes 2012-11-28 16:39:27.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 19 13:05:41 UTC 2012 - coolo(a)suse.com + +- updated to version 0.5.11 + +------------------------------------------------------------------- +Tue Nov 6 05:34:48 UTC 2012 - coolo(a)suse.com + +- updated to version 0.5.10 + +------------------------------------------------------------------- Old: ---- devise-i18n-0.5.9.gem New: ---- devise-i18n-0.5.11.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-devise-i18n.spec ++++++ --- /var/tmp/diff_new_pack.Tk8lfm/_old 2012-11-28 16:39:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Tk8lfm/_new 2012-11-28 16:39:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-devise-i18n -Version: 0.5.9 +Version: 0.5.11 Release: 0 %define mod_name devise-i18n %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.1110 for openSUSE:12.2:Update
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package patchinfo.1110 for openSUSE:12.2:Update checked in at 2012-11-28 16:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/patchinfo.1110 (Old) and /work/SRC/openSUSE:12.2:Update/.patchinfo.1110.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.1110", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="790140" tracker="bnc">MozillaFirefox 17.0/10.0.11 security release</issue> <issue id="CVE-2012-4218" tracker="cve" /> <issue id="CVE-2012-4213" tracker="cve" /> <issue id="CVE-2012-4212" tracker="cve" /> <issue id="CVE-2012-4210" tracker="cve" /> <issue id="CVE-2012-4217" tracker="cve" /> <issue id="CVE-2012-4216" tracker="cve" /> <issue id="CVE-2012-4215" tracker="cve" /> <issue id="CVE-2012-4214" tracker="cve" /> <issue id="CVE-2012-5841" tracker="cve" /> <issue id="CVE-2012-5840" tracker="cve" /> <issue id="CVE-2012-5843" tracker="cve" /> <issue id="CVE-2012-5842" tracker="cve" /> <issue id="CVE-2012-5829" tracker="cve" /> <issue id="CVE-2012-4204" tracker="cve" /> <issue id="CVE-2012-4205" tracker="cve" /> <issue id="CVE-2012-4207" tracker="cve" /> <issue id="CVE-2012-4201" tracker="cve" /> <issue id="CVE-2012-4202" tracker="cve" /> <issue id="CVE-2012-4203" tracker="cve" /> <issue id="CVE-2012-4208" tracker="cve" /> <issue id="CVE-2012-4209" tracker="cve" /> <issue id="CVE-2012-5838" tracker="cve" /> <issue id="CVE-2012-5839" tracker="cve" /> <issue id="CVE-2012-5835" tracker="cve" /> <issue id="CVE-2012-5836" tracker="cve" /> <issue id="CVE-2012-5837" tracker="cve" /> <issue id="CVE-2012-5830" tracker="cve" /> <issue id="CVE-2012-5833" tracker="cve" /> <category>security</category> <rating>moderate</rating> <packager>wrosenauer</packager> <description> Changes in MozillaFirefox: - update to Firefox 17.0 (bnc#790140) * MFSA 2012-91/CVE-2012-5842/CVE-2012-5843 Miscellaneous memory safety hazards * MFSA 2012-92/CVE-2012-4202 (bmo#758200) Buffer overflow while rendering GIF images * MFSA 2012-93/CVE-2012-4201 (bmo#747607) evalInSanbox location context incorrectly applied * MFSA 2012-94/CVE-2012-5836 (bmo#792857) Crash when combining SVG text on path with CSS * MFSA 2012-95/CVE-2012-4203 (bmo#765628) Javascript: URLs run in privileged context on New Tab page * MFSA 2012-96/CVE-2012-4204 (bmo#778603) Memory corruption in str_unescape * MFSA 2012-97/CVE-2012-4205 (bmo#779821) XMLHttpRequest inherits incorrect principal within sandbox * MFSA 2012-99/CVE-2012-4208 (bmo#798264) XrayWrappers exposes chrome-only properties when not in chrome compartment * MFSA 2012-100/CVE-2012-5841 (bmo#805807) Improper security filtering for cross-origin wrappers * MFSA 2012-101/CVE-2012-4207 (bmo#801681) Improper character decoding in HZ-GB-2312 charset * MFSA 2012-102/CVE-2012-5837 (bmo#800363) Script entered into Developer Toolbar runs with chrome privileges * MFSA 2012-103/CVE-2012-4209 (bmo#792405) Frames can shadow top.location * MFSA 2012-104/CVE-2012-4210 (bmo#796866) CSS and HTML injection through Style Inspector * MFSA 2012-105/CVE-2012-4214/CVE-2012-4215/CVE-2012-4216/ CVE-2012-5829/CVE-2012-5839/CVE-2012-5840/CVE-2012-4212/ CVE-2012-4213/CVE-2012-4217/CVE-2012-4218 Use-after-free and buffer overflow issues found using Address Sanitizer * MFSA 2012-106/CVE-2012-5830/CVE-2012-5833/CVE-2012-5835/CVE-2012-5838 Use-after-free, buffer overflow, and memory corruption issues found using Address Sanitizer - rebased patches - disabled WebRTC since build is broken (bmo#776877) </description> <summary>update for MozillaFirefox</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.1110 for openSUSE:12.1:Update
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package patchinfo.1110 for openSUSE:12.1:Update checked in at 2012-11-28 16:35:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/patchinfo.1110 (Old) and /work/SRC/openSUSE:12.1:Update/.patchinfo.1110.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.1110", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="790140" tracker="bnc">MozillaFirefox 17.0/10.0.11 security release</issue> <issue id="CVE-2012-4218" tracker="cve" /> <issue id="CVE-2012-4213" tracker="cve" /> <issue id="CVE-2012-4212" tracker="cve" /> <issue id="CVE-2012-4210" tracker="cve" /> <issue id="CVE-2012-4217" tracker="cve" /> <issue id="CVE-2012-4216" tracker="cve" /> <issue id="CVE-2012-4215" tracker="cve" /> <issue id="CVE-2012-4214" tracker="cve" /> <issue id="CVE-2012-5841" tracker="cve" /> <issue id="CVE-2012-5840" tracker="cve" /> <issue id="CVE-2012-5843" tracker="cve" /> <issue id="CVE-2012-5842" tracker="cve" /> <issue id="CVE-2012-5829" tracker="cve" /> <issue id="CVE-2012-4204" tracker="cve" /> <issue id="CVE-2012-4205" tracker="cve" /> <issue id="CVE-2012-4207" tracker="cve" /> <issue id="CVE-2012-4201" tracker="cve" /> <issue id="CVE-2012-4202" tracker="cve" /> <issue id="CVE-2012-4203" tracker="cve" /> <issue id="CVE-2012-4208" tracker="cve" /> <issue id="CVE-2012-4209" tracker="cve" /> <issue id="CVE-2012-5838" tracker="cve" /> <issue id="CVE-2012-5839" tracker="cve" /> <issue id="CVE-2012-5835" tracker="cve" /> <issue id="CVE-2012-5836" tracker="cve" /> <issue id="CVE-2012-5837" tracker="cve" /> <issue id="CVE-2012-5830" tracker="cve" /> <issue id="CVE-2012-5833" tracker="cve" /> <category>security</category> <rating>moderate</rating> <packager>wrosenauer</packager> <description> Changes in MozillaFirefox: - update to Firefox 17.0 (bnc#790140) * MFSA 2012-91/CVE-2012-5842/CVE-2012-5843 Miscellaneous memory safety hazards * MFSA 2012-92/CVE-2012-4202 (bmo#758200) Buffer overflow while rendering GIF images * MFSA 2012-93/CVE-2012-4201 (bmo#747607) evalInSanbox location context incorrectly applied * MFSA 2012-94/CVE-2012-5836 (bmo#792857) Crash when combining SVG text on path with CSS * MFSA 2012-95/CVE-2012-4203 (bmo#765628) Javascript: URLs run in privileged context on New Tab page * MFSA 2012-96/CVE-2012-4204 (bmo#778603) Memory corruption in str_unescape * MFSA 2012-97/CVE-2012-4205 (bmo#779821) XMLHttpRequest inherits incorrect principal within sandbox * MFSA 2012-99/CVE-2012-4208 (bmo#798264) XrayWrappers exposes chrome-only properties when not in chrome compartment * MFSA 2012-100/CVE-2012-5841 (bmo#805807) Improper security filtering for cross-origin wrappers * MFSA 2012-101/CVE-2012-4207 (bmo#801681) Improper character decoding in HZ-GB-2312 charset * MFSA 2012-102/CVE-2012-5837 (bmo#800363) Script entered into Developer Toolbar runs with chrome privileges * MFSA 2012-103/CVE-2012-4209 (bmo#792405) Frames can shadow top.location * MFSA 2012-104/CVE-2012-4210 (bmo#796866) CSS and HTML injection through Style Inspector * MFSA 2012-105/CVE-2012-4214/CVE-2012-4215/CVE-2012-4216/ CVE-2012-5829/CVE-2012-5839/CVE-2012-5840/CVE-2012-4212/ CVE-2012-4213/CVE-2012-4217/CVE-2012-4218 Use-after-free and buffer overflow issues found using Address Sanitizer * MFSA 2012-106/CVE-2012-5830/CVE-2012-5833/CVE-2012-5835/CVE-2012-5838 Use-after-free, buffer overflow, and memory corruption issues found using Address Sanitizer - rebased patches - disabled WebRTC since build is broken (bmo#776877) </description> <summary>update for MozillaFirefox</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:12.2:Update
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:12.2:Update checked in at 2012-11-28 16:35:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/MozillaFirefox (Old) and /work/SRC/openSUSE:12.2:Update/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla(a)forge.provo.novell.com" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.M9gclQ/_old 2012-11-28 16:35:46.000000000 +0100 +++ /var/tmp/diff_new_pack.M9gclQ/_new 2012-11-28 16:35:46.000000000 +0100 @@ -1 +1 @@ -<link package='MozillaFirefox.1041' cicount='copy' /> +<link package='MozillaFirefox.1110' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:12.1:Update
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:12.1:Update checked in at 2012-11-28 16:35:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/MozillaFirefox (Old) and /work/SRC/openSUSE:12.1:Update/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla(a)forge.provo.novell.com" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.vD2tv9/_old 2012-11-28 16:35:39.000000000 +0100 +++ /var/tmp/diff_new_pack.vD2tv9/_new 2012-11-28 16:35:39.000000000 +0100 @@ -1 +1 @@ -<link package='MozillaFirefox.1041' cicount='copy' /> +<link package='MozillaFirefox.1110' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2012-11-28 16:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2012-11-25 14:04:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2012-11-28 16:35:34.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Nov 23 01:28:46 UTC 2012 - mrueckert(a)suse.de + +- fix zeromq support + +------------------------------------------------------------------- +Fri Nov 23 01:01:01 UTC 2012 - mrueckert(a)suse.de + +- fix hiredis support + +------------------------------------------------------------------- +Thu Nov 22 23:44:27 UTC 2012 - mrueckert(a)suse.de + +- enabled elastic search support (build enabled by default): + -> new buildrequires curl devel + -> new subpackage rsyslog-module-elasticsearch +- added --enable-unlimited-select +- added --enable-imttcp: + -> this module is packaged in the main package as it has no + new dependencies +- added --enable-imdiag + -> this module is packaged in the diag package +- prepared adding support for hiredis, hdfs, mongodb and zeromq + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.XNsjeq/_old 2012-11-28 16:35:38.000000000 +0100 +++ /var/tmp/diff_new_pack.XNsjeq/_new 2012-11-28 16:35:38.000000000 +0100 @@ -44,6 +44,12 @@ %bcond_without snmp %bcond_without diagtools %bcond_without mmnormalize +%bcond_without elasticsearch +# TODO: ... doesnt have a proper configure check but wants hdfs.h +%bcond_with hdfs +%bcond_with mongodb +%bcond_with hiredis +%bcond_with zeromq %define upstream_version %{version} %define rsyslogdocdir %{_docdir}/%{name} %define rsyslog_rundir %{_localstatedir}/run/rsyslog @@ -74,6 +80,18 @@ BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: zlib-devel +%if %{with elasticsearch} +BuildRequires: curl-devel +%endif +%if %{with hiredis} +BuildRequires: hiredis-devel >= 0.10.1 +%endif +%if %{with mongodb} +# TODO: PKG_CHECK_MODULES(LIBMONGO_CLIENT, libmongo-client >= 0.1.4) +%endif +%if %{with zeromq} +BuildRequires: czmq-devel >= 1.1.0 +%endif %if %{with gssapi} BuildRequires: krb5-devel %endif @@ -309,6 +327,83 @@ %endif +%if %{with elasticsearch} + +%package module-elasticsearch +Requires: %{name} = %{version} +Summary: ElasticSearch output module for syslog +Group: System/Daemons + +%description module-elasticsearch +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides support to output to an ElasticSearch database. + +%endif + +%if %{with hdfs} + +%package module-hdfs +Requires: %{name} = %{version} +Summary: HDFS output module for syslog +Group: System/Daemons + +%description module-hdfs +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides support to output to an HDFS database. + +%endif + + +%if %{with mongodb} + +%package module-mongodb +Requires: %{name} = %{version} +Summary: MongoDB output module for syslog +Group: System/Daemons + +%description module-mongodb +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides support to output to a MongoDB database. + +%endif + + +%if %{with hiredis} + +%package module-hiredis +Requires: %{name} = %{version} +Summary: Redis output module for syslog +Group: System/Daemons + +%description module-hiredis +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides support to output to a Redis database. + +%endif + +%if %{with zeromq} + +%package module-zeromq +Requires: %{name} = %{version} +Summary: ZeroMQ support module for syslog +Group: System/Daemons + +%description module-zeromq +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides support for ZeroMQ. + +%endif + %prep %setup -q -n %{name}-%{upstream_version} %patch1 -p1 @@ -339,7 +434,11 @@ --enable-klog \ --enable-kmsg \ --enable-inet \ + --enable-unlimited-select \ --enable-rsyslogd \ +%if %{with elasticsearch} + --enable-elasticsearch \ +%endif %if %{with gnutls} --enable-gnutls \ %endif @@ -365,6 +464,7 @@ --enable-mail \ --enable-imfile \ --enable-imptcp \ + --enable-imttcp \ --enable-impstats \ --enable-omprog \ --enable-omuxsock \ @@ -383,7 +483,21 @@ --enable-mmjsonparse \ --enable-mmaudit \ %endif +%if %{with hdfs} + --enable-omhdfs \ +%endif +%if %{with mongodb} + --enable-ommongodb \ +%endif +%if %{with hiredis} + --enable-omhiredis \ +%endif +%if %{with zeromq} + --enable-imzmq3 \ + --enable-omzmq3 \ +%endif %if %{with diagtools} + --enable-imdiag \ --enable-diagtools \ %endif --disable-static @@ -426,6 +540,9 @@ mmjsonparse.so \ mmaudit.so \ %endif +%if %{with elasticsearch} + omelasticsearch.so \ +%endif ; do mv -f %{buildroot}%{rsyslog_module_dir_nodeps}/$mod \ %{buildroot}%{rsyslog_module_dir_withdeps} @@ -626,6 +743,7 @@ %{rsyslog_module_dir_nodeps}/imkmsg.so %{rsyslog_module_dir_nodeps}/immark.so %{rsyslog_module_dir_nodeps}/imtcp.so +%{rsyslog_module_dir_nodeps}/imttcp.so %{rsyslog_module_dir_nodeps}/imudp.so %{rsyslog_module_dir_nodeps}/imuxsock.so %{rsyslog_module_dir_nodeps}/lmnet.so @@ -680,6 +798,7 @@ %{_sbindir}/msggen %{_sbindir}/rsyslog_diag_hostname %{_sbindir}/zpipe +%{rsyslog_module_dir_nodeps}/imdiag.so %endif %if %{with gssapi} @@ -753,4 +872,40 @@ %{rsyslog_module_dir_nodeps}/omudpspoof.so %endif +%if %{with elasticsearch} + +%files module-elasticsearch +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/omelasticsearch.so +%endif + +%if %{with hdfs} + +%files module-hdfs +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/omhdfs.so +%endif + +%if %{with mongodb} + +%files module-mongodb +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/ommongodb.so +%endif + +%if %{with hiredis} + +%files module-hiredis +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/omhiredis.so +%endif + +%if %{with zeromq} + +%files module-zeromq +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/imzmq3.so +%{rsyslog_module_dir_withdeps}/omzmq3.so +%endif + %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox.1110 for openSUSE:12.1:Update
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package MozillaFirefox.1110 for openSUSE:12.1:Update checked in at 2012-11-28 16:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/MozillaFirefox.1110 (Old) and /work/SRC/openSUSE:12.1:Update/.MozillaFirefox.1110.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox.1110", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-11-26 11:02:30.307549147 +0100 +++ /work/SRC/openSUSE:12.1:Update/.MozillaFirefox.1110.new/MozillaFirefox.changes 2012-11-28 16:35:25.000000000 +0100 @@ -0,0 +1,2976 @@ +------------------------------------------------------------------- +Tue Nov 20 19:52:02 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 17.0 (bnc#790140) + * MFSA 2012-91/CVE-2012-5842/CVE-2012-5843 + Miscellaneous memory safety hazards + * MFSA 2012-92/CVE-2012-4202 (bmo#758200) + Buffer overflow while rendering GIF images + * MFSA 2012-93/CVE-2012-4201 (bmo#747607) + evalInSanbox location context incorrectly applied + * MFSA 2012-94/CVE-2012-5836 (bmo#792857) + Crash when combining SVG text on path with CSS + * MFSA 2012-95/CVE-2012-4203 (bmo#765628) + Javascript: URLs run in privileged context on New Tab page + * MFSA 2012-96/CVE-2012-4204 (bmo#778603) + Memory corruption in str_unescape + * MFSA 2012-97/CVE-2012-4205 (bmo#779821) + XMLHttpRequest inherits incorrect principal within sandbox + * MFSA 2012-99/CVE-2012-4208 (bmo#798264) + XrayWrappers exposes chrome-only properties when not in chrome + compartment + * MFSA 2012-100/CVE-2012-5841 (bmo#805807) + Improper security filtering for cross-origin wrappers + * MFSA 2012-101/CVE-2012-4207 (bmo#801681) + Improper character decoding in HZ-GB-2312 charset + * MFSA 2012-102/CVE-2012-5837 (bmo#800363) + Script entered into Developer Toolbar runs with chrome privileges + * MFSA 2012-103/CVE-2012-4209 (bmo#792405) + Frames can shadow top.location + * MFSA 2012-104/CVE-2012-4210 (bmo#796866) + CSS and HTML injection through Style Inspector + * MFSA 2012-105/CVE-2012-4214/CVE-2012-4215/CVE-2012-4216/ + CVE-2012-5829/CVE-2012-5839/CVE-2012-5840/CVE-2012-4212/ + CVE-2012-4213/CVE-2012-4217/CVE-2012-4218 + Use-after-free and buffer overflow issues found using Address + Sanitizer + * MFSA 2012-106/CVE-2012-5830/CVE-2012-5833/CVE-2012-5835/CVE-2012-5838 + Use-after-free, buffer overflow, and memory corruption issues + found using Address Sanitizer +- rebased patches +- disabled WebRTC since build is broken (bmo#776877) + +------------------------------------------------------------------- +Tue Nov 20 15:42:55 UTC 2012 - pcerny(a)suse.com + +- build on SLE11 + * mozilla-gcc43-enums.patch + * mozilla-gcc43-template_hacks.patch + * mozilla-gcc43-templates_instantiation.patch + +------------------------------------------------------------------- +Wed Oct 24 08:27:29 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 16.0.2 (bnc#786522) + * MFSA 2012-90/CVE-2012-4194/CVE-2012-4195/CVE-2012-4196 + (bmo#800666, bmo#793121, bmo#802557) + Fixes for Location object issues +- bring back Obsoletes for libproxy's mozjs plugin for distributions + before 12.2 to avoid crashes + +------------------------------------------------------------------- +Thu Oct 11 01:51:16 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 16.0.1 (bnc#783533) + * MFSA 2012-88/CVE-2012-4191 (bmo#798045) + Miscellaneous memory safety hazards + * MFSA 2012-89/CVE-2012-4192/CVE-2012-4193 (bmo#799952, bmo#720619) + defaultValue security checks not applied + +------------------------------------------------------------------- +Sun Oct 7 21:40:14 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 16.0 (bnc#783533) + * MFSA 2012-74/CVE-2012-3982/CVE-2012-3983 + Miscellaneous memory safety hazards + * MFSA 2012-75/CVE-2012-3984 (bmo#575294) + select element persistance allows for attacks + * MFSA 2012-76/CVE-2012-3985 (bmo#655649) + Continued access to initial origin after setting document.domain + * MFSA 2012-77/CVE-2012-3986 (bmo#775868) + Some DOMWindowUtils methods bypass security checks + * MFSA 2012-79/CVE-2012-3988 (bmo#725770) + DOS and crash with full screen and history navigation + * MFSA 2012-80/CVE-2012-3989 (bmo#783867) + Crash with invalid cast when using instanceof operator + * MFSA 2012-81/CVE-2012-3991 (bmo#783260) + GetProperty function can bypass security checks + * MFSA 2012-82/CVE-2012-3994 (bmo#765527) + top object and location property accessible by plugins + * MFSA 2012-83/CVE-2012-3993/CVE-2012-4184 (bmo#768101, bmo#780370) + Chrome Object Wrapper (COW) does not disallow acces to privileged + functions or properties + * MFSA 2012-84/CVE-2012-3992 (bmo#775009) + Spoofing and script injection through location.hash + * MFSA 2012-85/CVE-2012-3995/CVE-2012-4179/CVE-2012-4180/ + CVE-2012-4181/CVE-2012-4182/CVE-2012-4183 + Use-after-free, buffer overflow, and out of bounds read issues + found using Address Sanitizer + * MFSA 2012-86/CVE-2012-4185/CVE-2012-4186/CVE-2012-4187/ + CVE-2012-4188 + Heap memory corruption issues found using Address Sanitizer + * MFSA 2012-87/CVE-2012-3990 (bmo#787704) + Use-after-free in the IME State Manager +- requires NSPR 4.9.2 +- improve GStreamer integration (bmo#760140) +- removed upstreamed mozilla-crashreporter-restart-args.patch +- webapprt now included +- use kmozillahelper's new REVEAL command (bnc#777415) + (requires mozilla-kde4-integration >= 0.6.4) +- updated translations-other with new languages + +------------------------------------------------------------------- +Mon Sep 10 19:37:56 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 15.0.1 (bnc#779936) + * Sites visited while in Private Browsing mode could be found + through manual browser cache inspection (bmo#787743) + +------------------------------------------------------------------- +Sun Aug 26 13:47:43 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 15.0 (bnc#777588) + * MFSA 2012-57/CVE-2012-1970 + Miscellaneous memory safety hazards + * MFSA 2012-58/CVE-2012-1972/CVE-2012-1973/CVE-2012-1974/CVE-2012-1975 + CVE-2012-1976/CVE-2012-3956/CVE-2012-3957/CVE-2012-3958/CVE-2012-3959 + CVE-2012-3960/CVE-2012-3961/CVE-2012-3962/CVE-2012-3963/CVE-2012-3964 + Use-after-free issues found using Address Sanitizer + * MFSA 2012-59/CVE-2012-1956 (bmo#756719) + Location object can be shadowed using Object.defineProperty + * MFSA 2012-60/CVE-2012-3965 (bmo#769108) + Escalation of privilege through about:newtab + * MFSA 2012-61/CVE-2012-3966 (bmo#775794, bmo#775793) + Memory corruption with bitmap format images with negative height + * MFSA 2012-62/CVE-2012-3967/CVE-2012-3968 + WebGL use-after-free and memory corruption + * MFSA 2012-63/CVE-2012-3969/CVE-2012-3970 + SVG buffer overflow and use-after-free issues + * MFSA 2012-64/CVE-2012-3971 + Graphite 2 memory corruption + * MFSA 2012-65/CVE-2012-3972 (bmo#746855) + Out-of-bounds read in format-number in XSLT + * MFSA 2012-66/CVE-2012-3973 (bmo#757128) + HTTPMonitor extension allows for remote debugging without explicit + activation + * MFSA 2012-68/CVE-2012-3975 (bmo#770684) + DOMParser loads linked resources in extensions when parsing + text/html + * MFSA 2012-69/CVE-2012-3976 (bmo#768568) + Incorrect site SSL certificate data display + * MFSA 2012-70/CVE-2012-3978 (bmo#770429) + Location object security checks bypassed by chrome code + * MFSA 2012-72/CVE-2012-3980 (bmo#771859) + Web console eval capable of executing chrome-privileged code +- fix HTML5 video crash with GStreamer enabled (bmo#761030) +- GStreamer is only used for MP4 (no WebM, OGG) +- updated filelist +- moved browser specific preferences to correct location + +------------------------------------------------------------------- +Sun Jul 29 08:34:39 UTC 2012 - aj(a)suse.de + +- Fix mozilla-kde.patch to include sys/resource.h for getrlimit etc (glibc 2.16) + +------------------------------------------------------------------- +Sat Jul 14 19:31:51 UTC 2012 - wr(a)rosenauer.org + +- 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) ++++ 2779 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update/.MozillaFirefox.1110.new/MozillaFirefox.changes New: ---- MozillaFirefox-rpmlintrc MozillaFirefox.changes MozillaFirefox.desktop MozillaFirefox.spec add-plugins.sh.in compare-locales.tar.bz2 create-tar.sh find-external-requires.sh firefox-17.0-source.tar.bz2 firefox-branded-icons.patch firefox-browser-css.patch firefox-kde-114.patch firefox-kde.patch firefox-mimeinfo.xml firefox-multilocale-chrome.patch firefox-no-default-ualocale.patch firefox.1 firefox.js kde.js l10n-17.0.tar.bz2 mozilla-arm-disable-edsp.patch mozilla-disable-neon-option.patch mozilla-gcc43-enums.patch mozilla-gcc43-template_hacks.patch mozilla-gcc43-templates_instantiation.patch mozilla-get-app-id mozilla-gstreamer-760140.patch mozilla-gstreamer.patch mozilla-kde.patch mozilla-language.patch mozilla-nongnome-proxies.patch mozilla-ntlm-full-path.patch mozilla-ppc.patch mozilla-prefer_plugin_pref.patch mozilla-preferences.patch mozilla-repo.patch mozilla-shared-nss-db.patch mozilla-sle11.patch mozilla.sh.in source-stamp.txt toolkit-download-folder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ ++++ 622 lines (skipped) ++++++ MozillaFirefox-rpmlintrc ++++++ addFilter("no-jar-manifest") ++++++ MozillaFirefox.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=Firefox GenericName=Web Browser Comment=Web Browser TryExec=firefox Exec=firefox %u Icon=firefox Terminal=false StartupNotify=true MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; Type=Application ++++++ add-plugins.sh.in ++++++ #! /bin/sh # Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved. # # check if we are started as root # only one of UID and USER must be set correctly if test "$UID" != 0 -a "$USER" != root; then echo "You must be root to start $0." exit 1 fi PREFIX="%PROGDIR" # dictionaries MYSPELL=/usr/share/myspell MOZ_SPELL=$PREFIX/dictionaries if [ -d $MOZ_SPELL ] ; then if [ -d $MYSPELL ] ; then for dict in $MYSPELL/??[-_]??.aff ; do # check is it is really the file or it is a string which contain '??_??' if ! [ -e $dict ] ; then continue fi # the dict file name dict_file=`echo ${dict##*/}` # the dict file has a valid name lang=`echo ${dict_file:0:2}` country=`echo ${dict_file:3:2}` # check for .dic file if [ ! -r $MYSPELL/${lang}[-_]${country}.dic ] ; then continue fi # create links if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.aff ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.aff \ $MOZ_SPELL/${lang}-${country}.aff fi if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.dic ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.dic \ $MOZ_SPELL/${lang}-${country}.dic fi done echo "-> added myspell dictionaries" fi # remove broken links for dict in $MOZ_SPELL/*.{aff,dic} ; do if ! [ -r $dict ] ; then rm -f $dict fi done fi ++++++ create-tar.sh ++++++ #!/bin/bash CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" RELEASE_TAG="FIREFOX_17_0_RELEASE" VERSION="17.0" # mozilla echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH mozilla pushd mozilla [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG # get repo and source stamp echo -n "REV=" > ../source-stamp.txt hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt echo -n "REPO=" >> ../source-stamp.txt hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd echo "creating archive..." tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n echo "fetching locales..." test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; *) echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales echo "creating compare-locales" hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ find-external-requires.sh ++++++ #!/bin/sh # Finds requirements provided outside of the current file set filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) echo "$filelist" \ | /usr/lib/rpm/find-requires \ | grep -F -v "$provides" \ | sort -u ++++++ firefox-branded-icons.patch ++++++ # HG changeset patch # Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -127,16 +127,21 @@ endif endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default +ifdef MOZ_OFFICIAL_BRANDING + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default +endif endif libs:: $(srcdir)/profile/prefs.js $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ dsstore \ $(NULL) LINUX_BRANDING_FILES = \ default16.png \ + default22.png \ + default24.png \ default32.png \ default48.png \ + default256.png \ mozicon128.png \ $(NULL) OS2_BRANDING_FILES = \ firefox-os2.ico \ document-os2.ico \ $(NULL) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -496,18 +496,21 @@ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest #ifdef MOZ_GTK2 @BINPATH@/chrome/icons/default/default16.png +@BINPATH@/chrome/icons/default/default22.png +@BINPATH@/chrome/icons/default/default24.png @BINPATH@/chrome/icons/default/default32.png @BINPATH@/chrome/icons/default/default48.png +@BINPATH@/chrome/icons/default/default256.png #endif ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX @BINPATH@/icons/*.xpm @BINPATH@/icons/*.png #endif ++++++ firefox-browser-css.patch ++++++ From: Jakub Steiner <jimmac(a)novell.com>, Wolfgang Rosenauer <wr(a)rosenauer.org Subject: make style compatible with dark themes References: https://bugzilla.novell.com/show_bug.cgi?id=503351 https://bugzilla.mozilla.org/show_bug.cgi?id=478632 wr: changed because of https://bugzilla.novell.com/show_bug.cgi?id=561027 diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css --- a/browser/themes/gnomestripe/browser.css +++ b/browser/themes/gnomestripe/browser.css @@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button { #urlbar-display { margin-top: 0; margin-bottom: 0; -moz-margin-start: 0; color: GrayText; } +#PopupAutoCompleteRichResult .autocomplete-richlistitem { + background-color: -moz-Field !important; +} + +#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"], +#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] * { + color: HighlightText !important; + background: Highlight !important; +} + +.ac-title { + color: -moz-Fieldtext !important; +} + /* Favicon */ #page-proxy-favicon { width: 16px; height: 16px; margin-top: 2px; margin-bottom: 2px; -moz-margin-start: 4px; -moz-margin-end: 3px; ++++++ firefox-kde-114.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent ba2d9b1374e15e7c339a44452169d0afac2ca82e With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js @@ -751,17 +751,17 @@ var gAdvancedPane = { if (kde_session == 1) { var shellObj = Components.classes["@mozilla.org/file/local;1"] .createInstance(Components.interfaces.nsILocalFile); shellObj.initWithPath("/usr/bin/kwriteconfig"); var process = Components.classes["@mozilla.org/process/util;1"] .createInstance(Components.interfaces.nsIProcess); process.init(shellObj); var args = ["--file", "kdeglobals", "--group", "General", "--key", - "BrowserApplication", "MozillaFirefox"]; + "BrowserApplication", "firefox"]; process.run(false, args, args.length); } let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0; document.getElementById("setDefaultPane").selectedIndex = selectedIndex; } #endif }; ++++++ firefox-kde.patch ++++++ ++++ 1868 lines (skipped) ++++++ firefox-multilocale-chrome.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent ba286b90465d93b93487c0de6f8ebe5d1821d2c0 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +// Tell the search service to load search plugins from the locale JAR +pref("browser.search.loadFromJars", true); +pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); + // disable logging for the search service by default pref("browser.search.log", false); // Ordering of Search Engines in the Engine list. pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -118,39 +118,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; install:: $(addprefix generic/profile/,$(PROFILE_FILES)) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +SEARCH_PLUGINS = $(shell cat \ + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ + @srcdir@/en-US/searchplugins/list.txt ) ) -libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) - $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins - for SEARCH_PLUGIN in $^; do\ - SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ + printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ + @echo >> $@ + +searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) + for SEARCH_PLUGIN in $^; do \ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ + $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \ + mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \ done -install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) - $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/searchplugins - for i in $^; do \ - SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ - $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ - done +searchplugins:: tmp-search.jar.mn + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ + -s $(LOCALE_SRCDIR)/searchplugins \ + $(MAKE_JARS_FLAGS) tmp-search.jar.mn +libs:: searchplugins + +GARBAGE += tmp-search.jar.mn libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -108,16 +108,17 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) % locale pdf.js @AB_CD@ %locale/pdfviewer/ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) #ifdef MOZ_WEBAPP_RUNTIME ../webapprt/chrome/@AB_CD@.jar: ++++++ firefox-no-default-ualocale.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent be9f4eae7dc69ed989cc9f9259b3bb73d1f5dbf9 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -231,17 +231,17 @@ pref("xpinstall.whitelist.add.36", "getp pref("lightweightThemes.update.enabled", true); pref("keyword.enabled", true); // Override the default keyword.URL. Empty value means // "use the search service's default engine" pref("keyword.URL", ""); -pref("general.useragent.locale", "@AB_CD@"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.skins.selectedSkin", "classic/1.0"); pref("general.smoothScroll", true); #ifdef UNIX_BUT_NOT_MAC pref("general.autoScroll", false); #else pref("general.autoScroll", true); #endif ++++++ firefox.1 ++++++ .TH FIREFOX 1 "January 04, 2006" firefox "Linux User's Manual" .SH NAME firefox \- a Web browser for X11 derived from the Mozilla browser .SH SYNOPSIS .B firefox [\fIOPTIONS\fR] [\fIURL\fR] .SH DESCRIPTION \fBMozilla Firefox\fR is an open-source web browser, designed for standards compliance, performance and portability. .SH USAGE \fBfirefox\fR is a simple shell script that will set up the environment for the actual executable. .SH OPTIONS A summary of the options supported by \fBfirefox\fR is included below. .SS "GTK options" \fB\-\-gdk-debug=\fR\fIFLAGS\fR Gdk debugging flags to set .TP \fB\-\-gdk-no-debug=\fR\fIFLAGS\fR Gdk debugging flags to unset .TP \fB\-\-gtk-debug=\fR\fIFLAGS\fR Gtk+ debugging flags to set .TP \fB\-\-gtk-no-debug=\fR\fIFLAGS\fR Gtk+ debugging flags to unset .TP \fB\-\-gtk-module=\fR\fIMODULE\fR Load an additional Gtk module .SS "X11 options" .TP .BI \-\-display= DISPLAY X display to use .TP .B \--sync Make X calls synchronous .TP .B \-\-no-xshm Don't use X shared memory extension .TP .BI \-\-xim-preedit= STYLE .TP .BI \-\-xim-status= STYLE .TP .B \-\-g-fatal-warnings Make all warnings fatal .SS "Firefox options" .TP .B \-h, \-help Show summary of options. .TP \fB\-height\fR \fIvalue\fR Set height of startup window to \fIvalue\fR. .TP \fB\-width\fR \fIvalue\fR Set width of startup window to \fIvalue\fR. .TP .B \-v, \-version Print \fB/usr/bin/firefox-bin\fR version. .TP \fB\-CreateProfile\fR \fIprofile\fR Create \fIprofile\fR. .TP \fB\-P\fR \fIprofile\fR Start with \fIprofile\fR. .TP .B \-ProfileManager Start with profile manager. .TP \fB\-UILocale\fR \fIlang-region\fR Start with \fIlang-region\fR resources. .TP \fB\-contentLocale\fR \fIlang-region\fR Start with \fIlang-region\fR resources. .TP \fB\-remote\fR \fIcommand\fR Execute \fIcommand\fR in an already running Firefox process. For more info, see: \fIhttp://www.mozilla.org/unix/remote.html\fR .TP .B \-no-remote Don't try to control an already running instance. .TP .B \-jsconsole Start with Javascript Console .TP \fB\-chrome\fR \fIurl\fR Load the specified chrome. .TP \fB\-new-window\fR \fIurl\fR Open URL in a new window if Firefox is already running. .TP \fB\-new-tab\fR \fIurl\fR Open URL in a new tab if Firefox is already running. .TP \fB\-preferences\fR Open Firefox preferences menu. .TP .B \-safe-mode Disables extensions and themes for this session. .TP .SH FILES \fI/usr/bin/firefox\fR - shell script wrapping \fBfirefox\fR .br \fI/usr/lib/firefox/firefox\fR - \fBfirefox\fR executable .SH VERSION 3.0 .SH BUGS To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR .SH "SEE ALSO" .BR mozilla(1) .SH AUTHORS .TP .B The Mozilla Organization .I http://www.mozilla.org/about.html ++++++ firefox.js ++++++ pref("browser.preferences.instantApply", true); ++++++ kde.js ++++++ pref("browser.preferences.instantApply", false); ++++++ mozilla-arm-disable-edsp.patch ++++++ # HG changeset patch # User Adrian Schröter <adrian(a)suse.de> # Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f disable ESDP support (no BNC or BMO reference yet :-() diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h --- a/xpcom/glue/arm.h +++ b/xpcom/glue/arm.h @@ -143,17 +143,17 @@ namespace mozilla { extern bool NS_COM_GLUE neon_enabled; #endif #endif } #if defined(MOZILLA_PRESUME_EDSP) # define MOZILLA_MAY_SUPPORT_EDSP 1 inline bool supports_edsp() { return true; } -#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ +#elif 0 \ && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) inline bool supports_edsp() { return arm_private::edsp_enabled; } #else inline bool supports_edsp() { return false; } #endif #if defined(MOZILLA_PRESUME_ARMV6) # define MOZILLA_MAY_SUPPORT_ARMV6 1 ++++++ mozilla-disable-neon-option.patch ++++++ # HG changeset patch # User Joop Boonen <joop.boonen(a)opensuse.org> # Parent 5f38d3aa0414fe0ac7ff1f0b47da44069e7ccdda Add configure option to allow disabling of neon. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -1726,41 +1726,47 @@ if test -n "$all_flags"; then ASFLAGS="$ASFLAGS $all_flags" if test -n "$thumb_flag"; then LDFLAGS="$LDFLAGS $thumb_flag" fi fi AC_SUBST(MOZ_THUMB2) -if test "$CPU_ARCH" = "arm"; then - AC_MSG_CHECKING(for ARM SIMD support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], +MOZ_ARG_DISABLE_BOOL(neon, +[ --disable-neon Disable neon extensions], + NS_DISABLE_NEON=1, + NS_DISABLE_NEON= ) +if test "$NS_DISABLE_NEON" != "1"; then + if test "$CPU_ARCH" = "arm"; then + AC_MSG_CHECKING(for ARM SIMD support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], [asm("uqadd8 r1, r1, r2");], result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then AC_DEFINE(HAVE_ARM_SIMD) HAVE_ARM_SIMD=1 - fi - - AC_MSG_CHECKING(for ARM NEON support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], + fi + + AC_MSG_CHECKING(for ARM NEON support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], [asm(".fpu neon\n vadd.i8 d0, d0, d0");], result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then AC_DEFINE(HAVE_ARM_NEON) HAVE_ARM_NEON=1 - fi -fi # CPU_ARCH = arm + fi + fi # CPU_ARCH = arm +fi AC_SUBST(HAVE_ARM_SIMD) AC_SUBST(HAVE_ARM_NEON) dnl ================================================================= dnl Set up and test static assertion macros used to avoid AC_TRY_RUN, dnl which is bad when cross compiling. dnl ================================================================= diff --git a/js/src/configure.in b/js/src/configure.in --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1664,41 +1664,47 @@ if test -n "$all_flags"; then ASFLAGS="$ASFLAGS $all_flags" if test -n "$thumb_flag"; then LDFLAGS="$LDFLAGS $thumb_flag" fi fi AC_SUBST(MOZ_THUMB2) -if test "$CPU_ARCH" = "arm"; then - AC_MSG_CHECKING(for ARM SIMD support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], +MOZ_ARG_DISABLE_BOOL(neon, +[ --disable-neon Disable neon extensions], + NS_DISABLE_NEON=1, + NS_DISABLE_NEON= ) +if test "$NS_DISABLE_NEON" != "1"; then + if test "$CPU_ARCH" = "arm"; then + AC_MSG_CHECKING(for ARM SIMD support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], [asm("uqadd8 r1, r1, r2");], result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then AC_DEFINE(HAVE_ARM_SIMD) HAVE_ARM_SIMD=1 - fi - - AC_MSG_CHECKING(for ARM NEON support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], + fi + + AC_MSG_CHECKING(for ARM NEON support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], [asm(".fpu neon\n vadd.i8 d0, d0, d0");], result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then AC_DEFINE(HAVE_ARM_NEON) HAVE_ARM_NEON=1 - fi -fi # CPU_ARCH = arm + fi + fi # CPU_ARCH = arm +fi AC_SUBST(HAVE_ARM_SIMD) AC_SUBST(HAVE_ARM_NEON) dnl ================================================================= dnl Set up and test static assertion macros used to avoid AC_TRY_RUN, dnl which is bad when cross compiling. dnl ================================================================= ++++++ mozilla-gcc43-enums.patch ++++++ # HG changeset patch # Parent 6d0e0f7dc4cf04f1d08f8b4f8e9312ac05928608 remove trailing commas in enum definitions as these are unpalatable for gcc (4.3.4) in pedantic mode diff --git a/media/webrtc/trunk/src/common_types.h b/media/webrtc/trunk/src/common_types.h --- a/media/webrtc/trunk/src/common_types.h +++ b/media/webrtc/trunk/src/common_types.h @@ -342,17 +342,17 @@ enum TelephoneEventDetectionMethods enum NsModes // type of Noise Suppression { kNsUnchanged = 0, // previously set mode kNsDefault, // platform default kNsConference, // conferencing default kNsLowSuppression, // lowest suppression kNsModerateSuppression, kNsHighSuppression, - kNsVeryHighSuppression, // highest suppression + kNsVeryHighSuppression // highest suppression }; enum AgcModes // type of Automatic Gain Control { kAgcUnchanged = 0, // previously set mode kAgcDefault, // platform default // adaptive mode for use when analog volume control exists (e.g. for // PC softphone) @@ -367,17 +367,17 @@ enum AgcModes // type o // EC modes enum EcModes // type of Echo Control { kEcUnchanged = 0, // previously set mode kEcDefault, // platform default kEcConference, // conferencing default (aggressive AEC) kEcAec, // Acoustic Echo Cancellation - kEcAecm, // AEC mobile + kEcAecm // AEC mobile }; // AECM modes enum AecmModes // mode of AECM { kAecmQuietEarpieceOrHeadset = 0, // Quiet earpiece or headset use kAecmEarpiece, // most earpiece use @@ -416,43 +416,43 @@ enum NetEqModes // NetEQ pla // Optimized trade-off between low delay and jitter robustness for two-way // communication. kNetEqDefault = 0, // Improved jitter robustness at the cost of increased delay. Can be // used in one-way communication. kNetEqStreaming = 1, // Optimzed for decodability of fax signals rather than for perceived audio // quality. - kNetEqFax = 2, + kNetEqFax = 2 }; enum NetEqBgnModes // NetEQ Background Noise (BGN) configurations { // BGN is always on and will be generated when the incoming RTP stream // stops (default). kBgnOn = 0, // The BGN is faded to zero (complete silence) after a few seconds. kBgnFade = 1, // BGN is not used at all. Silence is produced after speech extrapolation // has faded. - kBgnOff = 2, + kBgnOff = 2 }; enum OnHoldModes // On Hold direction { kHoldSendAndPlay = 0, // Put both sending and playing in on-hold state. kHoldSendOnly, // Put only sending in on-hold state. kHoldPlayOnly // Put only playing in on-hold state. }; enum AmrMode { kRfc3267BwEfficient = 0, kRfc3267OctetAligned = 1, - kRfc3267FileStorage = 2, + kRfc3267FileStorage = 2 }; // ================================================================== // Video specific types // ================================================================== // Raw video types enum RawVideoType ++++++ mozilla-gcc43-template_hacks.patch ++++++ # HG changeset patch # Parent 993c5b5a44ca18c5273b74c75704b418c2477d28 bmo#783505 - bump gcc version required for building without template hacks diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -1404,17 +1404,17 @@ class TypedArrayTemplate // retrieves a given Value, probably from a slot on the object. template<Value ValueGetter(JSObject *obj)> static JSBool Getter(JSContext *cx, unsigned argc, Value *vp) { CallArgs args = CallArgsFromVp(argc, vp); // FIXME: Hack to keep us building with gcc 4.2. Remove this once we // drop support for gcc 4.2. See bug 783505 for the details. -#if defined(__GNUC__) && __GNUC_MINOR__ <= 2 +#if defined(__GNUC__) && __GNUC_MINOR__ <= 3 return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args); #else return CallNonGenericMethod<ThisTypeArray::IsThisClass, ThisTypeArray::GetterImpl<ValueGetter> >(cx, args); #endif } // Define an accessor for a read-only property that invokes a native getter ++++++ mozilla-gcc43-templates_instantiation.patch ++++++ # HG changeset patch # Parent 2e78665a1ab70f4dc3884965428bda14da684ef6 bmo#732340 - explicitly instantiate templates diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc --- a/gfx/harfbuzz/src/hb-ot-layout.cc +++ b/gfx/harfbuzz/src/hb-ot-layout.cc @@ -479,8 +479,12 @@ hb_ot_layout_position_lookup (hb_font_t return hb_ot_layout_from_face (font->face)->gpos->position_lookup (&c, lookup_index); } void hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer, hb_bool_t zero_width_attached_marks) { GPOS::position_finish (font, buffer, zero_width_attached_marks); } + +template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const; +template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const; +template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const; ++++++ mozilla-get-app-id ++++++ #!/usr/bin/perl -w use XML::Simple; my $file = shift || die "Usage: $0 [install.rdf|somefile.xpi]\n"; my $xml; if ($file =~ /\.xpi$/) { use Archive::Zip qw/:ERROR_CODES :CONSTANTS/; my $zip = Archive::Zip->new(); if ( $zip->read($file) != AZ_OK ) { die "zip file read error\n"; } my $data = $zip->contents("install.rdf"); die "missing install.rdf in $file\n" unless $data; $xml = XMLin($data) || die "$!\n"; } elsif ($file =~ /install.rdf/) { $xml = XMLin($file) || die "$!\n"; } else { die "unsupported file format\n"; } my $desc; for my $tag (qw/RDF:Description Description/) { if (exists $xml->{$tag}) { if (ref $xml->{$tag} eq 'ARRAY') { $desc = $xml->{$tag}; } else { $desc = [ $xml->{$tag} ]; } } } my $uuid; my $id; for my $x (@$desc) { if ($x->{"em:id"} =~ /{[[:xdigit:]]+-/) { print STDERR "Warning: multiple uuids!\n" if defined $uuid; $uuid = $x->{"em:id"}; } elsif ($x->{"em:id"} =~ /@/) { print STDERR "Warning: multiple ids!\n" if defined $id; $id = $x->{"em:id"}; } } if (defined $id) { print "$id\n"; } elsif (defined $uuid) { print "$uuid\n"; } else { exit 1; } ++++++ mozilla-gstreamer-760140.patch ++++++ From: Alessandro Decina <alessandro.d(a)gmail.com> Bug 760140 - Query the GstRegistry for the required demuxers/decoders from canPlayType diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -137,16 +137,19 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_ #include "xpcprivate.h" // nsXPConnect #include "nsScriptSecurityManager.h" #include "nsIChannelPolicy.h" #include "nsChannelPolicy.h" #include "nsIContentSecurityPolicy.h" #include "nsContentDLF.h" #ifdef MOZ_MEDIA #include "nsHTMLMediaElement.h" +#ifdef MOZ_GSTREAMER +#include "nsGStreamerDecoder.h" +#endif #endif #include "nsDOMTouchEvent.h" #include "nsIContentViewer.h" #include "nsIObjectLoadingContent.h" #include "nsCCUncollectableMarker.h" #include "mozilla/Base64.h" #include "mozilla/Preferences.h" #include "nsDOMMutationObserver.h" @@ -6580,26 +6583,23 @@ nsContentUtils::FindInternalContentViewe } return docFactory.forget(); } } } #endif #ifdef MOZ_GSTREAMER - if (nsHTMLMediaElement::IsH264Enabled()) { - for (unsigned int i = 0; i < ArrayLength(nsHTMLMediaElement::gH264Types); ++i) { - const char* type = nsHTMLMediaElement::gH264Types[i]; - if (!strcmp(aType, type)) { - docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); - if (docFactory && aLoaderType) { - *aLoaderType = TYPE_CONTENT; - } - return docFactory.forget(); + if (nsHTMLMediaElement::IsGStreamerEnabled()) { + if (nsGStreamerDecoder::CanHandleMediaType(aType, nullptr)) { + docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); + if (docFactory && aLoaderType) { + *aLoaderType = TYPE_CONTENT; } + return docFactory.forget(); } } #endif #ifdef MOZ_MEDIA_PLUGINS if (nsHTMLMediaElement::IsMediaPluginsEnabled() && nsHTMLMediaElement::IsMediaPluginsType(nsDependentCString(aType))) { docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h --- a/content/html/content/public/nsHTMLMediaElement.h +++ b/content/html/content/public/nsHTMLMediaElement.h @@ -256,17 +256,19 @@ public: void UpdateMediaSize(nsIntSize size); // Returns the CanPlayStatus indicating if we can handle this // MIME type. The MIME type should not include the codecs parameter. // If it returns anything other than CANPLAY_NO then it also // returns a null-terminated list of supported codecs // in *aSupportedCodecs. This list should not be freed, it is static data. static CanPlayStatus CanHandleMediaType(const char* aMIMEType, - char const *const ** aSupportedCodecs); + const char* aCodecs, + char const *const ** aSupportedCodecs, + bool* aCheckSupportedCodecs); // Returns the CanPlayStatus indicating if we can handle the // full MIME type including the optional codecs parameter. static CanPlayStatus GetCanPlay(const nsAString& aType); // Returns true if we should handle this MIME type when it appears // as an <object> or as a toplevel page. If, in practice, our support // for the type is more limited than appears in the wild, we should return @@ -296,20 +298,17 @@ public: #ifdef MOZ_WEBM static bool IsWebMEnabled(); static bool IsWebMType(const nsACString& aType); static const char gWebMTypes[2][11]; static char const *const gWebMCodecs[4]; #endif #ifdef MOZ_GSTREAMER - static bool IsH264Enabled(); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; - static char const *const gH264Codecs[7]; + static bool IsGStreamerEnabled(); #endif #ifdef MOZ_MEDIA_PLUGINS static bool IsMediaPluginsEnabled(); static bool IsMediaPluginsType(const nsACString& aType); #endif /** diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp --- a/content/html/content/src/nsHTMLMediaElement.cpp +++ b/content/html/content/src/nsHTMLMediaElement.cpp @@ -2112,52 +2112,20 @@ nsHTMLMediaElement::IsWebMType(const nsA } } return false; } #endif #ifdef MOZ_GSTREAMER -const char nsHTMLMediaElement::gH264Types[3][16] = { - "video/mp4", - "video/3gpp", - "video/quicktime", -}; - -char const *const nsHTMLMediaElement::gH264Codecs[7] = { - "avc1.42E01E", - "avc1.42001E", - "avc1.58A01E", - "avc1.4D401E", - "avc1.64001E", - "mp4a.40.2", - nullptr -}; - bool -nsHTMLMediaElement::IsH264Enabled() +nsHTMLMediaElement::IsGStreamerEnabled() { - return Preferences::GetBool("media.h264.enabled"); -} - -bool -nsHTMLMediaElement::IsH264Type(const nsACString& aType) -{ - if (!IsH264Enabled()) { - return false; - } - - for (uint32_t i = 0; i < ArrayLength(gH264Types); ++i) { - if (aType.EqualsASCII(gH264Types[i])) { - return true; - } - } - - return false; + return Preferences::GetBool("media.gstreamer.enabled"); } #endif #ifdef MOZ_MEDIA_PLUGINS bool nsHTMLMediaElement::IsMediaPluginsEnabled() { return Preferences::GetBool("media.plugins.enabled"); @@ -2180,18 +2148,22 @@ nsHTMLMediaElement::IsMediaPluginsType(c } return false; } #endif /* static */ nsHTMLMediaElement::CanPlayStatus nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType, - char const *const ** aCodecList) + const char *aCodecs, + char const *const ** aCodecList, + bool* aCheckCodecList) { + if (aCheckCodecList) + *aCheckCodecList = true; #ifdef MOZ_RAW if (IsRawType(nsDependentCString(aMIMEType))) { *aCodecList = gRawCodecs; return CANPLAY_MAYBE; } #endif #ifdef MOZ_OGG if (IsOggType(nsDependentCString(aMIMEType))) { @@ -2208,20 +2180,22 @@ nsHTMLMediaElement::CanHandleMediaType(c #ifdef MOZ_WEBM if (IsWebMType(nsDependentCString(aMIMEType))) { *aCodecList = gWebMCodecs; return CANPLAY_YES; } #endif #ifdef MOZ_GSTREAMER - if (IsH264Type(nsDependentCString(aMIMEType))) { - *aCodecList = gH264Codecs; - return CANPLAY_MAYBE; - } + if (aCheckCodecList) + *aCheckCodecList = false; + if (aCodecList) + *aCodecList = nullptr; + if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs)) + return CANPLAY_YES; #endif #ifdef MOZ_MEDIA_PLUGINS if (IsMediaPluginsEnabled() && GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), aCodecList)) return CANPLAY_MAYBE; #endif return CANPLAY_NO; } @@ -2236,17 +2210,17 @@ bool nsHTMLMediaElement::ShouldHandleMed if (IsOggType(nsDependentCString(aMIMEType))) return true; #endif #ifdef MOZ_WEBM if (IsWebMType(nsDependentCString(aMIMEType))) return true; #endif #ifdef MOZ_GSTREAMER - if (IsH264Type(nsDependentCString(aMIMEType))) + if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr)) return true; #endif #ifdef MOZ_MEDIA_PLUGINS if (IsMediaPluginsEnabled() && GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), NULL)) return true; #endif // We should not return true for Wave types, since there are some // Wave codecs actually in use in the wild that we don't support, and @@ -2272,26 +2246,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA { nsContentTypeParser parser(aType); nsAutoString mimeType; nsresult rv = parser.GetType(mimeType); if (NS_FAILED(rv)) return CANPLAY_NO; NS_ConvertUTF16toUTF8 mimeTypeUTF8(mimeType); + nsAutoString codecs; + rv = parser.GetParameter("codecs", codecs); + NS_ConvertUTF16toUTF8 codecsUTF8(codecs); char const *const * supportedCodecs; + bool checkSupportedCodecs = true; CanPlayStatus status = CanHandleMediaType(mimeTypeUTF8.get(), - &supportedCodecs); + codecsUTF8.get(), + &supportedCodecs, + &checkSupportedCodecs); if (status == CANPLAY_NO) return CANPLAY_NO; - nsAutoString codecs; - rv = parser.GetParameter("codecs", codecs); - if (NS_FAILED(rv)) { - // Parameter not found or whatever + if (codecs.IsEmpty() || !checkSupportedCodecs) { + /* no codecs to check for or they were already checked in CanHandleMediaType + * above */ return status; } CanPlayStatus result = CANPLAY_YES; // See http://www.rfc-editor.org/rfc/rfc4281.txt for the description // of the 'codecs' parameter nsCharSeparatedTokenizer tokenizer(codecs, ','); bool expectMoreTokens = false; @@ -2369,17 +2348,19 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_GSTREAMER - if (IsH264Type(aType)) { + const char *type; + NS_CStringGetData(aType, &type, NULL); + if (nsGStreamerDecoder::CanHandleMediaType(type, NULL)) { nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif return nullptr; } diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in @@ -17,16 +17,17 @@ LIBXUL_LIBRARY = 1 EXPORTS += \ nsGStreamerDecoder.h \ $(NULL) CPPSRCS = \ nsGStreamerReader.cpp \ nsGStreamerDecoder.cpp \ + nsGStreamerFormatHelper.cpp \ $(NULL) FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk CFLAGS += $(GSTREAMER_CFLAGS) CXXFLAGS += $(GSTREAMER_CFLAGS) diff --git a/content/media/gstreamer/nsGStreamerDecoder.cpp b/content/media/gstreamer/nsGStreamerDecoder.cpp --- a/content/media/gstreamer/nsGStreamerDecoder.cpp +++ b/content/media/gstreamer/nsGStreamerDecoder.cpp @@ -2,13 +2,19 @@ /* vim:set ts=2 sw=2 sts=2 et cindent: */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsBuiltinDecoderStateMachine.h" #include "nsGStreamerReader.h" #include "nsGStreamerDecoder.h" +#include "nsGStreamerFormatHelper.h" nsDecoderStateMachine* nsGStreamerDecoder::CreateStateMachine() { return new nsBuiltinDecoderStateMachine(this, new nsGStreamerReader(this)); } + +bool nsGStreamerDecoder::CanHandleMediaType(const char* aMIMEType, + const char* aCodecs) { + return nsGStreamerFormatHelper::Instance()->CanHandleMediaType(aMIMEType, aCodecs); +} diff --git a/content/media/gstreamer/nsGStreamerDecoder.h b/content/media/gstreamer/nsGStreamerDecoder.h --- a/content/media/gstreamer/nsGStreamerDecoder.h +++ b/content/media/gstreamer/nsGStreamerDecoder.h @@ -9,11 +9,12 @@ #include "nsBuiltinDecoder.h" class nsGStreamerDecoder : public nsBuiltinDecoder { public: virtual nsMediaDecoder* Clone() { return new nsGStreamerDecoder(); } virtual nsDecoderStateMachine* CreateStateMachine(); + static bool CanHandleMediaType(const char* aMIMEType, const char* aCodecs); }; #endif diff --git a/content/media/gstreamer/nsGStreamerFormatHelper.cpp b/content/media/gstreamer/nsGStreamerFormatHelper.cpp new file mode 100644 --- /dev/null +++ b/content/media/gstreamer/nsGStreamerFormatHelper.cpp @@ -0,0 +1,149 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 et cindent: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "nsGStreamerFormatHelper.h" +#include "nsCharSeparatedTokenizer.h" +#include "nsXPCOMStrings.h" + +#define ENTRY_FORMAT(entry) entry[0] +#define ENTRY_CAPS(entry) entry[1] + +nsGStreamerFormatHelper* nsGStreamerFormatHelper::gInstance = NULL; + +nsGStreamerFormatHelper *nsGStreamerFormatHelper::Instance() { + if (!gInstance) { + gst_init(NULL, NULL); + gInstance = new nsGStreamerFormatHelper(); + } + + return gInstance; +} + +nsGStreamerFormatHelper::nsGStreamerFormatHelper() + : mFactories(NULL), + mCookie(0) +{ + const char *containers[3][2] = { + {"video/mp4", "video/quicktime"}, + {"audio/mp4", "audio/mpeg, mpegversion=(int)4"}, + {"audio/mpeg", "audio/mpeg, mpegversion=(int)1"}, + }; + memcpy(mContainers, containers, sizeof(containers)); + + const char *codecs[7][2] = { + {"avc1.42E01E", "video/x-h264"}, + {"avc1.42001E", "video/x-h264"}, + {"avc1.58A01E", "video/x-h264"}, + {"avc1.4D401E", "video/x-h264"}, + {"avc1.64001E", "video/x-h264"}, + {"mp4a.40.2", "audio/mpeg, mpegversion=(int)4"}, + {"mp3", "audio/mpeg, mpegversion=(int)1"}, + }; + memcpy(mCodecs, codecs, sizeof(codecs)); +} + +nsGStreamerFormatHelper::~nsGStreamerFormatHelper() { + if (mFactories) + g_list_free(mFactories); +} + +bool nsGStreamerFormatHelper::CanHandleMediaType(const char* aMIMEType, + const char *aCodecs) { + GstCaps *caps = ConvertFormatsToCaps(aMIMEType, aCodecs); + if (!caps) { + return false; + } + + bool ret = HaveElementsToProcessCaps(caps); + gst_caps_unref(caps); + + return ret; +} + +GstCaps *nsGStreamerFormatHelper::ConvertFormatsToCaps(const char *aMIMEType, + const char *aCodecs) { + unsigned int i; + + /* convert aMIMEType to gst container caps */ + const char *capsString = NULL; + for (i = 0; i < G_N_ELEMENTS(mContainers); i++) { + if (!strcmp(ENTRY_FORMAT(mContainers[i]), aMIMEType)) { + capsString = ENTRY_CAPS(mContainers[i]); + break; + } + } + + if (!capsString) { + /* we couldn't find any matching caps */ + return NULL; + } + + GstCaps *caps = gst_caps_from_string(capsString); + /* container only */ + if (!aCodecs) { + return caps; + } + + nsDependentCSubstring codecs(aCodecs, strlen(aCodecs)); + nsCCharSeparatedTokenizer tokenizer(codecs, ','); + while (tokenizer.hasMoreTokens()) { + const nsCSubstring& codec = tokenizer.nextToken(); + capsString = NULL; + + for (i = 0; i < G_N_ELEMENTS(mCodecs); i++) { + if (codec.Equals(ENTRY_FORMAT(mCodecs[i]))) { + capsString = ENTRY_CAPS(mCodecs[i]); + break; + } + } + + if (!capsString) { + gst_caps_unref(caps); + return NULL; + } + + GstCaps *tmp = gst_caps_from_string(capsString); + /* appends and frees tmp */ + gst_caps_append(caps, tmp); + } + + return caps; +} + +bool nsGStreamerFormatHelper::HaveElementsToProcessCaps(GstCaps *aCaps) { + + GList *factories = GetFactories(); + + GList *list; + /* here aCaps contains [containerCaps, [codecCaps1, [codecCaps2, ...]]] so process + * caps structures individually as we want one element for _each_ + * structure */ + for (unsigned int i = 0; i < gst_caps_get_size(aCaps); i++) { + GstStructure *s = gst_caps_get_structure(aCaps, i); + GstCaps *caps = gst_caps_new_full(gst_structure_copy(s), NULL); + list = gst_element_factory_list_filter (factories, caps, GST_PAD_SINK, FALSE); + gst_caps_unref(caps); + if (!list) { + return false; + } + g_list_free(list); + } + + return true; +} + +GList * nsGStreamerFormatHelper::GetFactories() { + uint32_t cookie = gst_default_registry_get_feature_list_cookie (); + if (cookie != mCookie) { + g_list_free(mFactories); + mFactories = gst_element_factory_list_get_elements + (GST_ELEMENT_FACTORY_TYPE_DEMUXER | GST_ELEMENT_FACTORY_TYPE_DECODER, + GST_RANK_MARGINAL); + mCookie = cookie; + } + + return mFactories; +} diff --git a/content/media/gstreamer/nsGStreamerFormatHelper.h b/content/media/gstreamer/nsGStreamerFormatHelper.h new file mode 100644 --- /dev/null +++ b/content/media/gstreamer/nsGStreamerFormatHelper.h @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 et cindent: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#if !defined(nsGStreamerFormatHelper_h_) +#define nsGStreamerFormatHelper_h_ + +#include <gst/gst.h> +#include <mozilla/Types.h> + +class nsGStreamerFormatHelper { + public: + static nsGStreamerFormatHelper *Instance(); + ~nsGStreamerFormatHelper(); + + bool CanHandleMediaType(const char *aMIMEType, + const char *aCodecs); + + private: + nsGStreamerFormatHelper(); + GstCaps *ConvertFormatsToCaps(const char *aMIMEType, + const char *aCodecs); + char * const *CodecListFromCaps(GstCaps *aCaps); + bool HaveElementsToProcessCaps(GstCaps *aCaps); + GList *GetFactories(); + + static nsGStreamerFormatHelper *gInstance; + + const char *mContainers[3][2]; + const char *mCodecs[7][2]; + GList *mFactories; + uint32_t mCookie; +}; + +#endif diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -165,17 +165,17 @@ pref("media.opus.enabled", true); #endif #ifdef MOZ_WAVE pref("media.wave.enabled", true); #endif #ifdef MOZ_WEBM pref("media.webm.enabled", true); #endif #ifdef MOZ_GSTREAMER -pref("media.h264.enabled", true); +pref("media.gstreamer.enabled", true); #endif #ifdef MOZ_WEBRTC pref("media.navigator.enabled", false); #else #ifdef ANDROID pref("media.navigator.enabled", true); #endif #endif ++++++ mozilla-gstreamer.patch ++++++ # HG changeset patch # Parent e4b87e710b1a5f0bb7db058911bc163b4bf30227 # User Wolfgang Rosenauer <wr(a)rosenauer.org> No Bug - use GStreamer _only_ for MP4 (not WebM/OGG) diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp --- a/content/html/content/src/nsHTMLMediaElement.cpp +++ b/content/html/content/src/nsHTMLMediaElement.cpp @@ -2277,21 +2277,17 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_OGG if (IsOggType(aType)) { -#ifdef MOZ_GSTREAMER - nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); -#else nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder(); -#endif if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_WAVE if (IsWaveType(aType)) { nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); @@ -2305,21 +2301,17 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_WEBM if (IsWebMType(aType)) { -#ifdef MOZ_GSTREAMER - nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); -#else nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); -#endif if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_GSTREAMER if (IsH264Type(aType)) { ++++++ mozilla-kde.patch ++++++ ++++ 3664 lines (skipped) ++++++ mozilla-language.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp @@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE(resultLocale, ); #ifdef MOZ_WIDGET_QT const char* lang = QLocale::system().name().toAscii(); #else // Get system configuration const char* lang = getenv("LANG"); + const char* language = getenv("LANGUAGE"); #endif nsAutoString xpLocale, platformLocale; nsAutoString category, category_platform; int i; for( i = 0; i < LocaleListLength; i++ ) { nsresult result; @@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); } } if (NS_FAILED(result)) { return; } + // LANGUAGE is overriding LC_MESSAGES + if (i == LC_MESSAGES && language && *language) { + CopyASCIItoUTF16(language, platformLocale); + result = nsPosixLocale::GetXPLocale(language, xpLocale); + } resultLocale->AddCategory(category, xpLocale); resultLocale->AddCategory(category_platform, platformLocale); } mSystemLocale = do_QueryInterface(resultLocale); mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX #ifdef XP_OS2 ++++++ mozilla-nongnome-proxies.patch ++++++ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -74,22 +74,28 @@ private: nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult); }; NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) nsresult nsUnixSystemProxySettings::Init() { - mSchemeProxySettings.Init(5); - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); - if (mGSettings) { - mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), - getter_AddRefs(mProxySettings)); + // If this is a GNOME session, load gconf and try to use its preferences. + // If gconf is not available (which would be stupid) we'll proceed as if + // this was not a GNOME session, using *_PROXY environment variables. + const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + if (sessionType && !strcmp(sessionType, "gnome")) { + mSchemeProxySettings.Init(5); + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { + mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), + getter_AddRefs(mProxySettings)); + } } return NS_OK; } bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { ++++++ mozilla-ntlm-full-path.patch ++++++ # HG changeset patch # User Petr Cerny <pcerny(a)novell.com> # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp @@ -168,17 +168,17 @@ static uint8_t* ExtractMessage(const nsA nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { const char* username = PR_GetEnv("USER"); if (!username) return NS_ERROR_FAILURE; const char* const args[] = { - "ntlm_auth", + "/usr/bin/ntlm_auth", "--helper-protocol", "ntlmssp-client-1", "--use-cached-creds", "--username", username, nullptr }; bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD); if (!isOK) ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 58ae98c85e39def96a90cb21c90e871f41a03a71 # 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/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/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 @@ -50,17 +50,17 @@ // 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(__avr32__) || \ defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || defined(__powerpc__) || \ + defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++++++ mozilla-prefer_plugin_pref.patch ++++++ From: Ubuntu Subject: introduce a pref to prefer certain plugins for mime-types 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 @@ -1588,17 +1588,51 @@ nsPluginHost::FindPluginForType(const ch if (!aMimeType) { return nullptr; } LoadPlugins(); InfallibleTArray<nsPluginTag*> matchingPlugins; + char *preferredPluginPath = NULL; + nsCAutoString mimetypePrefString ("modules.plugins.mimetype."); + mimetypePrefString.Append(aMimeType); + const char *mimetypePrefChar = mimetypePrefString.get(); + nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar); + preferredPluginPath = (char*) pluginPath.get(); + nsPluginTag *plugin = mPlugins; + + if(preferredPluginPath) { + while (plugin) { + if (!aCheckEnabled || plugin->IsEnabled()) { + if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) || + 0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) { + matchingPlugins.AppendElement(plugin); + } + } + plugin = plugin->mNext; + } + + // now lets search for substrings + plugin = mPlugins; + while (plugin) { + if (!aCheckEnabled || plugin->IsEnabled()) { + if (nullptr != PL_strstr(plugin->mFileName.get(), preferredPluginPath) || + nullptr != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) { + matchingPlugins.AppendElement(plugin); + } + } + plugin = plugin->mNext; + } + + return FindPreferredPlugin(matchingPlugins); + } + while (plugin) { if (!aCheckEnabled || plugin->IsEnabled()) { int32_t mimeCount = plugin->mMimeTypes.Length(); for (int32_t i = 0; i < mimeCount; i++) { if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) { matchingPlugins.AppendElement(plugin); break; } ++++++ mozilla-preferences.patch ++++++ From: Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use system locale if available This setting used to live in the branding-openSUSE package but this is causing too much confusion and therefore is currently the only setting we switch in the unbranded package unconditionally. # HG changeset patch # Parent 020571ebc3766a68f1e50780b910c51d1bb76087 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -1085,17 +1085,17 @@ pref("intl.charsetmenu.browser.unicode", pref("intl.charsetmenu.mailedit", "chrome://global/locale/intl.properties"); pref("intl.charsetmenu.browser.cache", ""); pref("intl.charsetmenu.mailview.cache", ""); pref("intl.charsetmenu.composer.cache", ""); pref("intl.charsetmenu.browser.cache.size", 5); pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); -pref("intl.locale.matchOS", false); +pref("intl.locale.matchOS", true); // fallback charset list for Unicode conversion (converting from Unicode) // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) // for ISO-8859-1 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252"); pref("font.language.group", "chrome://global/locale/intl.properties"); // these locales have right-to-left UI pref("intl.uidirection.ar", "rtl"); ++++++ mozilla-repo.patch ++++++ # HG changeset patch # Parent 7820633b718ca1983da7b105d7868c455809cff1 diff --git a/build/Makefile.in b/build/Makefile.in --- a/build/Makefile.in +++ b/build/Makefile.in @@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) ifdef MOZ_SOURCE_STAMP DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" endif _dollar=$$ -SOURCE_REPO := $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +SOURCE_REPO ?= $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) ifdef SOURCE_REPO DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" endif DEFINES += \ -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ -DMOZ_APP_ID="$(MOZ_APP_ID)" \ diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -35,17 +35,17 @@ endif ifeq (Android,$(OS_TARGET)) DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) endif # strip a trailing slash from the repo URL because it's not always present, # and we want to construct a working URL in buildconfig.html # make+shell+sed = awful _dollar=$$ -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) # extra sanity check for old versions of hg # that don't support showconfig ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)" endif BUILD_HOSTNAME = $(shell hostname -s || hostname) DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) # strip a trailing slash from the repo URL because it's not always present, # and we want to construct a working URL in the sourcestamp file. # make+shell+sed = awful _dollar=$$ -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip endif # PACKAGE_NAME_MK_INCLUDED diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -218,20 +218,20 @@ endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) ifdef MOZ_SOURCE_STAMP INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) # strip a trailing slash from the repo URL because it's not always present, # and we want to construct a working URL in buildconfig.html - SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) - SOURCE_REPO := $(strip $(SOURCE_REPO)) - SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO)) - SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) + SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) # command set should change based on revision control use. # warn for now in case (git, bzr, ...) is in use. $(call warnIfEmpty,SOURCE_REPO) # extra sanity check for old versions of hg, no showconfig support ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) INIARGS += --sourcerepo=$(SOURCE_REPO) ++++++ mozilla-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -7987,16 +7987,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz dnl ======================================================== MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' AC_SUBST(MOZ_HARFBUZZ_LIBS) dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + +if test "$MOZ_ENABLE_NSSHELPER"; then + AC_DEFINE(MOZ_ENABLE_NSSHELPER) +fi +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + +dnl ======================================================== dnl SIL Graphite dnl ======================================================== if test "$MOZ_GRAPHITE"; then MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' AC_DEFINE(MOZ_GRAPHITE) else MOZ_GRAPHITE_LIBS= fi diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -90,12 +90,14 @@ DEFINES += \ $(NULL) EXPORTS += \ nsNSSShutDown.h \ $(NULL) # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's -LOCAL_INCLUDES += $(NSS_CFLAGS) +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) + +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -1,14 +1,21 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif + #include "nsNSSComponent.h" #include "nsNSSCallbacks.h" #include "nsNSSIOLayer.h" #include "nsCertVerificationThread.h" #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" @@ -1731,18 +1738,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs // module by NSS_Initialize because we will load it in InstallLoadableRoots // later. It also allows us to work around a bug in the system NSS in // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", - SECMOD_DB, init_flags); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } else { + init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), init_flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } + } +#else + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); +#endif if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); if (supress_warning_preference) { which_nss_problem = problem_none; } else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -443,17 +443,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) DEFINES += -DIMPL_XREAPI -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) OS_LIBS += \ -framework SystemConfiguration \ -framework QTKit \ -framework IOKit \ -F/System/Library/PrivateFrameworks -framework CoreUI \ ++++++ mozilla-sle11.patch ++++++ Subject: Patches needed to build on SLE11/11.1 References: https://bugzilla.mozilla.org/show_bug.cgi?id=513422 diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp --- a/xpcom/glue/SSE.cpp +++ b/xpcom/glue/SSE.cpp @@ -44,26 +44,77 @@ namespace { // SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION. // We can't declare these functions in the header file, however, because // <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to // include both SSE.h and <windows.h>. #ifdef HAVE_CPUID_H // cpuid.h is available on gcc 4.3 and higher on i386 and x86_64 -#include <cpuid.h> +//#include <cpuid.h> enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 }; +#ifdef __i386__ +#define _my_cpuid(level, a, b, c, d) \ + __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \ + "cpuid\n\t" \ + "xchg{l}\t{%%}ebx, %1\n\t" \ + : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \ + : "0" (level)) +#else +#define _my_cpuid(level, a, b, c, d) \ + __asm__ ("cpuid\n\t" \ + : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ + : "0" (level)) +#endif + +static __inline unsigned int +my_cpuid_max (unsigned int __ext, unsigned int *__sig) +{ + unsigned int __eax, __ebx, __ecx, __edx; + +#ifdef __i386__ + __asm__ ("pushf{l|d}\n\t" + "pushf{l|d}\n\t" + "pop{l}\t%0\n\t" + "mov{l}\t{%0, %1|%1, %0}\n\t" + "xor{l}\t{%2, %0|%0, %2}\n\t" + "push{l}\t%0\n\t" + "popf{l|d}\n\t" + "pushf{l|d}\n\t" + "pop{l}\t%0\n\t" + "popf{l|d}\n\t" + : "=&r" (__eax), "=&r" (__ebx) + : "i" (0x00200000)); + + if (!((__eax ^ __ebx) & 0x00200000)) + return 0; +#endif + + /* Host supports cpuid. Return highest supported cpuid input value. */ + _my_cpuid (__ext, __eax, __ebx, __ecx, __edx); + + if (__sig) + *__sig = __ebx; + + return __eax; +} + static bool has_cpuid_bit(unsigned int level, CPUIDRegister reg, unsigned int bit) { unsigned int regs[4]; - return __get_cpuid(level, &regs[0], &regs[1], &regs[2], &regs[3]) && - (regs[reg] & bit); + + unsigned int __ext = level & 0x80000000; + if (my_cpuid_max(__ext, 0) < level) + return false; + + _my_cpuid(level, regs[0], regs[1], regs[2], regs[3]); + return !!(unsigned(regs[reg]) & bit); } #elif defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(_M_IX86) || defined(_M_AMD64)) // MSVC 2005 or newer on x86-32 or x86-64 #include <intrin.h> enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 }; ++++++ mozilla.sh.in ++++++ #!/bin/sh # # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # The Original Code is mozilla.org Code. # # The Initial Developer of the Original Code is # Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 1998 # the Initial Developer. All Rights Reserved. # # Contributor(s): # Wolfgang Rosenauer <wolfgang.rosenauer(a)suse.de> # <wr(a)rosenauer.org> # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), # in which case the provisions of the GPL or the LGPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of either the GPL or the LGPL, and not to allow others to # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** ## ## Usage: ## ## $ mozilla [args] ## ## This script is meant to run a mozilla program from the mozilla ## rpm installation. ## ## The script will setup all the environment voodoo needed to make ## mozilla work. cmdname=`basename $0` ## ## Variables ## MOZ_DIST_BIN="%PREFIX" MOZ_DIST_LIB="%PROGDIR" MOZ_APPNAME="%APPNAME" MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME" MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh" if [ "$0" = "$MOZ_APP_LAUNCHER" ]; then [ -h "/usr/bin/$MOZ_APPNAME" ] && \ _link=$(readlink -f "/usr/bin/$MOZ_APPNAME") if [ "$_link" = "$MOZ_APP_LAUNCHER" ]; then export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi else export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi mozilla_lib=`file $MOZ_PROGRAM` LIB=lib echo $mozilla_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC)' && LIB=lib64 BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins if [ ! -d $BROWSER_PLUGIN_DIR ]; then BROWSER_PLUGIN_DIR=/opt/netscape/plugins fi MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" export MOZILLA_FIVE_HOME LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ## if [ -z "$MOZ_PLUGIN_PATH" ]; then export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR else # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null _retval=$? if [ ${_retval} -ne 0 ]; then export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR fi fi # disable Gnome crash dialog (doesn't make sense anyway) export GNOME_DISABLE_CRASH_DIALOG=1 moz_debug=0 script_args="" pass_arg_count=0 while [ $# -gt $pass_arg_count ] do case "$1" in -d | --debugger) moz_debugger=$2; if [ "${moz_debugger}" != "" ]; then shift 2 moz_debug=1 else echo "-d requires an argument" exit 1 fi ;; *) # Move the unrecognized argument to the end of the list. arg="$1" shift set -- "$@" "$arg" pass_arg_count=`expr $pass_arg_count + 1` ;; esac done if [ $moz_debug -eq 1 ]; then tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 echo -e "set args ${1+"$@"}\nrun" > $tmpfile echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile" exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile else exec $MOZ_PROGRAM "$@" fi ++++++ source-stamp.txt ++++++ REV=0af23f8db35d REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ toolkit-download-folder.patch ++++++ From: Wolfgang Rosenauer Subject: Don't use localized Downloads unless XDG is set up References: https://bugzilla.novell.com/show_bug.cgi?id=501724 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -344,7 +344,7 @@ var gMainPane = { // With 3.0, a new desktop folder - 'Downloads' was introduced for // platforms and versions that don't support a default system downloads // folder. See nsDownloadManager for details. - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); + downloadFolder.label = "Downloads"; iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); } else { // 'Desktop' diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp @@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi // XDG user dir spec, with a fallback to Home/Downloads nsXPIDLString folderName; - mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), - getter_Copies(folderName)); + // We don't want localized "Downloads" unless XDG is used + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), + // getter_Copies(folderName)); + folderName.AssignLiteral("Downloads"); #if defined (XP_MACOSX) rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2012-11-28 16:34:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2012-11-18 20:26:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2012-11-28 16:35:01.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 23 13:11:52 UTC 2012 - saschpe(a)suse.de + +- Add additional OpenStack users/groups + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ config ++++++ --- /var/tmp/diff_new_pack.22qsRt/_old 2012-11-28 16:35:07.000000000 +0100 +++ /var/tmp/diff_new_pack.22qsRt/_new 2012-11-28 16:35:07.000000000 +0100 @@ -139,9 +139,12 @@ 'ntop', 'ntp', 'oinstall', + 'openstack-ceilometer', + 'openstack-cinder', 'openstack-glance', + 'openstack-heat', 'openstack-keystone', - 'openstack-nova' + 'openstack-nova', 'openstack-quantum', 'openstack-swift', 'otrs', @@ -265,9 +268,12 @@ 'novlxsrvd', 'ntop', 'ntp', + 'openstack-ceilometer', + 'openstack-cinder', 'openstack-glance', + 'openstack-heat', 'openstack-keystone', - 'openstack-nova' + 'openstack-nova', 'openstack-quantum', 'openstack-swift', 'oracle', -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qwt6 for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package qwt6 for openSUSE:Factory checked in at 2012-11-28 16:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt6 (Old) and /work/SRC/openSUSE:Factory/.qwt6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qwt6", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qwt6/qwt6.changes 2012-04-02 10:31:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qwt6.new/qwt6.changes 2012-11-28 16:34:47.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 20 17:23:54 UTC 2012 - nico.kruber(a)gmail.com + +- Fix the SLES build (%make_install is not expanded on SLES) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt6.spec ++++++ --- /var/tmp/diff_new_pack.geUGIH/_old 2012-11-28 16:34:50.000000000 +0100 +++ /var/tmp/diff_new_pack.geUGIH/_new 2012-11-28 16:34:50.000000000 +0100 @@ -131,7 +131,7 @@ make %{?_smp_mflags} %install -%makeinstall INSTALL_ROOT=%{buildroot} +make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot} # Documentation mkdir -p %{buildroot}%{_docdir}/%{name} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qwt for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '12

28 Nov '12

Hello community, here is the log from the commit of package qwt for openSUSE:Factory checked in at 2012-11-28 16:33:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt (Old) and /work/SRC/openSUSE:Factory/.qwt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qwt", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qwt/qwt.changes 2012-06-25 12:45:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qwt.new/qwt.changes 2012-11-28 16:33:43.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 20 17:23:54 UTC 2012 - nico.kruber(a)gmail.com + +- Fix the SLES build (%make_install is not expanded on SLES) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt.spec ++++++ --- /var/tmp/diff_new_pack.Rr6a0o/_old 2012-11-28 16:33:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Rr6a0o/_new 2012-11-28 16:33:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qwt # -# 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 @@ -16,14 +16,13 @@ # - Name: qwt %define lname libqwt5 Summary: Qt Widgets for Technical Applications -Version: 5.2.2 -Release: 1 License: SUSE-QWT-1.0 Group: Development/Libraries/C and C++ +Version: 5.2.2 +Release: 0 Url: http://qwt.sourceforge.net/ Source: http://switch.dl.sourceforge.net/sourceforge/qwt/qwt-%{version}.tar.bz2 Source2: qwt-rpmlintrc @@ -140,7 +139,7 @@ make %{?_smp_mflags} %install -%makeinstall INSTALL_ROOT=%{buildroot} +make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot} # man mkdir -p %{buildroot}/%{_mandir} mv -v %{buildroot}/%{_docdir}/%{name}-devel-doc/man/man3 %{buildroot}/%{_mandir}/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0