February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-samba-server for openSUSE:12.3
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package yast2-samba-server for openSUSE:12.3 checked in at 2013-02-20 09:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/yast2-samba-server (Old) and /work/SRC/openSUSE:12.3/.yast2-samba-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-server", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/yast2-samba-server/yast2-samba-server.changes 2013-01-31 16:44:29.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.yast2-samba-server.new/yast2-samba-server.changes 2013-02-20 09:39:17.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 19 17:36:01 CET 2013 - jsuchome(a)suse.cz + +- Shares table: show share specific guest access status, added + button to toggle the it (bnc#803512) +- 2.23.2 + +------------------------------------------------------------------- Old: ---- yast2-samba-server-2.23.1.tar.bz2 New: ---- yast2-samba-server-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.lTmaop/_old 2013-02-20 09:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.lTmaop/_new 2013-02-20 09:39:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-samba-server-2.23.1.tar.bz2 -> yast2-samba-server-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/VERSION new/yast2-samba-server-2.23.2/VERSION --- old/yast2-samba-server-2.23.1/VERSION 2013-01-31 14:06:34.000000000 +0100 +++ new/yast2-samba-server-2.23.2/VERSION 2013-02-19 17:41:33.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/configure new/yast2-samba-server-2.23.2/configure --- old/yast2-samba-server-2.23.1/configure 2013-01-31 14:06:46.000000000 +0100 +++ new/yast2-samba-server-2.23.2/configure 2013-02-19 17:41:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-samba-server 2.23.1. +# Generated by GNU Autoconf 2.69 for yast2-samba-server 2.23.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-server' PACKAGE_TARNAME='yast2-samba-server' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-samba-server 2.23.1' +PACKAGE_VERSION='2.23.2' +PACKAGE_STRING='yast2-samba-server 2.23.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-samba-server 2.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-samba-server 2.23.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-server 2.23.1:";; + short | recursive ) echo "Configuration of yast2-samba-server 2.23.2:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-server configure 2.23.1 +yast2-samba-server configure 2.23.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-samba-server $as_me 2.23.1, which was +It was created by yast2-samba-server $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-server' - VERSION='2.23.1' + VERSION='2.23.2' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-server" MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-server $as_me 2.23.1, which was +This file was extended by yast2-samba-server $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-samba-server config.status 2.23.1 +yast2-samba-server config.status 2.23.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/configure.in new/yast2-samba-server-2.23.2/configure.in --- old/yast2-samba-server-2.23.1/configure.in 2013-01-31 14:06:41.000000000 +0100 +++ new/yast2-samba-server-2.23.2/configure.in 2013-02-19 17:41:41.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-server, 2.23.1, http://bugs.opensuse.org/, yast2-samba-server) +AC_INIT(yast2-samba-server, 2.23.2, http://bugs.opensuse.org/, yast2-samba-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-server" MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/src/dialogs.ycp new/yast2-samba-server-2.23.2/src/dialogs.ycp --- old/yast2-samba-server-2.23.1/src/dialogs.ycp 2013-01-22 11:58:52.000000000 +0100 +++ new/yast2-samba-server-2.23.2/src/dialogs.ycp 2013-02-19 17:41:33.000000000 +0100 @@ -84,7 +84,8 @@ string enabled = SambaConfig::ShareEnabled(name) ? _("Enabled") : _("Disabled"); string comment = SambaConfig::ShareGetStr(name, "comment", ""); boolean ro = SambaConfig::ShareGetTruth(name, "read only", true); - return `item( `id(index), enabled, ro ? _("Yes") : _("No"), name, pth , comment); + boolean ga = SambaConfig::ShareGetTruth(name, "guest ok", false); + return `item( `id(index), enabled, ro ? _("Yes") : _("No"), name, pth, ga ? _("Yes") : _("No"), comment); }); } @@ -399,6 +400,7 @@ UI::ChangeWidget( `id(`edit), `Enabled, size(items)>0 ); UI::ChangeWidget( `id(`delete), `Enabled, size(items)>0 ); UI::ChangeWidget( `id(`toggle), `Enabled, size(items)>0 ); + UI::ChangeWidget( `id(`guest), `Enabled, size(items)>0 ); InitUserShareWidgets(); AdjustUserShareWidgets(); @@ -526,6 +528,12 @@ UI::ChangeWidget( `id(`table), `CurrentItem, id ); return nil; } + if (ret == `guest) { + SambaConfig::ShareSetTruth (share, "guest ok", !SambaConfig::ShareGetTruth (share, "guest ok", false)); + UI::ChangeWidget( `id(`table), `Items, sharesItems(false) ); + UI::ChangeWidget( `id(`table), `CurrentItem, id ); + return nil; + } if (ret == `delete) { // confirmation dialog before deleting a share @@ -835,13 +843,16 @@ `item(`id(`filter_all), _("Show &All Shares") ), `item(`id(`filter_non_system), _("Do Not Show &System Shares") )]))), // translators: table header texts - `Table( `id(`table ), `opt(`hvstretch), `header(_("Status"), _("Read-Only"), _("Name"), _("Path"), _("Comment")), []), + `Table (`id (`table), `opt (`hvstretch), + `header (_("Status"), _("Read-Only"), _("Name"), _("Path"), _("Guest Access"), _("Comment")), [] + ), `HBox( `PushButton(`id(`add), Label::AddButton() + "..."), `PushButton(`id(`edit), Label::EditButton() + "..."), `PushButton(`id(`delete), Label::DeleteButton()), `HStretch(), `PushButton(`id(`rename), _("&Rename...")), + `PushButton(`id(`guest), _("Guest Access")), `PushButton(`id(`toggle), _("&Toggle Status")) ) )), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-server for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at 2013-02-20 09:39:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-server", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes 2013-01-31 16:44:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes 2013-02-20 09:39:10.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 19 17:36:01 CET 2013 - jsuchome(a)suse.cz + +- Shares table: show share specific guest access status, added + button to toggle the it (bnc#803512) +- 2.23.2 + +------------------------------------------------------------------- Old: ---- yast2-samba-server-2.23.1.tar.bz2 New: ---- yast2-samba-server-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.cagVmv/_old 2013-02-20 09:39:11.000000000 +0100 +++ /var/tmp/diff_new_pack.cagVmv/_new 2013-02-20 09:39:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-samba-server-2.23.1.tar.bz2 -> yast2-samba-server-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/VERSION new/yast2-samba-server-2.23.2/VERSION --- old/yast2-samba-server-2.23.1/VERSION 2013-01-31 14:06:34.000000000 +0100 +++ new/yast2-samba-server-2.23.2/VERSION 2013-02-19 17:41:33.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/configure new/yast2-samba-server-2.23.2/configure --- old/yast2-samba-server-2.23.1/configure 2013-01-31 14:06:46.000000000 +0100 +++ new/yast2-samba-server-2.23.2/configure 2013-02-19 17:41:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-samba-server 2.23.1. +# Generated by GNU Autoconf 2.69 for yast2-samba-server 2.23.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-server' PACKAGE_TARNAME='yast2-samba-server' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-samba-server 2.23.1' +PACKAGE_VERSION='2.23.2' +PACKAGE_STRING='yast2-samba-server 2.23.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-samba-server 2.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-samba-server 2.23.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-server 2.23.1:";; + short | recursive ) echo "Configuration of yast2-samba-server 2.23.2:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-server configure 2.23.1 +yast2-samba-server configure 2.23.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-samba-server $as_me 2.23.1, which was +It was created by yast2-samba-server $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-server' - VERSION='2.23.1' + VERSION='2.23.2' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-server" MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-server $as_me 2.23.1, which was +This file was extended by yast2-samba-server $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-samba-server config.status 2.23.1 +yast2-samba-server config.status 2.23.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/configure.in new/yast2-samba-server-2.23.2/configure.in --- old/yast2-samba-server-2.23.1/configure.in 2013-01-31 14:06:41.000000000 +0100 +++ new/yast2-samba-server-2.23.2/configure.in 2013-02-19 17:41:41.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-server, 2.23.1, http://bugs.opensuse.org/, yast2-samba-server) +AC_INIT(yast2-samba-server, 2.23.2, http://bugs.opensuse.org/, yast2-samba-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-server" MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.23.1/src/dialogs.ycp new/yast2-samba-server-2.23.2/src/dialogs.ycp --- old/yast2-samba-server-2.23.1/src/dialogs.ycp 2013-01-22 11:58:52.000000000 +0100 +++ new/yast2-samba-server-2.23.2/src/dialogs.ycp 2013-02-19 17:41:33.000000000 +0100 @@ -84,7 +84,8 @@ string enabled = SambaConfig::ShareEnabled(name) ? _("Enabled") : _("Disabled"); string comment = SambaConfig::ShareGetStr(name, "comment", ""); boolean ro = SambaConfig::ShareGetTruth(name, "read only", true); - return `item( `id(index), enabled, ro ? _("Yes") : _("No"), name, pth , comment); + boolean ga = SambaConfig::ShareGetTruth(name, "guest ok", false); + return `item( `id(index), enabled, ro ? _("Yes") : _("No"), name, pth, ga ? _("Yes") : _("No"), comment); }); } @@ -399,6 +400,7 @@ UI::ChangeWidget( `id(`edit), `Enabled, size(items)>0 ); UI::ChangeWidget( `id(`delete), `Enabled, size(items)>0 ); UI::ChangeWidget( `id(`toggle), `Enabled, size(items)>0 ); + UI::ChangeWidget( `id(`guest), `Enabled, size(items)>0 ); InitUserShareWidgets(); AdjustUserShareWidgets(); @@ -526,6 +528,12 @@ UI::ChangeWidget( `id(`table), `CurrentItem, id ); return nil; } + if (ret == `guest) { + SambaConfig::ShareSetTruth (share, "guest ok", !SambaConfig::ShareGetTruth (share, "guest ok", false)); + UI::ChangeWidget( `id(`table), `Items, sharesItems(false) ); + UI::ChangeWidget( `id(`table), `CurrentItem, id ); + return nil; + } if (ret == `delete) { // confirmation dialog before deleting a share @@ -835,13 +843,16 @@ `item(`id(`filter_all), _("Show &All Shares") ), `item(`id(`filter_non_system), _("Do Not Show &System Shares") )]))), // translators: table header texts - `Table( `id(`table ), `opt(`hvstretch), `header(_("Status"), _("Read-Only"), _("Name"), _("Path"), _("Comment")), []), + `Table (`id (`table), `opt (`hvstretch), + `header (_("Status"), _("Read-Only"), _("Name"), _("Path"), _("Guest Access"), _("Comment")), [] + ), `HBox( `PushButton(`id(`add), Label::AddButton() + "..."), `PushButton(`id(`edit), Label::EditButton() + "..."), `PushButton(`id(`delete), Label::DeleteButton()), `HStretch(), `PushButton(`id(`rename), _("&Rename...")), + `PushButton(`id(`guest), _("Guest Access")), `PushButton(`id(`toggle), _("&Toggle Status")) ) )), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xulrunner for openSUSE:12.3
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package xulrunner for openSUSE:12.3 checked in at 2013-02-20 09:38:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xulrunner (Old) and /work/SRC/openSUSE:12.3/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/xulrunner/xulrunner.changes 2013-01-31 01:46:48.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xulrunner.new/xulrunner.changes 2013-02-20 09:39:06.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Feb 16 17:38:21 UTC 2013 - wr(a)rosenauer.org + +- update to 17.0.3esr (bnc#804248) + * MFSA 2013-21/CVE-2013-0783 + Miscellaneous memory safety hazards + * MFSA 2013-24/CVE-2013-0773 (bmo#809652) + Web content bypass of COW and SOW security wrappers + * MFSA 2013-25/CVE-2013-0774 (bmo#827193) + Privacy leak in JavaScript Workers + * MFSA 2013-26/CVE-2013-0775 (bmo#831095) + Use-after-free in nsImageLoadingContent + * MFSA 2013-27/CVE-2013-0776 (bmo#796475) + Phishing on HTTPS connection through malicious proxy + * MFSA 2013-28/CVE-2013-0780/CVE-2013-0782 + Use-after-free, out of bounds read, and buffer overflow issues + found using Address Sanitizer + +------------------------------------------------------------------- Old: ---- l10n-17.0.2.tar.bz2 xulrunner-17.0.2-source.tar.bz2 New: ---- l10n-17.0.3.tar.bz2 xulrunner-17.0.3-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.3u4Dq0/_old 2013-02-20 09:39:10.000000000 +0100 +++ /var/tmp/diff_new_pack.3u4Dq0/_new 2013-02-20 09:39:10.000000000 +0100 @@ -2,7 +2,7 @@ # spec file for package xulrunner # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2012 Wolfgang Rosenauer +# 2006-2013 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,12 +44,12 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.9.4 BuildRequires: mozilla-nss-devel >= 3.14.1 -Version: 17.0.2 +Version: 17.0.3 Release: 0 -%define releasedate 2013010500 -%define version_internal 17.0.2 +%define releasedate 2013021500 +%define version_internal 17.0.3 %define apiversion 17 -%define uaweight 1700002 +%define uaweight 1700003 Summary: Mozilla Runtime Environment License: MPL-2.0 Group: Productivity/Other ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.3u4Dq0/_old 2013-02-20 09:39:10.000000000 +0100 +++ /var/tmp/diff_new_pack.3u4Dq0/_new 2013-02-20 09:39:10.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="esr17" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_2esr_RELEASE" -VERSION="17.0.2" +RELEASE_TAG="FIREFOX_17_0_3esr_RELEASE" +VERSION="17.0.3" # mozilla echo "cloning $BRANCH..." ++++++ l10n-17.0.2.tar.bz2 -> l10n-17.0.3.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/xulrunner/l10n-17.0.2.tar.bz2 /work/SRC/openSUSE:12.3/.xulrunner.new/l10n-17.0.3.tar.bz2 differ: char 11, line 1 ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.3u4Dq0/_old 2013-02-20 09:39:10.000000000 +0100 +++ /var/tmp/diff_new_pack.3u4Dq0/_new 2013-02-20 09:39:10.000000000 +0100 @@ -1,2 +1,2 @@ -REV=023401f37090 +REV=05f89cd1150a REPO=http://hg.mozilla.org/releases/mozilla-esr17 ++++++ xulrunner-17.0.2-source.tar.bz2 -> xulrunner-17.0.3-source.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/xulrunner/xulrunner-17.0.2-source.tar.bz2 /work/SRC/openSUSE:12.3/.xulrunner.new/xulrunner-17.0.3-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xulrunner for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2013-02-20 09:38:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2013-01-10 16:00:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2013-02-20 09:38:51.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Feb 16 17:38:21 UTC 2013 - wr(a)rosenauer.org + +- update to 17.0.3esr (bnc#804248) + * MFSA 2013-21/CVE-2013-0783 + Miscellaneous memory safety hazards + * MFSA 2013-24/CVE-2013-0773 (bmo#809652) + Web content bypass of COW and SOW security wrappers + * MFSA 2013-25/CVE-2013-0774 (bmo#827193) + Privacy leak in JavaScript Workers + * MFSA 2013-26/CVE-2013-0775 (bmo#831095) + Use-after-free in nsImageLoadingContent + * MFSA 2013-27/CVE-2013-0776 (bmo#796475) + Phishing on HTTPS connection through malicious proxy + * MFSA 2013-28/CVE-2013-0780/CVE-2013-0782 + Use-after-free, out of bounds read, and buffer overflow issues + found using Address Sanitizer + +------------------------------------------------------------------- Old: ---- l10n-17.0.2.tar.bz2 xulrunner-17.0.2-source.tar.bz2 New: ---- l10n-17.0.3.tar.bz2 xulrunner-17.0.3-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.8smzh9/_old 2013-02-20 09:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.8smzh9/_new 2013-02-20 09:39:02.000000000 +0100 @@ -2,7 +2,7 @@ # spec file for package xulrunner # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2012 Wolfgang Rosenauer +# 2006-2013 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,12 +44,12 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.9.4 BuildRequires: mozilla-nss-devel >= 3.14.1 -Version: 17.0.2 +Version: 17.0.3 Release: 0 -%define releasedate 2013010500 -%define version_internal 17.0.2 +%define releasedate 2013021500 +%define version_internal 17.0.3 %define apiversion 17 -%define uaweight 1700002 +%define uaweight 1700003 Summary: Mozilla Runtime Environment License: MPL-2.0 Group: Productivity/Other ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.8smzh9/_old 2013-02-20 09:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.8smzh9/_new 2013-02-20 09:39:02.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="esr17" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_2esr_RELEASE" -VERSION="17.0.2" +RELEASE_TAG="FIREFOX_17_0_3esr_RELEASE" +VERSION="17.0.3" # mozilla echo "cloning $BRANCH..." ++++++ l10n-17.0.2.tar.bz2 -> l10n-17.0.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-17.0.2.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-17.0.3.tar.bz2 differ: char 11, line 1 ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.8smzh9/_old 2013-02-20 09:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.8smzh9/_new 2013-02-20 09:39:02.000000000 +0100 @@ -1,2 +1,2 @@ -REV=023401f37090 +REV=05f89cd1150a REPO=http://hg.mozilla.org/releases/mozilla-esr17 ++++++ xulrunner-17.0.2-source.tar.bz2 -> xulrunner-17.0.3-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-17.0.2-source.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-17.0.3-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:12.3
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package xterm for openSUSE:12.3 checked in at 2013-02-20 09:37:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xterm (Old) and /work/SRC/openSUSE:12.3/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/xterm/xterm.changes 2013-01-31 01:46:40.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xterm.new/xterm.changes 2013-02-20 09:37:16.000000000 +0100 @@ -1,0 +2,47 @@ +Tue Feb 19 10:00:45 UTC 2013 - sndirsch(a)suse.com + +- fixed check for existance of bdftopcf; added bdftopcf + Buildrequires for openSUSE > 12.1 (bnc#804329) + +------------------------------------------------------------------- +Mon Feb 18 13:07:25 UTC 2013 - abergmann(a)novell.com + +- Patch #290 - 2013/02/12 + * revert of patch #282 change was incomplete (report by Jim Reisert). + * fix typo in manpage (report by Vincent Lefevre). + +- Patch #289 - 2013/02/08 + + * revert the patch #282 change which restored "lost" text after + shrinking/growing the screen size. If the screen was updated between + the two resizing operations, unexpected text might be shown at the + end (report/testcase by Joe Peterson). + * reverse the arrow-keys sent for alternateScroll to match the usage + in browsers (suggested by Dieter Roelants). + * modify mouse reports to consistently indicate motion events whether + or not a button is pressed. Old behavior (since patch #127 modified + encoding for wheel mouse) showed only that the button was released + if no button had been pressed (report by Andy Koppe). + * correct and improve behavior for SGR 1006 mouse protocol on button + release in any-event mode. Initial implementation in patch #277 left + internal state showing the last button pressed when reporting motion + events. It now keeps track of all buttons which have been pressed + and released, showing the lowest remaining button by number in the + response (reports by Hayaki Saito, Andy Koppe). + * fix inconsistency between TermColors and OscTextColors enums which + interchanged values for tektronix cursor color and highlight + foreground in control sequences in patch #225 (report/patch by + Peder Stray). + * fix inconsistent use of noreturn-attribute in Exit function which + interfered with analysis by clang. + * remove incorrect free used in computation of XTERM_SHELL variable, + from Coverity fixes in patch #288 (FreeBSD #175782). + * add --with-valgrind option to configure script for consistency with + my other programs. + * update table of ambiguous width characters in wcwidth.c based on + Unicode 6.2.0 + * update table of combining characters in wcwidth.c based on Unicode + 6.2.0 + * update precompose.c based on Unicode 6.2.0 + +------------------------------------------------------------------- Old: ---- xterm-288.tgz xterm-288.tgz.asc New: ---- xterm-290.tgz xterm-290.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.H1YRXw/_old 2013-02-20 09:37:16.000000000 +0100 +++ /var/tmp/diff_new_pack.H1YRXw/_new 2013-02-20 09:37:16.000000000 +0100 @@ -37,6 +37,8 @@ %if 0%{?suse_version} > 1210 # post xorg libs split BuildRequires: libXaw-devel +# separate package now +BuildRequires: bdftopcf %endif %else BuildRequires: XFree86-devel @@ -50,7 +52,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 288 +Version: 290 Release: 0 Summary: The basic X terminal program License: MIT @@ -136,7 +138,7 @@ make %{?_smp_mflags} popd -if [ ! which bdftopcf ] ; then exit 1; fi +if ! which bdftopcf &> /dev/null; then exit 1; fi for i in *.bdf do bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz" ++++++ xterm-288.tgz -> xterm-290.tgz ++++++ ++++ 13051 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/INSTALL new/xterm-290/INSTALL --- old/xterm-288/INSTALL 2013-01-06 17:28:21.000000000 +0100 +++ new/xterm-290/INSTALL 2013-02-03 20:36:47.000000000 +0100 @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.141 2013/01/06 16:28:21 tom Exp $ +-- $XTermId: INSTALL,v 1.142 2013/02/03 19:36:47 tom Exp $ ------------------------------------------------------------------------------- -- Copyright 1997-2012,2013 by Thomas E. Dickey -- @@ -215,7 +215,7 @@ type. If you do not need input method (and are troubled by the warning messages), it is safe to disable this option. - --disable-leaks test: set to test memory leaks + --disable-leaks test: free permanent memory, analyze leaks Compile-in code which frees memory which might confuse a leak-testing tool. Normally these chunks of memory are retained as long as xterm @@ -565,6 +565,14 @@ Use --without-app-defaults or --with-app-defaults=no to disable the feature. + --with-dmalloc test: use Gray Watson's dmalloc library + + Check for and link with dmalloc. + + --with-dbmalloc test: use Conor Cahill's dbmalloc library + + Check for and link with dbmalloc. + --with-desktop-category=XXX one or more desktop catgories or auto This is a list of names. The configure script maps blanks and commas to semicolons (";") which are used by the desktop utils as a separator. @@ -706,6 +714,11 @@ If xterm is not installed setuid'd to root, this option is not needed, since it cannot change the tty device's ownership. + --with-valgrind test: use valgrind + + Activate the --disable-leaks option, and ensure that "-g" is added to + CFLAGS. + --with-xpm=DIR use Xpm library for colored icon, may specify path Use Xpm library to show colored icon in window decoration, e.g., diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/MANIFEST new/xterm-290/MANIFEST --- old/xterm-288/MANIFEST 2012-12-31 23:28:15.000000000 +0100 +++ new/xterm-290/MANIFEST 2013-02-13 01:48:52.000000000 +0100 @@ -1,4 +1,4 @@ -MANIFEST for xterm-288, version xterm-288 +MANIFEST for xterm-290, version xterm-290 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -85,6 +85,7 @@ uxterm wrapper script to make unicode-xterm uxterm.desktop sample desktop file for uxterm uxterm.man manpage for uxterm, from Debian +version.c xterm package version, used also in resize version.h version of xterm vms.c VMS version of xterm's spawn(), etc. vms.h system headers and definitions for vms.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/button.c new/xterm-290/button.c --- old/xterm-288/button.c 2013-01-08 10:34:42.000000000 +0100 +++ new/xterm-290/button.c 2013-02-06 10:56:15.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: button.c,v 1.446 2013/01/08 09:34:42 tom Exp $ */ +/* $XTermId: button.c,v 1.451 2013/02/06 09:56:15 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -1320,10 +1320,11 @@ for (i = 0; i < (*text_list_count); ++i) { data = (Char *) (*text_list)[i]; size = strlen((*text_list)[i]) + 1; - data = UTF8toLatin1(screen, data, size, &size); - memcpy(tmp, data, size + 1); - new_text_list[i] = tmp; - tmp += size + 1; + if ((data = UTF8toLatin1(screen, data, size, &size)) != 0) { + memcpy(tmp, data, size + 1); + new_text_list[i] = tmp; + tmp += size + 1; + } } XFreeStringList((*text_list)); *text_list = new_text_list; @@ -4188,15 +4189,21 @@ { int result = (int) (32 + (KeyState(event->state) << 2)); + if (event->type == MotionNotify) + result += 32; + if (button < 0 || button > 5) { result += 3; } else { if (button > 3) result += (64 - 4); - if (event->type == MotionNotify) - result += 32; result += button; } + TRACE(("BtnCode button %d, %s state " FMT_MODIFIER_NAMES " ->%#x\n", + button, + visibleEventType(event->type), + ARG_MODIFIER_NAMES(event->state), + result)); return result; } @@ -4237,6 +4244,22 @@ return count; } +static int +FirstBitN(int bits) +{ + int result = -1; + if (bits > 0) { + result = 0; + while (!(bits & 1)) { + bits /= 2; + ++result; + } + } + return result; +} + +#define ButtonBit(button) ((button >= 0) ? (1 << (button)) : 0) + #define EMIT_BUTTON(button) EmitButtonCode(screen, line, count, event, button) static void @@ -4313,7 +4336,7 @@ /* Button-Motion events */ switch (event->type) { case ButtonPress: - screen->mouse_button = button; + screen->mouse_button |= ButtonBit(button); count = EMIT_BUTTON(button); break; case ButtonRelease: @@ -4323,6 +4346,7 @@ * release for buttons 1..3 to a -1, which will be later mapped * into a "0" (some button was released). */ + screen->mouse_button &= ~ButtonBit(button); if (button < 3) { switch (screen->extend_coords) { case SET_SGR_EXT_MODE_MOUSE: @@ -4333,7 +4357,6 @@ break; } } - screen->mouse_button = button; count = EMIT_BUTTON(button); break; case MotionNotify: @@ -4344,7 +4367,7 @@ && (col == screen->mouse_col)) { changed = False; } else { - count = EMIT_BUTTON(screen->mouse_button); + count = EMIT_BUTTON(FirstBitN(screen->mouse_button)); } break; default: @@ -4815,9 +4838,11 @@ static void executeCommand(char **argv) { - if (fork() == 0) { - execvp(argv[0], argv); - exit(EXIT_FAILURE); + if (argv != 0 && argv[0] != 0) { + if (fork() == 0) { + execvp(argv[0], argv); + exit(EXIT_FAILURE); + } } } @@ -4957,8 +4982,8 @@ free(exps); } free(data); - free(temp); } + free(temp); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/charproc.c new/xterm-290/charproc.c --- old/xterm-288/charproc.c 2013-01-08 02:37:28.000000000 +0100 +++ new/xterm-290/charproc.c 2013-02-05 02:47:58.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: charproc.c,v 1.1280 2013/01/08 01:37:28 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1283 2013/02/05 01:47:58 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -4352,7 +4352,7 @@ #endif } if (need_cleanup) - Cleanup(0); + NormalExit(); #if OPT_DOUBLE_BUFFER if (screen->needSwap) { XdbeSwapInfo swap; @@ -7029,7 +7029,7 @@ Cardinal n; int value = -1; - while (*source != '\0') { + while (!IsEmpty(source)) { char *next = ParseList(&source); Boolean found = False; @@ -7261,7 +7261,7 @@ TRACE((" Actual foreground 0x%06lx\n", wnew->old_foreground)); TRACE((" Actual background 0x%06lx\n", wnew->old_background)); - TScreenOf(wnew)->mouse_button = -1; + TScreenOf(wnew)->mouse_button = 0; TScreenOf(wnew)->mouse_row = -1; TScreenOf(wnew)->mouse_col = -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/configure.in new/xterm-290/configure.in --- old/xterm-288/configure.in 2013-01-03 02:31:07.000000000 +0100 +++ new/xterm-290/configure.in 2013-02-03 20:30:48.000000000 +0100 @@ -1,4 +1,4 @@ -dnl $XTermId: configure.in,v 1.311 2013/01/03 01:31:07 tom Exp $ +dnl $XTermId: configure.in,v 1.312 2013/02/03 19:30:48 tom Exp $ dnl dnl ----------------------------------------------------------------------------- dnl this file is part of xterm @@ -928,16 +928,7 @@ EXTRAOBJS="$EXTRAOBJS trace.o" fi -AC_MSG_CHECKING(if you want to test memory leaks) -CF_ARG_DISABLE(leaks, - [ --disable-leaks test: set to test memory leaks], - [disable_leaks=yes], - [disable_leaks=no]) -AC_MSG_RESULT($disable_leaks) -if test "$disable_leaks" = yes ; then - AC_DEFINE(NO_LEAKS,1,[Define to 1 to test memory leaks]) -fi - +CF_DISABLE_LEAKS CF_DISABLE_ECHO AC_MSG_CHECKING(if you want magic cookie emulation) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/ctlseqs.ms new/xterm-290/ctlseqs.ms --- old/xterm-288/ctlseqs.ms 2013-01-01 22:33:58.000000000 +0100 +++ new/xterm-290/ctlseqs.ms 2013-02-07 02:59:09.000000000 +0100 @@ -1,6 +1,6 @@ .\"#! troff -ms $1 -*- Nroff -*- .\" "Xterm Control Sequences" document -.\" $XTermId: ctlseqs.ms,v 1.281 2013/01/01 21:33:58 tom Exp $ +.\" $XTermId: ctlseqs.ms,v 1.285 2013/02/07 01:59:09 tom Exp $ .\" .\" .\" Copyright 1996-2012,2013 by Thomas E. Dickey @@ -69,8 +69,8 @@ .\" .ds XT XTerm .ds xt xterm -.ds LF Patch #288 -.ds RF 2013/01/01 +.ds LF Patch #289 +.ds RF 2013/02/06 .\" .if n .pl 9999v \" no page breaks in nroff .ND @@ -111,6 +111,8 @@ .de Ss .LP .B +\\$* +.br .. .ds CH \" as nothing .ds LH \*(XT Control Sequences @@ -409,8 +411,7 @@ . .St .\" -.Ss -Single-character functions +.Ss Single-character functions .\" .IP \\*(Be Bell (Ctrl-G). @@ -453,8 +454,7 @@ .\" .\" .St -.Ss -Controls beginning with \*(Es +.Ss Controls beginning with \*(Es .LP This excludes controls where \*(Es is part of a 7-bit equivalent to 8-bit C1 controls, ordered by the final character(s). .\" @@ -598,16 +598,14 @@ .Ed . .St -.Ss -Application Program-Control functions +.Ss Application Program-Control functions .IP \\*(AP\\*(Pt\\*s\\*(ST None. \fIxterm\fP implements no \*(AP functions; \*(Pt is ignored. \*(Pt need not be printable characters. .Ed . .St -.Ss -Device-Control functions +.Ss Device-Control functions .IP \\*(Dc\\*(Ps\\*;\\*(Ps\\*|\\*(Pt\\*s\\*(ST User-Defined Keys (DECUDK). The first parameter: @@ -670,8 +668,7 @@ .Ed .\" .St -.Ss -Functions using \*(Cs, ordered by the final character(s) +.Ss Functions using \*(Cs, ordered by the final character(s) .IP \\*(Cs\\*(Ps\\*s\\*@ Insert \*(Ps (Blank) Character(s) (default = 1) (ICH). . @@ -1487,8 +1484,7 @@ .Ed . .St -.Ss -Operating System Controls +.Ss Operating System Controls . .IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(ST .IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(Be @@ -1639,8 +1635,7 @@ \*(Ps = \*1\*1\*8 \(-> Reset Tektronix cursor color. . .St -.Ss -Privacy Message +.Ss Privacy Message .IP \\*(PM\\*(Pt\\*s\\*(ST \fIxterm\fP implements no \*(PM functions; \*(Pt is ignored. \*(Pt need not be printable characters. @@ -2154,6 +2149,7 @@ The upper left character position on the terminal is denoted as 1,1. This scheme dates back to X10, though the normal mouse-tracking (from X11) is more elaborate. +.Ss X10 compatbility mode .lP X10 compatibility mode sends an escape sequence only on button press, encoding the location and the mouse button pressed. @@ -2165,6 +2161,7 @@ .bP \*(Cx and \*(Cy are the x and y coordinates of the mouse when the button was pressed. +.Ss Normal tracking mode .lP Normal tracking mode sends an escape sequence on both button press and release. @@ -2186,6 +2183,7 @@ .bP \*(Cx and \*(Cy are the x and y coordinates of the mouse event, encoded as in X10 mode. +.Ss Wheel mice .lP Wheel mice may return buttons 4 and 5. Those buttons are represented by the same event codes @@ -2202,6 +2200,7 @@ the alternate screen. The initial state of Alternate Scroll mode is set using the \fBalternateScroll\fP resource. +.Ss Highlight tracking .lP Mouse highlight tracking notifies a program of a button press, receives a range of lines from the program, highlights the region covered by @@ -2249,6 +2248,7 @@ give the location of the mouse at button up, which may not be over a character. .RE +.Ss Button-event tracking .lP Button-event tracking is essentially the same as normal tracking, but \fIxterm\fP also reports button-motion events. @@ -2269,16 +2269,19 @@ Similarly, motion with button 3 down is reported as \*(Cs\*M\*(cB\*(Cx\*(Cy. (\ \*(cB = 32 + 2 (button 3) + 32 (motion indicator)\ ). +.Ss Any-event tracking .lP Any-event mode is the same as button-event mode, except that all motion events are reported, even if no mouse button is down. It is enabled by specifying 1003 to DECSET. +.Ss FocusIn/FocusOut .lP FocusIn/FocusOut can be combined with any of the mouse events since it uses a different protocol. When set, it causes \fIxterm\fP to send \*(Cs\*I when the terminal gains focus, and \*(Cs\*O when it loses focus. +.Ss Extended coordinates .lP The original X10 mouse protocol limits the \*(Cx and \*(Cy ordinates to 223 (=255\ -\ 32). @@ -2309,13 +2312,17 @@ the \*(Cx and \*(Cy ordinates and a final character which is \*M for button press and \*m for button release. -.IP +.RS +.bP The encoded button value in this case does not add 32 since that was useful only in the X10 scheme for ensuring that the byte containing the button value is a printable code. +.bP The modifiers are encoded in the same way. +.bP A different final character is used for button release to resolve the X10 ambiguity regarding which button was released. +.RE .IP The highlight tracking responses are also modified to an SGR-like format, using the same SGR-style scheme and button-encodings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/ctlseqs.txt new/xterm-290/ctlseqs.txt --- old/xterm-288/ctlseqs.txt 2013-01-01 22:36:45.000000000 +0100 +++ new/xterm-290/ctlseqs.txt 2013-02-07 02:59:43.000000000 +0100 @@ -21,7 +21,7 @@ Thomas Dickey XFree86 Project (1996-2006) invisible-island.net (2006-2012) - updated for XTerm Patch #288 (2013/01/01) + updated for XTerm Patch #289 (2013/02/06) @@ -1460,6 +1460,7 @@ the value 1. The upper left character position on the terminal is denoted as 1,1. This scheme dates back to X10, though the normal mouse- tracking (from X11) is more elaborate. +X10 compatbility mode X10 compatibility mode sends an escape sequence only on button press, encoding the location and the mouse button pressed. It is enabled by @@ -1468,6 +1469,7 @@ o Cb is button-1. o Cx and Cy are the x and y coordinates of the mouse when the button was pressed. +Normal tracking mode Normal tracking mode sends an escape sequence on both button press and release. Modifier key (shift, ctrl, meta) information is also sent. It @@ -1484,6 +1486,7 @@ the mod1 mask, and is not necessarily the "Meta" key (see xmodmap). o Cx and Cy are the x and y coordinates of the mouse event, encoded as in X10 mode. +Wheel mice Wheel mice may return buttons 4 and 5. Those buttons are represented by the same event codes as buttons 1 and 2 respectively, except that 64 is @@ -1494,6 +1497,7 @@ is set, then cursor up/down controls are sent when the terminal is dis- playing the alternate screen. The initial state of Alternate Scroll mode is set using the alternateScroll resource. +Highlight tracking Mouse highlight tracking notifies a program of a button press, receives a range of lines from the program, highlights the region covered by the @@ -1525,6 +1529,7 @@ character positions of the region. - mousex and mousey give the location of the mouse at button up, which may not be over a character. +Button-event tracking Button-event tracking is essentially the same as normal tracking, but xterm also reports button-motion events. Motion events are reported @@ -1539,14 +1544,17 @@ (motion indicator) ). Similarly, motion with button 3 down is reported as CSI M B CxCy. ( B = 32 + 2 (button 3) + 32 (motion indicator) ). +Any-event tracking Any-event mode is the same as button-event mode, except that all motion events are reported, even if no mouse button is down. It is enabled by specifying 1003 to DECSET. +FocusIn/FocusOut FocusIn/FocusOut can be combined with any of the mouse events since it uses a different protocol. When set, it causes xterm to send CSI I when the terminal gains focus, and CSI O when it loses focus. +Extended coordinates The original X10 mouse protocol limits the Cx and Cy ordinates to 223 (=255 - 32). Xterm supports more than one scheme for extending this @@ -1573,12 +1581,14 @@ semicolon-separated encoded button value, the Cx and Cy ordi- nates and a final character which is M for button press and m for button release. - The encoded button value in this case does not add 32 since - that was useful only in the X10 scheme for ensuring that the - byte containing the button value is a printable code. The - modifiers are encoded in the same way. A different final - character is used for button release to resolve the X10 ambi- - guity regarding which button was released. + o The encoded button value in this case does not add 32 + since that was useful only in the X10 scheme for ensuring + that the byte containing the button value is a printable + code. + o The modifiers are encoded in the same way. + o A different final character is used for button release to + resolve the X10 ambiguity regarding which button was + released. The highlight tracking responses are also modified to an SGR- like format, using the same SGR-style scheme and button-encod- ings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/input.c new/xterm-290/input.c --- old/xterm-288/input.c 2012-11-23 19:43:35.000000000 +0100 +++ new/xterm-290/input.c 2013-02-06 10:51:33.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: input.c,v 1.344 2012/11/23 18:43:35 tom Exp $ */ +/* $XTermId: input.c,v 1.345 2013/02/06 09:51:33 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -143,42 +143,6 @@ static void hpfuncvalue(ANSI *, KEY_DATA *); static void scofuncvalue(ANSI *, KEY_DATA *); -#if OPT_TRACE -static const char * -ModifierName(unsigned modifier) -{ - const char *s = ""; - if (modifier & ShiftMask) - s = " Shift"; - else if (modifier & LockMask) - s = " Lock"; - else if (modifier & ControlMask) - s = " Control"; - else if (modifier & Mod1Mask) - s = " Mod1"; - else if (modifier & Mod2Mask) - s = " Mod2"; - else if (modifier & Mod3Mask) - s = " Mod3"; - else if (modifier & Mod4Mask) - s = " Mod4"; - else if (modifier & Mod5Mask) - s = " Mod5"; - return s; -} - -#define FMT_MODIFIER_NAMES "%s%s%s%s%s%s%s%s" -#define ARG_MODIFIER_NAMES(state) \ - ModifierName(state & ShiftMask), \ - ModifierName(state & LockMask), \ - ModifierName(state & ControlMask), \ - ModifierName(state & Mod1Mask), \ - ModifierName(state & Mod2Mask), \ - ModifierName(state & Mod3Mask), \ - ModifierName(state & Mod4Mask), \ - ModifierName(state & Mod5Mask) -#endif - static void AdjustAfterInput(XtermWidget xw) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/linedata.c new/xterm-290/linedata.c --- old/xterm-288/linedata.c 2012-09-21 22:40:21.000000000 +0200 +++ new/xterm-290/linedata.c 2013-02-08 01:11:16.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: linedata.c,v 1.81 2012/09/21 20:40:21 tom Exp $ */ +/* $XTermId: linedata.c,v 1.82 2013/02/08 00:11:16 tom Exp $ */ /* - * Copyright 2009-2010,2011 by Thomas E. Dickey + * Copyright 2009-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -31,7 +31,6 @@ */ #include <xterm.h> -#include <data.h> /* FIXME - needed for 'term' */ #include <assert.h> @@ -64,6 +63,7 @@ result = (LineData *) scrnHeadAddr(screen, buffer, (unsigned) row); if (result != 0) { #if 1 /* FIXME - these should be done in setupLineData, etc. */ + result->lineSize = (Dimension) MaxCols(screen); #if OPT_WIDE_CHARS if (screen->wide_chars) { result->combSize = (Char) screen->max_combining; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/main.c new/xterm-290/main.c --- old/xterm-288/main.c 2013-01-01 14:32:39.000000000 +0100 +++ new/xterm-290/main.c 2013-02-04 00:10:05.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: main.c,v 1.714 2013/01/01 13:32:39 tom Exp $ */ +/* $XTermId: main.c,v 1.716 2013/02/03 23:10:05 tom Exp $ */ /* * Copyright 2002-2012,2013 by Thomas E. Dickey @@ -2000,7 +2000,9 @@ for (n = 1; n < argc; n++) { if ((option_ptr = parseArg(&n, argv, &option_value)) == 0) { - if (isOption(argv[n])) { + if (argv[n] == 0) { + break; + } else if (isOption(argv[n])) { Syntax(argv[n]); } else if (explicit_shname != 0) { xtermWarning("Explicit shell already was %s\n", explicit_shname); @@ -4517,7 +4519,6 @@ } } else { xtermSetenv("SHELL", explicit_shname); - free(explicit_shname); } if (access(shell_path, X_OK) != 0) { xtermPerror("Cannot use '%s' as shell", shell_path); @@ -4767,8 +4768,9 @@ struct UTMP_STR *utptr; /* don't do this more than once */ - if (xterm_exiting) - return; + if (xterm_exiting) { + exit(n); + } xterm_exiting = True; #ifdef PUCC_PTYD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/menu.c new/xterm-290/menu.c --- old/xterm-288/menu.c 2012-11-27 02:30:52.000000000 +0100 +++ new/xterm-290/menu.c 2013-02-03 22:53:58.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: menu.c,v 1.311 2012/11/27 01:30:52 tom Exp $ */ +/* $XTermId: menu.c,v 1.313 2013/02/03 21:53:58 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -1639,6 +1639,7 @@ char *entryname = (char *) closure; int i; + TRACE(("do_vtfont(%s)\n", entryname)); for (i = 0; i < NMENUFONTS; i++) { if (strcmp(entryname, fontMenuEntries[i].name) == 0) { SetVTFont(xw, i, True, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/misc.c new/xterm-290/misc.c --- old/xterm-288/misc.c 2013-01-09 02:30:47.000000000 +0100 +++ new/xterm-290/misc.c 2013-02-04 00:18:38.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.657 2013/01/09 01:30:47 tom Exp $ */ +/* $XTermId: misc.c,v 1.658 2013/02/03 23:18:38 tom Exp $ */ /* * Copyright 1999-2012,2013 by Thomas E. Dickey @@ -553,7 +553,7 @@ XtInputMask input_mask; if (need_cleanup) - Cleanup(0); + NormalExit(); if (screen->scroll_amt) FlushScroll(xw); @@ -1832,7 +1832,7 @@ */ do if (waited == TScreenOf(term)->pid) - Cleanup(0); + NormalExit(); while ((waited = nonblocking_wait()) > 0) ; #endif /* HAVE_WAITPID */ #ifndef WIFEXITED @@ -4919,44 +4919,48 @@ Cleanup(code); } -/* - * cleanup by sending SIGHUP to client processes - */ void -Cleanup(int code) +NormalExit(void) { static Bool cleaning; - TScreen *screen = TScreenOf(term); /* * Process "-hold" and session cleanup only for a normal exit. */ - if (code == 0) { - if (cleaning) { - hold_screen = 0; - return; - } - - cleaning = True; - need_cleanup = False; + if (cleaning) { + hold_screen = 0; + return; + } - TRACE(("Cleanup %d\n", code)); + cleaning = True; + need_cleanup = False; - if (hold_screen) { - hold_screen = 2; - while (hold_screen) { - xevents(); - Sleep(10); - } + if (hold_screen) { + hold_screen = 2; + while (hold_screen) { + xevents(); + Sleep(10); } + } #if OPT_SESSION_MGT - if (resource.sessionMgt) { - XtVaSetValues(toplevel, - XtNjoinSession, False, - (void *) 0); - } -#endif + if (resource.sessionMgt) { + XtVaSetValues(toplevel, + XtNjoinSession, False, + (void *) 0); } +#endif + Cleanup(0); +} + +/* + * cleanup by sending SIGHUP to client processes + */ +void +Cleanup(int code) +{ + TScreen *screen = TScreenOf(term); + + TRACE(("Cleanup %d\n", code)); if (screen->pid > 1) { (void) kill_process_group(screen->pid, SIGHUP); @@ -5638,7 +5642,7 @@ XtPointer client_data GCC_UNUSED, XtPointer call_data GCC_UNUSED) { - Cleanup(0); + NormalExit(); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/package/debian/changelog new/xterm-290/package/debian/changelog --- old/xterm-288/package/debian/changelog 2012-11-27 02:53:28.000000000 +0100 +++ new/xterm-290/package/debian/changelog 2013-02-13 01:48:24.000000000 +0100 @@ -1,3 +1,16 @@ +xterm-dev (290) unstable; urgency=low + + * Fix incomplete revert of #282 change. + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Tue, 12 Feb 2013 19:48:21 -0500 + +xterm-dev (289) unstable; urgency=low + + * Miscellaneous fixes. + * Fix regression with XTERM_SHELL feature. + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Sun, 03 Feb 2013 13:59:20 -0500 + xterm-dev (288) unstable; urgency=low * Miscellaneous fixes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/package/freebsd/Makefile new/xterm-290/package/freebsd/Makefile --- old/xterm-288/package/freebsd/Makefile 2012-10-30 00:55:09.000000000 +0100 +++ new/xterm-290/package/freebsd/Makefile 2013-02-13 01:49:11.000000000 +0100 @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 286 +PORTVERSION= 290 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/package/xterm.spec new/xterm-290/package/xterm.spec --- old/xterm-288/package/xterm.spec 2013-01-01 13:24:40.000000000 +0100 +++ new/xterm-290/package/xterm.spec 2013-02-13 01:46:35.000000000 +0100 @@ -1,7 +1,7 @@ -# $XTermId: xterm.spec,v 1.42 2013/01/01 12:24:40 tom Exp $ +# $XTermId: xterm.spec,v 1.44 2013/02/13 00:46:35 tom Exp $ Summary: X terminal emulator (development version) Name: xterm-dev -Version: 288 +Version: 290 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/precompose.c new/xterm-290/precompose.c --- old/xterm-288/precompose.c 2007-02-05 02:06:36.000000000 +0100 +++ new/xterm-290/precompose.c 2013-02-03 18:06:01.000000000 +0100 @@ -4,7 +4,7 @@ * DO NOT EDIT BY HAND! This is generated by the script * unicode/make-precompose.sh */ -/* $XTermId: precompose.c,v 1.8 2007/02/05 01:06:36 Thomas.Wolff Exp $ */ +/* $XTermId: precompose.c,v 1.9 2013/02/03 17:06:01 tom Exp $ */ /* $XFree86$ */ #include <precompose.h> @@ -1014,6 +1014,11 @@ { 0x30FE, 0x30FD, 0x3099}, { 0xFB2C, 0xFB49, 0x05C1}, { 0xFB2D, 0xFB49, 0x05C2}, +{ 0x1109A, 0x11099, 0x110BA}, +{ 0x1109C, 0x1109B, 0x110BA}, +{ 0x110AB, 0x110A5, 0x110BA}, +{ 0x1112E, 0x11131, 0x11127}, +{ 0x1112F, 0x11132, 0x11127}, { 0x1D15E, 0x1D157, 0x1D165}, { 0x1D15F, 0x1D158, 0x1D165}, { 0x1D160, 0x1D15F, 0x1D16E}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/ptydata.c new/xterm-290/ptydata.c --- old/xterm-288/ptydata.c 2013-01-06 15:58:13.000000000 +0100 +++ new/xterm-290/ptydata.c 2013-02-04 00:17:07.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: ptydata.c,v 1.102 2013/01/06 14:58:13 tom Exp $ */ +/* $XTermId: ptydata.c,v 1.103 2013/02/03 23:17:07 tom Exp $ */ /* * Copyright 1999-2011,2013 by Thomas E. Dickey @@ -203,7 +203,7 @@ */ if (size <= 0) { if (save_err == EIO || save_err == 0) - Cleanup(0); + NormalExit(); else if (!E_TEST(save_err)) Panic("input: read returned unexpected error (%d)\n", save_err); size = 0; @@ -211,13 +211,13 @@ #else /* !f*ugly */ if (size < 0) { if (save_err == EIO) - Cleanup(0); + NormalExit(); else if (!E_TEST(save_err)) Panic("input: read returned unexpected error (%d)\n", save_err); size = 0; } else if (size == 0) { #if defined(__FreeBSD__) - Cleanup(0); + NormalExit(); #else Panic("input: read returned zero\n", 0); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/ptyx.h new/xterm-290/ptyx.h --- old/xterm-288/ptyx.h 2013-01-06 15:58:13.000000000 +0100 +++ new/xterm-290/ptyx.h 2013-02-13 01:42:21.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: ptyx.h,v 1.760 2013/01/06 14:58:13 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.762 2013/02/13 00:42:21 tom Exp $ */ /* * Copyright 1999-2012,2013 by Thomas E. Dickey @@ -862,13 +862,17 @@ , MOUSE_FG /* mouse foreground */ , MOUSE_BG /* mouse background */ #if OPT_TEK4014 - , TEK_FG /* tektronix foreground */ + , TEK_FG = 5 /* tektronix foreground */ , TEK_BG /* tektronix background */ - , TEK_CURSOR /* tektronix cursor */ #endif #if OPT_HIGHLIGHT_COLOR - , HIGHLIGHT_BG /* highlight background */ - , HIGHLIGHT_FG /* highlight foreground */ + , HIGHLIGHT_BG = 7 /* highlight background */ +#endif +#if OPT_TEK4014 + , TEK_CURSOR = 8 /* tektronix cursor */ +#endif +#if OPT_HIGHLIGHT_COLOR + , HIGHLIGHT_FG = 9 /* highlight foreground */ #endif , NCOLORS /* total number of colors */ } TermColors; @@ -1893,7 +1897,6 @@ * Working variables for getLineData(). */ size_t lineExtra; /* extra space for combining chars */ - Dimension widestLine; /* length of longest LineData */ /* * Pointer to the current visible buffer. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/screen.c new/xterm-290/screen.c --- old/xterm-288/screen.c 2013-01-09 00:42:52.000000000 +0100 +++ new/xterm-290/screen.c 2013-02-13 01:42:30.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: screen.c,v 1.473 2013/01/08 23:42:52 tom Exp $ */ +/* $XTermId: screen.c,v 1.475 2013/02/13 00:42:30 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -328,7 +328,8 @@ AlignValue(ncol); length = ((nrow + 1) * sizeofScrnRow(screen, ncol)); - if ((result = (Char *) calloc(length, sizeof(Char))) == 0) + if (length == 0 + || (result = (Char *) calloc(length, sizeof(Char))) == 0) SysError(ERROR_SCALLOC2); TRACE(("allocScrnData %ux%u -> %lu -> %p..%p\n", @@ -446,10 +447,6 @@ return 0; } - if (screen->widestLine < ncol) - screen->widestLine = (Dimension) ncol; - ncol = screen->widestLine; - oldBufData = *sbufaddr; TRACE(("Reallocate %dx%d -> %dx%d\n", oldrow, MaxCols(screen), nrow, ncol)); @@ -549,10 +546,6 @@ assert(nrow != 0); assert(ncol != 0); - if (screen->widestLine < ncol) - screen->widestLine = (Dimension) ncol; - ncol = screen->widestLine; - oldBufData = *sbufaddr; oldBufHead = *sbuf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/scrollbar.c new/xterm-290/scrollbar.c --- old/xterm-288/scrollbar.c 2013-01-06 23:03:21.000000000 +0100 +++ new/xterm-290/scrollbar.c 2013-02-07 11:04:38.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: scrollbar.c,v 1.194 2013/01/06 22:03:21 tom Exp $ */ +/* $XTermId: scrollbar.c,v 1.195 2013/02/07 10:04:38 tom Exp $ */ /* * Copyright 2000-2011,2012 by Thomas E. Dickey @@ -709,10 +709,10 @@ ? ANSI_SS3 : ANSI_CSI); if (amount > 0) { - reply.a_final = 'A'; + reply.a_final = 'B'; } else { amount = -amount; - reply.a_final = 'B'; + reply.a_final = 'A'; } while (amount-- > 0) { unparseseq(xw, &reply); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/trace.c new/xterm-290/trace.c --- old/xterm-288/trace.c 2013-01-06 17:28:21.000000000 +0100 +++ new/xterm-290/trace.c 2013-02-06 10:51:17.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: trace.c,v 1.144 2013/01/06 16:28:21 tom Exp $ */ +/* $XTermId: trace.c,v 1.145 2013/02/06 09:51:17 tom Exp $ */ /* * Copyright 1997-2012,2013 by Thomas E. Dickey @@ -750,6 +750,29 @@ return 1; } +const char * +ModifierName(unsigned modifier) +{ + const char *s = ""; + if (modifier & ShiftMask) + s = " Shift"; + else if (modifier & LockMask) + s = " Lock"; + else if (modifier & ControlMask) + s = " Control"; + else if (modifier & Mod1Mask) + s = " Mod1"; + else if (modifier & Mod2Mask) + s = " Mod2"; + else if (modifier & Mod3Mask) + s = " Mod3"; + else if (modifier & Mod4Mask) + s = " Mod4"; + else if (modifier & Mod5Mask) + s = " Mod5"; + return s; +} + void TraceTranslations(const char *name, Widget w) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/trace.h new/xterm-290/trace.h --- old/xterm-288/trace.h 2012-11-22 21:22:15.000000000 +0100 +++ new/xterm-290/trace.h 2013-02-06 10:52:14.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: trace.h,v 1.67 2012/11/22 20:22:15 tom Exp $ */ +/* $XTermId: trace.h,v 1.68 2013/02/06 09:52:14 tom Exp $ */ /* * Copyright 1997-2011,2012 by Thomas E. Dickey @@ -116,6 +116,18 @@ (reqwide), (reqhigh), \ (gotwide), (gothigh)) +extern const char * ModifierName(unsigned /* modifier */); +#define FMT_MODIFIER_NAMES "%s%s%s%s%s%s%s%s" +#define ARG_MODIFIER_NAMES(state) \ + ModifierName(state & ShiftMask), \ + ModifierName(state & LockMask), \ + ModifierName(state & ControlMask), \ + ModifierName(state & Mod1Mask), \ + ModifierName(state & Mod2Mask), \ + ModifierName(state & Mod3Mask), \ + ModifierName(state & Mod4Mask), \ + ModifierName(state & Mod5Mask) + #else #define REQ_RESIZE(w, reqwide, reqhigh, gotwide, gothigh) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/util.c new/xterm-290/util.c --- old/xterm-288/util.c 2012-10-05 02:26:28.000000000 +0200 +++ new/xterm-290/util.c 2013-02-04 01:46:58.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: util.c,v 1.598 2012/10/05 00:26:28 tom Exp $ */ +/* $XTermId: util.c,v 1.600 2013/02/04 00:46:58 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -3541,24 +3541,17 @@ (unsigned) (last - first), on_wide); } #if OPT_WIDE_CHARS - if (ucs_workaround(xw, ch, flags, gc, - x, y, - chrset, on_wide)) { - /* - * if true, we drew at least one cell whether or not it is - * printable - */ - if (ch_width <= 0) - ch_width = 1; - } else -#endif - { - if (ch_width <= 0) - ch_width = 1; - xtermDrawBoxChar(xw, ch, flags, gc, - x, y, - ch_width); + /* + * One way or another, we will draw at least one cell. + */ + if (ch_width <= 0) + ch_width = 1; + if (!ucs_workaround(xw, ch, flags, gc, x, y, chrset, on_wide)) { + xtermDrawBoxChar(xw, ch, flags, gc, x, y, ch_width); } +#else + xtermDrawBoxChar(xw, ch, flags, gc, x, y, ch_width); +#endif x += (ch_width * FontWidth(screen)); first = last + 1; drewBoxes = True; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/version.h new/xterm-290/version.h --- old/xterm-288/version.h 2013-01-09 11:10:35.000000000 +0100 +++ new/xterm-290/version.h 2013-02-13 01:44:06.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.356 2013/01/09 10:10:35 tom Exp $ */ +/* $XTermId: version.h,v 1.359 2013/02/13 00:44:06 tom Exp $ */ /* * Copyright 1998-2012,2013 by Thomas E. Dickey @@ -38,8 +38,8 @@ * version of X to which this version of xterm has been built. The resulting * number in parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 288 -#define XTERM_DATE 2013-01-09 +#define XTERM_PATCH 290 +#define XTERM_DATE 2013-02-12 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/wcwidth.c new/xterm-290/wcwidth.c --- old/xterm-288/wcwidth.c 2009-02-13 20:53:12.000000000 +0100 +++ new/xterm-290/wcwidth.c 2013-02-03 19:54:31.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: wcwidth.c,v 1.22 2009/02/13 19:53:12 tom Exp $ */ +/* $XTermId: wcwidth.c,v 1.24 2013/02/03 18:54:31 tom Exp $ */ /* $XFree86: xc/programs/xterm/wcwidth.c,v 1.9 2006/06/19 00:36:52 dickey Exp $ */ @@ -132,54 +132,83 @@ * uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c */ static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD }, + { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, + { 0x05C7, 0x05C7 }, { 0x0600, 0x0604 }, { 0x0610, 0x061A }, + { 0x064B, 0x065F }, { 0x0670, 0x0670 }, { 0x06D6, 0x06DD }, + { 0x06DF, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0816, 0x0819 }, + { 0x081B, 0x0823 }, { 0x0825, 0x0827 }, { 0x0829, 0x082D }, + { 0x0859, 0x085B }, { 0x08E4, 0x08FE }, { 0x0900, 0x0902 }, + { 0x093A, 0x093A }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, + { 0x094D, 0x094D }, { 0x0951, 0x0957 }, { 0x0962, 0x0963 }, + { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, + { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, + { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, + { 0x0A4B, 0x0A4D }, { 0x0A51, 0x0A51 }, { 0x0A70, 0x0A71 }, + { 0x0A75, 0x0A75 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, + { 0x0BC0, 0x0BC0 }, { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, + { 0x0C46, 0x0C48 }, { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, + { 0x0C62, 0x0C63 }, { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF }, + { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, { 0x0CE2, 0x0CE3 }, + { 0x0D41, 0x0D44 }, { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F8D, 0x0F97 }, { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1032, 0x1037 }, { 0x1039, 0x103A }, { 0x103D, 0x103E }, + { 0x1058, 0x1059 }, { 0x105E, 0x1060 }, { 0x1071, 0x1074 }, + { 0x1082, 0x1082 }, { 0x1085, 0x1086 }, { 0x108D, 0x108D }, + { 0x109D, 0x109D }, { 0x1160, 0x11FF }, { 0x135D, 0x135F }, { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x1A17, 0x1A18 }, { 0x1A56, 0x1A56 }, { 0x1A58, 0x1A5E }, + { 0x1A60, 0x1A60 }, { 0x1A62, 0x1A62 }, { 0x1A65, 0x1A6C }, + { 0x1A73, 0x1A7C }, { 0x1A7F, 0x1A7F }, { 0x1B00, 0x1B03 }, + { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, + { 0x1B42, 0x1B42 }, { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 }, + { 0x1BA2, 0x1BA5 }, { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAB }, + { 0x1BE6, 0x1BE6 }, { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED }, + { 0x1BEF, 0x1BF1 }, { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 }, + { 0x1CD0, 0x1CD2 }, { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 }, + { 0x1CED, 0x1CED }, { 0x1CF4, 0x1CF4 }, { 0x1DC0, 0x1DE6 }, + { 0x1DFC, 0x1DFF }, { 0x200B, 0x200F }, { 0x202A, 0x202E }, + { 0x2060, 0x2064 }, { 0x206A, 0x206F }, { 0x20D0, 0x20F0 }, + { 0x2CEF, 0x2CF1 }, { 0x2D7F, 0x2D7F }, { 0x2DE0, 0x2DFF }, + { 0x302A, 0x302D }, { 0x3099, 0x309A }, { 0xA66F, 0xA672 }, + { 0xA674, 0xA67D }, { 0xA69F, 0xA69F }, { 0xA6F0, 0xA6F1 }, + { 0xA802, 0xA802 }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xA8C4, 0xA8C4 }, { 0xA8E0, 0xA8F1 }, + { 0xA926, 0xA92D }, { 0xA947, 0xA951 }, { 0xA980, 0xA982 }, + { 0xA9B3, 0xA9B3 }, { 0xA9B6, 0xA9B9 }, { 0xA9BC, 0xA9BC }, + { 0xAA29, 0xAA2E }, { 0xAA31, 0xAA32 }, { 0xAA35, 0xAA36 }, + { 0xAA43, 0xAA43 }, { 0xAA4C, 0xAA4C }, { 0xAAB0, 0xAAB0 }, + { 0xAAB2, 0xAAB4 }, { 0xAAB7, 0xAAB8 }, { 0xAABE, 0xAABF }, + { 0xAAC1, 0xAAC1 }, { 0xAAEC, 0xAAED }, { 0xAAF6, 0xAAF6 }, + { 0xABE5, 0xABE5 }, { 0xABE8, 0xABE8 }, { 0xABED, 0xABED }, + { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE26 }, + { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, { 0x101FD, 0x101FD }, { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, - { 0xE0100, 0xE01EF } + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x11001, 0x11001 }, + { 0x11038, 0x11046 }, { 0x11080, 0x11081 }, { 0x110B3, 0x110B6 }, + { 0x110B9, 0x110BA }, { 0x110BD, 0x110BD }, { 0x11100, 0x11102 }, + { 0x11127, 0x1112B }, { 0x1112D, 0x11134 }, { 0x11180, 0x11181 }, + { 0x111B6, 0x111BE }, { 0x116AB, 0x116AB }, { 0x116AD, 0x116AD }, + { 0x116B0, 0x116B5 }, { 0x116B7, 0x116B7 }, { 0x16F8F, 0x16F92 }, + { 0x1D167, 0x1D169 }, { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, + { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, + { 0xE0020, 0xE007F }, { 0xE0100, 0xE01EF } }; /* test for 8-bit control characters */ @@ -283,29 +312,34 @@ { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 }, { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 }, - { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, - { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, - { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B }, - { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, - { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, - { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E }, - { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 }, - { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, - { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F }, - { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, - { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, - { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B }, - { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 }, - { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, - { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, - { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, - { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 }, - { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 }, - { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 }, - { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 }, - { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F }, - { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF }, - { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } + { 0x2189, 0x2189 }, { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, + { 0x21D2, 0x21D2 }, { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, + { 0x2200, 0x2200 }, { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, + { 0x220B, 0x220B }, { 0x220F, 0x220F }, { 0x2211, 0x2211 }, + { 0x2215, 0x2215 }, { 0x221A, 0x221A }, { 0x221D, 0x2220 }, + { 0x2223, 0x2223 }, { 0x2225, 0x2225 }, { 0x2227, 0x222C }, + { 0x222E, 0x222E }, { 0x2234, 0x2237 }, { 0x223C, 0x223D }, + { 0x2248, 0x2248 }, { 0x224C, 0x224C }, { 0x2252, 0x2252 }, + { 0x2260, 0x2261 }, { 0x2264, 0x2267 }, { 0x226A, 0x226B }, + { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, + { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, + { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, + { 0x24EB, 0x254B }, { 0x2550, 0x2573 }, { 0x2580, 0x258F }, + { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, + { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, + { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, + { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, + { 0x2605, 0x2606 }, { 0x2609, 0x2609 }, { 0x260E, 0x260F }, + { 0x2614, 0x2615 }, { 0x261C, 0x261C }, { 0x261E, 0x261E }, + { 0x2640, 0x2640 }, { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, + { 0x2663, 0x2665 }, { 0x2667, 0x266A }, { 0x266C, 0x266D }, + { 0x266F, 0x266F }, { 0x269E, 0x269F }, { 0x26BE, 0x26BF }, + { 0x26C4, 0x26CD }, { 0x26CF, 0x26E1 }, { 0x26E3, 0x26E3 }, + { 0x26E8, 0x26FF }, { 0x273D, 0x273D }, { 0x2757, 0x2757 }, + { 0x2776, 0x277F }, { 0x2B55, 0x2B59 }, { 0x3248, 0x324F }, + { 0xE000, 0xF8FF }, { 0xFFFD, 0xFFFD }, { 0x1F100, 0x1F10A }, + { 0x1F110, 0x1F12D }, { 0x1F130, 0x1F169 }, { 0x1F170, 0x1F19A }, + { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } }; /* binary search in table of non-spacing characters */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/xstrings.c new/xterm-290/xstrings.c --- old/xterm-288/xstrings.c 2013-01-09 02:43:09.000000000 +0100 +++ new/xterm-290/xstrings.c 2013-02-03 23:11:25.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: xstrings.c,v 1.56 2013/01/09 01:43:09 tom Exp $ */ +/* $XTermId: xstrings.c,v 1.57 2013/02/03 22:11:25 tom Exp $ */ /* * Copyright 2000-2012,2013 by Thomas E. Dickey @@ -326,32 +326,34 @@ int state; int pass; - for (pass = 0; pass < 2; ++pass) { - for (n = count = 0, state = 0; first[n] != '\0'; ++n) { - switch (state) { - case 0: - if (!isspace(CharOf(first[n]))) { - state = 1; - if (pass) - result[count] = blob + n; - ++count; - } else { - blob[n] = '\0'; + if (blob != 0) { + for (pass = 0; pass < 2; ++pass) { + for (n = count = 0, state = 0; first[n] != '\0'; ++n) { + switch (state) { + case 0: + if (!isspace(CharOf(first[n]))) { + state = 1; + if (pass) + result[count] = blob + n; + ++count; + } else { + blob[n] = '\0'; + } + break; + case 1: + if (isspace(CharOf(first[n]))) { + blob[n] = '\0'; + state = 0; + } + break; } - break; - case 1: - if (isspace(CharOf(first[n]))) { - blob[n] = '\0'; - state = 0; - } - break; } - } - if (!pass) { - result = TypeCallocN(char *, count + 1); - if (!result) { - free(blob); - break; + if (!pass) { + result = TypeCallocN(char *, count + 1); + if (!result) { + free(blob); + break; + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/xterm.h new/xterm-290/xterm.h --- old/xterm-288/xterm.h 2013-01-06 16:15:38.000000000 +0100 +++ new/xterm-290/xterm.h 2013-02-04 00:21:00.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: xterm.h,v 1.715 2013/01/06 15:15:38 tom Exp $ */ +/* $XTermId: xterm.h,v 1.716 2013/02/03 23:21:00 tom Exp $ */ /* * Copyright 1999-2012,2013 by Thomas E. Dickey @@ -1007,7 +1007,7 @@ extern void ChangeIconName (XtermWidget /* xw */, char * /* name */); extern void ChangeTitle (XtermWidget /* xw */, char * /* name */); extern void ChangeXprop (char * /* name */); -extern void Cleanup (int /* code */); +extern void Cleanup (int /* code */) GCC_NORETURN; extern void HandleBellPropertyChange PROTO_XT_EV_HANDLER_ARGS; extern void HandleEightBitKeyPressed PROTO_XT_ACTIONS_ARGS; extern void HandleEnterWindow PROTO_XT_EV_HANDLER_ARGS; @@ -1017,6 +1017,7 @@ extern void HandleLeaveWindow PROTO_XT_EV_HANDLER_ARGS; extern void HandleSpawnTerminal PROTO_XT_ACTIONS_ARGS; extern void HandleStringEvent PROTO_XT_ACTIONS_ARGS; +extern void NormalExit (void); extern void Panic (const char * /* s */, int /* a */); extern void Redraw (void); extern void ReverseOldColors (void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/xterm.log.html new/xterm-290/xterm.log.html --- old/xterm-288/xterm.log.html 2013-01-09 11:10:06.000000000 +0100 +++ new/xterm-290/xterm.log.html 2013-02-13 02:58:03.000000000 +0100 @@ -31,7 +31,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1301 2013/01/09 10:10:06 tom Exp $ + $XTermId: xterm.log.html,v 1.1317 2013/02/13 01:58:03 tom Exp $ --> <html> @@ -70,6 +70,10 @@ the latest version of this file.</p> <ul> + <li><a href="#xterm_290">Patch #290 - 2013/02/12</a></li> + + <li><a href="#xterm_289">Patch #289 - 2013/02/08</a></li> + <li><a href="#xterm_288">Patch #288 - 2013/01/09</a></li> <li><a href="#xterm_287">Patch #287 - 2012/11/25</a></li> @@ -859,6 +863,70 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_290" id="xterm_290">Patch #290 - + 2013/02/12</a></h1> + + <ul> + <li>revert of <a href="#xterm_282">patch #282</a> change was + incomplete (report by Jim Reisert).</li> + + <li>fix typo in manpage (report by Vincent Lefevre).</li> + </ul> + + <h1><a name="xterm_289" id="xterm_289">Patch #289 - + 2013/02/08</a></h1> + + <ul> + <li>revert the <a href="#xterm_282">patch #282</a> change which + restored "lost" text after shrinking/growing the screen size. + If the screen was updated between the two resizing operations, + unexpected text might be shown at the end (report/testcase by + Joe Peterson).</li> + + <li>reverse the arrow-keys sent for + <code>alternateScroll</code> to match the usage in browsers + (suggested by Dieter Roelants).</li> + + <li>modify mouse reports to consistently indicate motion events + whether or not a button is pressed. Old behavior (since + <a href="#xterm_127">patch #127</a> modified encoding for wheel + mouse) showed only that the button was released if no button + had been pressed (report by Andy Koppe).</li> + + <li>correct and improve behavior for SGR 1006 mouse protocol on + button release in any-event mode. Initial implementation in + <a href="#xterm_277">patch #277</a> left internal state showing + the last button pressed when reporting motion events. It now + keeps track of all buttons which have been pressed and + released, showing the lowest remaining button by number in the + response (reports by Hayaki Saito, Andy Koppe).</li> + + <li>fix inconsistency between <code>TermColors</code> and + <code>OscTextColors</code> enums which interchanged values for + tektronix cursor color and highlight foreground in control + sequences in <a href="#xterm_225">patch #225</a> (report/patch + by Peder Stray).</li> + + <li>fix inconsistent use of noreturn-attribute in + <code>Exit</code> function which interfered with analysis by + clang.</li> + + <li>remove incorrect <code>free</code> used in computation of + <code>XTERM_SHELL</code> variable, from Coverity fixes in + <a href="#xterm_288">patch #288</a> (FreeBSD #175782).</li> + + <li>add <code>--with-valgrind</code> option to configure script + for consistency with my other programs.</li> + + <li>update table of ambiguous width characters in wcwidth.c + based on Unicode 6.2.0</li> + + <li>update table of combining characters in wcwidth.c based on + Unicode 6.2.0</li> + + <li>update precompose.c based on Unicode 6.2.0</li> + </ul> + <h1><a name="xterm_288" id="xterm_288">Patch #288 - 2013/01/09</a></h1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/xterm.man new/xterm-290/xterm.man --- old/xterm-288/xterm.man 2013-01-01 00:36:19.000000000 +0100 +++ new/xterm-290/xterm.man 2013-02-13 01:47:18.000000000 +0100 @@ -1,5 +1,5 @@ '\" t -.\" $XTermId: xterm.man,v 1.555 2012/12/31 23:36:19 tom Exp $ +.\" $XTermId: xterm.man,v 1.556 2013/02/13 00:47:18 tom Exp $ .\" .\" Copyright 1996-2011,2012 by Thomas E. Dickey .\" @@ -3785,7 +3785,7 @@ Query window/icon labels using hexadecimal .TP 5 2 -Set window/icon labels using UTF-8 (overrides \fButf8Titles\fP resource). +Set window/icon labels using UTF-8 (overrides \fButf8Title\fP resource). .TP 5 3 Query window/icon labels using UTF-8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-288/xtermcfg.hin new/xterm-290/xtermcfg.hin --- old/xterm-288/xtermcfg.hin 2012-10-05 02:27:29.000000000 +0200 +++ new/xterm-290/xtermcfg.hin 2013-02-03 23:58:03.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: xtermcfg.hin,v 1.196 2012/10/05 00:27:29 tom Exp $ */ +/* $XTermId: xtermcfg.hin,v 1.197 2013/02/03 22:58:03 tom Exp $ */ /* - * Copyright 1997-2011,2012 by Thomas E. Dickey + * Copyright 1997-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -201,6 +201,7 @@ #ifndef __cplusplus #undef GCC_PRINTF #undef GCC_PRINTFLIKE +#undef GCC_NORETURN #undef GCC_UNUSED #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2013-02-20 09:37:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2013-02-18 20:29:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2013-02-20 09:37:06.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 19 10:00:45 UTC 2013 - sndirsch(a)suse.com + +- fixed check for existance of bdftopcf; added bdftopcf + Buildrequires for openSUSE > 12.1 (bnc#804329) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.uFoey7/_old 2013-02-20 09:37:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uFoey7/_new 2013-02-20 09:37:08.000000000 +0100 @@ -37,6 +37,8 @@ %if 0%{?suse_version} > 1210 # post xorg libs split BuildRequires: libXaw-devel +# separate package now +BuildRequires: bdftopcf %endif %else BuildRequires: XFree86-devel @@ -136,7 +138,7 @@ make %{?_smp_mflags} popd -if [ ! which bdftopcf ] ; then exit 1; fi +if ! which bdftopcf &> /dev/null; then exit 1; fi for i in *.bdf do bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shared-mime-info for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package shared-mime-info for openSUSE:Factory checked in at 2013-02-20 09:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shared-mime-info (Old) and /work/SRC/openSUSE:Factory/.shared-mime-info.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shared-mime-info", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/shared-mime-info/shared-mime-info.changes 2012-07-24 17:20:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shared-mime-info.new/shared-mime-info.changes 2013-02-20 09:36:38.000000000 +0100 @@ -1,0 +2,21 @@ +Sun Feb 17 17:13:58 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 1.1: + + Many mime-type changes + + Specification changes: + - Fix mimetype names used as examples. + - Document that the first extension is the main one. + - Fix missing plural. + + Honor NOCONFIGURE=1. + + Allow builders to not run make check by default. + + Fix build for platforms with executable extensions. + + Disable checks when cross compiling. + + Use non-installed update-mime-database in install-data-hook. + + Use native update-mime-database for install when cross + compiling. + + Add a local-test target to print mime in. +- Pass --disable-default-make-check to configure: we prefer to + execute make check in the separate %check section. +- Add a %check section and execute make check + +------------------------------------------------------------------- Old: ---- shared-mime-info-1.0.tar.xz New: ---- shared-mime-info-1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-mime-info.spec ++++++ --- /var/tmp/diff_new_pack.XywDdz/_old 2013-02-20 09:36:39.000000000 +0100 +++ /var/tmp/diff_new_pack.XywDdz/_new 2013-02-20 09:36:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package shared-mime-info # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,7 +17,7 @@ Name: shared-mime-info -Version: 1.0 +Version: 1.1 Release: 0 Url: http://freedesktop.org/wiki/Software/shared-mime-info Summary: Shared MIME Database @@ -61,7 +61,8 @@ translation-update-upstream %build -%configure +%configure \ + --disable-default-make-check make %install @@ -71,6 +72,9 @@ # Install rpm macros install -D -m644 %{S:2} %{buildroot}%{_sysconfdir}/rpm/macros.shared-mime-info +%check +make check + %clean rm -rf $RPM_BUILD_ROOT -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seamonkey for openSUSE:12.3
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package seamonkey for openSUSE:12.3 checked in at 2013-02-20 09:36:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/seamonkey (Old) and /work/SRC/openSUSE:12.3/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/seamonkey/seamonkey.changes 2013-02-09 10:16:54.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.seamonkey.new/seamonkey.changes 2013-02-20 09:36:27.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Feb 18 07:41:44 UTC 2013 - wr(a)rosenauer.org + +- update to SeaMonkey 2.16 (bnc#804248) + * MFSA 2013-21/CVE-2013-0783/2013-0784 + Miscellaneous memory safety hazards + * MFSA 2013-22/CVE-2013-0772 (bmo#801366) + Out-of-bounds read in image rendering + * MFSA 2013-23/CVE-2013-0765 (bmo#830614) + Wrapped WebIDL objects can be wrapped again + * MFSA 2013-24/CVE-2013-0773 (bmo#809652) + Web content bypass of COW and SOW security wrappers + * MFSA 2013-25/CVE-2013-0774 (bmo#827193) + Privacy leak in JavaScript Workers + * MFSA 2013-26/CVE-2013-0775 (bmo#831095) + Use-after-free in nsImageLoadingContent + * MFSA 2013-27/CVE-2013-0776 (bmo#796475) + Phishing on HTTPS connection through malicious proxy + * MFSA 2013-28/CVE-2013-0780/CVE-2013-0782/CVE-2013-0777/ + CVE-2013-0778/CVE-2013-0779/CVE-2013-0781 + Use-after-free, out of bounds read, and buffer overflow issues + found using Address Sanitizer +- removed obsolete patches + * mozilla-webrtc.patch + * mozilla-gstreamer-803287.patch + +------------------------------------------------------------------- @@ -26 +52 @@ -- update to SeaMonkey 2.15 /(bnc#796895) +- update to SeaMonkey 2.15 (bnc#796895) Old: ---- l10n-2.15.2.tar.bz2 mozilla-gstreamer-803287.patch mozilla-webrtc.patch seamonkey-2.15.2-source.tar.bz2 New: ---- _constraints l10n-2.16.tar.bz2 mozilla-webrtc-ppc.patch seamonkey-2.16-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.bOImtL/_old 2013-02-20 09:36:36.000000000 +0100 +++ /var/tmp/diff_new_pack.bOImtL/_new 2013-02-20 09:36:36.000000000 +0100 @@ -48,9 +48,9 @@ %endif Provides: web_browser Provides: browser(npapi) -Version: 2.15.2 +Version: 2.16 Release: 0 -%define releasedate 2013020300 +%define releasedate 2013021700 Summary: The successor of the Mozilla Application Suite License: MPL-2.0 Group: Productivity/Networking/Web/Browsers @@ -71,12 +71,11 @@ Patch3: mozilla-shared-nss-db.patch Patch4: mozilla-sle11.patch Patch5: mozilla-language.patch -Patch6: mozilla-gstreamer-803287.patch Patch7: mozilla-ntlm-full-path.patch Patch8: mozilla-ua-locale.patch Patch9: mozilla-ppc.patch Patch10: mozilla-gstreamer-760140.patch -Patch11: mozilla-webrtc.patch +Patch11: mozilla-webrtc-ppc.patch Patch12: mozilla-libproxy-compat.patch Patch20: seamonkey-ua-locale.patch Patch21: seamonkey-shared-nss-db.patch @@ -175,7 +174,6 @@ %patch4 -p1 %endif %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.bOImtL/_old 2013-02-20 09:36:36.000000000 +0100 +++ /var/tmp/diff_new_pack.bOImtL/_new 2013-02-20 09:36:36.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="SEAMONKEY_2_15_2_RELEASE" -VERSION="2.15.2" +RELEASE_TAG="SEAMONKEY_2_16_RELEASE" +VERSION="2.16" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.15.2.tar.bz2 -> l10n-2.16.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/seamonkey/l10n-2.15.2.tar.bz2 /work/SRC/openSUSE:12.3/.seamonkey.new/l10n-2.16.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gstreamer-760140.patch ++++++ --- /var/tmp/diff_new_pack.bOImtL/_old 2013-02-20 09:36:36.000000000 +0100 +++ /var/tmp/diff_new_pack.bOImtL/_new 2013-02-20 09:36:36.000000000 +0100 @@ -4,7 +4,7 @@ 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 -@@ -147,16 +147,19 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_ +@@ -143,16 +143,19 @@ #include "xpcprivate.h" // nsXPConnect #include "nsScriptSecurityManager.h" #include "nsIChannelPolicy.h" @@ -14,7 +14,7 @@ #ifdef MOZ_MEDIA #include "nsHTMLMediaElement.h" +#ifdef MOZ_GSTREAMER -+#include "nsGStreamerDecoder.h" ++#include "GStreamerDecoder.h" +#endif #endif #include "nsDOMTouchEvent.h" @@ -27,7 +27,7 @@ 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 -@@ -263,17 +263,19 @@ public: +@@ -259,17 +259,19 @@ public: void UpdateMediaSize(nsIntSize size); // Returns the CanPlayStatus indicating if we can handle this @@ -48,30 +48,29 @@ // 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 -@@ -305,19 +307,16 @@ public: +@@ -292,18 +294,16 @@ public: + #ifdef MOZ_WEBM static bool IsWebMType(const nsACString& aType); static const char gWebMTypes[2][11]; static char const *const gWebMCodecs[4]; #endif #ifdef MOZ_GSTREAMER - static bool IsGStreamerEnabled(); static bool IsGStreamerSupportedType(const nsACString& aType); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; -- static char const *const gH264Codecs[7]; #endif #ifdef MOZ_WIDGET_GONK - static bool IsOmxEnabled(); static bool IsOmxSupportedType(const nsACString& aType); static const char gOmxTypes[5][16]; - static char const *const gH264Codecs[7]; #endif + + #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) 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 -@@ -2128,51 +2128,34 @@ nsHTMLMediaElement::IsWebMType(const nsA +@@ -2213,50 +2213,29 @@ nsHTMLMediaElement::IsWebMType(const nsA return true; } } @@ -82,30 +81,26 @@ -#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) +#ifdef MOZ_WIDGET_GONK - char const *const nsHTMLMediaElement::gH264Codecs[7] = { - "avc1.42E01E", - "avc1.42001E", - "avc1.58A01E", - "avc1.4D401E", - "avc1.64001E", - "mp4a.40.2", + char const *const nsHTMLMediaElement::gH264Codecs[9] = { + "avc1.42E01E", // H.264 Constrained Baseline Profile Level 3.0 + "avc1.42001E", // H.264 Baseline Profile Level 3.0 + "avc1.58A01E", // H.264 Extended Profile Level 3.0 + "avc1.4D401E", // H.264 Main Profile Level 3.0 + "avc1.64001E", // H.264 High Profile Level 3.0 + "avc1.64001F", // H.264 High Profile Level 3.1 + "mp4v.20.3", // 3GPP + "mp4a.40.2", // AAC-LC nullptr }; - #endif - - #ifdef MOZ_GSTREAMER +-#endif +- +-#ifdef MOZ_GSTREAMER -const char nsHTMLMediaElement::gH264Types[3][16] = { - "video/mp4", - "video/3gpp", - "video/quicktime", -}; - - bool - nsHTMLMediaElement::IsGStreamerEnabled() - { - return Preferences::GetBool("media.gstreamer.enabled"); - } -- -bool -nsHTMLMediaElement::IsH264Type(const nsACString& aType) -{ @@ -116,22 +111,26 @@ - } - return false; -} - #endif - - #ifdef MOZ_WIDGET_GONK +-#endif +- +-#ifdef MOZ_WIDGET_GONK ++ const char nsHTMLMediaElement::gOmxTypes[5][16] = { "audio/mpeg", "audio/mp4", "video/mp4", "video/3gpp", -@@ -2257,18 +2240,22 @@ nsHTMLMediaElement::IsDASHMPDType(const + "video/quicktime", + }; + +@@ -2319,18 +2298,22 @@ nsHTMLMediaElement::IsDASHMPDType(const return false; } #endif /* static */ - nsHTMLMediaElement::CanPlayStatus + nsHTMLMediaElement::CanPlayStatus nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType, - char const *const ** aCodecList) + const char *aCodecs, @@ -148,7 +147,7 @@ #endif #ifdef MOZ_OGG if (IsOggType(nsDependentCString(aMIMEType))) { -@@ -2292,20 +2279,22 @@ nsHTMLMediaElement::CanHandleMediaType(c +@@ -2354,20 +2337,22 @@ nsHTMLMediaElement::CanHandleMediaType(c if (IsDASHMPDType(nsDependentCString(aMIMEType))) { // DASH manifest uses WebM codecs only. *aCodecList = gWebMCodecs; @@ -165,7 +164,7 @@ + *aCheckCodecList = false; + if (aCodecList) + *aCodecList = nullptr; -+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs)) ++ if (GStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs)) + return CANPLAY_YES; #endif #ifdef MOZ_WIDGET_GONK @@ -175,7 +174,7 @@ } #endif #ifdef MOZ_MEDIA_PLUGINS -@@ -2326,17 +2315,17 @@ bool nsHTMLMediaElement::ShouldHandleMed +@@ -2388,17 +2373,17 @@ bool nsHTMLMediaElement::ShouldHandleMed if (IsOggType(nsDependentCString(aMIMEType))) return true; #endif @@ -185,7 +184,7 @@ #endif #ifdef MOZ_GSTREAMER - if (IsH264Type(nsDependentCString(aMIMEType))) -+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr)) ++ if (GStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr)) return true; #endif #ifdef MOZ_WIDGET_GONK @@ -194,7 +193,7 @@ } #endif #ifdef MOZ_MEDIA_PLUGINS -@@ -2367,26 +2356,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA +@@ -2429,26 +2414,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA { nsContentTypeParser parser(aType); nsAutoString mimeType; @@ -231,20 +230,20 @@ // of the 'codecs' parameter nsCharSeparatedTokenizer tokenizer(codecs, ','); bool expectMoreTokens = false; -@@ -2425,46 +2419,41 @@ nsHTMLMediaElement::CanPlayType(const ns +@@ -2487,43 +2477,39 @@ nsHTMLMediaElement::CanPlayType(const ns } #ifdef MOZ_GSTREAMER bool nsHTMLMediaElement::IsGStreamerSupportedType(const nsACString& aMimeType) { - if (!IsGStreamerEnabled()) + if (!MediaDecoder::IsGStreamerEnabled()) return false; - if (IsH264Type(aMimeType)) + + const char *type; + NS_CStringGetData(aMimeType, &type, nullptr); -+ if (nsGStreamerDecoder::CanHandleMediaType(type, nullptr)) ++ if (GStreamerDecoder::CanHandleMediaType(type, nullptr)) return true; - if (!Preferences::GetBool("media.prefer-gstreamer", false)) - return false; @@ -261,129 +260,124 @@ } #endif - already_AddRefed<nsMediaDecoder> + already_AddRefed<MediaDecoder> nsHTMLMediaElement::CreateDecoder(const nsACString& aType) { + #ifdef MOZ_GSTREAMER // When enabled, use GStreamer for H.264, but not for codecs handled by our // bundled decoders, unless the "media.prefer-gstreamer" pref is set. - if (IsGStreamerSupportedType(aType)) { -- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); +- nsRefPtr<GStreamerDecoder> decoder = new GStreamerDecoder(); - if (decoder->Init(this)) { - return decoder.forget(); + if (!Preferences::GetBool("media.prefer-gstreamer", false)) { + if (IsGStreamerSupportedType(aType)) { -+ nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); ++ nsRefPtr<GStreamerDecoder> decoder = new GStreamerDecoder(); + if (decoder->Init(this)) { + return decoder.forget(); + } } } #endif -- + #ifdef MOZ_RAW if (IsRawType(aType)) { - nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); - if (decoder->Init(this)) { - return decoder.forget(); - } - } - #endif -@@ -2503,25 +2492,33 @@ nsHTMLMediaElement::CreateDecoder(const - #ifdef MOZ_WEBM - if (IsWebMType(aType)) { - nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); + nsRefPtr<RawDecoder> decoder = new RawDecoder(); if (decoder->Init(this)) { - return decoder.forget(); - } - } - #endif -- - #ifdef MOZ_DASH +@@ -2576,16 +2562,26 @@ nsHTMLMediaElement::CreateDecoder(const if (IsDASHMPDType(aType)) { - nsRefPtr<nsDASHDecoder> decoder = new nsDASHDecoder(); + nsRefPtr<DASHDecoder> decoder = new DASHDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif + +#ifdef MOZ_GSTREAMER + // use GStreamer as fallback if not preferred + if (IsGStreamerSupportedType(aType)) { -+ nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); ++ nsRefPtr<GStreamerDecoder> decoder = new GStreamerDecoder(); + if (decoder->Init(this)) { + return decoder.forget(); + } + } +#endif - ++ return nullptr; } - nsresult nsHTMLMediaElement::InitializeDecoderAsClone(nsMediaDecoder* aOriginal) + nsresult nsHTMLMediaElement::InitializeDecoderAsClone(MediaDecoder* aOriginal) { NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set"); NS_ASSERTION(mDecoder == nullptr, "Shouldn't have a decoder"); -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 @@ +diff --git a/content/media/gstreamer/GStreamerDecoder.cpp b/content/media/gstreamer/GStreamerDecoder.cpp +--- a/content/media/gstreamer/GStreamerDecoder.cpp ++++ b/content/media/gstreamer/GStreamerDecoder.cpp +@@ -2,18 +2,23 @@ /* 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 "MediaDecoderStateMachine.h" + #include "GStreamerReader.h" + #include "GStreamerDecoder.h" +#include "nsGStreamerFormatHelper.h" - nsDecoderStateMachine* nsGStreamerDecoder::CreateStateMachine() + namespace mozilla { + + MediaDecoderStateMachine* GStreamerDecoder::CreateStateMachine() { - return new nsBuiltinDecoderStateMachine(this, new nsGStreamerReader(this)); + return new MediaDecoderStateMachine(this, new GStreamerReader(this)); } -+ -+bool nsGStreamerDecoder::CanHandleMediaType(const char* aMIMEType, + ++bool GStreamerDecoder::CanHandleMediaType(const char* aMIMEType, + const char* aCodecs) { -+ return nsGStreamerFormatHelper::Instance()->CanHandleMediaType(aMIMEType, aCodecs); ++ return GStreamerFormatHelper::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 @@ + } // namespace mozilla + +diff --git a/content/media/gstreamer/GStreamerDecoder.h b/content/media/gstreamer/GStreamerDecoder.h +--- a/content/media/gstreamer/GStreamerDecoder.h ++++ b/content/media/gstreamer/GStreamerDecoder.h +@@ -11,13 +11,14 @@ - #include "nsBuiltinDecoder.h" + namespace mozilla { - class nsGStreamerDecoder : public nsBuiltinDecoder + class GStreamerDecoder : public MediaDecoder { public: - virtual nsMediaDecoder* Clone() { return new nsGStreamerDecoder(); } - virtual nsDecoderStateMachine* CreateStateMachine(); + virtual MediaDecoder* Clone() { return new GStreamerDecoder(); } + virtual MediaDecoderStateMachine* CreateStateMachine(); + static bool CanHandleMediaType(const char* aMIMEType, const char* aCodecs); }; + } // namespace mozilla + #endif +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 += \ + GStreamerDecoder.h \ + $(NULL) + + CPPSRCS = \ + GStreamerReader.cpp \ + GStreamerDecoder.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/nsGStreamerFormatHelper.cpp b/content/media/gstreamer/nsGStreamerFormatHelper.cpp new file mode 100644 --- /dev/null @@ -402,18 +396,18 @@ +#define ENTRY_FORMAT(entry) entry[0] +#define ENTRY_CAPS(entry) entry[1] + -+nsGStreamerFormatHelper* nsGStreamerFormatHelper::gInstance = nullptr; ++GStreamerFormatHelper* GStreamerFormatHelper::gInstance = nullptr; + -+nsGStreamerFormatHelper *nsGStreamerFormatHelper::Instance() { ++GStreamerFormatHelper *GStreamerFormatHelper::Instance() { + if (!gInstance) { + gst_init(nullptr, nullptr); -+ gInstance = new nsGStreamerFormatHelper(); ++ gInstance = new GStreamerFormatHelper(); + } + + return gInstance; +} + -+nsGStreamerFormatHelper::nsGStreamerFormatHelper() ++GStreamerFormatHelper::GStreamerFormatHelper() + : mFactories(nullptr), + mCookie(0) +{ @@ -436,12 +430,12 @@ + memcpy(mCodecs, codecs, sizeof(codecs)); +} + -+nsGStreamerFormatHelper::~nsGStreamerFormatHelper() { ++GStreamerFormatHelper::~GStreamerFormatHelper() { + if (mFactories) + g_list_free(mFactories); +} + -+bool nsGStreamerFormatHelper::CanHandleMediaType(const char* aMIMEType, ++bool GStreamerFormatHelper::CanHandleMediaType(const char* aMIMEType, + const char *aCodecs) { + GstCaps *caps = ConvertFormatsToCaps(aMIMEType, aCodecs); + if (!caps) { @@ -454,7 +448,7 @@ + return ret; +} + -+GstCaps *nsGStreamerFormatHelper::ConvertFormatsToCaps(const char *aMIMEType, ++GstCaps *GStreamerFormatHelper::ConvertFormatsToCaps(const char *aMIMEType, + const char *aCodecs) { + unsigned int i; + @@ -504,7 +498,7 @@ + return caps; +} + -+bool nsGStreamerFormatHelper::HaveElementsToProcessCaps(GstCaps *aCaps) { ++bool GStreamerFormatHelper::HaveElementsToProcessCaps(GstCaps *aCaps) { + + GList *factories = GetFactories(); + @@ -526,7 +520,7 @@ + return true; +} + -+GList * nsGStreamerFormatHelper::GetFactories() { ++GList * GStreamerFormatHelper::GetFactories() { + uint32_t cookie = gst_default_registry_get_feature_list_cookie (); + if (cookie != mCookie) { + g_list_free(mFactories); @@ -555,23 +549,23 @@ +#include <gst/gst.h> +#include <mozilla/Types.h> + -+class nsGStreamerFormatHelper { ++class GStreamerFormatHelper { + public: -+ static nsGStreamerFormatHelper *Instance(); -+ ~nsGStreamerFormatHelper(); ++ static GStreamerFormatHelper *Instance(); ++ ~GStreamerFormatHelper(); + + bool CanHandleMediaType(const char *aMIMEType, + const char *aCodecs); + + private: -+ nsGStreamerFormatHelper(); ++ GStreamerFormatHelper(); + GstCaps *ConvertFormatsToCaps(const char *aMIMEType, + const char *aCodecs); + char * const *CodecListFromCaps(GstCaps *aCaps); + bool HaveElementsToProcessCaps(GstCaps *aCaps); + GList *GetFactories(); + -+ static nsGStreamerFormatHelper *gInstance; ++ static GStreamerFormatHelper *gInstance; + + const char *mContainers[3][2]; + const char *mCodecs[7][2]; ++++++ mozilla-libproxy-compat.patch ++++++ --- /var/tmp/diff_new_pack.bOImtL/_old 2013-02-20 09:36:36.000000000 +0100 +++ /var/tmp/diff_new_pack.bOImtL/_new 2013-02-20 09:36:36.000000000 +0100 @@ -2,6 +2,7 @@ # Parent 99164862ccce7947259465dcf9edbf6375d56413 # User Wolfgang Rosenauer <wr(a)rosenauer.org> No bug - libproxy API change picked up in bmo#769764 but fails in openSUSE 11.2 and earlier. Still cast to char* to make "all" happy +Note: Remove that patch when openSUSE 11.2 runs out of any support! diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp --- a/toolkit/system/unixproxy/nsLibProxySettings.cpp ++++++ mozilla-webrtc-ppc.patch ++++++ Submitted-by: schwab@@linux-m68k.org Subject: fix PPC build References: (not delivered with the patch but apparently mix of:) Bug 750869 - Support WebRTC for Android in our build system (TM:20) Bug 814693 - Build failure on Debian powerpc (TM:20) diff --git a/media/webrtc/shared_libs.mk b/media/webrtc/shared_libs.mk --- a/media/webrtc/shared_libs.mk +++ b/media/webrtc/shared_libs.mk @@ -23,33 +23,39 @@ WEBRTC_LIBS = \ $(call EXPAND_LIBNAME_PATH,video_render_module,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_render_module) \ $(call EXPAND_LIBNAME_PATH,video_engine_core,$(DEPTH)/media/webrtc/trunk/src/video_engine/video_engine_video_engine_core) \ $(call EXPAND_LIBNAME_PATH,media_file,$(DEPTH)/media/webrtc/trunk/src/modules/modules_media_file) \ $(call EXPAND_LIBNAME_PATH,rtp_rtcp,$(DEPTH)/media/webrtc/trunk/src/modules/modules_rtp_rtcp) \ $(call EXPAND_LIBNAME_PATH,udp_transport,$(DEPTH)/media/webrtc/trunk/src/modules/modules_udp_transport) \ $(call EXPAND_LIBNAME_PATH,bitrate_controller,$(DEPTH)/media/webrtc/trunk/src/modules/modules_bitrate_controller) \ $(call EXPAND_LIBNAME_PATH,remote_bitrate_estimator,$(DEPTH)/media/webrtc/trunk/src/modules/modules_remote_bitrate_estimator) \ $(call EXPAND_LIBNAME_PATH,video_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing) \ - $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \ $(call EXPAND_LIBNAME_PATH,voice_engine_core,$(DEPTH)/media/webrtc/trunk/src/voice_engine/voice_engine_voice_engine_core) \ $(call EXPAND_LIBNAME_PATH,audio_conference_mixer,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_conference_mixer) \ $(call EXPAND_LIBNAME_PATH,audio_device,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_device) \ $(call EXPAND_LIBNAME_PATH,audio_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_processing) \ $(call EXPAND_LIBNAME_PATH,aec,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec) \ - $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \ $(call EXPAND_LIBNAME_PATH,apm_util,$(DEPTH)/media/webrtc/trunk/src/modules/modules_apm_util) \ $(call EXPAND_LIBNAME_PATH,aecm,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aecm) \ $(call EXPAND_LIBNAME_PATH,agc,$(DEPTH)/media/webrtc/trunk/src/modules/modules_agc) \ $(call EXPAND_LIBNAME_PATH,ns,$(DEPTH)/media/webrtc/trunk/src/modules/modules_ns) \ $(call EXPAND_LIBNAME_PATH,yuv,$(DEPTH)/media/webrtc/trunk/third_party/libyuv/libyuv_libyuv) \ $(call EXPAND_LIBNAME_PATH,webrtc_jpeg,$(DEPTH)/media/webrtc/trunk/src/common_video/common_video_webrtc_jpeg) \ $(call EXPAND_LIBNAME_PATH,nicer,$(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer) \ $(call EXPAND_LIBNAME_PATH,nrappkit,$(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit) \ $(NULL) +# if we're on an intel arch, we want SSE2 optimizations +ifneq (,$(INTEL_ARCHITECTURE)) +WEBRTC_LIBS += \ + $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \ + $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \ + $(NULL) +endif + # If you enable one of these codecs in webrtc_config.gypi, you'll need to re-add the # relevant library from this list: # # $(call EXPAND_LIBNAME_PATH,G722,$(DEPTH)/media/webrtc/trunk/src/modules/modules_G722) \ # $(call EXPAND_LIBNAME_PATH,iLBC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iLBC) \ # $(call EXPAND_LIBNAME_PATH,iSAC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSAC) \ # $(call EXPAND_LIBNAME_PATH,iSACFix,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSACFix) \ # diff --git a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi --- a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi +++ b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi @@ -6,16 +6,19 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. { 'targets': [ { 'target_name': 'PCM16B', 'type': '<(library)', + 'dependencies': [ + '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', + ], 'include_dirs': [ 'include', ], 'direct_dependent_settings': { 'include_dirs': [ 'include', ], }, diff --git a/media/webrtc/trunk/src/typedefs.h b/media/webrtc/trunk/src/typedefs.h --- a/media/webrtc/trunk/src/typedefs.h +++ b/media/webrtc/trunk/src/typedefs.h @@ -52,16 +52,24 @@ //#define WEBRTC_ARCH_ARMEL #define WEBRTC_ARCH_32_BITS #define WEBRTC_ARCH_LITTLE_ENDIAN #define WEBRTC_LITTLE_ENDIAN #elif defined(__MIPSEL__) #define WEBRTC_ARCH_32_BITS #define WEBRTC_ARCH_LITTLE_ENDIAN #define WEBRTC_LITTLE_ENDIAN +#elif defined(__powerpc__) +#if defined(__powerpc64__) +#define WEBRTC_ARCH_64_BITS +#else +#define WEBRTC_ARCH_32_BITS +#endif +#define WEBRTC_ARCH_BIG_ENDIAN +#define WEBRTC_BIG_ENDIAN #else #error Please add support for your architecture in typedefs.h #endif #if defined(__SSE2__) || defined(_MSC_VER) #define WEBRTC_USE_SSE2 #endif ++++++ seamonkey-2.15.2-source.tar.bz2 -> seamonkey-2.16-source.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/seamonkey/seamonkey-2.15.2-source.tar.bz2 /work/SRC/openSUSE:12.3/.seamonkey.new/seamonkey-2.16-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seamonkey for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package seamonkey for openSUSE:Factory checked in at 2013-02-20 09:35:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seamonkey (Old) and /work/SRC/openSUSE:Factory/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/seamonkey/seamonkey.changes 2013-02-09 10:16:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey.changes 2013-02-20 09:36:07.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Feb 18 07:41:44 UTC 2013 - wr(a)rosenauer.org + +- update to SeaMonkey 2.16 (bnc#804248) + * MFSA 2013-21/CVE-2013-0783/2013-0784 + Miscellaneous memory safety hazards + * MFSA 2013-22/CVE-2013-0772 (bmo#801366) + Out-of-bounds read in image rendering + * MFSA 2013-23/CVE-2013-0765 (bmo#830614) + Wrapped WebIDL objects can be wrapped again + * MFSA 2013-24/CVE-2013-0773 (bmo#809652) + Web content bypass of COW and SOW security wrappers + * MFSA 2013-25/CVE-2013-0774 (bmo#827193) + Privacy leak in JavaScript Workers + * MFSA 2013-26/CVE-2013-0775 (bmo#831095) + Use-after-free in nsImageLoadingContent + * MFSA 2013-27/CVE-2013-0776 (bmo#796475) + Phishing on HTTPS connection through malicious proxy + * MFSA 2013-28/CVE-2013-0780/CVE-2013-0782/CVE-2013-0777/ + CVE-2013-0778/CVE-2013-0779/CVE-2013-0781 + Use-after-free, out of bounds read, and buffer overflow issues + found using Address Sanitizer +- removed obsolete patches + * mozilla-webrtc.patch + * mozilla-gstreamer-803287.patch + +------------------------------------------------------------------- @@ -26 +52 @@ -- update to SeaMonkey 2.15 /(bnc#796895) +- update to SeaMonkey 2.15 (bnc#796895) Old: ---- l10n-2.15.2.tar.bz2 mozilla-gstreamer-803287.patch mozilla-webrtc.patch seamonkey-2.15.2-source.tar.bz2 New: ---- _constraints l10n-2.16.tar.bz2 mozilla-webrtc-ppc.patch seamonkey-2.16-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.HYclTx/_old 2013-02-20 09:36:22.000000000 +0100 +++ /var/tmp/diff_new_pack.HYclTx/_new 2013-02-20 09:36:22.000000000 +0100 @@ -48,9 +48,9 @@ %endif Provides: web_browser Provides: browser(npapi) -Version: 2.15.2 +Version: 2.16 Release: 0 -%define releasedate 2013020300 +%define releasedate 2013021700 Summary: The successor of the Mozilla Application Suite License: MPL-2.0 Group: Productivity/Networking/Web/Browsers @@ -71,12 +71,11 @@ Patch3: mozilla-shared-nss-db.patch Patch4: mozilla-sle11.patch Patch5: mozilla-language.patch -Patch6: mozilla-gstreamer-803287.patch Patch7: mozilla-ntlm-full-path.patch Patch8: mozilla-ua-locale.patch Patch9: mozilla-ppc.patch Patch10: mozilla-gstreamer-760140.patch -Patch11: mozilla-webrtc.patch +Patch11: mozilla-webrtc-ppc.patch Patch12: mozilla-libproxy-compat.patch Patch20: seamonkey-ua-locale.patch Patch21: seamonkey-shared-nss-db.patch @@ -175,7 +174,6 @@ %patch4 -p1 %endif %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.HYclTx/_old 2013-02-20 09:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.HYclTx/_new 2013-02-20 09:36:23.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="SEAMONKEY_2_15_2_RELEASE" -VERSION="2.15.2" +RELEASE_TAG="SEAMONKEY_2_16_RELEASE" +VERSION="2.16" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.15.2.tar.bz2 -> l10n-2.16.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/seamonkey/l10n-2.15.2.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/l10n-2.16.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gstreamer-760140.patch ++++++ --- /var/tmp/diff_new_pack.HYclTx/_old 2013-02-20 09:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.HYclTx/_new 2013-02-20 09:36:23.000000000 +0100 @@ -4,7 +4,7 @@ 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 -@@ -147,16 +147,19 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_ +@@ -143,16 +143,19 @@ #include "xpcprivate.h" // nsXPConnect #include "nsScriptSecurityManager.h" #include "nsIChannelPolicy.h" @@ -14,7 +14,7 @@ #ifdef MOZ_MEDIA #include "nsHTMLMediaElement.h" +#ifdef MOZ_GSTREAMER -+#include "nsGStreamerDecoder.h" ++#include "GStreamerDecoder.h" +#endif #endif #include "nsDOMTouchEvent.h" @@ -27,7 +27,7 @@ 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 -@@ -263,17 +263,19 @@ public: +@@ -259,17 +259,19 @@ public: void UpdateMediaSize(nsIntSize size); // Returns the CanPlayStatus indicating if we can handle this @@ -48,30 +48,29 @@ // 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 -@@ -305,19 +307,16 @@ public: +@@ -292,18 +294,16 @@ public: + #ifdef MOZ_WEBM static bool IsWebMType(const nsACString& aType); static const char gWebMTypes[2][11]; static char const *const gWebMCodecs[4]; #endif #ifdef MOZ_GSTREAMER - static bool IsGStreamerEnabled(); static bool IsGStreamerSupportedType(const nsACString& aType); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; -- static char const *const gH264Codecs[7]; #endif #ifdef MOZ_WIDGET_GONK - static bool IsOmxEnabled(); static bool IsOmxSupportedType(const nsACString& aType); static const char gOmxTypes[5][16]; - static char const *const gH264Codecs[7]; #endif + + #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) 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 -@@ -2128,51 +2128,34 @@ nsHTMLMediaElement::IsWebMType(const nsA +@@ -2213,50 +2213,29 @@ nsHTMLMediaElement::IsWebMType(const nsA return true; } } @@ -82,30 +81,26 @@ -#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) +#ifdef MOZ_WIDGET_GONK - char const *const nsHTMLMediaElement::gH264Codecs[7] = { - "avc1.42E01E", - "avc1.42001E", - "avc1.58A01E", - "avc1.4D401E", - "avc1.64001E", - "mp4a.40.2", + char const *const nsHTMLMediaElement::gH264Codecs[9] = { + "avc1.42E01E", // H.264 Constrained Baseline Profile Level 3.0 + "avc1.42001E", // H.264 Baseline Profile Level 3.0 + "avc1.58A01E", // H.264 Extended Profile Level 3.0 + "avc1.4D401E", // H.264 Main Profile Level 3.0 + "avc1.64001E", // H.264 High Profile Level 3.0 + "avc1.64001F", // H.264 High Profile Level 3.1 + "mp4v.20.3", // 3GPP + "mp4a.40.2", // AAC-LC nullptr }; - #endif - - #ifdef MOZ_GSTREAMER +-#endif +- +-#ifdef MOZ_GSTREAMER -const char nsHTMLMediaElement::gH264Types[3][16] = { - "video/mp4", - "video/3gpp", - "video/quicktime", -}; - - bool - nsHTMLMediaElement::IsGStreamerEnabled() - { - return Preferences::GetBool("media.gstreamer.enabled"); - } -- -bool -nsHTMLMediaElement::IsH264Type(const nsACString& aType) -{ @@ -116,22 +111,26 @@ - } - return false; -} - #endif - - #ifdef MOZ_WIDGET_GONK +-#endif +- +-#ifdef MOZ_WIDGET_GONK ++ const char nsHTMLMediaElement::gOmxTypes[5][16] = { "audio/mpeg", "audio/mp4", "video/mp4", "video/3gpp", -@@ -2257,18 +2240,22 @@ nsHTMLMediaElement::IsDASHMPDType(const + "video/quicktime", + }; + +@@ -2319,18 +2298,22 @@ nsHTMLMediaElement::IsDASHMPDType(const return false; } #endif /* static */ - nsHTMLMediaElement::CanPlayStatus + nsHTMLMediaElement::CanPlayStatus nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType, - char const *const ** aCodecList) + const char *aCodecs, @@ -148,7 +147,7 @@ #endif #ifdef MOZ_OGG if (IsOggType(nsDependentCString(aMIMEType))) { -@@ -2292,20 +2279,22 @@ nsHTMLMediaElement::CanHandleMediaType(c +@@ -2354,20 +2337,22 @@ nsHTMLMediaElement::CanHandleMediaType(c if (IsDASHMPDType(nsDependentCString(aMIMEType))) { // DASH manifest uses WebM codecs only. *aCodecList = gWebMCodecs; @@ -165,7 +164,7 @@ + *aCheckCodecList = false; + if (aCodecList) + *aCodecList = nullptr; -+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs)) ++ if (GStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs)) + return CANPLAY_YES; #endif #ifdef MOZ_WIDGET_GONK @@ -175,7 +174,7 @@ } #endif #ifdef MOZ_MEDIA_PLUGINS -@@ -2326,17 +2315,17 @@ bool nsHTMLMediaElement::ShouldHandleMed +@@ -2388,17 +2373,17 @@ bool nsHTMLMediaElement::ShouldHandleMed if (IsOggType(nsDependentCString(aMIMEType))) return true; #endif @@ -185,7 +184,7 @@ #endif #ifdef MOZ_GSTREAMER - if (IsH264Type(nsDependentCString(aMIMEType))) -+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr)) ++ if (GStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr)) return true; #endif #ifdef MOZ_WIDGET_GONK @@ -194,7 +193,7 @@ } #endif #ifdef MOZ_MEDIA_PLUGINS -@@ -2367,26 +2356,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA +@@ -2429,26 +2414,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA { nsContentTypeParser parser(aType); nsAutoString mimeType; @@ -231,20 +230,20 @@ // of the 'codecs' parameter nsCharSeparatedTokenizer tokenizer(codecs, ','); bool expectMoreTokens = false; -@@ -2425,46 +2419,41 @@ nsHTMLMediaElement::CanPlayType(const ns +@@ -2487,43 +2477,39 @@ nsHTMLMediaElement::CanPlayType(const ns } #ifdef MOZ_GSTREAMER bool nsHTMLMediaElement::IsGStreamerSupportedType(const nsACString& aMimeType) { - if (!IsGStreamerEnabled()) + if (!MediaDecoder::IsGStreamerEnabled()) return false; - if (IsH264Type(aMimeType)) + + const char *type; + NS_CStringGetData(aMimeType, &type, nullptr); -+ if (nsGStreamerDecoder::CanHandleMediaType(type, nullptr)) ++ if (GStreamerDecoder::CanHandleMediaType(type, nullptr)) return true; - if (!Preferences::GetBool("media.prefer-gstreamer", false)) - return false; @@ -261,129 +260,124 @@ } #endif - already_AddRefed<nsMediaDecoder> + already_AddRefed<MediaDecoder> nsHTMLMediaElement::CreateDecoder(const nsACString& aType) { + #ifdef MOZ_GSTREAMER // When enabled, use GStreamer for H.264, but not for codecs handled by our // bundled decoders, unless the "media.prefer-gstreamer" pref is set. - if (IsGStreamerSupportedType(aType)) { -- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); +- nsRefPtr<GStreamerDecoder> decoder = new GStreamerDecoder(); - if (decoder->Init(this)) { - return decoder.forget(); + if (!Preferences::GetBool("media.prefer-gstreamer", false)) { + if (IsGStreamerSupportedType(aType)) { -+ nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); ++ nsRefPtr<GStreamerDecoder> decoder = new GStreamerDecoder(); + if (decoder->Init(this)) { + return decoder.forget(); + } } } #endif -- + #ifdef MOZ_RAW if (IsRawType(aType)) { - nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); - if (decoder->Init(this)) { - return decoder.forget(); - } - } - #endif -@@ -2503,25 +2492,33 @@ nsHTMLMediaElement::CreateDecoder(const - #ifdef MOZ_WEBM - if (IsWebMType(aType)) { - nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); + nsRefPtr<RawDecoder> decoder = new RawDecoder(); if (decoder->Init(this)) { - return decoder.forget(); - } - } - #endif -- - #ifdef MOZ_DASH +@@ -2576,16 +2562,26 @@ nsHTMLMediaElement::CreateDecoder(const if (IsDASHMPDType(aType)) { - nsRefPtr<nsDASHDecoder> decoder = new nsDASHDecoder(); + nsRefPtr<DASHDecoder> decoder = new DASHDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif + +#ifdef MOZ_GSTREAMER + // use GStreamer as fallback if not preferred + if (IsGStreamerSupportedType(aType)) { -+ nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); ++ nsRefPtr<GStreamerDecoder> decoder = new GStreamerDecoder(); + if (decoder->Init(this)) { + return decoder.forget(); + } + } +#endif - ++ return nullptr; } - nsresult nsHTMLMediaElement::InitializeDecoderAsClone(nsMediaDecoder* aOriginal) + nsresult nsHTMLMediaElement::InitializeDecoderAsClone(MediaDecoder* aOriginal) { NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set"); NS_ASSERTION(mDecoder == nullptr, "Shouldn't have a decoder"); -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 @@ +diff --git a/content/media/gstreamer/GStreamerDecoder.cpp b/content/media/gstreamer/GStreamerDecoder.cpp +--- a/content/media/gstreamer/GStreamerDecoder.cpp ++++ b/content/media/gstreamer/GStreamerDecoder.cpp +@@ -2,18 +2,23 @@ /* 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 "MediaDecoderStateMachine.h" + #include "GStreamerReader.h" + #include "GStreamerDecoder.h" +#include "nsGStreamerFormatHelper.h" - nsDecoderStateMachine* nsGStreamerDecoder::CreateStateMachine() + namespace mozilla { + + MediaDecoderStateMachine* GStreamerDecoder::CreateStateMachine() { - return new nsBuiltinDecoderStateMachine(this, new nsGStreamerReader(this)); + return new MediaDecoderStateMachine(this, new GStreamerReader(this)); } -+ -+bool nsGStreamerDecoder::CanHandleMediaType(const char* aMIMEType, + ++bool GStreamerDecoder::CanHandleMediaType(const char* aMIMEType, + const char* aCodecs) { -+ return nsGStreamerFormatHelper::Instance()->CanHandleMediaType(aMIMEType, aCodecs); ++ return GStreamerFormatHelper::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 @@ + } // namespace mozilla + +diff --git a/content/media/gstreamer/GStreamerDecoder.h b/content/media/gstreamer/GStreamerDecoder.h +--- a/content/media/gstreamer/GStreamerDecoder.h ++++ b/content/media/gstreamer/GStreamerDecoder.h +@@ -11,13 +11,14 @@ - #include "nsBuiltinDecoder.h" + namespace mozilla { - class nsGStreamerDecoder : public nsBuiltinDecoder + class GStreamerDecoder : public MediaDecoder { public: - virtual nsMediaDecoder* Clone() { return new nsGStreamerDecoder(); } - virtual nsDecoderStateMachine* CreateStateMachine(); + virtual MediaDecoder* Clone() { return new GStreamerDecoder(); } + virtual MediaDecoderStateMachine* CreateStateMachine(); + static bool CanHandleMediaType(const char* aMIMEType, const char* aCodecs); }; + } // namespace mozilla + #endif +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 += \ + GStreamerDecoder.h \ + $(NULL) + + CPPSRCS = \ + GStreamerReader.cpp \ + GStreamerDecoder.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/nsGStreamerFormatHelper.cpp b/content/media/gstreamer/nsGStreamerFormatHelper.cpp new file mode 100644 --- /dev/null @@ -402,18 +396,18 @@ +#define ENTRY_FORMAT(entry) entry[0] +#define ENTRY_CAPS(entry) entry[1] + -+nsGStreamerFormatHelper* nsGStreamerFormatHelper::gInstance = nullptr; ++GStreamerFormatHelper* GStreamerFormatHelper::gInstance = nullptr; + -+nsGStreamerFormatHelper *nsGStreamerFormatHelper::Instance() { ++GStreamerFormatHelper *GStreamerFormatHelper::Instance() { + if (!gInstance) { + gst_init(nullptr, nullptr); -+ gInstance = new nsGStreamerFormatHelper(); ++ gInstance = new GStreamerFormatHelper(); + } + + return gInstance; +} + -+nsGStreamerFormatHelper::nsGStreamerFormatHelper() ++GStreamerFormatHelper::GStreamerFormatHelper() + : mFactories(nullptr), + mCookie(0) +{ @@ -436,12 +430,12 @@ + memcpy(mCodecs, codecs, sizeof(codecs)); +} + -+nsGStreamerFormatHelper::~nsGStreamerFormatHelper() { ++GStreamerFormatHelper::~GStreamerFormatHelper() { + if (mFactories) + g_list_free(mFactories); +} + -+bool nsGStreamerFormatHelper::CanHandleMediaType(const char* aMIMEType, ++bool GStreamerFormatHelper::CanHandleMediaType(const char* aMIMEType, + const char *aCodecs) { + GstCaps *caps = ConvertFormatsToCaps(aMIMEType, aCodecs); + if (!caps) { @@ -454,7 +448,7 @@ + return ret; +} + -+GstCaps *nsGStreamerFormatHelper::ConvertFormatsToCaps(const char *aMIMEType, ++GstCaps *GStreamerFormatHelper::ConvertFormatsToCaps(const char *aMIMEType, + const char *aCodecs) { + unsigned int i; + @@ -504,7 +498,7 @@ + return caps; +} + -+bool nsGStreamerFormatHelper::HaveElementsToProcessCaps(GstCaps *aCaps) { ++bool GStreamerFormatHelper::HaveElementsToProcessCaps(GstCaps *aCaps) { + + GList *factories = GetFactories(); + @@ -526,7 +520,7 @@ + return true; +} + -+GList * nsGStreamerFormatHelper::GetFactories() { ++GList * GStreamerFormatHelper::GetFactories() { + uint32_t cookie = gst_default_registry_get_feature_list_cookie (); + if (cookie != mCookie) { + g_list_free(mFactories); @@ -555,23 +549,23 @@ +#include <gst/gst.h> +#include <mozilla/Types.h> + -+class nsGStreamerFormatHelper { ++class GStreamerFormatHelper { + public: -+ static nsGStreamerFormatHelper *Instance(); -+ ~nsGStreamerFormatHelper(); ++ static GStreamerFormatHelper *Instance(); ++ ~GStreamerFormatHelper(); + + bool CanHandleMediaType(const char *aMIMEType, + const char *aCodecs); + + private: -+ nsGStreamerFormatHelper(); ++ GStreamerFormatHelper(); + GstCaps *ConvertFormatsToCaps(const char *aMIMEType, + const char *aCodecs); + char * const *CodecListFromCaps(GstCaps *aCaps); + bool HaveElementsToProcessCaps(GstCaps *aCaps); + GList *GetFactories(); + -+ static nsGStreamerFormatHelper *gInstance; ++ static GStreamerFormatHelper *gInstance; + + const char *mContainers[3][2]; + const char *mCodecs[7][2]; ++++++ mozilla-libproxy-compat.patch ++++++ --- /var/tmp/diff_new_pack.HYclTx/_old 2013-02-20 09:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.HYclTx/_new 2013-02-20 09:36:23.000000000 +0100 @@ -2,6 +2,7 @@ # Parent 99164862ccce7947259465dcf9edbf6375d56413 # User Wolfgang Rosenauer <wr(a)rosenauer.org> No bug - libproxy API change picked up in bmo#769764 but fails in openSUSE 11.2 and earlier. Still cast to char* to make "all" happy +Note: Remove that patch when openSUSE 11.2 runs out of any support! diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp --- a/toolkit/system/unixproxy/nsLibProxySettings.cpp ++++++ mozilla-webrtc-ppc.patch ++++++ Submitted-by: schwab@@linux-m68k.org Subject: fix PPC build References: (not delivered with the patch but apparently mix of:) Bug 750869 - Support WebRTC for Android in our build system (TM:20) Bug 814693 - Build failure on Debian powerpc (TM:20) diff --git a/media/webrtc/shared_libs.mk b/media/webrtc/shared_libs.mk --- a/media/webrtc/shared_libs.mk +++ b/media/webrtc/shared_libs.mk @@ -23,33 +23,39 @@ WEBRTC_LIBS = \ $(call EXPAND_LIBNAME_PATH,video_render_module,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_render_module) \ $(call EXPAND_LIBNAME_PATH,video_engine_core,$(DEPTH)/media/webrtc/trunk/src/video_engine/video_engine_video_engine_core) \ $(call EXPAND_LIBNAME_PATH,media_file,$(DEPTH)/media/webrtc/trunk/src/modules/modules_media_file) \ $(call EXPAND_LIBNAME_PATH,rtp_rtcp,$(DEPTH)/media/webrtc/trunk/src/modules/modules_rtp_rtcp) \ $(call EXPAND_LIBNAME_PATH,udp_transport,$(DEPTH)/media/webrtc/trunk/src/modules/modules_udp_transport) \ $(call EXPAND_LIBNAME_PATH,bitrate_controller,$(DEPTH)/media/webrtc/trunk/src/modules/modules_bitrate_controller) \ $(call EXPAND_LIBNAME_PATH,remote_bitrate_estimator,$(DEPTH)/media/webrtc/trunk/src/modules/modules_remote_bitrate_estimator) \ $(call EXPAND_LIBNAME_PATH,video_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing) \ - $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \ $(call EXPAND_LIBNAME_PATH,voice_engine_core,$(DEPTH)/media/webrtc/trunk/src/voice_engine/voice_engine_voice_engine_core) \ $(call EXPAND_LIBNAME_PATH,audio_conference_mixer,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_conference_mixer) \ $(call EXPAND_LIBNAME_PATH,audio_device,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_device) \ $(call EXPAND_LIBNAME_PATH,audio_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_processing) \ $(call EXPAND_LIBNAME_PATH,aec,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec) \ - $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \ $(call EXPAND_LIBNAME_PATH,apm_util,$(DEPTH)/media/webrtc/trunk/src/modules/modules_apm_util) \ $(call EXPAND_LIBNAME_PATH,aecm,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aecm) \ $(call EXPAND_LIBNAME_PATH,agc,$(DEPTH)/media/webrtc/trunk/src/modules/modules_agc) \ $(call EXPAND_LIBNAME_PATH,ns,$(DEPTH)/media/webrtc/trunk/src/modules/modules_ns) \ $(call EXPAND_LIBNAME_PATH,yuv,$(DEPTH)/media/webrtc/trunk/third_party/libyuv/libyuv_libyuv) \ $(call EXPAND_LIBNAME_PATH,webrtc_jpeg,$(DEPTH)/media/webrtc/trunk/src/common_video/common_video_webrtc_jpeg) \ $(call EXPAND_LIBNAME_PATH,nicer,$(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer) \ $(call EXPAND_LIBNAME_PATH,nrappkit,$(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit) \ $(NULL) +# if we're on an intel arch, we want SSE2 optimizations +ifneq (,$(INTEL_ARCHITECTURE)) +WEBRTC_LIBS += \ + $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \ + $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \ + $(NULL) +endif + # If you enable one of these codecs in webrtc_config.gypi, you'll need to re-add the # relevant library from this list: # # $(call EXPAND_LIBNAME_PATH,G722,$(DEPTH)/media/webrtc/trunk/src/modules/modules_G722) \ # $(call EXPAND_LIBNAME_PATH,iLBC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iLBC) \ # $(call EXPAND_LIBNAME_PATH,iSAC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSAC) \ # $(call EXPAND_LIBNAME_PATH,iSACFix,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSACFix) \ # diff --git a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi --- a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi +++ b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi @@ -6,16 +6,19 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. { 'targets': [ { 'target_name': 'PCM16B', 'type': '<(library)', + 'dependencies': [ + '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', + ], 'include_dirs': [ 'include', ], 'direct_dependent_settings': { 'include_dirs': [ 'include', ], }, diff --git a/media/webrtc/trunk/src/typedefs.h b/media/webrtc/trunk/src/typedefs.h --- a/media/webrtc/trunk/src/typedefs.h +++ b/media/webrtc/trunk/src/typedefs.h @@ -52,16 +52,24 @@ //#define WEBRTC_ARCH_ARMEL #define WEBRTC_ARCH_32_BITS #define WEBRTC_ARCH_LITTLE_ENDIAN #define WEBRTC_LITTLE_ENDIAN #elif defined(__MIPSEL__) #define WEBRTC_ARCH_32_BITS #define WEBRTC_ARCH_LITTLE_ENDIAN #define WEBRTC_LITTLE_ENDIAN +#elif defined(__powerpc__) +#if defined(__powerpc64__) +#define WEBRTC_ARCH_64_BITS +#else +#define WEBRTC_ARCH_32_BITS +#endif +#define WEBRTC_ARCH_BIG_ENDIAN +#define WEBRTC_BIG_ENDIAN #else #error Please add support for your architecture in typedefs.h #endif #if defined(__SSE2__) || defined(_MSC_VER) #define WEBRTC_USE_SSE2 #endif ++++++ seamonkey-2.15.2-source.tar.bz2 -> seamonkey-2.16-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/seamonkey/seamonkey-2.15.2-source.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey-2.16-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:12.3
by root＠hilbert.suse.de 20 Feb '13

20 Feb '13

Hello community, here is the log from the commit of package rsyslog for openSUSE:12.3 checked in at 2013-02-20 09:34:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/rsyslog (Old) and /work/SRC/openSUSE:12.3/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/rsyslog/rsyslog.changes 2013-01-31 01:36:37.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.rsyslog.new/rsyslog.changes 2013-02-20 09:34:55.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 19 16:25:03 UTC 2013 - mt(a)suse.de + +- Fixed rsyslog.service file to support reload (bnc#803994) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.service.in.in ++++++ --- /var/tmp/diff_new_pack.l2WHcR/_old 2013-02-20 09:34:56.000000000 +0100 +++ /var/tmp/diff_new_pack.l2WHcR/_new 2013-02-20 09:34:56.000000000 +0100 @@ -10,6 +10,7 @@ ExecStartPre=@sbindir@/rsyslog-service-prepare EnvironmentFile=-/etc/sysconfig/syslog ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS +ExecReload=/bin/kill -HUP $MAINPID Sockets=syslog.socket StandardOutput=null -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0