September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit gdm-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package gdm-branding-openSUSE for openSUSE:Factory checked in at 2014-09-30 19:36:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.gdm-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdm-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/gdm-branding-openSUSE/gdm-branding-openSUSE.changes 2013-09-09 10:49:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdm-branding-openSUSE.new/gdm-branding-openSUSE.changes 2014-09-30 19:36:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 23 15:56:15 UTC 2014 - zaitor(a)opensuse.org + +- Bump version to 13.2, to prepare for next version of openSUSE. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.lqkTjd/_old 2014-09-30 19:36:27.000000000 +0200 +++ /var/tmp/diff_new_pack.lqkTjd/_new 2014-09-30 19:36:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: gdm-branding-openSUSE -Version: 13.1 +Version: 13.2 Release: 0 Summary: The GNOME Display Manager -- openSUSE default configuration License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libthai for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package libthai for openSUSE:Factory checked in at 2014-09-30 19:36:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libthai (Old) and /work/SRC/openSUSE:Factory/.libthai.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libthai" Changes: -------- --- /work/SRC/openSUSE:Factory/libthai/libthai.changes 2013-12-30 10:19:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libthai.new/libthai.changes 2014-09-30 19:36:25.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 23 21:25:56 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.1.21: + + Updated word break dictionary. + + Improve word breaking performance by 8.61%. + +------------------------------------------------------------------- Old: ---- libthai-0.1.20.tar.xz New: ---- libthai-0.1.21.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libthai.spec ++++++ --- /var/tmp/diff_new_pack.MRloh7/_old 2014-09-30 19:36:26.000000000 +0200 +++ /var/tmp/diff_new_pack.MRloh7/_new 2014-09-30 19:36:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libthai # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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: libthai -Version: 0.1.20 +Version: 0.1.21 Release: 0 Summary: Thai Language Support Routines License: LGPL-2.1+ ++++++ libthai-0.1.20.tar.xz -> libthai-0.1.21.tar.xz ++++++ ++++ 2493 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit check for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package check for openSUSE:Factory checked in at 2014-09-30 19:36:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/check (Old) and /work/SRC/openSUSE:Factory/.check.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "check" Changes: -------- --- /work/SRC/openSUSE:Factory/check/check.changes 2014-07-13 17:16:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.check.new/check.changes 2014-09-30 19:36:23.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Aug 23 21:27:32 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.9.14: + + Changes to (unofficially for now) support Solaris and AIX + platforms. + + Fix issue with checked teardown functions in CK_NOFORK mode. + + Allow checked fixtures when compiled without fork(). + + Various code cleanup, including changes for compiling Check on + c++ compilers Clang and g++. + + Re-enable internal unit tests. + +------------------------------------------------------------------- Old: ---- check-0.9.13.tar.gz New: ---- check-0.9.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ check.spec ++++++ --- /var/tmp/diff_new_pack.b1oymf/_old 2014-09-30 19:36:24.000000000 +0200 +++ /var/tmp/diff_new_pack.b1oymf/_new 2014-09-30 19:36:24.000000000 +0200 @@ -17,13 +17,13 @@ Name: check -Version: 0.9.13 +Version: 0.9.14 Release: 0 Summary: Unit Test Framework for C License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://check.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/check/check/0.9.13/%{name}-%{versi… +Source: http://downloads.sourceforge.net/project/check/check/0.9.14/%{name}-%{versi… Source99: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config ++++++ check-0.9.13.tar.gz -> check-0.9.14.tar.gz ++++++ ++++ 3614 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxml++ for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package libxml++ for openSUSE:Factory checked in at 2014-09-30 19:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxml++ (Old) and /work/SRC/openSUSE:Factory/.libxml++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxml++" Changes: -------- --- /work/SRC/openSUSE:Factory/libxml++/libxml++.changes 2013-09-23 09:56:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxml++.new/libxml++.changes 2014-09-30 19:36:22.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 18 15:19:27 UTC 2014 - fcrozat(a)suse.com + +- Add obsoletes/provides to baselibs.conf. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml++.spec ++++++ --- /var/tmp/diff_new_pack.NOZsCf/_old 2014-09-30 19:36:23.000000000 +0200 +++ /var/tmp/diff_new_pack.NOZsCf/_new 2014-09-30 19:36:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libxml++ # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.NOZsCf/_old 2014-09-30 19:36:23.000000000 +0200 +++ /var/tmp/diff_new_pack.NOZsCf/_new 2014-09-30 19:36:23.000000000 +0200 @@ -1 +1,3 @@ libxml++-2_6-2 + obsoletes "libxml++-<targettype> <= 2.26.1" + provides "libxml++-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-menus for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package gnome-menus for openSUSE:Factory checked in at 2014-09-30 19:36:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-menus (Old) and /work/SRC/openSUSE:Factory/.gnome-menus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-menus" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-menus/gnome-menus.changes 2013-10-17 14:09:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-menus.new/gnome-menus.changes 2014-09-30 19:36:20.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 6 19:18:36 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 3.13.3: + + Fix some crashes. + + Fix some refcounting bugs. + + Fix some leaks. + + Add some small effiencies to our notify handler. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-menus-3.10.1.tar.xz New: ---- gnome-menus-3.13.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus.spec ++++++ --- /var/tmp/diff_new_pack.z9aNLf/_old 2014-09-30 19:36:21.000000000 +0200 +++ /var/tmp/diff_new_pack.z9aNLf/_new 2014-09-30 19:36:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-menus # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,13 +17,13 @@ Name: gnome-menus -Version: 3.10.1 +Version: 3.13.3 Release: 0 Summary: The GNOME Desktop Menu License: LGPL-2.1+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-menus/3.10/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-menus/3.13/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gobject-introspection-devel ++++++ gnome-menus-3.10.1.tar.xz -> gnome-menus-3.13.3.tar.xz ++++++ ++++ 9700 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grilo for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package grilo for openSUSE:Factory checked in at 2014-09-30 19:36:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo (Old) and /work/SRC/openSUSE:Factory/.grilo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grilo" Changes: -------- --- /work/SRC/openSUSE:Factory/grilo/grilo.changes 2014-05-05 21:17:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grilo.new/grilo.changes 2014-09-30 19:36:19.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Aug 24 16:59:31 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 0.2.11: + + Fixes in build system. + + Generate AUTHORS file automatically- + + Added new keys: GRL_METADATA_KEY_TITLE_FROM_FILENAME, + GRL_METADATA_KEY_MB_ALBUM_ID. + + Added new tool: grl-launch, to run Grilo operations from + command line. + + Bugs fixed: bgo#706877, bgo#726698, bgo#727223, bgo#728812, + bgo#730003, bgo#730548, bgo#731282, bgo#733232, bgo#733285. + + Updated translations. + +------------------------------------------------------------------- Old: ---- grilo-0.2.10.tar.xz New: ---- grilo-0.2.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.DPLdUD/_old 2014-09-30 19:36:20.000000000 +0200 +++ /var/tmp/diff_new_pack.DPLdUD/_new 2014-09-30 19:36:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: grilo -Version: 0.2.10 +Version: 0.2.11 Release: 0 Summary: Framework for browsing and searching media content License: LGPL-2.1+ @@ -204,7 +204,7 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/grl-inspect-0.2 -%{_bindir}/grilo-simple-playlist +%{_bindir}/grl-launch-0.2 %{_bindir}/grilo-test-ui-0.2 %{_mandir}/man1/grl-inspect.1%{?ext_man} ++++++ grilo-0.2.10.tar.xz -> grilo-0.2.11.tar.xz ++++++ ++++ 10391 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pithos for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '14

30 Sep '14

Hello community, here is the log from the commit of package pithos for openSUSE:Factory checked in at 2014-09-30 19:36:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pithos (Old) and /work/SRC/openSUSE:Factory/.pithos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pithos" Changes: -------- --- /work/SRC/openSUSE:Factory/pithos/pithos.changes 2012-05-25 16:18:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pithos.new/pithos.changes 2014-09-30 19:36:15.000000000 +0200 @@ -1,0 +2,31 @@ +Tue Aug 5 00:45:56 UTC 2014 - malcolmlewis(a)opensuse.org + +- Update to version 1.0.0: + + Move to Python 3, Gtk3 and GStreamer 1.0. + + Fix issue causing large amounts of buffering. + + Add indication when songs are replaced by ads. + + Add bitrate to song description. + + Add new icon. + + Add playback controls to notifications. + + Add support for Proxy Auto-Config +- Changes from version 0.3.18: + + Fix high quality setting. + + Fix screensaver_pause plugin on DE's other than Gnome. + + Fix fake client. + + Pause playback when space is pressed. + + Implement the rest of MPRIS 2.2. + + No longer bundle pylast. + + Have gstreamer respect proxy. + + Move to setuptools. +- Update Url. +- Update python-devel, python-desturils-extra and python-setuptools + with their respective python3-* BuildRequires: follow the port to + python3. +- Replace gstreamer-0_10-* BuildRequires with the GStreamer 1.0 + related gstreamer-* counterparts. +- Drop obsolete openSUSE version checks from spec. +- Add gobject-introspection BuildRequires for automatic typelib()- + Requires. +- Drop python-gtk and python-notify Requires: no longer required. + +------------------------------------------------------------------- Old: ---- pithos_0.3.17.tgz New: ---- 1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pithos.spec ++++++ --- /var/tmp/diff_new_pack.FyafGQ/_old 2014-09-30 19:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.FyafGQ/_new 2014-09-30 19:36:16.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package pithos # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2012 Malcolm J Lewis <malcolmlewis(a)opensuse.org> +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012-2014 Malcolm J Lewis <malcolmlewis(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,40 +18,31 @@ Name: pithos -Version: 0.3.17 +Version: 1.0.0 Release: 0 Summary: Native Pandora Radio client for Linux License: GPL-3.0 Group: Productivity/Multimedia/Other -Url: http://kevinmehall.net/p/pithos/ -Source0: http://kevinmehall.net/p/pithos/release/%{name}_%{version}.tgz +Url: http://pithos.github.io/ +Source0: https://github.com/pithos/pithos/archive/1.0.0.tar.gz BuildRequires: fdupes +# Needed for automatic typelib() Requires. +BuildRequires: gobject-introspection BuildRequires: hicolor-icon-theme BuildRequires: intltool -BuildRequires: python-devel -BuildRequires: python-distutils-extra >= 2.10 -BuildRequires: python-setuptools +BuildRequires: python3-devel +BuildRequires: python3-distutils-extra +BuildRequires: python3-setuptools BuildRequires: update-desktop-files Requires: dbus-1-python -Requires: gstreamer-0_10-plugins-bad -Requires: gstreamer-0_10-plugins-good -Requires: python-gstreamer-0_10 -%if 0%{?suse_version} > 1130 -Requires: python-gobject2 -%else -Requires: python-gobject -%endif -Requires: python-gtk -Requires: python-notify -Requires: python-xdg +Requires: gstreamer-plugins-bad +Requires: gstreamer-plugins-good +Requires: python3-gobject +Requires: python3-pylast +Requires: python3-setuptools +Requires: python3-xdg BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 BuildArch: noarch -%endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Pithos is a native Pandora Radio client for Linux. It's much more @@ -59,18 +50,18 @@ features such as media keys, notifications, and the sound menu. %prep -%setup -q -n %{name}_%{version} +%setup -q -n pithos-%{version} %build +python3 setup.py build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -# We package this as %%doc -rm %{buildroot}%{_datadir}/doc/%{name}/README.md -%suse_update_desktop_file %{name} -%fdupes %{buildroot} +python3 setup.py install -O1 --skip-build --prefix=%{_prefix} --root=%{buildroot} +#Remove unnecessary icons +rm -rf %{buildroot}%{_datadir}/icons/ubuntu-mono* +%suse_update_desktop_file pithos +%fdupes -s %{buildroot} -%if 0%{?suse_version} > 1130 %post %desktop_database_post %icon_theme_cache_post @@ -78,16 +69,14 @@ %postun %desktop_database_postun %icon_theme_cache_postun -%endif %files %defattr(-,root,root) -%doc CHANGELOG README.md -%{_bindir}/%{name} -%{python_sitelib}/%{name} -%{python_sitelib}/%{name}-0.3-py%{py_ver}.egg-info -%{_datadir}/%{name}/ -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg +%doc license README.md +%{_bindir}/pithos +%{python3_sitelib}/pithos +%{python3_sitelib}/pithos-%{version}-py%{py3_ver}.egg-info +%{_datadir}/applications/pithos.desktop +%{_datadir}/icons/hicolor/*/apps/pithos* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit unrar for openSUSE:Factory:NonFree
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2014-09-29 12:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old) and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "unrar" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2014-08-25 11:11:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2014-09-29 12:57:41.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 27 05:59:26 UTC 2014 - jengelh(a)inai.de + +- Remove libunrar.so.5 symlink, which does not match the SONAME of + any library and would conflict with another libunrar version. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.36GBUT/_old 2014-09-29 12:57:41.000000000 +0200 +++ /var/tmp/diff_new_pack.36GBUT/_new 2014-09-29 12:57:42.000000000 +0200 @@ -40,7 +40,6 @@ archives created with the RAR archiver. %package -n libunrar%{libsuffix} - Summary: Decompress library for RAR archives Group: System/Libraries @@ -78,8 +77,7 @@ %{buildroot}%{_libdir}/libunrar.so.%{version} install -Dm 0644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp ln -s libunrar.so.%{version} \ - %{buildroot}%{_libdir}/libunrar.so.%{majorversion} -ln -s libunrar.so.%{majorversion} %{buildroot}%{_libdir}/libunrar.so + %{buildroot}%{_libdir}/libunrar.so %post -n libunrar%{libsuffix} -p /sbin/ldconfig @@ -94,7 +92,7 @@ %files -n libunrar%{libsuffix} %defattr(-,root,root) %doc license.txt -%{_libdir}/*.so.%{majorversion}* +%{_libdir}/*.so.%version %files -n libunrar-devel %defattr(-,root,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 bash for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at 2014-09-29 12:40:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash (Old) and /work/SRC/openSUSE:Factory/.bash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bash" Changes: -------- --- /work/SRC/openSUSE:Factory/bash/bash.changes 2014-09-28 19:53:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bash.new/bash.changes 2014-09-29 12:40:46.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Sep 26 11:07:24 UTC 2014 - werner(a)suse.de + +- Add patches + bash-4.2-BSC898604.patch for bsc#898604: functions via environment + hardening + bash-4.2-CVE-2014-7169.patch for bsc#898346, CVE-2014-7169: + incremental parsing fix for function environment issue + bash-4.2-CVE-2014-7187.patch for bsc#898603, CVE-2014-7186, + CVE-2014-7187: bad handling of HERE documents and for loop issue + +------------------------------------------------------------------- New: ---- bash-4.2-BSC898604.patch bash-4.2-CVE-2014-7169.patch bash-4.2-CVE-2014-7187.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.2HePQg/_old 2014-09-29 12:40:48.000000000 +0200 +++ /var/tmp/diff_new_pack.2HePQg/_new 2014-09-29 12:40:48.000000000 +0200 @@ -101,6 +101,9 @@ Patch47: config-guess-sub-update.patch # PATCH-FIX-UPSTREAM bnc#895475 -- bnc#896776, CVE-2014-6271: unexpected code execution with environment variables Patch48: bash-4.2-CVE-2014-6271.patch +Patch49: bash-4.2-BSC898604.patch +Patch50: bash-4.2-CVE-2014-7169.patch +Patch51: bash-4.2-CVE-2014-7187.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _incdir %{_includedir} @@ -323,6 +326,9 @@ %patch46 -p0 -b .notimestamp %patch47 %patch48 -p2 +%patch49 -p0 +%patch50 -p0 +%patch51 -p0 %patch0 -p0 -b .0 pushd ../readline-%{rl_vers}%{extend} for patch in ../readline-%{rl_vers}-patches/*; do ++++++ bash-4.2-BSC898604.patch ++++++ --- ../bash-4.2-orig/variables.c 2014-09-25 13:07:59.313209541 +0200 +++ variables.c 2014-09-25 13:15:29.869420719 +0200 @@ -268,7 +268,7 @@ static void propagate_temp_var __P((PTR_T)); static void dispose_temporary_env __P((sh_free_func_t *)); -static inline char *mk_env_string __P((const char *, const char *)); +static inline char *mk_env_string __P((const char *, const char *, int)); static char **make_env_array_from_var_list __P((SHELL_VAR **)); static char **make_var_export_array __P((VAR_CONTEXT *)); static char **make_func_export_array __P((void)); @@ -301,6 +301,14 @@ #endif } +/* Prefix and suffix for environment variable names which contain + shell functions. */ +#define FUNCDEF_PREFIX "BASH_FUNC_" +#define FUNCDEF_PREFIX_LEN (strlen (FUNCDEF_PREFIX)) +#define FUNCDEF_SUFFIX "()" +#define FUNCDEF_SUFFIX_LEN (strlen (FUNCDEF_SUFFIX)) + + /* Initialize the shell variables from the current environment. If PRIVMODE is nonzero, don't import functions from ENV or parse $SHELLOPTS. */ @@ -338,27 +346,39 @@ /* If exported function, define it now. Don't import functions from the environment in privileged mode. */ - if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4)) - { - string_length = strlen (string); - temp_string = (char *)xmalloc (3 + string_length + char_index); + if (privmode == 0 && read_but_dont_execute == 0 + && STREQN (FUNCDEF_PREFIX, name, FUNCDEF_PREFIX_LEN) + && STREQ (name + char_index - FUNCDEF_SUFFIX_LEN, FUNCDEF_SUFFIX) + && STREQN ("() {", string, 4)) + { + size_t name_length + = char_index - (FUNCDEF_PREFIX_LEN + FUNCDEF_SUFFIX_LEN); + char *temp_name = name + FUNCDEF_PREFIX_LEN; + /* Temporarily remove the suffix. */ + temp_name[name_length] = '\0'; - strcpy (temp_string, name); - temp_string[char_index] = ' '; - strcpy (temp_string + char_index + 1, string); + string_length = strlen (string); + temp_string = (char *)xmalloc (name_length + 1 + string_length + 1); + memcpy (temp_string, temp_name, name_length); + temp_string[name_length] = ' '; + memcpy (temp_string + name_length + 1, string, string_length + 1); /* Don't import function names that are invalid identifiers from the environment. */ - if (legal_identifier (name)) - parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + if (legal_identifier (temp_name)) + parse_and_execute (temp_string, temp_name, + SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); - if (temp_var = find_function (name)) + if (temp_var = find_function (temp_name)) { VSETATTR (temp_var, (att_exported|att_imported)); array_needs_making = 1; } else report_error (_("error importing function definition for `%s'"), name); + + /* Restore the original suffix. */ + temp_name[name_length] = FUNCDEF_SUFFIX[0]; } #if defined (ARRAY_VARS) # if 0 @@ -2537,7 +2557,7 @@ var->context = variable_context; /* XXX */ INVALIDATE_EXPORTSTR (var); - var->exportstr = mk_env_string (name, value); + var->exportstr = mk_env_string (name, value, 0); array_needs_making = 1; @@ -3388,22 +3408,43 @@ /* */ /* **************************************************************** */ +/* Returns the string NAME=VALUE if !FUNCTIONP or if VALUE == NULL (in + which case it is treated as empty). Otherwise, decorate NAME with + FUNCDEF_PREFIX and FUNCDEF_SUFFIX, and return a string of the form + FUNCDEF_PREFIX NAME FUNCDEF_SUFFIX = VALUE (without spaces). */ static inline char * -mk_env_string (name, value) +mk_env_string (name, value, functionp) const char *name, *value; + int functionp; { - int name_len, value_len; - char *p; + size_t name_len, value_len; + char *p, *q; name_len = strlen (name); value_len = STRLEN (value); - p = (char *)xmalloc (2 + name_len + value_len); - strcpy (p, name); - p[name_len] = '='; + if (functionp && value != NULL) + { + p = (char *)xmalloc (FUNCDEF_PREFIX_LEN + name_len + FUNCDEF_SUFFIX_LEN + + 1 + value_len + 1); + q = p; + memcpy (q, FUNCDEF_PREFIX, FUNCDEF_PREFIX_LEN); + q += FUNCDEF_PREFIX_LEN; + memcpy (q, name, name_len); + q += name_len; + memcpy (q, FUNCDEF_SUFFIX, FUNCDEF_SUFFIX_LEN); + q += FUNCDEF_SUFFIX_LEN; + } + else + { + p = (char *)xmalloc (name_len + 1 + value_len + 1); + memcpy (p, name, name_len); + q = p + name_len; + } + q[0] = '='; if (value && *value) - strcpy (p + name_len + 1, value); + memcpy (q + 1, value, value_len + 1); else - p[name_len + 1] = '\0'; + q[1] = '\0'; return (p); } @@ -3489,7 +3530,7 @@ /* Gee, I'd like to get away with not using savestring() if we're using the cached exportstr... */ list[list_index] = USE_EXPORTSTR ? savestring (value) - : mk_env_string (var->name, value); + : mk_env_string (var->name, value, function_p (var)); if (USE_EXPORTSTR == 0) SAVE_EXPORTSTR (var, list[list_index]); ++++++ bash-4.2-CVE-2014-6271.patch ++++++ --- /var/tmp/diff_new_pack.2HePQg/_old 2014-09-29 12:40:48.000000000 +0200 +++ /var/tmp/diff_new_pack.2HePQg/_new 2014-09-29 12:40:48.000000000 +0200 @@ -1,67 +1,72 @@ -diff -ur a/bash/builtins/common.h b/bash/builtins/common.h ---- a/bash/builtins/common.h 2010-05-31 00:31:51.000000000 +0200 -+++ b/bash/builtins/common.h 2014-09-16 21:36:20.139826595 +0200 -@@ -33,6 +33,8 @@ - #define SEVAL_RESETLINE 0x010 - #define SEVAL_PARSEONLY 0x020 - #define SEVAL_NOLONGJMP 0x040 -+#define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ -+#define SEVAL_ONECMD 0x100 /* only allow a single command */ - - /* Flags for describe_command, shared between type.def and command.def */ - #define CDESC_ALL 0x001 /* type -a */ -diff -ur a/bash/builtins/evalstring.c b/bash/builtins/evalstring.c ---- a/bash/builtins/evalstring.c 2010-11-23 14:22:15.000000000 +0100 -+++ b/bash/builtins/evalstring.c 2014-09-16 21:36:20.139826595 +0200 -@@ -261,6 +261,14 @@ - { - struct fd_bitmap *bitmap; - -+ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) -+ { -+ internal_warning ("%s: ignoring function definition attempt", from_file); -+ should_jump_to_top_level = 0; -+ last_result = last_command_exit_value = EX_BADUSAGE; -+ break; -+ } -+ - bitmap = new_fd_bitmap (FD_BITMAP_SIZE); - begin_unwind_frame ("pe_dispose"); - add_unwind_protect (dispose_fd_bitmap, bitmap); -@@ -321,6 +329,9 @@ - dispose_command (command); - dispose_fd_bitmap (bitmap); - discard_unwind_frame ("pe_dispose"); -+ -+ if (flags & SEVAL_ONECMD) -+ break; - } - } - else -diff -ur a/bash/variables.c b/bash/variables.c ---- a/bash/variables.c 2014-09-16 21:35:34.878850652 +0200 -+++ b/bash/variables.c 2014-09-16 21:37:16.221034763 +0200 -@@ -347,7 +347,11 @@ - temp_string[char_index] = ' '; - strcpy (temp_string + char_index + 1, string); - -- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); -+ /* Don't import function names that are invalid identifiers from the -+ environment, though we still allow them to be defined as shell -+ variables. */ -+ if (legal_identifier (name)) -+ parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); - - /* Ancient backwards compatibility. Old versions of bash exported - functions like name()=() {...} */ -@@ -361,10 +365,6 @@ - } - else - report_error (_("error importing function definition for `%s'"), name); -- -- /* ( */ -- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') -- name[char_index - 2] = '('; /* ) */ - } - #if defined (ARRAY_VARS) - # if 0 +*** ../bash-4.2.47/builtins/common.h 2010-05-30 18:31:51.000000000 -0400 +--- builtins/common.h 2014-09-16 19:35:45.000000000 -0400 +*************** +*** 36,39 **** +--- 36,41 ---- + + /* Flags for describe_command, shared between type.def and command.def */ ++ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ ++ #define SEVAL_ONECMD 0x100 /* only allow a single command */ + #define CDESC_ALL 0x001 /* type -a */ + #define CDESC_SHORTDESC 0x002 /* command -V */ +*** ../bash-4.2.47/builtins/evalstring.c 2010-11-23 08:22:15.000000000 -0500 +--- builtins/evalstring.c 2014-09-16 19:35:45.000000000 -0400 +*************** +*** 262,265 **** +--- 262,273 ---- + struct fd_bitmap *bitmap; + ++ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) ++ { ++ internal_warning ("%s: ignoring function definition attempt", from_file); ++ should_jump_to_top_level = 0; ++ last_result = last_command_exit_value = EX_BADUSAGE; ++ break; ++ } ++ + bitmap = new_fd_bitmap (FD_BITMAP_SIZE); + begin_unwind_frame ("pe_dispose"); +*************** +*** 322,325 **** +--- 330,336 ---- + dispose_fd_bitmap (bitmap); + discard_unwind_frame ("pe_dispose"); ++ ++ if (flags & SEVAL_ONECMD) ++ break; + } + } +*** ../bash-4.2.47/variables.c 2011-03-01 16:15:20.000000000 -0500 +--- variables.c 2014-09-16 19:35:45.000000000 -0400 +*************** +*** 348,357 **** + strcpy (temp_string + char_index + 1, string); + +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); +! +! /* Ancient backwards compatibility. Old versions of bash exported +! functions like name()=() {...} */ +! if (name[char_index - 1] == ')' && name[char_index - 2] == '(') +! name[char_index - 2] = '\0'; + + if (temp_var = find_function (name)) +--- 348,355 ---- + strcpy (temp_string + char_index + 1, string); + +! /* Don't import function names that are invalid identifiers from the +! environment. */ +! if (legal_identifier (name)) +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + + if (temp_var = find_function (name)) +*************** +*** 362,369 **** + else + report_error (_("error importing function definition for `%s'"), name); +- +- /* ( */ +- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') +- name[char_index - 2] = '('; /* ) */ + } + #if defined (ARRAY_VARS) +--- 360,363 ---- ++++++ bash-4.2-CVE-2014-7169.patch ++++++ *** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400 --- parse.y 2014-09-24 22:47:28.000000000 -0400 *************** *** 2959,2962 **** --- 2959,2964 ---- word_desc_to_read = (WORD_DESC *)NULL; + eol_ungetc_lookahead = 0; + current_token = '\n'; /* XXX */ last_read_token = '\n'; ++++++ bash-4.2-CVE-2014-7187.patch ++++++ --- ../bash-4.2-orig/parse.y 2014-09-25 13:07:59.218209276 +0200 +++ parse.y 2014-09-25 15:26:52.813159810 +0200 @@ -264,9 +264,21 @@ /* Variables to manage the task of reading here documents, because we need to defer the reading until after a complete command has been collected. */ -static REDIRECT *redir_stack[10]; +static REDIRECT **redir_stack; int need_here_doc; +/* Pushes REDIR onto redir_stack, resizing it as needed. */ +static void +push_redir_stack (REDIRECT *redir) +{ + /* Guard against oveflow. */ + if (need_here_doc + 1 > INT_MAX / sizeof (*redir_stack)) + abort (); + redir_stack = xrealloc (redir_stack, + (need_here_doc + 1) * sizeof (*redir_stack)); + redir_stack[need_here_doc++] = redir; +} + /* Where shell input comes from. History expansion is performed on each line when the shell is interactive. */ static char *shell_input_line = (char *)NULL; @@ -519,42 +531,42 @@ source.dest = 0; redir.filename = $2; $$ = make_redirection (source, r_reading_until, redir, 0); - redir_stack[need_here_doc++] = $$; + push_redir_stack ($$); } | NUMBER LESS_LESS WORD { source.dest = $1; redir.filename = $3; $$ = make_redirection (source, r_reading_until, redir, 0); - redir_stack[need_here_doc++] = $$; + push_redir_stack ($$); } | REDIR_WORD LESS_LESS WORD { source.filename = $1; redir.filename = $3; $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); - redir_stack[need_here_doc++] = $$; + push_redir_stack ($$); } | LESS_LESS_MINUS WORD { source.dest = 0; redir.filename = $2; $$ = make_redirection (source, r_deblank_reading_until, redir, 0); - redir_stack[need_here_doc++] = $$; + push_redir_stack ($$); } | NUMBER LESS_LESS_MINUS WORD { source.dest = $1; redir.filename = $3; $$ = make_redirection (source, r_deblank_reading_until, redir, 0); - redir_stack[need_here_doc++] = $$; + push_redir_stack ($$); } | REDIR_WORD LESS_LESS_MINUS WORD { source.filename = $1; redir.filename = $3; $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); - redir_stack[need_here_doc++] = $$; + push_redir_stack ($$); } | LESS_LESS_LESS WORD { @@ -4757,7 +4769,7 @@ case CASE: case SELECT: case FOR: - if (word_top < MAX_CASE_NEST) + if (word_top + 1 < MAX_CASE_NEST) word_top++; word_lineno[word_top] = line_number; break; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgaminggear for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package libgaminggear for openSUSE:Factory checked in at 2014-09-29 12:40:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgaminggear (Old) and /work/SRC/openSUSE:Factory/.libgaminggear.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgaminggear" Changes: -------- --- /work/SRC/openSUSE:Factory/libgaminggear/libgaminggear.changes 2014-07-11 20:06:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgaminggear.new/libgaminggear.changes 2014-09-29 12:40:38.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Sep 28 16:15:12 UTC 2014 - sfalken(a)opensuse.org + +- Removed %defines for minor and microversion, as they really aren't needed. + +------------------------------------------------------------------- +Sat Sep 27 17:38:00 UTC 2014 - sfalken(a)opensuse.org + +- Update to version 0.5.0 + * Improved: GaminggearDevice + * Fixed: Canberra notifications are failsafe now +- Added: + * libgaminggear-0.5.0.tar.bz2 + * 0001-fix_libgaminggearwidget_libs.patch + + Patch adds dependecy libraries to libgaminggearwidget/CMakeLists.txt +- Removed: + * libgaminggear-0.4.0.tar.bz2 + +------------------------------------------------------------------- Old: ---- libgaminggear-0.4.0.tar.bz2 New: ---- 0001-fix_libgaminggearwidget_libs.patch libgaminggear-0.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgaminggear.spec ++++++ --- /var/tmp/diff_new_pack.52GoNj/_old 2014-09-29 12:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.52GoNj/_new 2014-09-29 12:40:39.000000000 +0200 @@ -17,16 +17,16 @@ %define majorversion 0 -%define minorversion 4 -%define microversion 0 Name: libgaminggear -Version: %{majorversion}.%{minorversion}.%{microversion} +Version: 0.5.0 Release: 0 Summary: Library for gaming input devices License: GPL-2.0 and CC-BY-3.0 Group: Development/Libraries/C and C++ Url: https://sourceforge.net/projects/libgaminggear/ -Source: http://downloads.sourceforge.net/libgaminggear/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/%{name}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-fix_libgaminggearwidget_libs.patch sfalken(a)opensuse.org -- Adds library dependencies to libgaminggearwidget, so it will build properly (sf#/p/libgaminggear/patches/1/) +Patch0: 0001-fix_libgaminggearwidget_libs.patch BuildRequires: cmake >= 2.6.4 BuildRequires: doxygen BuildRequires: fdupes @@ -55,6 +55,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake ++++++ 0001-fix_libgaminggearwidget_libs.patch ++++++ Index: libgaminggear-0.5.0/libgaminggearwidget/CMakeLists.txt =================================================================== --- libgaminggear-0.5.0.orig/libgaminggearwidget/CMakeLists.txt +++ libgaminggear-0.5.0/libgaminggearwidget/CMakeLists.txt @@ -41,7 +41,13 @@ ADD_DEPENDENCIES(libgaminggearwidget ) TARGET_LINK_LIBRARIES(libgaminggearwidget + libgaminggear + m ${GTK2_LIBRARIES} + ${GLIB2_LIBRARIES} + ${GDK_LIBRARIES} + ${CAIRO_LIBRARIES} + ${PANGO_LIBRARIES} ) SET_TARGET_PROPERTIES(libgaminggearwidget ++++++ libgaminggear-0.4.0.tar.bz2 -> libgaminggear-0.5.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.4.0/CMakeLists.txt new/libgaminggear-0.5.0/CMakeLists.txt --- old/libgaminggear-0.4.0/CMakeLists.txt 2014-07-04 14:37:43.000000000 +0200 +++ new/libgaminggear-0.5.0/CMakeLists.txt 2014-09-08 16:02:23.000000000 +0200 @@ -37,7 +37,7 @@ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") SET(V_MAJOR 0) -SET(V_MINOR 4) +SET(V_MINOR 5) SET(V_MICRO 0) INCLUDE_DIRECTORIES( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.4.0/Changelog new/libgaminggear-0.5.0/Changelog --- old/libgaminggear-0.4.0/Changelog 2014-07-04 14:37:43.000000000 +0200 +++ new/libgaminggear-0.5.0/Changelog 2014-09-08 16:02:23.000000000 +0200 @@ -1,3 +1,8 @@ +0.5.0 2014-09-08 + + * Improved: GaminggearDevice + * Fixed: Canberra notifications are failsafe now + 0.4.0 2014-07-04 * Added GaminggearAudioNotificator and GaminggearScreenNotificator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.4.0/include/gaminggear/gaminggear_device.h new/libgaminggear-0.5.0/include/gaminggear/gaminggear_device.h --- old/libgaminggear-0.4.0/include/gaminggear/gaminggear_device.h 2014-07-04 14:37:43.000000000 +0200 +++ new/libgaminggear-0.5.0/include/gaminggear/gaminggear_device.h 2014-09-08 16:02:23.000000000 +0200 @@ -51,10 +51,11 @@ * \param identifier The unique identifier of the device. * \param vendor_id The vendor id of the device. * \param product_id The product id of the device. + * \param num_interfaces The number of interfaces of the device. * \retval device The new GaminggearDevice which should be freed with g_object_unref(). * \since 1.0 */ -GaminggearDevice *gaminggear_device_new(gchar const *identifier, guint vendor_id, guint product_id); +GaminggearDevice *gaminggear_device_new(gchar const *identifier, guint vendor_id, guint product_id, guint num_interfaces); /*! \brief Get identifier. * \param gaminggear_dev A GaminggearDevice. @@ -77,6 +78,13 @@ */ guint gaminggear_device_get_vendor_id(GaminggearDevice const *gaminggear_dev); +/*! \brief Get number of interfaces. + * \param gaminggear_dev A GaminggearDevice. + * \retval num_interfaces The number of interfaces of the device given at construction time. + * \since 1.0 + */ +guint gaminggear_device_get_num_interfaces(GaminggearDevice const *gaminggear_dev); + /*! \brief Match device agains vendor/product id * \param gaminggear_dev A GaminggearDevice. * \param vendor_id The vendor id to match against. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.4.0/libgaminggear/gaminggear_audio_notificator_canberra.c new/libgaminggear-0.5.0/libgaminggear/gaminggear_audio_notificator_canberra.c --- old/libgaminggear-0.4.0/libgaminggear/gaminggear_audio_notificator_canberra.c 2014-07-04 14:37:43.000000000 +0200 +++ new/libgaminggear-0.5.0/libgaminggear/gaminggear_audio_notificator_canberra.c 2014-09-08 16:02:23.000000000 +0200 @@ -30,6 +30,9 @@ }; static guint gaminggear_audio_notificator_claim_next_id(GaminggearAudioNotificator *notificator) { + if (notificator == NULL) + return 0; + return notificator->next_id++; } @@ -86,7 +89,7 @@ void gaminggear_audio_notificator_deinit(GaminggearAudioNotificator *notificator) { gint retval; - if (notificator->context == NULL) + if (notificator == NULL) return; retval = ca_context_destroy(notificator->context); @@ -97,6 +100,10 @@ GaminggearAudioNotification *gaminggear_audio_notification_new(GaminggearAudioNotificator *notificator) { GaminggearAudioNotification *notification; + + if (notificator == NULL) + return NULL; + notification = (GaminggearAudioNotification *)g_malloc0(sizeof(GaminggearAudioNotification)); notification->notificator = notificator; notification->id = gaminggear_audio_notificator_claim_next_id(notificator); @@ -109,6 +116,10 @@ gboolean gaminggear_audio_notification_cancel(GaminggearAudioNotification *notification) { gint retval; + + if (notification == NULL) + return FALSE; + retval = ca_context_cancel(notification->notificator->context, notification->id); if (retval != 0 && retval != CA_ERROR_STATE) { g_warning("Error cancelling audio notificator: %s", ca_strerror(retval)); @@ -121,6 +132,9 @@ gint retval; gchar *volume_string; + if (notification == NULL) + return FALSE; + volume_string = g_strdup_printf("%f", volume); gaminggear_audio_notification_cancel(notification); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.4.0/libgaminggear/gaminggear_device.c new/libgaminggear-0.5.0/libgaminggear/gaminggear_device.c --- old/libgaminggear-0.4.0/libgaminggear/gaminggear_device.c 2014-07-04 14:37:43.000000000 +0200 +++ new/libgaminggear-0.5.0/libgaminggear/gaminggear_device.c 2014-09-08 16:02:23.000000000 +0200 @@ -30,6 +30,9 @@ guint vendor_id; guint product_id; GaminggearRecMutex lock; + GHashTable *paths; + GHashTable *fds; + guint num_interfaces; }; enum { @@ -37,74 +40,50 @@ PROP_IDENTIFIER, PROP_PRODUCT_ID, PROP_VENDOR_ID, + PROP_NUM_INTERFACES, }; G_DEFINE_TYPE(GaminggearDevice, gaminggear_device, G_TYPE_OBJECT); -static gchar *create_fd_string(gchar const *key) { - return g_strconcat("fd_", key, NULL); -} - -static void gaminggear_device_set_fd(GaminggearDevice *gaminggear_device, gchar const *key, gint fd) { - gchar *fd_key; - fd_key = create_fd_string(key); - g_object_set_data(G_OBJECT(gaminggear_device), fd_key, GINT_TO_POINTER(fd)); - g_free(fd_key); -} - -static int gaminggear_device_get_fd(GaminggearDevice *gaminggear_device, gchar const *key) { - gchar *fd_key; - int fd; - - fd_key = create_fd_string(key); - fd = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gaminggear_device), fd_key)); - g_free(fd_key); - - return fd; -} - int gaminggear_device_open(GaminggearDevice *gaminggear_device, gchar const *key, gint flags, GError **error) { gchar const *path; + gpointer value; int fd; - /* fd is only valid if path is set */ + // already open? + if (g_hash_table_lookup_extended(gaminggear_device->priv->fds, key, NULL, &value)) + return GPOINTER_TO_INT(value); + path = gaminggear_device_get_path(gaminggear_device, key); if (!path) { - g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "Error opening file: no path"); + g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "GaminggearDevice: error opening file for key %s: no path", key); return -1; } - fd = gaminggear_device_get_fd(gaminggear_device, key); - if (fd >= 0) - return fd; - fd = open(path, flags, 0); if (fd < 0) - g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), "Error opening %s: %s", path, g_strerror(errno)); + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), "GaminggearDevice: error opening %s for key %s: %s", path, key, g_strerror(errno)); + + g_hash_table_insert(gaminggear_device->priv->fds, g_strdup(key), GINT_TO_POINTER(fd)); - gaminggear_device_set_fd(gaminggear_device, key, fd); return fd; } gboolean gaminggear_device_close(GaminggearDevice *gaminggear_device, gchar const *key, GError **error) { - gchar const *path; + gpointer value; int fd; - /* fd is only valid if path is set */ - path = gaminggear_device_get_path(gaminggear_device, key); - if (!path) { - g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "Error closing file: no path"); + if (!g_hash_table_lookup_extended(gaminggear_device->priv->fds, key, NULL, &value)) { + g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "GaminggearDevice: error closing fd for key %s: no entry", key); return FALSE; } - fd = gaminggear_device_get_fd(gaminggear_device, key); - if (fd >= 0) { - if (close(fd) < 0) { - g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), "Error closing %s: %s", path, g_strerror(errno)); - return FALSE; - } - gaminggear_device_set_fd(gaminggear_device, key, -1); + fd = GPOINTER_TO_INT(value); + if (close(fd) < 0) { + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), "GaminggearDevice: error closing fd for key %s: %s", key, g_strerror(errno)); + return FALSE; } + g_hash_table_remove(gaminggear_device->priv->fds, key); return TRUE; } @@ -117,12 +96,11 @@ g_free(old_path); } - g_object_set_data(G_OBJECT(gaminggear_device), key, g_strdup(path)); - gaminggear_device_set_fd(gaminggear_device, key, -1); + g_hash_table_insert(gaminggear_device->priv->paths, g_strdup(key), g_strdup(path)); } gchar const *gaminggear_device_get_path(GaminggearDevice *gaminggear_device, gchar const *key) { - return (gchar const *)g_object_get_data(G_OBJECT(gaminggear_device), key); + return (gchar const *)g_hash_table_lookup(gaminggear_device->priv->paths, key); } void gaminggear_device_lock(GaminggearDevice *gaminggear_dev) { @@ -145,24 +123,42 @@ return gaminggear_dev->priv->vendor_id; } +guint gaminggear_device_get_num_interfaces(GaminggearDevice const *gaminggear_dev) { + return gaminggear_dev->priv->num_interfaces; +} + gboolean gaminggear_device_matches(GaminggearDevice const *gaminggear_dev, guint vendor_id, guint product_id) { GaminggearDevicePrivate *priv = gaminggear_dev->priv; return (priv->vendor_id == vendor_id && priv->product_id == product_id); } -GaminggearDevice *gaminggear_device_new(gchar const *identifier, guint vendor_id, guint product_id) { +GaminggearDevice *gaminggear_device_new(gchar const *identifier, guint vendor_id, guint product_id, guint num_interfaces) { return GAMINGGEAR_DEVICE(g_object_new(GAMINGGEAR_DEVICE_TYPE, "identifier", identifier, "vendor-id", vendor_id, "product-id", product_id, + "num-interfaces", num_interfaces, NULL)); } +static void destroy_str(gpointer data) { + g_free(data); +} + +static void destroy_fd(gpointer data) { + int fd = GPOINTER_TO_INT(data); + if (close(fd) < 0) + g_warning("GaminggearDevice: error closing fd %i: %s", fd, g_strerror(errno)); +} + static void gaminggear_device_init(GaminggearDevice *gaminggear_dev) { GaminggearDevicePrivate *priv = GAMINGGEAR_DEVICE_GET_PRIVATE(gaminggear_dev); gaminggear_dev->priv = priv; gaminggear_rec_mutex_init(&priv->lock); + + priv->paths = g_hash_table_new_full(g_str_hash, g_str_equal, destroy_str, destroy_str); + priv->fds = g_hash_table_new_full(g_str_hash, g_str_equal, destroy_str, destroy_fd); } static void set_property(GObject *object, guint prop_id, GValue const *value, GParamSpec *pspec) { @@ -178,6 +174,9 @@ case PROP_VENDOR_ID: priv->vendor_id = g_value_get_uint(value); break; + case PROP_NUM_INTERFACES: + priv->num_interfaces = g_value_get_uint(value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -188,6 +187,8 @@ GaminggearDevicePrivate *priv = GAMINGGEAR_DEVICE(object)->priv; g_free(priv->identifier); + g_hash_table_unref(priv->paths); + g_hash_table_unref(priv->fds); gaminggear_rec_mutex_clear(&priv->lock); G_OBJECT_CLASS(gaminggear_device_parent_class)->finalize(object); @@ -223,6 +224,13 @@ "Vendor ID", 0, G_MAXUINT, 0, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property(gobject_class, PROP_NUM_INTERFACES, + g_param_spec_uint("num-interfaces", + "num-interfaces", + "Number of interfaces", + 0, G_MAXUINT, 0, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); } gboolean gaminggear_device_equal(GaminggearDevice const *one, GaminggearDevice const *other) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.4.0/libgaminggear.spec new/libgaminggear-0.5.0/libgaminggear.spec --- old/libgaminggear-0.4.0/libgaminggear.spec 2014-07-04 14:37:43.000000000 +0200 +++ new/libgaminggear-0.5.0/libgaminggear.spec 2014-09-08 16:02:23.000000000 +0200 @@ -1,5 +1,5 @@ %define vmajor 0 -%define vminor 4 +%define vminor 5 %define vmicro 0 Name: libgaminggear @@ -80,5 +80,5 @@ /usr/share/cmake/Modules/FindGAMINGGEAR%{vmajor}.cmake %changelog -* Fri Jul 04 2014 Stefan Achatz <erazor_de(a)users.sourceforge.net> 0.4.0-1 +* Mon Sep 08 2014 Stefan Achatz <erazor_de(a)users.sourceforge.net> 0.5.0-1 - Initial version -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ibus-table-others for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package ibus-table-others for openSUSE:Factory checked in at 2014-09-29 12:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-table-others (Old) and /work/SRC/openSUSE:Factory/.ibus-table-others.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-table-others" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-table-others/ibus-table-others.changes 2014-07-28 06:31:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-table-others.new/ibus-table-others.changes 2014-09-29 12:40:35.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Sep 28 23:03:07 PRC 2014 - hillwood(a)linuxfans.org + +- Update to 1.3.4 + * Make status prompts and symbols more consistent + * Change MAX_KEY_LENGTH from 2 to 1 for the rusle, rustrad, thai, and yawerty tables. + * Delete the RULES from the emoji-table + * Make default options of rusle.txt the same as in rustrad.txt + * Add Russian Legacy layout + * Add “\circ ∘ U+2218 RING OPERATOR” back to the latex table + +------------------------------------------------------------------- Old: ---- ibus-table-others-1.3.1.tar.gz New: ---- ibus-table-others-1.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-table-others.spec ++++++ --- /var/tmp/diff_new_pack.7XI8rZ/_old 2014-09-29 12:40:36.000000000 +0200 +++ /var/tmp/diff_new_pack.7XI8rZ/_new 2014-09-29 12:40:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: ibus-table-others -Version: 1.3.1 +Version: 1.3.4 Release: 0 Summary: Other non-Chinese tables for ibus License: GPL-3.0 @@ -159,6 +159,14 @@ %description -n ibus-table-mathwriter The package contains table for writing Unicode mathematics symbols. +%package -n ibus-table-rusle +Summary: Rusle table for ibus-table +Group: System/Localization +Requires: ibus-table + +%description -n ibus-table-rusle +ibus-table-rusle provides the Rusle table for ibus-table. + %prep %setup @@ -252,4 +260,9 @@ %{_datadir}/ibus-table/icons/mathwriter.png %{_datadir}/ibus-table/tables/mathwriter-ibus.db +%files -n ibus-table-rusle +%defattr(-,root,root) +%{_datadir}/ibus-table/icons/rusle.png +%{_datadir}/ibus-table/tables/rusle.db + %changelog ++++++ ibus-table-others-1.3.1.tar.gz -> ibus-table-others-1.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/ChangeLog new/ibus-table-others-1.3.4/ChangeLog --- old/ibus-table-others-1.3.1/ChangeLog 2014-07-23 09:37:06.000000000 +0200 +++ new/ibus-table-others-1.3.4/ChangeLog 2014-09-15 17:00:13.000000000 +0200 @@ -1,4 +1,85 @@ -commit 94fb28fe8a5ecc0bab4f5b889f3bb9c5ce9b5818 +commit 999f2b3b4bd8d5fa78023f60eab088a1836e5e50 +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Mon Sep 15 17:00:02 2014 +0200 + + Release 1.3.4 + +commit cf2f2268ddbbf0b9a07b8a8002e93d7dc98a9f1a +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Sat Sep 13 11:31:15 2014 +0200 + + Make status prompts and symbols more consistent + + - Use status prompt “^_^” for emoji-table instead of “CN” + The icon ibus-emoji.svg also looks similar. + - Use status prompt “Ć” instead of “C” for compose.txt + Looks nicer, compose is about typing accents. + It also looks more like the icon that way. + - Make sure that all tables have both status prompts and symbols + (They can be the same always). + +commit cb7d05e0eed928ffaa3a337b929210aa9db78623 +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Mon Sep 1 16:14:15 2014 +0200 + + Release 1.3.3 + +commit e9c55f90486655deb63d6ba92bfaa768bfe90c82 +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Mon Sep 1 15:52:41 2014 +0200 + + Change MAX_KEY_LENGTH from 2 to 1 for the rusle, rustrad, thai, and yawerty tables. + + The comments why MAX_KEY_LENGTH was set to 2 said: + + “changed to 2 to fake col prob in sqlite db” + + “It is supposed to be 1 but need to be 2 to avoid schema mismatch + bug in optimize_database() in ibus-table.” + + So this was probably a workaround for some bug in ibus-table, + probably it had something to do with the old database format + where each input key was stored in a different column. + + With the current ibus-table dataformat, there is no problem + in using the correct value MAX_KEY_LENGTH=1. + +commit 560f0abb27332bad88ddf00c7b925bb1dd36346d +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Mon Sep 1 15:51:25 2014 +0200 + + Delete the RULES from the emoji-table + + The RULES make no sense for the emoji-table. And USER_CAN_DEFINE_PHRASE is + set to FALSE for the emoji-table anyway. + +commit 36f8c5a80f48696d3b3ef76e5543f2f2a03664a2 +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Fri Jul 25 17:13:49 2014 +0200 + + Release 1.3.2 + +commit 9d402621b0ac908ba939f60c0d40cf73188cf54d +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Fri Jul 25 17:12:24 2014 +0200 + + Make default options of rusle.txt the same as in rustrad.txt + +commit 1d62a3c2d64a1926c32e2f14e3f47b3414d26284 +Author: Stas Sergeev <stsp(a)users.sourceforge.net> +Date: Fri Jul 25 17:00:51 2014 +0200 + + Add Russian Legacy layout + +commit 183e42e7d99fdf777a275e8d5333b24be0a9e566 +Author: Mike FABIAN <mfabian(a)redhat.com> +Date: Wed Jul 23 15:01:10 2014 +0200 + + Add “\circ ∘ U+2218 RING OPERATOR” back to the latex table + + Giuseppe Castagna says he deleted it by mistake. + +commit 8498f47823c27cea1b4f6cc92ce3520c47dc2a02 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Wed Jul 23 09:33:45 2014 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/configure new/ibus-table-others-1.3.4/configure --- old/ibus-table-others-1.3.1/configure 2014-07-23 09:38:08.000000000 +0200 +++ new/ibus-table-others-1.3.4/configure 2014-09-15 17:00:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ibus-table-others 1.3.1. +# Generated by GNU Autoconf 2.69 for ibus-table-others 1.3.4. # # Report bugs to <http://code.google.com/p/ibus/issues/entry>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='ibus-table-others' PACKAGE_TARNAME='ibus-table-others' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='ibus-table-others 1.3.1' +PACKAGE_VERSION='1.3.4' +PACKAGE_STRING='ibus-table-others 1.3.4' PACKAGE_BUGREPORT='http://code.google.com/p/ibus/issues/entry' PACKAGE_URL='' @@ -600,6 +600,8 @@ IBUS_TABLE_BUILD_THAI_TRUE IBUS_TABLE_BUILD_YAWERTY_FALSE IBUS_TABLE_BUILD_YAWERTY_TRUE +IBUS_TABLE_BUILD_RUSLE_FALSE +IBUS_TABLE_BUILD_RUSLE_TRUE IBUS_TABLE_BUILD_RUSTRAD_FALSE IBUS_TABLE_BUILD_RUSTRAD_TRUE IBUS_TABLE_BUILD_TRANSLITUA_FALSE @@ -703,6 +705,7 @@ enable_translit enable_translitua enable_rustrad +enable_rusle enable_yawerty enable_thai enable_viqr @@ -1261,7 +1264,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 ibus-table-others 1.3.1 to adapt to many kinds of systems. +\`configure' configures ibus-table-others 1.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1328,7 +1331,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibus-table-others 1.3.1:";; + short | recursive ) echo "Configuration of ibus-table-others 1.3.4:";; esac cat <<\_ACEOF @@ -1346,6 +1349,7 @@ --enable-translit Generate Translit Engine --enable-translitua Generate Ukrainian Translit Engine --enable-rustrad Generate Russian Traditional Engine + --enable-rusle Generate Russian Legacy Engine --enable-yawerty Generate Yawerty Engine --enable-thai Generate Thai Engine --enable-viqr Generate Viqr Engine @@ -1434,7 +1438,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibus-table-others configure 1.3.1 +ibus-table-others configure 1.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1451,7 +1455,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibus-table-others $as_me 1.3.1, which was +It was created by ibus-table-others $as_me 1.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2314,7 +2318,7 @@ # Define the identity of the package. PACKAGE='ibus-table-others' - VERSION='1.3.1' + VERSION='1.3.4' cat >>confdefs.h <<_ACEOF @@ -2997,6 +3001,23 @@ fi +# Check whether --enable-rusle was given. +if test "${enable_rusle+set}" = set; then : + enableval=$enable_rusle; +else + enable_rusle=yes +fi + + + if test x"$enable_rusle" != x"no"; then + IBUS_TABLE_BUILD_RUSLE_TRUE= + IBUS_TABLE_BUILD_RUSLE_FALSE='#' +else + IBUS_TABLE_BUILD_RUSLE_TRUE='#' + IBUS_TABLE_BUILD_RUSLE_FALSE= +fi + + # Check whether --enable-yawerty was given. if test "${enable_yawerty+set}" = set; then : enableval=$enable_yawerty; @@ -3298,6 +3319,10 @@ as_fn_error $? "conditional \"IBUS_TABLE_BUILD_RUSTRAD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${IBUS_TABLE_BUILD_RUSLE_TRUE}" && test -z "${IBUS_TABLE_BUILD_RUSLE_FALSE}"; then + as_fn_error $? "conditional \"IBUS_TABLE_BUILD_RUSLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${IBUS_TABLE_BUILD_YAWERTY_TRUE}" && test -z "${IBUS_TABLE_BUILD_YAWERTY_FALSE}"; then as_fn_error $? "conditional \"IBUS_TABLE_BUILD_YAWERTY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -3723,7 +3748,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibus-table-others $as_me 1.3.1, which was +This file was extended by ibus-table-others $as_me 1.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3776,7 +3801,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ibus-table-others config.status 1.3.1 +ibus-table-others config.status 1.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4365,6 +4390,7 @@ Build Translit $enable_translit Build Ukrainian Translit $enable_translitua Build Russian Traditional $enable_rustrad + Build Russian Legacy $enable_rusle Build Yawerty $enable_yawerty Build Thai $enable_thai Build Viqr $enable_viqr @@ -4382,6 +4408,7 @@ Build Translit $enable_translit Build Ukrainian Translit $enable_translitua Build Russian Traditional $enable_rustrad + Build Russian Legacy $enable_rusle Build Yawerty $enable_yawerty Build Thai $enable_thai Build Viqr $enable_viqr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/configure.ac new/ibus-table-others-1.3.4/configure.ac --- old/ibus-table-others-1.3.1/configure.ac 2014-07-23 09:36:30.000000000 +0200 +++ new/ibus-table-others-1.3.4/configure.ac 2014-09-15 16:59:36.000000000 +0200 @@ -23,7 +23,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [3]) -m4_define([ibus_micro_version], [1]) +m4_define([ibus_micro_version], [4]) # commented out as datestamp doesn't suit dist date. m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -85,6 +85,13 @@ AM_CONDITIONAL([IBUS_TABLE_BUILD_RUSTRAD],[test x"$enable_rustrad" != x"no"]) +AC_ARG_ENABLE([rusle], + [AC_HELP_STRING([--enable-rusle], + [Generate Russian Legacy Engine])], , + [enable_rusle=yes]) + +AM_CONDITIONAL([IBUS_TABLE_BUILD_RUSLE],[test x"$enable_rusle" != x"no"]) + AC_ARG_ENABLE([yawerty], [AC_HELP_STRING([--enable-yawerty], [Generate Yawerty Engine])], , @@ -154,6 +161,7 @@ Build Translit $enable_translit Build Ukrainian Translit $enable_translitua Build Russian Traditional $enable_rustrad + Build Russian Legacy $enable_rusle Build Yawerty $enable_yawerty Build Thai $enable_thai Build Viqr $enable_viqr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/ibus-table-others.spec.in new/ibus-table-others-1.3.4/ibus-table-others.spec.in --- old/ibus-table-others-1.3.1/ibus-table-others.spec.in 2014-02-18 11:07:54.000000000 +0100 +++ new/ibus-table-others-1.3.4/ibus-table-others.spec.in 2014-07-28 20:52:17.000000000 +0200 @@ -25,6 +25,7 @@ --disable-static \ --enable-translit \ --enable-translitua \ + --enable-rusle \ --enable-rustrad \ --enable-yawerty --enable-mathwriter @@ -39,6 +40,7 @@ %post ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/translit.db ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/translit-ua.db +ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/rusle.db ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/rustrad.db ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/yawerty.db ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/mathwriter-ibus.db @@ -51,6 +53,7 @@ %doc AUTHORS COPYING README %{_datadir}/ibus-table/icons/translit.svg %{_datadir}/ibus-table/icons/translit-ua.svg +%{_datadir}/ibus-table/icons/rusle.png %{_datadir}/ibus-table/icons/rustrad.png %{_datadir}/ibus-table/icons/yawerty.png %{_datadir}/ibus-table/tables/translit.db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/icons/Makefile.am new/ibus-table-others-1.3.4/icons/Makefile.am --- old/ibus-table-others-1.3.1/icons/Makefile.am 2014-02-18 11:07:54.000000000 +0100 +++ new/ibus-table-others-1.3.4/icons/Makefile.am 2014-07-28 20:52:17.000000000 +0200 @@ -40,6 +40,10 @@ icons_DATA += rustrad.png endif +if IBUS_TABLE_BUILD_RUSLE +icons_DATA += rusle.png +endif + if IBUS_TABLE_BUILD_YAWERTY icons_DATA += yawerty.png endif @@ -78,6 +82,7 @@ translit.svg \ translit-ua.svg \ rustrad.png \ + rusle.png \ yawerty.png \ thai.png \ viqr.png \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/icons/Makefile.in new/ibus-table-others-1.3.4/icons/Makefile.in --- old/ibus-table-others-1.3.1/icons/Makefile.in 2014-07-23 09:38:08.000000000 +0200 +++ new/ibus-table-others-1.3.4/icons/Makefile.in 2014-09-15 17:00:50.000000000 +0200 @@ -101,13 +101,14 @@ @IBUS_TABLE_BUILD_TRANSLIT_TRUE@am__append_3 = translit.svg @IBUS_TABLE_BUILD_TRANSLITUA_TRUE@am__append_4 = translit-ua.svg @IBUS_TABLE_BUILD_RUSTRAD_TRUE@am__append_5 = rustrad.png -@IBUS_TABLE_BUILD_YAWERTY_TRUE@am__append_6 = yawerty.png -@IBUS_TABLE_BUILD_THAI_TRUE@am__append_7 = thai.png -@IBUS_TABLE_BUILD_VIQR_TRUE@am__append_8 = viqr.png -@IBUS_TABLE_BUILD_LATEX_TRUE@am__append_9 = latex.svg -@IBUS_TABLE_BUILD_CNS11643_TRUE@am__append_10 = cns11643.png -@IBUS_TABLE_BUILD_EMOJI_TRUE@am__append_11 = ibus-emoji.svg -@IBUS_TABLE_BUILD_MATHWRITER_TRUE@am__append_12 = mathwriter.png +@IBUS_TABLE_BUILD_RUSLE_TRUE@am__append_6 = rusle.png +@IBUS_TABLE_BUILD_YAWERTY_TRUE@am__append_7 = yawerty.png +@IBUS_TABLE_BUILD_THAI_TRUE@am__append_8 = thai.png +@IBUS_TABLE_BUILD_VIQR_TRUE@am__append_9 = viqr.png +@IBUS_TABLE_BUILD_LATEX_TRUE@am__append_10 = latex.svg +@IBUS_TABLE_BUILD_CNS11643_TRUE@am__append_11 = cns11643.png +@IBUS_TABLE_BUILD_EMOJI_TRUE@am__append_12 = ibus-emoji.svg +@IBUS_TABLE_BUILD_MATHWRITER_TRUE@am__append_13 = mathwriter.png subdir = icons DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -259,7 +260,8 @@ icons_DATA = $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_4) $(am__append_5) $(am__append_6) \ $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) $(NULL) + $(am__append_10) $(am__append_11) $(am__append_12) \ + $(am__append_13) $(NULL) iconsdir = $(datadir)/ibus-table/icons EXTRA_DIST = \ compose.svg \ @@ -267,6 +269,7 @@ translit.svg \ translit-ua.svg \ rustrad.png \ + rusle.png \ yawerty.png \ thai.png \ viqr.png \ Files old/ibus-table-others-1.3.1/icons/rusle.png and new/ibus-table-others-1.3.4/icons/rusle.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/Makefile.am new/ibus-table-others-1.3.4/tables/Makefile.am --- old/ibus-table-others-1.3.1/tables/Makefile.am 2012-09-12 11:05:40.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/Makefile.am 2014-07-28 20:52:17.000000000 +0200 @@ -43,6 +43,10 @@ tables_DATA += rustrad.db endif +if IBUS_TABLE_BUILD_RUSLE +tables_DATA += rusle.db +endif + if IBUS_TABLE_BUILD_YAWERTY tables_DATA += yawerty.db endif @@ -81,6 +85,7 @@ translit.txt \ translit-ua.txt \ rustrad.txt \ + rusle.txt \ yawerty.txt \ thai.txt \ viqr.txt \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/Makefile.in new/ibus-table-others-1.3.4/tables/Makefile.in --- old/ibus-table-others-1.3.1/tables/Makefile.in 2014-07-23 09:38:08.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/Makefile.in 2014-09-15 17:00:50.000000000 +0200 @@ -101,13 +101,14 @@ @IBUS_TABLE_BUILD_TRANSLIT_TRUE@am__append_3 = translit.db @IBUS_TABLE_BUILD_TRANSLITUA_TRUE@am__append_4 = translit-ua.db @IBUS_TABLE_BUILD_RUSTRAD_TRUE@am__append_5 = rustrad.db -@IBUS_TABLE_BUILD_YAWERTY_TRUE@am__append_6 = yawerty.db -@IBUS_TABLE_BUILD_THAI_TRUE@am__append_7 = thai.db -@IBUS_TABLE_BUILD_VIQR_TRUE@am__append_8 = viqr.db -@IBUS_TABLE_BUILD_LATEX_TRUE@am__append_9 = latex.db -@IBUS_TABLE_BUILD_CNS11643_TRUE@am__append_10 = cns11643.db -@IBUS_TABLE_BUILD_EMOJI_TRUE@am__append_11 = emoji-table.db -@IBUS_TABLE_BUILD_MATHWRITER_TRUE@am__append_12 = mathwriter-ibus.db +@IBUS_TABLE_BUILD_RUSLE_TRUE@am__append_6 = rusle.db +@IBUS_TABLE_BUILD_YAWERTY_TRUE@am__append_7 = yawerty.db +@IBUS_TABLE_BUILD_THAI_TRUE@am__append_8 = thai.db +@IBUS_TABLE_BUILD_VIQR_TRUE@am__append_9 = viqr.db +@IBUS_TABLE_BUILD_LATEX_TRUE@am__append_10 = latex.db +@IBUS_TABLE_BUILD_CNS11643_TRUE@am__append_11 = cns11643.db +@IBUS_TABLE_BUILD_EMOJI_TRUE@am__append_12 = emoji-table.db +@IBUS_TABLE_BUILD_MATHWRITER_TRUE@am__append_13 = mathwriter-ibus.db subdir = tables DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -262,7 +263,8 @@ tables_DATA = $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_4) $(am__append_5) $(am__append_6) \ $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) $(NULL) + $(am__append_10) $(am__append_11) $(am__append_12) \ + $(am__append_13) $(NULL) tablesdir = $(datadir)/ibus-table/tables EXTRA_DIST = \ compose.txt \ @@ -270,6 +272,7 @@ translit.txt \ translit-ua.txt \ rustrad.txt \ + rusle.txt \ yawerty.txt \ thai.txt \ viqr.txt \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/cns11643.txt new/ibus-table-others-1.3.4/tables/cns11643.txt --- old/ibus-table-others-1.3.1/tables/cns11643.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/cns11643.txt 2014-09-13 11:56:07.000000000 +0200 @@ -18,6 +18,12 @@ ICON = cns11643.png +### The symbol to be displayed in IM switchers +SYMBOL = 中 + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = 中 + ### The default name of this table NAME = CNS11643 @@ -29,9 +35,6 @@ ### Supported languages of this table LANGUAGES = zh_TW,zh_HK,zh_CN,zh_SG -### Prompt string to be displayed in the status area. -STATUS_PROMPT = 中 - ### Layout ### This table can be used with any layout capable of typing ASCII. ### Therefore, we should not require a special layout like “us”. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/compose.txt new/ibus-table-others-1.3.4/tables/compose.txt --- old/ibus-table-others-1.3.1/tables/compose.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/compose.txt 2014-09-13 11:56:07.000000000 +0200 @@ -30,6 +30,9 @@ ### The symbol to be displayed in IM switchers SYMBOL = Ć +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Ć + ### The default name of this table NAME = Compose @@ -40,9 +43,6 @@ AUTHOR = Yu Yuwei <yu-yuwei(a)xmu.edu.cn> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = C - ### Layout ### This table can be used with any layout capable of typing ASCII. ### Therefore, we should not require a special layout like “us”. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/emoji-table.txt new/ibus-table-others-1.3.4/tables/emoji-table.txt --- old/ibus-table-others-1.3.1/tables/emoji-table.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/emoji-table.txt 2014-09-13 11:56:07.000000000 +0200 @@ -27,6 +27,12 @@ ### the most widely ones are "png" and "svg", letter one is recommended ICON = ibus-emoji.svg +### The symbol to be displayed in IM switchers +SYMBOL = ^_^ + +### Prompt string to be displayed in the status area +STATUS_PROMPT = ^_^ + ### The default name of this table, this is needed NAME = emoji @@ -47,10 +53,6 @@ ### The author of this table AUTHOR = Shellex Y <5h3ll3x(a)gmail.com> -### Prompt string to be displayed in the status area, CN will be replaced by -### the gettext tools in runtime as 中. -STATUS_PROMPT = CN - ### Valid input chars. VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyz @@ -70,11 +72,6 @@ ### Not use full width letter by default DEF_FULL_WIDTH_LETTER = FALSE -### Whether user are allow to define phrase, default is true -### You have to define the word construction rules below. -### For input methods which do not input phrases, set this to False -USER_CAN_DEFINE_PHRASE = FALSE - ### Whether support PinYin Mode, default is true. ### this feature is just for Chinese, set it to False if your IM is not ### Chinese. @@ -98,17 +95,14 @@ ### some punctuations ### NO_CHECK_CHARS = -### Rules for constructing user defined phrase -### "ce" stands for "ci equal", a Chinese English :), means "phrase length -### equal to", thus ce2 -> phrase length equal to 2; and "ca" means "phrase -### length equal or above", so ca4 -> phrase length equal or above 4. -### p21 -> the 1st key of 2nd character in the phrase, and so on. -### Each rule separate via ";". -### Example below is a complete rule-set, -### becuase [2,2] ∩ [3,3] ∩ [4,+∞] = [2,+∞], which is the range of length -### of phrase. This have to be satisfied if you need ibus-table to build up -### your own inputed phrase via your daily using. -RULES = ce2:p11+p12+p21+p22;ce3:p11+p21+p22+p31;ca4:p11+p21+p31+p41 +### Whether user are allow to define phrase, default is true +### You have to define the word construction rules below. +### For input methods which do not input phrases, set this to False +USER_CAN_DEFINE_PHRASE = FALSE + +### Rules for constructing user defined phrase (This is not useful +### for emoji-table, therefore it is set to the empty string.) +RULES = END_DEFINITION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/ipa-x-sampa.txt new/ibus-table-others-1.3.4/tables/ipa-x-sampa.txt --- old/ibus-table-others-1.3.1/tables/ipa-x-sampa.txt 2014-07-07 10:42:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/ipa-x-sampa.txt 2014-09-13 11:56:07.000000000 +0200 @@ -29,6 +29,9 @@ ### The symbol to be displayed in IM switchers SYMBOL = ə +### Prompt string to be displayed in the status area. +STATUS_PROMPT = ə + ### The default name of this table NAME = IPA-X-SAMPA @@ -41,9 +44,6 @@ ### The author of this table AUTHOR = Mike FABIAN <maiku.fabian(a)gmail.com> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = IPA - ### Layout ### This table can be used with any layout capable of typing ASCII. ### Therefore, we should not require a special layout like “us”. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/latex.txt new/ibus-table-others-1.3.4/tables/latex.txt --- old/ibus-table-others-1.3.1/tables/latex.txt 2014-07-23 09:36:30.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/latex.txt 2014-09-13 11:56:07.000000000 +0200 @@ -23,7 +23,10 @@ ICON = latex.svg ### The symbol to be displayed in IM switchers -SYMBOL = ∑ +SYMBOL = Σ + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Σ ### The default name of this table NAME = LaTeX @@ -37,9 +40,6 @@ ### Supported locales of this table LANGUAGES = other -### Prompt string to be displayed in the status area. -STATUS_PROMPT = Σ - ### If true then the phrases' frequencies will be adjusted dynamically. DYNAMIC_ADJUST = TRUE @@ -101,6 +101,7 @@ \ddot ¨ 0 \lnot ¬ 0 \bar ¯ 0 +\circ ∘ 0 \circ ° 0 \pm ± 0 \acute ´ 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/mathwriter-ibus.txt new/ibus-table-others-1.3.4/tables/mathwriter-ibus.txt --- old/ibus-table-others-1.3.1/tables/mathwriter-ibus.txt 2014-06-03 22:21:53.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/mathwriter-ibus.txt 2014-09-13 11:56:07.000000000 +0200 @@ -9,6 +9,7 @@ NAME = mathwriter LANGUAGES = other +SYMBOL = Σ STATUS_PROMPT = Σ icon = mathwriter.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/rusle.txt new/ibus-table-others-1.3.4/tables/rusle.txt --- old/ibus-table-others-1.3.1/tables/rusle.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-table-others-1.3.4/tables/rusle.txt 2014-09-13 11:56:07.000000000 +0200 @@ -0,0 +1,194 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### This file is based on the traditional Russian typewriter layout +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = 83e1cb20-027c-11e3-8ffd-0800200c9a66 + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20130811 + +ICON = rusle.png + +### The symbol to be displayed in IM switchers +SYMBOL = Р + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Р + +### The default name of this table +NAME = RussianLegacy2 + +### The local names of this table +NAME.ru_RU = Русская (устаревшая) + +### Supported languages of this table +LANGUAGES = ru_RU + +### The author of this table +AUTHOR = Stas Sergeev <stsp(a)users.sourceforge.net> + +### The Keyboard Layout used by this table. +### Set to "default" to accept any kind of layout +KEYBOARD_LAYOUT = us + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = TRUE + +### Single wildcard char (leave empty if you don’t want a wildcard character). +SINGLE_WILDCARD_CHAR = + +### Multi wildcard char (leave empty if you don’t want a wildcard character). +MULTI_WILDCARD_CHAR = + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputted string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = @$%^&F<DULT~:PBQRKVYJGHCNEA{WXIO}SM">Zf,dult`;pbqrkvyjghcnea[wxio]sm'.z + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputted string to client. +FORWARD_KEYS = Return + +### The key strokes to select candidiate phrases. +SELECT_KEYS = 1,2,3,4,5,6,7,8,9 + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = Page_Up + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = Page_Down + +### Whether user are allow to define phrase, default is true +### You have to define the word construction rules below. +### For input methods which do not input phrases, set this to False +USER_CAN_DEFINE_PHRASE = FALSE + +### Rules for constructing user defined phrase (This is not useful +### for emoji-table, therefore it is set to the empty string.) +RULES = + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +@ " 0 +$ ; 0 +% : 0 +^ , 0 +& . 0 +F А 0 +< Б 0 +D В 0 +U Г 0 +L Д 0 +T Е 0 +~ Ё 0 +: Ж 0 +P З 0 +B И 0 +Q Й 0 +R К 0 +K Л 0 +V М 0 +Y Н 0 +J О 0 +G П 0 +H Р 0 +C С 0 +N Т 0 +E У 0 +A Ф 0 +{ Х 0 +W Ц 0 +X Ч 0 +I Ш 0 +O Щ 0 +} Ъ 0 +S Ы 0 +M Ь 0 +" Э 0 +> Ю 0 +Z Я 0 +f а 0 +, б 0 +d в 0 +u г 0 +l д 0 +t е 0 +` ё 0 +; ж 0 +p з 0 +b и 0 +q й 0 +r к 0 +k л 0 +v м 0 +y н 0 +j о 0 +g п 0 +h р 0 +c с 0 +n т 0 +e у 0 +a ф 0 +[ х 0 +w ц 0 +x ч 0 +i ш 0 +o щ 0 +] ъ 0 +s ы 0 +m ь 0 +' э 0 +. ю 0 +z я 0 +END_TABLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/rustrad.txt new/ibus-table-others-1.3.4/tables/rustrad.txt --- old/ibus-table-others-1.3.1/tables/rustrad.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/rustrad.txt 2014-09-13 11:56:07.000000000 +0200 @@ -18,6 +18,12 @@ ICON = rustrad.png +### The symbol to be displayed in IM switchers +SYMBOL = Р + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Р + ### The default name of this table NAME = RussianTraditional @@ -30,9 +36,6 @@ ### The author of this table AUTHOR = Yuri Victorovich <yuri(a)rawbw.com> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = Р - ### The Keyboard Layout used by this table. ### Set to "default" to accept any kind of layout. LAYOUT = us @@ -81,8 +84,7 @@ DEF_FULL_WIDTH_LETTER = FALSE ### The maxmium length of a key. -### MAX_KEY_LENGTH = 1 (changed to 2 to fake col prob in sqlite db) -MAX_KEY_LENGTH = 2 +MAX_KEY_LENGTH = 1 ### Valid input chars. VALID_INPUT_CHARS = F<DULT~:PBQRKVYJGHCNEA{WXIO}SM">Zf,dult`;pbqrkvyjghcnea[wxio]sm'.z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/thai.txt new/ibus-table-others-1.3.4/tables/thai.txt --- old/ibus-table-others-1.3.1/tables/thai.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/thai.txt 2014-09-13 11:56:07.000000000 +0200 @@ -21,6 +21,9 @@ ### The symbol to be displayed in IM switchers SYMBOL = ก +### Prompt string to be displayed in the status area. +STATUS_PROMPT = ก + ### The default name of this table NAME = Thai @@ -30,9 +33,6 @@ ### Supported locales of this table LANGUAGES = th -### Prompt string to be displayed in the status area. -STATUS_PROMPT = Th - ### Layout ### This table seems to emulate a Thai keyboard, it is not ### a transliteration input method. Therefore, we should require @@ -83,9 +83,7 @@ DEF_FULL_WIDTH_LETTER = FALSE ### The maxmium length of a key. -### It is supposed to be 1 but need to be 2 to avoid schema mismatch bug in -### optimize_database() in ibus-table. -MAX_KEY_LENGTH = 2 +MAX_KEY_LENGTH = 1 ### Valid input chars. ### Since '=' is one of the VALID_INPUT_CHARS, ibus-table fallback to delimit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/translit-ua.txt new/ibus-table-others-1.3.4/tables/translit-ua.txt --- old/ibus-table-others-1.3.1/tables/translit-ua.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/translit-ua.txt 2014-09-13 11:56:07.000000000 +0200 @@ -25,6 +25,12 @@ ICON = translit-ua.svg +### The symbol to be displayed in IM switchers +SYMBOL = Yi + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Yi + ### The default name of this table NAME = Ua-Translit @@ -37,9 +43,6 @@ ### The author of this table AUTHOR = Daniil Ivanov <daniil.ivanov(a)gmail.com> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = Yi - ### Layout ### This table can be used with any layout capable of typing ASCII. ### Therefore, we should not require a special layout like “us”. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/translit.txt new/ibus-table-others-1.3.4/tables/translit.txt --- old/ibus-table-others-1.3.1/tables/translit.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/translit.txt 2014-09-13 11:56:07.000000000 +0200 @@ -23,6 +23,12 @@ ICON = translit.svg +### The symbol to be displayed in IM switchers +SYMBOL = Ya + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Ya + ### The default name of this table NAME = Translit @@ -35,9 +41,6 @@ ### The author of this table AUTHOR = Daniil Ivanov <daniil.ivanov(a)gmail.com> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = Ya - ### Layout ### This table can be used with any layout capable of typing ASCII. ### Therefore, we should not require a special layout like “us”. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/viqr.txt new/ibus-table-others-1.3.4/tables/viqr.txt --- old/ibus-table-others-1.3.1/tables/viqr.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/viqr.txt 2014-09-13 11:56:07.000000000 +0200 @@ -17,6 +17,12 @@ ICON = viqr.png +### The symbol to be displayed in IM switchers +SYMBOL = đ + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = đ + ### The default name of this table NAME = Viqr @@ -29,9 +35,6 @@ ### The author of this table AUTHOR = Samuel Thibault <samuel.thibault(a)ens-lyon.org> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = đ - ### Layout ### This table can be used with any layout capable of typing ASCII. ### Therefore, we should not require a special layout like “us”. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-table-others-1.3.1/tables/yawerty.txt new/ibus-table-others-1.3.4/tables/yawerty.txt --- old/ibus-table-others-1.3.1/tables/yawerty.txt 2014-06-25 10:14:04.000000000 +0200 +++ new/ibus-table-others-1.3.4/tables/yawerty.txt 2014-09-13 11:56:07.000000000 +0200 @@ -21,6 +21,9 @@ ### The symbol to be displayed in IM switchers SYMBOL = Я +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Я + ### The default name of this table NAME = Yawerty @@ -33,9 +36,6 @@ ### The author of this table AUTHOR = Matthew Fischer <futhark(a)users.sourceforge.net> -### Prompt string to be displayed in the status area. -STATUS_PROMPT = Я - ### The Keyboard Layout used by this table. ### Set to "default" to accept any kind of layouts. LAYOUT = us @@ -84,7 +84,7 @@ DEF_FULL_WIDTH_LETTER = FALSE ### The maxmium length of a key. -MAX_KEY_LENGTH = 2 +MAX_KEY_LENGTH = 1 ### Valid input chars. VALID_INPUT_CHARS == ABWGDE&VZIJKLMNOPRSTUFHC+{}$YX|~Qabwgde^vzijklmnoprstufhc=[]#yx\`q -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ibus-table for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package ibus-table for openSUSE:Factory checked in at 2014-09-29 12:40:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-table (Old) and /work/SRC/openSUSE:Factory/.ibus-table.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-table" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-table/ibus-table.changes 2014-07-29 16:48:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-table.new/ibus-table.changes 2014-09-29 12:40:30.000000000 +0200 @@ -1,0 +2,30 @@ +Sun Sep 28 23:10:37 PRC 2014 - hillwood(a)linuxfans.org + +- update to 1.8.11 + * Fix typo in variable name self_onechar -> self._onechar + * Disable “onechar” (Phrase mode/Single char mode) option for non-CJK + databases + * Disable auto_commit option for tables which do not have RULES + * Resolves: rhbz#1135759 - The rusle is broken with "Normal commit mode" + See: https://bugzilla.redhat.com/show_bug.cgi?id=1135759 + * Pass IBus.KEY_KP_Enter to the application if the preedit is empty + * Resolves: rhbz#1133424 - With the new "rusle" table in ibus-table-cyrillic, + Keypad Enter problem + See: https://bugzilla.redhat.com/show_bug.cgi?id=1133424 + * Ignore Shift+Space hotkey to switch fullwidth/halfwidth if the database + is not for CJK + * Move some options into a new tab “Details” + * Disable properties related to fullwidth/halfwidth for non-CJK tables + * Remove “Hide Candidates/Display Candidates” from the properties menu + * Show keyboard shortcuts also in the property menu entries + * Use the “notify::text” signal instead of “activate” on GtkEntry widget + * Update Chinese .po files + * Update German translation + * Move the “Restore all defaults” button into the GtkButtonBox at bottom + * Apply fix for 同 again to Unihan_Variants.txt, it is both simplified *and* + traditional Chinese + * And regenerate engine/chinese_variants.py. + * Escape % and _ if they are not intended as wildcards + * Require Python >= 3.3 + +------------------------------------------------------------------- Old: ---- ibus-table-1.8.5.tar.gz New: ---- ibus-table-1.8.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-table.spec ++++++ --- /var/tmp/diff_new_pack.G0FnP9/_old 2014-09-29 12:40:31.000000000 +0200 +++ /var/tmp/diff_new_pack.G0FnP9/_new 2014-09-29 12:40:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: ibus-table -Version: 1.8.5 +Version: 1.8.11 Release: 0 Summary: The Table engine for IBus platform License: LGPL-2.1+ ++++++ ibus-table-1.8.5.tar.gz -> ibus-table-1.8.11.tar.gz ++++++ ++++ 4575 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit uim for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package uim for openSUSE:Factory checked in at 2014-09-29 12:40:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uim (Old) and /work/SRC/openSUSE:Factory/.uim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "uim" Changes: -------- --- /work/SRC/openSUSE:Factory/uim/uim.changes 2014-02-15 08:07:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.uim.new/uim.changes 2014-09-29 12:40:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 28 06:34:10 UTC 2014 - ftake(a)geeko.jp + +- Drop locale(ja) to slim down Japanese locale + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uim.spec ++++++ --- /var/tmp/diff_new_pack.Z3uMAb/_old 2014-09-29 12:40:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Z3uMAb/_new 2014-09-29 12:40:27.000000000 +0200 @@ -57,7 +57,6 @@ %if %build_gtk3 BuildRequires: pkgconfig(gtk+-3.0) %endif -Provides: locale(xorg-x11:ja) Recommends: %{name}-gtk2 = %{version} %if %build_gtk3 Recommends: %{name}-gtk3 = %{version} @@ -88,7 +87,6 @@ Summary: GTK2 IM Module for UIM Group: System/I18n/Japanese Requires: %{name} = %{version} -Provides: locale(gtk2:ja) %gtk2_immodule_requires %description gtk2 @@ -100,7 +98,6 @@ Summary: GTK3 IM Module for UIM Group: System/I18n/Japanese Requires: %{name} = %{version} -Provides: locale(gtk3:ja) %gtk3_immodule_requires %description gtk3 @@ -114,7 +111,6 @@ Requires: %{name} = %{version} Obsoletes: uim-applet < %{version} Provides: uim-applet = %{version} -Provides: locale(gnome-libs:ja) %description applet-gnome GNOME applet for uim @@ -124,7 +120,6 @@ Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} -Provides: locale(libqt4:ja) %description qt4 Qt4 input module plugin for uim -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ppc64-diag for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2014-09-29 12:40:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ppc64-diag (Old) and /work/SRC/openSUSE:Factory/.ppc64-diag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ppc64-diag" Changes: -------- --- /work/SRC/openSUSE:Factory/ppc64-diag/ppc64-diag.changes 2014-09-10 17:02:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new/ppc64-diag.changes 2014-09-29 12:40:18.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 26 09:20:31 UTC 2014 - stefan.fent(a)suse.com + +- fix bsc #898480 ppc64-diag: fixes for LE support +- patches added: + - ppc64-diag.opal-dump-parse-Add-printk-log-in-the-list-of-dump-s.patch + - ppc64-diag.rtas_errd-Fix-PRRN-Event-handling-on-LE.patch + - ppc64-diag.rtas_errd-LE-fixes-for-extract_platdump.patch + +------------------------------------------------------------------- New: ---- ppc64-diag.opal-dump-parse-Add-printk-log-in-the-list-of-dump-s.patch ppc64-diag.rtas_errd-Fix-PRRN-Event-handling-on-LE.patch ppc64-diag.rtas_errd-LE-fixes-for-extract_platdump.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.bEDdEm/_old 2014-09-29 12:40:19.000000000 +0200 +++ /var/tmp/diff_new_pack.bEDdEm/_new 2014-09-29 12:40:19.000000000 +0200 @@ -56,6 +56,9 @@ Patch3: %{name}.opal_errd.patch Patch4: ppc64-diag.add_ncurses_include_path.patch Patch5: ppc64-diag-tmpraces.patch +Patch6: %{name}.opal-dump-parse-Add-printk-log-in-the-list-of-dump-s.patch +Patch7: %{name}.rtas_errd-LE-fixes-for-extract_platdump.patch +Patch8: %{name}.rtas_errd-Fix-PRRN-Event-handling-on-LE.patch %description This package contains various diagnostic tools for PowerLinux. @@ -78,6 +81,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build %if 0%{?has_systemd} ++++++ ppc64-diag.opal-dump-parse-Add-printk-log-in-the-list-of-dump-s.patch ++++++ >From f5a0a711ad79e6d1ec8bbf5f561a55582ae8ea03 Mon Sep 17 00:00:00 2001 From: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> Date: Thu, 4 Sep 2014 11:09:18 +0530 Subject: [PATCH 1/3] opal-dump-parse: Add printk log in the list of dump sections Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> --- opal-dump-parse/opal-dump-parse.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opal-dump-parse/opal-dump-parse.h b/opal-dump-parse/opal-dump-parse.h index 1d13029..8fbd928 100644 --- a/opal-dump-parse/opal-dump-parse.h +++ b/opal-dump-parse/opal-dump-parse.h @@ -28,7 +28,8 @@ #define DUMP_SECTION_DESC \ {0, "Unknown"}, \ {1, "Opal-log"}, \ - {2, "HostBoot-Runtime-log"} + {2, "HostBoot-Runtime-log"}, \ + {128, "printk"} #define MDST_SECTION_DESC_LEN 128 -- 1.8.3.1 ++++++ ppc64-diag.rtas_errd-Fix-PRRN-Event-handling-on-LE.patch ++++++ >From f53bb968306ee868de781911e1d906879698c3cd Mon Sep 17 00:00:00 2001 From: "Suzuki K. Poulose" <suzuki(a)in.ibm.com> Date: Tue, 9 Sep 2014 15:24:50 -0400 Subject: [PATCH 3/3] rtas_errd: Fix PRRN Event handling on LE Fixes for PRRN event handling on LE systems 1) Convert the number of properties to host endian in i update_properties(). 2) Use phandle in host endian while issuing an ofdt command, since we pass the phandle as a numeric string to the kernel. With this patch the PRRN event handling works fine, however, drmgr needs to support LE systems for a seemless operation of the rtas_errd, since we depend on drmgr Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com> Acked-by: Nathan Fontenot <nfont(a)linux.vnet.ibm.com> Signed-off-by: Vasant Hegde <hegdevasant(a)linux.vnet.ibm.com> --- rtas_errd/prrn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtas_errd/prrn.c b/rtas_errd/prrn.c index 7a791cb..8226ec1 100644 --- a/rtas_errd/prrn.c +++ b/rtas_errd/prrn.c @@ -342,7 +342,7 @@ static int update_properties(uint32_t phandle) dbg("successful rtas_update_properties (more %d)", rc); op = wa+4; - nprop = *op++; + nprop = be32toh(*op++); /* Should just be on property to update, the affinity. Except * for reconfig memory, that is a single property for @@ -374,7 +374,7 @@ static int update_properties(uint32_t phandle) dbg("%s - delete property %s", pms->name, pname); sprintf(cmd,"remove_property %u %s", - htobe32(phandle), pname); + phandle, pname); do_update(cmd, strlen(cmd)); break; @@ -412,7 +412,7 @@ static int update_properties(uint32_t phandle) */ lenpos = sprintf(longcmd, "update_property %u " - "%s ", htobe32(phandle), + "%s ", phandle, pname); strcat(longcmd, "000000 "); cmdlen = strlen(longcmd); -- 1.8.3.1 ++++++ ppc64-diag.rtas_errd-LE-fixes-for-extract_platdump.patch ++++++ >From 852c42d36ee94f41d9a314eb7fde7c3486a89ffd Mon Sep 17 00:00:00 2001 From: "Suzuki K. Poulose" <suzuki(a)in.ibm.com> Date: Tue, 9 Sep 2014 15:24:49 -0400 Subject: [PATCH 2/3] rtas_errd: LE fixes for extract_platdump Exit with error when we can't retrieve a dump for an invalid dump ID. Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com> Signed-off-by: Vasant Hegde <hegdevasant(a)linux.vnet.ibm.com> --- rtas_errd/extract_platdump.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rtas_errd/extract_platdump.c b/rtas_errd/extract_platdump.c index 75be727..b9afdde 100644 --- a/rtas_errd/extract_platdump.c +++ b/rtas_errd/extract_platdump.c @@ -226,6 +226,13 @@ extract_platform_dump(uint64_t dump_tag) ret = 1; goto platdump_error_out; } + /* If we didn't read enough bytes, handle it */ + if (bytes <= 0) { + msg("Platform dump with id: 0x%016LX is either invalid " + "or empty\n", dump_tag); + ret = 1; + goto platdump_error_out; + } seq = seq_next; -- 1.8.3.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 powerpc-utils for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package powerpc-utils for openSUSE:Factory checked in at 2014-09-29 12:40:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerpc-utils (Old) and /work/SRC/openSUSE:Factory/.powerpc-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "powerpc-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/powerpc-utils/powerpc-utils.changes 2014-09-10 17:02:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.powerpc-utils.new/powerpc-utils.changes 2014-09-29 12:40:16.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 19 09:55:35 UTC 2014 - stefan.fent(a)suse.com + +- Fix OF Patchnames with vscsi (bnc #886123) +- added patches: + powerpc-utils-bug-886123_01-l2of_scsi.patch + powerpc-utils-bug-886123_02-of2l_scsi.patch + +------------------------------------------------------------------- New: ---- powerpc-utils-bug-886123_01-l2of_scsi.patch powerpc-utils-bug-886123_02-of2l_scsi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.vfQjnN/_old 2014-09-29 12:40:17.000000000 +0200 +++ /var/tmp/diff_new_pack.vfQjnN/_new 2014-09-29 12:40:17.000000000 +0200 @@ -45,6 +45,8 @@ Source1: nvsetenv Patch1: powerpc-utils-lsprop.patch Patch3: powerpc-utils.ofpathname.bootlist.patch +Patch4: powerpc-utils-bug-886123_01-l2of_scsi.patch +Patch5: powerpc-utils-bug-886123_02-of2l_scsi.patch ExclusiveArch: ppc ppc64 ppc64le %description @@ -55,6 +57,8 @@ %setup -q %patch1 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %configure ++++++ powerpc-utils-bug-886123_01-l2of_scsi.patch ++++++ commit e7ee16163122f5c6f1ae600a2bc59a4eeab0c965 Author: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> Date: Mon Sep 15 13:54:54 2014 +0530 ofpathname: Convert logical path to OF device path for virtio-scsi devices Add support to convert logical device path to Open firmware device path for virtio-scsi devices. Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> diff --git a/scripts/ofpathname b/scripts/ofpathname index 52df06c..f7baef7 100755 --- a/scripts/ofpathname +++ b/scripts/ofpathname @@ -139,6 +139,39 @@ get_hbtl() } # +# get_scsi_disk_no +# Given a path that ends in an HBTL, convert the HBTL values into a +# virtual disk number (not sure what the real terminology is for it). +# To do the conversion, the HBTL (A:B:C:D) is split apart and +# calculated as; +# no = (0x1000000 | C << 16 | D) +# +# $1 path ending in HBTL +get_scsi_disk_no() +{ + get_hbtl $1 + + local C D + + C=$((0x$ID << 16)) + D=$((0x$LUN)) + + local vdiskno vdisk + typeset -i vdiskno + vdiskno=$((0x1000000 | $C | $D )) + vdisk=${vdiskno##-} + + vdisk=`echo \`bc << END +ibase=10 +obase=16 +$vdisk +END\`` + + local extrazeroes="00000000" + echo $vdisk$extrazeroes +} + +# # get_vdisk_no # Given a path that ends in an HBTL, convert the HBTL values into a # virtual disk number (not sure what the real terminology is for it). @@ -804,7 +837,19 @@ l2of_scsi() OF_PATH=$OF_PATH/$scsi_name fi - OF_PATH=$OF_PATH/sd@$ID,$LUN + local modalias="" + goto_dir $device_path "device" + if [ $? -eq 0 ]; then + modalias=`$CAT $PWD/modalias` + fi + + if [[ $modalias =~ "virtio" ]]; then + local diskno + diskno=`get_scsi_disk_no $device_dir` + OF_PATH=$OF_PATH/disk\@$diskno + else + OF_PATH=$OF_PATH/sd@$ID,$LUN + fi fi } ++++++ powerpc-utils-bug-886123_02-of2l_scsi.patch ++++++ commit ae434a8e2f1bc90cb9344c112e71078f38f5f7ba Author: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> Date: Mon Sep 15 15:01:04 2014 +0530 ofpathname: Convert OF format to logical device for virtio-scsi devices Add support to convert a Open Firmware device path to logical device path for virtio scsi device. Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> diff --git a/scripts/ofpathname b/scripts/ofpathname index f7baef7..31000a6 100755 --- a/scripts/ofpathname +++ b/scripts/ofpathname @@ -873,6 +873,14 @@ ofpathname_to_logical() DEVTYPE=${DEVICE%:*} fi + if [[ $DEVTYPE = "disk" && $FC = "v-scsi" ]]; then + DEVTYPE="v-scsi" + fi + + if [[ $DEVTYPE = "disk" && $FC = "scsi" ]]; then + DEVTYPE="scsi" + fi + if [[ $DEVTYPE = "disk" && $SAS = "sas" ]]; then DEVTYPE="sas" fi @@ -1123,6 +1131,7 @@ of2l_vscsi() # of2l_scsi() { + DEV_HBTL_NO=${DEVICE##*\@} DEV_TARGET=${DEVICE##*\@} DEV_TARGET=${DEV_TARGET%%,*} DEV_LUN=${DEVICE##*,} @@ -1147,16 +1156,19 @@ of2l_scsi() fi local hbtl=`is_hbtl $link` + local diskno # Do not call get_hbtl for virtio block devices if [[ $hbtl = 1 ]]; then get_hbtl $link + diskno=`get_scsi_disk_no $link` fi cd $link # save the name of the current directory, we may need it later... local device_dir=${PWD##/*/} - if [[ !$hbtl || ($ID = $DEV_TARGET && $LUN = $DEV_LUN) ]]; then + if [[ $hbtl = 0 || $diskno = $DEV_HBTL_NO || + ($ID = $DEV_TARGET && $LUN = $DEV_LUN) ]]; then goto_dir $PWD "devspec" local devspec=`$CAT ./devspec 2>/dev/null` -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xz for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package xz for openSUSE:Factory checked in at 2014-09-29 12:40:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xz (Old) and /work/SRC/openSUSE:Factory/.xz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xz" Changes: -------- --- /work/SRC/openSUSE:Factory/xz/xz.changes 2013-12-19 13:35:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xz.new/xz.changes 2014-09-29 12:40:12.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Sep 23 00:11:27 UTC 2014 - andreas.stieger(a)gmx.de + +- xz 5.0.7: + * Fix regressions introduced in 5.0.6: + - Fix building with non-GNU make. + - Fix invalid Libs.private value in liblzma.pc which broke + static linking against liblzma if the linker flags were + taken from pkg-config. +- include changes from 5.0.6: + * xzgrep now exits with status 0 if at least one file matched. + * A few minor portability and build system fixes + +------------------------------------------------------------------- Old: ---- xz-5.0.5.tar.gz xz-5.0.5.tar.gz.sig New: ---- xz-5.0.7.tar.gz xz-5.0.7.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xz.spec ++++++ --- /var/tmp/diff_new_pack.SOeLCi/_old 2014-09-29 12:40:13.000000000 +0200 +++ /var/tmp/diff_new_pack.SOeLCi/_new 2014-09-29 12:40:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +# avoid bootstrapping problem +%define _binary_payload w9.bzdio %if 0%{?centos_version} || 0%{?rhel_version} %if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600} %bcond_without static_libs @@ -23,36 +25,31 @@ %else %bcond_with static_libs %endif - +%if 0%{?suse_version} < 1130 +%define do_profiling 0 +%endif +%ifarch aarch64 %{arm} %{sparc} +%define do_profiling 0 +%endif Name: xz +Version: 5.0.7 +Release: 0 Summary: A Program for Compressing Files License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Archiving/Compression -Version: 5.0.5 -Release: 0 Url: http://tukaani.org/xz/ Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz Source1: http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig Source2: baselibs.conf # from http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring Source3: xz.keyring -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig -Provides: lzma = %version -Obsoletes: lzma < %version - -%if 0%{?suse_version} < 1130 -%define do_profiling 0 -%endif -%ifarch aarch64 %{arm} %sparc -%define do_profiling 0 -%endif - +Provides: lzma = %{version} +Obsoletes: lzma < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?lang_package:1} > 0 -Recommends: %name-lang +Recommends: %{name}-lang %endif -# avoid bootstrapping problem -%define _binary_payload w9.bzdio %description The xz command is a very powerful program for compressing files. @@ -85,20 +82,21 @@ Summary: Development package for the LZMA library Group: Development/Libraries/C and C++ Requires: liblzma5 = %{version} -Provides: lzma-devel = %version -Obsoletes: lzma-devel < %version -Provides: lzma-alpha-devel = %version -Obsoletes: lzma-alpha-devel < %version +Provides: lzma-devel = %{version} +Obsoletes: lzma-devel < %{version} +Provides: lzma-alpha-devel = %{version} +Obsoletes: lzma-alpha-devel < %{version} %description devel This package contains the header files and libraries needed for compiling programs using the LZMA library. %if %{with static_libs} + %package static-devel Summary: Static version of LZMA library Group: Development/Libraries/C and C++ -Requires: lzma-devel = %version +Requires: lzma-devel = %{version} %description static-devel Static library for the LZMA library @@ -112,25 +110,25 @@ %if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT -export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" +export CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir" %endif %configure \ %if ! %{with static_libs} --disable-static \ %endif --with-pic \ - --docdir=%_docdir/%name + --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %if %{do_profiling} time make check -make clean -export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" +make clean %{?_smp_mflags} +export CFLAGS="%{optflags} %{cflags_profile_feedback}=$profiledir" %configure \ %if %{without static_libs} --disable-static \ %endif --with-pic \ - --docdir=%_docdir/%name + --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %endif @@ -138,8 +136,8 @@ time make check %install -make install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -v %{buildroot}%{_libdir}/liblzma.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -v %{buildroot}%{_libdir}/liblzma.la %find_lang %{name} %post -n liblzma5 -p /sbin/ldconfig @@ -152,13 +150,14 @@ %defattr(-, root, root) %files +%defattr(-,root,root) %else %files -f %{name}.lang %defattr(-, root, root) %endif %defattr(-, root, root) -%_docdir/%name +%{_docdir}/%{name} %{_bindir}/* %{_mandir}/man?/* @@ -174,6 +173,7 @@ %{_libdir}/pkgconfig/*.pc %if %{with static_libs} + %files static-devel %defattr(-, root, root) %{_libdir}/*.a ++++++ xz-5.0.5.tar.gz -> xz-5.0.7.tar.gz ++++++ ++++ 19921 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package autofs for openSUSE:13.1:Update checked in at 2014-09-29 12:15:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/autofs (Old) and /work/SRC/openSUSE:13.1:Update/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autofs" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.uIFkFG/_old 2014-09-29 12:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.uIFkFG/_new 2014-09-29 12:15:30.000000000 +0200 @@ -1 +1 @@ -<link package='autofs.2639' cicount='copy' /> +<link package='autofs.3018' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package libqt4 for openSUSE:13.1:Update checked in at 2014-09-29 12:15:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/libqt4 (Old) and /work/SRC/openSUSE:13.1:Update/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.3hYc5k/_old 2014-09-29 12:15:29.000000000 +0200 +++ /var/tmp/diff_new_pack.3hYc5k/_new 2014-09-29 12:15:29.000000000 +0200 @@ -1 +1 @@ -<link package='libqt4.2439' cicount='copy' /> +<link package='libqt4.3013' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4-sql-plugins for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package libqt4-sql-plugins for openSUSE:13.1:Update checked in at 2014-09-29 12:15:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/libqt4-sql-plugins (Old) and /work/SRC/openSUSE:13.1:Update/.libqt4-sql-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4-sql-plugins" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.9JkJaD/_old 2014-09-29 12:15:22.000000000 +0200 +++ /var/tmp/diff_new_pack.9JkJaD/_new 2014-09-29 12:15:22.000000000 +0200 @@ -1 +1 @@ -<link package='libqt4-sql-plugins.2439' cicount='copy' /> +<link package='libqt4-sql-plugins.3013' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4-devel-doc for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package libqt4-devel-doc for openSUSE:13.1:Update checked in at 2014-09-29 12:15:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/libqt4-devel-doc (Old) and /work/SRC/openSUSE:13.1:Update/.libqt4-devel-doc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4-devel-doc" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.papWyT/_old 2014-09-29 12:15:18.000000000 +0200 +++ /var/tmp/diff_new_pack.papWyT/_new 2014-09-29 12:15:18.000000000 +0200 @@ -1 +1 @@ -<link package='libqt4-devel-doc.2439' cicount='copy' /> +<link package='libqt4-devel-doc.3013' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package wireshark for openSUSE:13.1:Update checked in at 2014-09-29 09:20:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/wireshark (Old) and /work/SRC/openSUSE:13.1:Update/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.zY0Rsx/_old 2014-09-29 09:20:29.000000000 +0200 +++ /var/tmp/diff_new_pack.zY0Rsx/_new 2014-09-29 09:20:29.000000000 +0200 @@ -1 +1 @@ -<link package='wireshark.2952' cicount='copy' /> +<link package='wireshark.3016' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark.3016 for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package wireshark.3016 for openSUSE:13.1:Update checked in at 2014-09-29 09:20:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/wireshark.3016 (Old) and /work/SRC/openSUSE:13.1:Update/.wireshark.3016.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark.3016" Changes: -------- New Changes file: --- /dev/null 2014-09-26 12:09:11.568032006 +0200 +++ /work/SRC/openSUSE:13.1:Update/.wireshark.3016.new/wireshark.changes 2014-09-29 09:20:26.000000000 +0200 @@ -0,0 +1,2708 @@ +------------------------------------------------------------------- +Sat Sep 20 18:21:53 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.10.10 [bnc#897055] + This update fixes vulnerabilities in Wireshark that could allow + an attacker to crash Wireshark or make it become unresponsive by + sending specific packages onto the network or have it loaded via + a capture file while the dissectors are running. It also contains + a number of other bug fixes. + * RTP dissector crash + wnpa-sec-2014-12 CVE-2014-6421 CVE-2014-6422 + * MEGACO dissector infinite loop + wnpa-sec-2014-13 CVE-2014-6423 + * Netflow dissector crash + wnpa-sec-2014-14 CVE-2014-6424 + * RTSP dissector crash + wnpa-sec-2014-17 CVE-2014-6427 + * SES dissector crash + wnpa-sec-2014-18 CVE-2014-6428 + * Sniffer file parser crash + wnpa-sec-2014-19 CVE-2014-6429 CVE-2014-6430 CVE-2014-6431 + CVE-2014-6432 +- Further bug fixes as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.10.html + +------------------------------------------------------------------- +Fri Aug 01 23:28:38 UTC 2014 - cyliu(a)suse.com + +- update to 1.10.9 + fixes several crashes triggered by malformed protocol packages +- vulnerabilities fixed: + * The Catapult DCT2000 and IrDA dissectors could underrun a buffer + wnpa-sec-2014-08 CVE-2014-5161 CVE-2014-5162 (bnc#889901) + * The GSM Management dissector could crash + wnpa-sec-2014-09 CVE-2014-5163 (bnc#889906) + * The RLC dissector could crash + wnpa-sec-2014-10 CVE-2014-5164 (bnc#889900) + * The ASN.1 BER dissector could crash + wnpa-sec-2014-11 CVE-2014-5165 (bnc#889899) +- Further bug fixes as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.9.html + +------------------------------------------------------------------- +Fri Jun 13 21:32:43 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.10.8 [bnc#882602] + + vulnerabilities fixed: + * The frame metadissector could crash. + wnpa-sec-2014-07 CVE-2014-4020 + + bug fixed: + * VoIP flow graph crash upon opening. + * Tshark with "-F pcap" still generates a pcapng file. + * IPv6 Next Header 0x3d recognized as SHIM6. + * Failed to export pdml on large pcap. + * TCAP: set a fence on info column after calling sub + dissector + * Dissector bug in JSON protocol. + * GSM RLC MAC: do not skip too many lines of the CSN_DESCR + when the field is missing + * Wireshark PEEKREMOTE incorrectly decoding QoS data packets + from Cisco Sniffer APs. + * IEEE 802.11: fix dissection of HT Capabilities + + Further updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.8.html + +------------------------------------------------------------------- +Wed Apr 23 17:57:54 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.10.7 [bnc#874760] + + vulnerabilities fixed: + * The RTP dissector could crash + wnpa-sec-2014-06 CVE-2014-2907 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.7.html + +------------------------------------------------------------------- +Sat Mar 8 10:10:14 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.10.6 [bnc#867485] + + vulnerabilities fixed: + * The NFS dissector could crash + wnpa-sec-2014-01 CVE-2014-2281 + * The M3UA dissector could crash + wnpa-sec-2014-02 CVE-2014-2282 + * The RLC dissector could crash + wnpa-sec-2014-03 CVE-2014-2283 + * The MPEG file parser could overflow a buffer + wnpa-sec-2014-04 CVE-2014-2299 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.6.html + +------------------------------------------------------------------- +Thu Dec 19 23:25:37 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.10.5 + + bugs fixed: + * Wireshark stops showing new packets but dumpcap keeps writing + them to the temp file. + * Wireshark 1.10.4 shuts down when promiscuous mode is + unchecked. + * Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector + accessed an invalid memory address. + +------------------------------------------------------------------- +Tue Dec 17 22:16:16 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.10.4 [bnc#855980] + + vulnerabilities fixed: + * The SIP dissector could go into an infinite loop. + wnpa-sec-2013-66 CVE-2013-7112 + * The BSSGP dissector could crash. + wnpa-sec-2013-67 CVE-2013-7113 + * The NTLMSSP v2 dissector could crash. Discovered by Garming Sam. + wnpa-sec-2013-68 CVE-2013-7114 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.4.html + +------------------------------------------------------------------- +Fri Nov 1 21:44:02 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.10.3 [bnc#848738] + + vulnerabilities fixed: + * The IEEE 802.15.4 dissector could crash + wnpa-sec-2013-61 CVE-2013-6336 + * The NBAP dissector could crash + wnpa-sec-2013-62 CVE-2013-6337 + * The SIP dissector could crash + wnpa-sec-2013-63 CVE-2013-6338 + * The OpenWire dissector could go into a large loop + wnpa-sec-2013-64 CVE-2013-6339 + * The TCP dissector could crash + wnpa-sec-2013-65 CVE-2013-6340 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.3.html +- drop wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch + merged upstream + +------------------------------------------------------------------- +Mon Sep 30 18:50:37 UTC 2013 - andreas.stieger(a)gmx.de + +- fix duplicate enum definition to fix build in 13.1 and Factory, + adding wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch + from upstream commits [bnc#843304] + +------------------------------------------------------------------- +Thu Sep 19 00:46:02 UTC 2013 - opensuse(a)sukimashita.com + +- add missing ws_symbol_export.h and frame_data_sequence.h includes + to -devel package to allow building of external plugins again + +------------------------------------------------------------------- +Wed Sep 11 20:34:17 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.10.2 [bnc#839607] + + vulnerabilities fixed: + * The Bluetooth HCI ACL dissector could crash. + wnpa-sec-2013-54 CVE-2013-5717 + * The NBAP dissector could crash. + wnpa-sec-2013-55 CVE-2013-5718 + * The ASSA R3 dissector could go into an infinite loop. + wnpa-sec-2013-56 CVE-2013-5719 + * The RTPS dissector could overflow a buffer. + wnpa-sec-2013-57 CVE-2013-5720 + * The MQ dissector could crash. + wnpa-sec-2013-58 CVE-2013-5721 + * The LDAP dissector could crash. + wnpa-sec-2013-59 CVE-2013-5722 + * The Netmon file parser could crash. + wnpa-sec-2013-60 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.2.html +- drop wireshark-1.10.x-reordercap-r49436.patch, merged upstream + +------------------------------------------------------------------- +Sun Aug 18 16:18:30 UTC 2013 - andreas.stieger(a)gmx.de + +- gtk3 version in openSUSE Factory (13.1) deprecates elements used + in wireshark 1.10.1. Revert back to gtk2 UI. + +------------------------------------------------------------------- +Sat Jul 27 00:02:02 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.10.1 [bnc#831718] + + vulnerabilities fixed: + The DCP ETSI dissector could crash + CVE-2013-4083 wnpa-sec-2013-41 + + The P1 dissector could crash + CVE-2013-4920 wnpa-sec-2013-42 + + The Radiotap dissector could crash + CVE-2013-4921 wnpa-sec-2013-43 + + The DCOM ISystemActivator dissector could crash + CVE-2013-4922 CVE-2013-4923 CVE-2013-4924 CVE-2013-4925 + CVE-2013-4926 wnpa-sec-2013-44 + + The Bluetooth SDP dissector could go into a large loop + CVE-2013-4927 wnpa-sec-2013-45 + + The Bluetooth OBEX dissector could go into an infinite loop + CVE-2013-4928 wnpa-sec-2013-46 ++++ 2511 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.wireshark.3016.new/wireshark.changes New: ---- SIGNATURES-1.10.10.txt wireshark-1.10.0-authors-pod2man.patch wireshark-1.10.0-enable_lua.patch wireshark-1.10.10.tar.bz2 wireshark-1.2.0-disable-warning-dialog.patch wireshark-1.2.0-geoip.patch wireshark.changes wireshark.keyring wireshark.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ # # spec file for package wireshark # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # disable caps for now %define use_caps 0 # openSUSE Factory gtk3 deprecates gtk2 elements used %define use_gtk3 0 Name: wireshark Version: 1.10.10 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ and GPL-3.0+ Group: Productivity/Networking/Diagnostic Url: https://www.wireshark.org/ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wiresha… # PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak(a)suse.cz -- don't show warning when running as root Patch1: wireshark-1.2.0-disable-warning-dialog.patch # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak(a)suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders Patch2: wireshark-1.2.0-geoip.patch Patch4: wireshark-1.10.0-enable_lua.patch Patch5: wireshark-1.10.0-authors-pod2man.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex %if 0%{?suse_version} <= 1140 BuildRequires: gtk2-devel %else %if 0%{?use_gtk3} BuildRequires: gtk3-devel %else BuildRequires: gtk2-devel %endif %endif BuildRequires: krb5-devel BuildRequires: libcap-devel BuildRequires: libcares-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel BuildRequires: libpcap-devel BuildRequires: libsmi-devel # required for Lua support in openSUSE 12.2 and later [bnc#780669] %if 0%{?suse_version} >= 1220 BuildRequires: lua51-devel %else BuildRequires: lua-devel %endif BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: portaudio-devel BuildRequires: python-devel BuildRequires: tcpd-devel BuildRequires: xdg-utils %if 0%{?suse_version} > 1220 BuildRequires: zlib-devel %endif Requires: xdg-utils Provides: ethereal = %{version} Obsoletes: ethereal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: libGeoIP-devel BuildRequires: update-desktop-files Recommends: GeoIP %endif %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif %description Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. %package devel Summary: A Network Traffic Analyser Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: glib2-devel Requires: glibc-devel Provides: ethereal-devel = %{version} Obsoletes: ethereal-devel < %{version} %description devel Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. %prep %{?gpg_verify: %gpg_verify %{S:2}} # The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes. # Verify hashes in that file against source tarball. echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep MD5 | head -n1 | cut -d= -f2` %{S:0}" | md5sum -c echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep SHA1 | head -n1 | cut -d= -f2` %{S:0}" | sha1sum -c %setup -q %patch2 %patch4 -p1 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 %if ! %{use_caps} %patch1 sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop %endif %patch5 -p1 %build # zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2 %configure \ %if 0%{?suse_version} < 1220 --without-zlib \ %endif %if 0%{?suse_version} > 1140 %if 0%{?use_gtk3} --with-gtk3 \ %endif %endif --with-ssl \ --with-gnutls=yes \ --with-gcrypt=yes \ --with-python \ --with-plugins=%{_libdir}/%{name}/plugins/%{version} make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install find %{buildroot} -name "*.la" -delete -print ln -fs wireshark %{buildroot}%{_bindir}/ethereal ln -fs tshark %{buildroot}%{_bindir}/tethereal install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ # install -m 0644 *.1 %%{buildroot}%%{_mandir}/man1/ # -devel install -d -m 0755 %{buildroot}%{_includedir}/wireshark IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark" mkdir -p "${IDIR}/epan" mkdir -p "${IDIR}/epan/crypt" mkdir -p "${IDIR}/epan/ftypes" mkdir -p "${IDIR}/epan/dfilter" mkdir -p "${IDIR}/epan/dissectors" mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wsutil" install -m 644 color.h config.h register.h "${IDIR}/" install -m 644 cfile.h file.h "${IDIR}/" install -m 644 frame_data_sequence.h "${IDIR}/" install -m 644 packet-range.h print.h "${IDIR}/" install -m 644 epan/*.h "${IDIR}/epan/" install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 ws_symbol_export.h "${IDIR}/" install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop %if 0%{?suse_version} %suse_update_desktop_file %{name} %endif %clean rm -rf %{buildroot} %if %{use_caps} %pre getent group wireshark >/dev/null || groupadd wireshark %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README README.linux README.vmware %doc %{_mandir}/man1/[^i]* %doc %{_mandir}/man4/* %{_datadir}/applications/wireshark.desktop %{_datadir}/pixmaps/wireshark.png %{_bindir}/ethereal %{_bindir}/tethereal %{_bindir}/wireshark %{_bindir}/editcap %{_bindir}/tshark %{_bindir}/mergecap %{_bindir}/reordercap %{_bindir}/text2pcap %{_bindir}/dftest %{_bindir}/capinfos %{_bindir}/randpkt %if %{use_caps} %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap %else %{_bindir}/dumpcap %endif %{_bindir}/rawshark %{_libdir}/lib*.so.* %{_libdir}/wireshark/ %{_datadir}/wireshark/ %files devel %defattr(-,root,root) %doc doc/README.* %{_includedir}/wireshark %{_libdir}/lib*.so %changelog ++++++ SIGNATURES-1.10.10.txt ++++++ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 wireshark-1.10.10.tar.bz2: 26823919 bytes MD5(wireshark-1.10.10.tar.bz2)=1458cedf1b67a36db4555e6469a179e1 SHA1(wireshark-1.10.10.tar.bz2)=bcad35318e0a2428caf7e44d6c33a79ec9c1bdd6 RIPEMD160(wireshark-1.10.10.tar.bz2)=f8ace3bad8736246c6342200d199d143bbbcebac Wireshark-win32-1.10.10.exe: 22177056 bytes MD5(Wireshark-win32-1.10.10.exe)=cb160b6be686602993b66ca2b1b2b1da SHA1(Wireshark-win32-1.10.10.exe)=8db0db187186a496ce71127b0c2eeed20ae14423 RIPEMD160(Wireshark-win32-1.10.10.exe)=6ff8c12f8da4ad92542cc83e2d3257f80637b4a0 Wireshark-win64-1.10.10.exe: 28023688 bytes MD5(Wireshark-win64-1.10.10.exe)=f73c60486b789e7e3c7edede59cc4ecf SHA1(Wireshark-win64-1.10.10.exe)=83ecf6f426d08b80664a8fa95bf9c681df70e38a RIPEMD160(Wireshark-win64-1.10.10.exe)=49181a0a9447110bba1229dacd91e18a27fc14ea Wireshark-1.10.10.u3p: 30662795 bytes MD5(Wireshark-1.10.10.u3p)=871172cc6ab38da8f2d397198b4dfb19 SHA1(Wireshark-1.10.10.u3p)=1780de9260aeed43e28264716c48558ece5d6f24 RIPEMD160(Wireshark-1.10.10.u3p)=ddeb6193b953dce454c4ffa92469bf38397b1fc5 WiresharkPortable-1.10.10.paf.exe: 23540840 bytes MD5(WiresharkPortable-1.10.10.paf.exe)=3985cb6904095f125856b665b5b72417 SHA1(WiresharkPortable-1.10.10.paf.exe)=a79f1e508ff3d36c1372dff669e881ccb2508008 RIPEMD160(WiresharkPortable-1.10.10.paf.exe)=18d9f033e6e88876576ddffb2a4a92c5de54fe4b Wireshark 1.10.10 Intel 32.dmg: 20474898 bytes MD5(Wireshark 1.10.10 Intel 32.dmg)=24d3b766a25795afe6b68dadd4c7d36b SHA1(Wireshark 1.10.10 Intel 32.dmg)=6cde849afc8cc15f9b2e25ab62bf9c03a18fcbb8 RIPEMD160(Wireshark 1.10.10 Intel 32.dmg)=91d29372156af5bde64723eaa23ff0614659b499 Wireshark 1.10.10 Intel 64.dmg: 24805922 bytes MD5(Wireshark 1.10.10 Intel 64.dmg)=6b1d50f0851e4d47a07314bab3879b0c SHA1(Wireshark 1.10.10 Intel 64.dmg)=ef6e179e004a17ca0c1e2110d3c4fcc6de0cbe28 RIPEMD160(Wireshark 1.10.10 Intel 64.dmg)=db500717cfc36fc892f0dc881433facefaabd204 patch-wireshark-1.10.9-to-1.10.10.bz2: 72244 bytes MD5(patch-wireshark-1.10.9-to-1.10.10.bz2)=5b9398f27f0f933ef817e267c294aeee SHA1(patch-wireshark-1.10.9-to-1.10.10.bz2)=1b15c1335d4d62b0dbbaf18218727623058b9ada RIPEMD160(patch-wireshark-1.10.9-to-1.10.10.bz2)=e30dc55d2e9db6b9e683bbfe5066ef718b34586d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (Darwin) iEYEARECAAYFAlQYiQEACgkQpw8IXSHylJrCcgCdGltdOnq3Bgulmv7In4iLo4Zn rzAAoL5U6FcKZJvMshlCf2vmBJHzOLih =BgSv -----END PGP SIGNATURE----- ++++++ wireshark-1.10.0-authors-pod2man.patch ++++++ From: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Thu, 27 Jun 2013 21:02:17 +0100 Subject: [patch] change characters in AUTHORS file to be compatible with pod2man Upstream: never * remove some characters for which Pod::Man does not have an escape sequence * replace cyrillic name with transliteration Wide character in printf at /usr/lib/perl5/5.18.0/Pod/Simple.pm line 539. wireshark.pod around line 3455: Non-ASCII character seen before =encoding in 'Moń'. Assuming UTF-8 POD document had syntax errors at /usr/bin/pod2man line 71. make: *** [wireshark.1] Error 255 error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build) --- AUTHORS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: wireshark-1.10.0/AUTHORS =================================================================== --- wireshark-1.10.0.orig/AUTHORS 2013-05-29 17:52:27.000000000 +0100 +++ wireshark-1.10.0/AUTHORS 2013-06-27 20:04:34.000000000 +0100 @@ -3509,7 +3509,7 @@ Peter Hatina <phatina[AT]redhat.com> { Gtk3 Wireshark fixes } -Tomasz Moń <desowin[AT]gmail.com> { +Tomasz Mon <desowin[AT]gmail.com> { USBPcap support } @@ -3612,7 +3612,7 @@ Cvetan Ivanov <zezo[AT]spnet.net> Vasanth Manickam <vasanth.manickam[AT]bt.com> Julian Onions <julian.onions[AT]gmail.com> Samuel Thibault <samuel.thibault[AT]ens-lyon.org> -Peter Kovář <peter.kovar[AT]gmail.com> +Peter Kovár <peter.kovar[AT]gmail.com> Paul Ollis <paul.ollis[AT]roke.co.uk> Dominik Kuhlen <dkuhlen[AT]gmx.net> Karl Knoebl <karl.knoebl[AT]siemens.com> @@ -3703,7 +3703,7 @@ Paul Stath <pstath[AT]axxcelera.com> DeCount <aatrade[AT]libero.it> Andras Veres-Szentkiralyi <vsza[AT]vsza.hu> Jakob Hirsch <jh.wireshark-bugzilla[AT]plonk.de> -Роман Донченко <DXDragon[AT]yandex.ru> +Roman Donchenko <DXDragon[AT]yandex.ru> <billyjeans[AT]gmail.com> Evan Huus <eapache[AT]gmail.com> Tom Cook <tcook[AT]ixiacom.com> ++++++ wireshark-1.10.0-enable_lua.patch ++++++ From: prusnak(a)opensuse.org References: [bnc#650434] Upstream: never - fix lua error at startup (enable_lua.patch) [bnc#650434] previously named wireshark-1.2.4-enable_lua.patch --- epan/wslua/template-init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: wireshark-1.10.0rc2/epan/wslua/template-init.lua =================================================================== --- wireshark-1.10.0rc2.orig/epan/wslua/template-init.lua 2013-04-22 19:04:37.000000000 +0100 +++ wireshark-1.10.0rc2/epan/wslua/template-init.lua 2013-05-26 17:43:20.000000000 +0100 @@ -43,7 +43,7 @@ if running_superuser then local disabled_lib = {} setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } ); - dofile = function() error("dofile " .. hint) end +-- dofile = function() error("dofile " .. hint) end loadfile = function() error("loadfile " .. hint) end loadlib = function() error("loadlib " .. hint) end require = function() error("require " .. hint) end ++++++ wireshark-1.2.0-disable-warning-dialog.patch ++++++ Index: ui/gtk/main.c =================================================================== --- ui/gtk/main.c.orig 2012-08-10 01:35:00.000000000 +0100 +++ ui/gtk/main.c 2012-08-15 20:28:59.000000000 +0100 @@ -1399,11 +1399,13 @@ main_colorize_changed(gboolean packet_li static GtkWidget *close_dlg = NULL; +/* static void priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) { recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog); } +*/ #ifdef _WIN32 static void @@ -2081,9 +2083,10 @@ check_and_warn_user_startup(gchar *cf_na #endif { gchar *cur_user, *cur_group; - gpointer priv_warning_dialog; +// gpointer priv_warning_dialog; /* Tell the user not to run as root. */ +/* if (running_with_special_privs() && recent.privs_warn_if_elevated) { cur_user = get_cur_username(); cur_group = get_cur_groupname(); @@ -2098,6 +2101,7 @@ check_and_warn_user_startup(gchar *cf_na simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); } +*/ #ifdef _WIN32 /* Warn the user if npf.sys isn't loaded. */ ++++++ wireshark-1.2.0-geoip.patch ++++++ Index: epan/geoip_db.c =================================================================== --- epan/geoip_db.c.orig 2012-06-05 17:33:40.000000000 +0100 +++ epan/geoip_db.c 2012-06-21 21:55:14.000000000 +0100 @@ -177,6 +177,9 @@ geoip_db_init(void) { geoip_dat_scan_dir(geoip_db_paths[i].path); } } + if (num_geoip_db_paths < 1) { + geoip_dat_scan_dir("/var/lib/GeoIP"); + } /* add fake databases for latitude and longitude (using "City" in reality) */ { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark for openSUSE:12.3:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package wireshark for openSUSE:12.3:Update checked in at 2014-09-29 09:20:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/wireshark (Old) and /work/SRC/openSUSE:12.3:Update/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.MtUVXC/_old 2014-09-29 09:20:24.000000000 +0200 +++ /var/tmp/diff_new_pack.MtUVXC/_new 2014-09-29 09:20:24.000000000 +0200 @@ -1 +1 @@ -<link package='wireshark.2879' cicount='copy' /> +<link package='wireshark.3016' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark.3016 for openSUSE:12.3:Update
by root＠hilbert.suse.de 29 Sep '14

29 Sep '14

Hello community, here is the log from the commit of package wireshark.3016 for openSUSE:12.3:Update checked in at 2014-09-29 09:20:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/wireshark.3016 (Old) and /work/SRC/openSUSE:12.3:Update/.wireshark.3016.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark.3016" Changes: -------- New Changes file: --- /dev/null 2014-09-26 12:09:11.568032006 +0200 +++ /work/SRC/openSUSE:12.3:Update/.wireshark.3016.new/wireshark.changes 2014-09-29 09:20:24.000000000 +0200 @@ -0,0 +1,2601 @@ +------------------------------------------------------------------- +Sat Sep 20 18:43:38 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.10.10 [bnc#897055] + Package upgraded to 1.10.x from 1.8.x as it was discontinued. + This update fixes vulnerabilities in Wireshark that could allow + an attacker to crash Wireshark or make it become unresponsive by + sending specific packages onto the network or have it loaded via + a capture file while the dissectors are running. It also contains + a number of other bug fixes. + * RTP dissector crash + wnpa-sec-2014-12 CVE-2014-6421 CVE-2014-6422 + * MEGACO dissector infinite loop + wnpa-sec-2014-13 CVE-2014-6423 + * Netflow dissector crash + wnpa-sec-2014-14 CVE-2014-6424 + * RTSP dissector crash + wnpa-sec-2014-17 CVE-2014-6427 + * SES dissector crash + wnpa-sec-2014-18 CVE-2014-6428 + * Sniffer file parser crash + wnpa-sec-2014-19 CVE-2014-6429 CVE-2014-6430 CVE-2014-6431 + CVE-2014-6432 +- Further bug fixes as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.10.html +- includes changes from 1.10.9: + fixes several crashes triggered by malformed protocol packages +- vulnerabilities fixed: + * The Catapult DCT2000 and IrDA dissectors could underrun a buffer + wnpa-sec-2014-08 CVE-2014-5161 CVE-2014-5162 (bnc#889901) + * The GSM Management dissector could crash + wnpa-sec-2014-09 CVE-2014-5163 (bnc#889906) + * The RLC dissector could crash + wnpa-sec-2014-10 CVE-2014-5164 (bnc#889900) + * The ASN.1 BER dissector could crash + wnpa-sec-2014-11 CVE-2014-5165 (bnc#889899) +- Further bug fixes as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.10.9.html + +------------------------------------------------------------------- +Fri Jun 13 22:47:21 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.8.15 [bnc#882731] + + bugs fixed: + * Tshark with "-F libpcap" still generates a pcapng file. + * IPv6 Next Header 0x3d recognized as SHIM6. + * Pcap-ng PB/EPB with caplen > len shouldn’t be treated as an + error. + * TCAP: set a fence on info column after calling sub dissector + * Wireshark PEEKREMOTE incorrectly decoding QoS data packets + from Cisco Sniffer APs. + * IEEE 802.11: fix dissection of HT Capabilities + + Further updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.15.html + +------------------------------------------------------------------- +Wed Apr 23 19:59:56 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.8.14 [bnc#874692] + + bugs fixed: + * Lua: Trying to get/access a Preference before its registered + causes a segfault + * Some value_string strings contain newlines + * Tighten the NO_MORE_DATA_CHECK macros + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.14.html + +------------------------------------------------------------------- +Sat Mar 8 10:29:19 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.8.13 [bnc#867485] + + vulnerabilities fixed: + * The NFS dissector could crash + wnpa-sec-2014-01 CVE-2014-2281 + * The RLC dissector could crash + wnpa-sec-2014-03 CVE-2014-2283 + * The MPEG file parser could overflow a buffer + wnpa-sec-2014-04 CVE-2014-2299 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.13.html + +------------------------------------------------------------------- +Tue Dec 17 23:10:51 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.8.12 [bnc#855980] + + vulnerabilities fixed: + * The SIP dissector could go into an infinite loop. + wnpa-sec-2013-66 CVE-2013-7112 + * The NTLMSSP v2 dissector could crash. Discovered by Garming Sam. + wnpa-sec-2013-68 CVE-2013-7114 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.12.html + +------------------------------------------------------------------- +Fri Nov 1 22:42:39 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.8.11 [bnc#848738] + + vulnerabilities fixed: + * The IEEE 802.15.4 dissector could crash + wnpa-sec-2013-61 CVE-2013-6336 + * The NBAP dissector could crash + wnpa-sec-2013-62 CVE-2013-6337 + * The SIP dissector could crash + wnpa-sec-2013-63 CVE-2013-6338 + * The OpenWire dissector could go into a large loop + wnpa-sec-2013-64 CVE-2013-6339 + * The TCP dissector could crash + wnpa-sec-2013-65 CVE-2013-6340 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.11.html + +------------------------------------------------------------------- +Wed Sep 11 20:54:02 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.8.10 [bnc#839607] + + vulnerabilities fixed: + * The NBAP dissector could crash. + wnpa-sec-2013-55 CVE-2013-5718 + * The ASSA R3 dissector could go into an infinite loop. + wnpa-sec-2013-56 CVE-2013-5719 + * The RTPS dissector could overflow a buffer. + wnpa-sec-2013-57 CVE-2013-5720 + * The MQ dissector could crash. + wnpa-sec-2013-58 CVE-2013-5721 + * The LDAP dissector could crash. + wnpa-sec-2013-59 CVE-2013-5722 + * The Netmon file parser could crash. + wnpa-sec-2013-60 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.10.html + +------------------------------------------------------------------- +Fri Jul 26 23:47:04 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.8.9 [bnc#831718] + + vulnerabilities fixed: + * The Bluetooth SDP dissector could go into a large loop + CVE-2013-4927 wnpa-sec-2013-45 + * The DIS dissector could go into a large loop + CVE-2013-4929 wnpa-sec-2013-47 + * The DVB-CI dissector could crash + CVE-2013-4930 wnpa-sec-2013-48 + * The GSM RR dissector (and possibly others) could go into a large loop + CVE-2013-4931 wnpa-sec-2013-49 + * The GSM A Common dissector could crash + CVE-2013-4932 wnpa-sec-2013-50 + * The Netmon file parser could crash + CVE-2013-4933 CVE-2013-4934 wnpa-sec-2013-51 + * The ASN.1 PER dissector could crash + CVE-2013-4935 wnpa-sec-2013-52 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.9.html + +------------------------------------------------------------------- +Fri Jun 7 20:20:29 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.8.8 [bnc#823932] + + vulnerabilities fixed: + * The CAPWAP dissector could crash. + wnpa-sec-2013-32 + * The GMR-1 BCCH dissector could crash. + wnpa-sec-2013-33 + * The PPP dissector could crash. + wnpa-sec-2013-34 + * The NBAP dissector could crash. + wnpa-sec-2013-35 + * The RDP dissector could crash. + wnpa-sec-2013-36 + * The GSM CBCH dissector could crash. + wnpa-sec-2013-37 + * The Assa Abloy R3 dissector could consume excessive memory + and CPU. + wnpa-sec-2013-38 + * The HTTP dissector could overrun the stack. + wnpa-sec-2013-39 + * The Ixia IxVeriWave file parser could overflow the heap. + wnpa-sec-2013-40 + * The DCP ETSI dissector could crash. + wnpa-sec-2013-41 + + Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.8.html + +------------------------------------------------------------------- +Sat May 18 06:03:18 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.8.7 [bnc#820566] + + vulnerabilities fixed: + * The RELOAD dissector could go into an infinite loop. + wnpa-sec-2013-23 CVE-2013-2486 CVE-2013-2487 + * The GTPv2 dissector could crash. + wnpa-sec-2013-24 CVE-2013-3555 + * The ASN.1 BER dissector could crash. + wnpa-sec-2013-25 CVE-2013-3556 CVE-2013-3557 + * The PPP CCP dissector could crash. + wnpa-sec-2013-26 CVE-2013-3558 + * The DCP ETSI dissector could crash. + wnpa-sec-2013-27 CVE-2013-3559 ++++ 2404 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.wireshark.3016.new/wireshark.changes New: ---- SIGNATURES-1.10.10.txt wireshark-1.10.0-authors-pod2man.patch wireshark-1.10.0-enable_lua.patch wireshark-1.10.10.tar.bz2 wireshark-1.2.0-disable-warning-dialog.patch wireshark-1.2.0-geoip.patch wireshark.changes wireshark.keyring wireshark.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ # # spec file for package wireshark # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # disable caps for now %define use_caps 0 Name: wireshark Version: 1.10.10 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ and GPL-3.0+ Group: Productivity/Networking/Diagnostic Url: https://www.wireshark.org/ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wiresha… # PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak(a)suse.cz -- don't show warning when running as root Patch1: wireshark-1.2.0-disable-warning-dialog.patch # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak(a)suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders Patch2: wireshark-1.2.0-geoip.patch Patch4: wireshark-1.10.0-enable_lua.patch Patch5: wireshark-1.10.0-authors-pod2man.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex %if 0%{?suse_version} <= 1140 BuildRequires: gtk2-devel %else BuildRequires: gtk3-devel %endif BuildRequires: krb5-devel BuildRequires: libcap-devel BuildRequires: libcares-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel BuildRequires: libpcap-devel BuildRequires: libsmi-devel # required for Lua support in openSUSE 12.2 and later [bnc#780669] %if 0%{?suse_version} >= 1220 BuildRequires: lua51-devel %else BuildRequires: lua-devel %endif BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: portaudio-devel BuildRequires: python-devel BuildRequires: tcpd-devel BuildRequires: xdg-utils %if 0%{?suse_version} > 1220 BuildRequires: zlib-devel %endif Requires: xdg-utils Provides: ethereal = %{version} Obsoletes: ethereal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: libGeoIP-devel BuildRequires: update-desktop-files Recommends: GeoIP %endif %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif %description Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. %package devel Summary: A Network Traffic Analyser Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: glib2-devel Requires: glibc-devel Provides: ethereal-devel = %{version} Obsoletes: ethereal-devel < %{version} %description devel Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. %prep %{?gpg_verify: %gpg_verify %{S:2}} # The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes. # Verify hashes in that file against source tarball. echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep MD5 | head -n1 | cut -d= -f2` %{S:0}" | md5sum -c echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep SHA1 | head -n1 | cut -d= -f2` %{S:0}" | sha1sum -c %setup -q %patch2 %patch4 -p1 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 %if ! %{use_caps} %patch1 sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop %endif %patch5 -p1 %build # zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2 %configure \ %if 0%{?suse_version} < 1220 --without-zlib \ %endif %if 0%{?suse_version} > 1140 --with-gtk3 \ %endif --with-ssl \ --with-gnutls=yes \ --with-gcrypt=yes \ --with-python \ --with-plugins=%{_libdir}/%{name}/plugins/%{version} make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install find %{buildroot} -name "*.la" -delete -print ln -fs wireshark %{buildroot}%{_bindir}/ethereal ln -fs tshark %{buildroot}%{_bindir}/tethereal install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ # install -m 0644 *.1 %%{buildroot}%%{_mandir}/man1/ # -devel install -d -m 0755 %{buildroot}%{_includedir}/wireshark IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark" mkdir -p "${IDIR}/epan" mkdir -p "${IDIR}/epan/crypt" mkdir -p "${IDIR}/epan/ftypes" mkdir -p "${IDIR}/epan/dfilter" mkdir -p "${IDIR}/epan/dissectors" mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wsutil" install -m 644 color.h config.h register.h "${IDIR}/" install -m 644 cfile.h file.h "${IDIR}/" install -m 644 frame_data_sequence.h "${IDIR}/" install -m 644 packet-range.h print.h "${IDIR}/" install -m 644 epan/*.h "${IDIR}/epan/" install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 ws_symbol_export.h "${IDIR}/" install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop %if 0%{?suse_version} %suse_update_desktop_file %{name} %endif %clean rm -rf %{buildroot} %if %{use_caps} %pre getent group wireshark >/dev/null || groupadd wireshark %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README README.linux README.vmware %doc %{_mandir}/man1/[^i]* %doc %{_mandir}/man4/* %{_datadir}/applications/wireshark.desktop %{_datadir}/pixmaps/wireshark.png %{_bindir}/ethereal %{_bindir}/tethereal %{_bindir}/wireshark %{_bindir}/editcap %{_bindir}/tshark %{_bindir}/mergecap %{_bindir}/reordercap %{_bindir}/text2pcap %{_bindir}/dftest %{_bindir}/capinfos %{_bindir}/randpkt %if %{use_caps} %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap %else %{_bindir}/dumpcap %endif %{_bindir}/rawshark %{_libdir}/lib*.so.* %{_libdir}/wireshark/ %{_datadir}/wireshark/ %files devel %defattr(-,root,root) %doc doc/README.* %{_includedir}/wireshark %{_libdir}/lib*.so %changelog ++++++ SIGNATURES-1.10.10.txt ++++++ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 wireshark-1.10.10.tar.bz2: 26823919 bytes MD5(wireshark-1.10.10.tar.bz2)=1458cedf1b67a36db4555e6469a179e1 SHA1(wireshark-1.10.10.tar.bz2)=bcad35318e0a2428caf7e44d6c33a79ec9c1bdd6 RIPEMD160(wireshark-1.10.10.tar.bz2)=f8ace3bad8736246c6342200d199d143bbbcebac Wireshark-win32-1.10.10.exe: 22177056 bytes MD5(Wireshark-win32-1.10.10.exe)=cb160b6be686602993b66ca2b1b2b1da SHA1(Wireshark-win32-1.10.10.exe)=8db0db187186a496ce71127b0c2eeed20ae14423 RIPEMD160(Wireshark-win32-1.10.10.exe)=6ff8c12f8da4ad92542cc83e2d3257f80637b4a0 Wireshark-win64-1.10.10.exe: 28023688 bytes MD5(Wireshark-win64-1.10.10.exe)=f73c60486b789e7e3c7edede59cc4ecf SHA1(Wireshark-win64-1.10.10.exe)=83ecf6f426d08b80664a8fa95bf9c681df70e38a RIPEMD160(Wireshark-win64-1.10.10.exe)=49181a0a9447110bba1229dacd91e18a27fc14ea Wireshark-1.10.10.u3p: 30662795 bytes MD5(Wireshark-1.10.10.u3p)=871172cc6ab38da8f2d397198b4dfb19 SHA1(Wireshark-1.10.10.u3p)=1780de9260aeed43e28264716c48558ece5d6f24 RIPEMD160(Wireshark-1.10.10.u3p)=ddeb6193b953dce454c4ffa92469bf38397b1fc5 WiresharkPortable-1.10.10.paf.exe: 23540840 bytes MD5(WiresharkPortable-1.10.10.paf.exe)=3985cb6904095f125856b665b5b72417 SHA1(WiresharkPortable-1.10.10.paf.exe)=a79f1e508ff3d36c1372dff669e881ccb2508008 RIPEMD160(WiresharkPortable-1.10.10.paf.exe)=18d9f033e6e88876576ddffb2a4a92c5de54fe4b Wireshark 1.10.10 Intel 32.dmg: 20474898 bytes MD5(Wireshark 1.10.10 Intel 32.dmg)=24d3b766a25795afe6b68dadd4c7d36b SHA1(Wireshark 1.10.10 Intel 32.dmg)=6cde849afc8cc15f9b2e25ab62bf9c03a18fcbb8 RIPEMD160(Wireshark 1.10.10 Intel 32.dmg)=91d29372156af5bde64723eaa23ff0614659b499 Wireshark 1.10.10 Intel 64.dmg: 24805922 bytes MD5(Wireshark 1.10.10 Intel 64.dmg)=6b1d50f0851e4d47a07314bab3879b0c SHA1(Wireshark 1.10.10 Intel 64.dmg)=ef6e179e004a17ca0c1e2110d3c4fcc6de0cbe28 RIPEMD160(Wireshark 1.10.10 Intel 64.dmg)=db500717cfc36fc892f0dc881433facefaabd204 patch-wireshark-1.10.9-to-1.10.10.bz2: 72244 bytes MD5(patch-wireshark-1.10.9-to-1.10.10.bz2)=5b9398f27f0f933ef817e267c294aeee SHA1(patch-wireshark-1.10.9-to-1.10.10.bz2)=1b15c1335d4d62b0dbbaf18218727623058b9ada RIPEMD160(patch-wireshark-1.10.9-to-1.10.10.bz2)=e30dc55d2e9db6b9e683bbfe5066ef718b34586d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (Darwin) iEYEARECAAYFAlQYiQEACgkQpw8IXSHylJrCcgCdGltdOnq3Bgulmv7In4iLo4Zn rzAAoL5U6FcKZJvMshlCf2vmBJHzOLih =BgSv -----END PGP SIGNATURE----- ++++++ wireshark-1.10.0-authors-pod2man.patch ++++++ From: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Thu, 27 Jun 2013 21:02:17 +0100 Subject: [patch] change characters in AUTHORS file to be compatible with pod2man Upstream: never * remove some characters for which Pod::Man does not have an escape sequence * replace cyrillic name with transliteration Wide character in printf at /usr/lib/perl5/5.18.0/Pod/Simple.pm line 539. wireshark.pod around line 3455: Non-ASCII character seen before =encoding in 'Moń'. Assuming UTF-8 POD document had syntax errors at /usr/bin/pod2man line 71. make: *** [wireshark.1] Error 255 error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build) --- AUTHORS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: wireshark-1.10.0/AUTHORS =================================================================== --- wireshark-1.10.0.orig/AUTHORS 2013-05-29 17:52:27.000000000 +0100 +++ wireshark-1.10.0/AUTHORS 2013-06-27 20:04:34.000000000 +0100 @@ -3509,7 +3509,7 @@ Peter Hatina <phatina[AT]redhat.com> { Gtk3 Wireshark fixes } -Tomasz Moń <desowin[AT]gmail.com> { +Tomasz Mon <desowin[AT]gmail.com> { USBPcap support } @@ -3612,7 +3612,7 @@ Cvetan Ivanov <zezo[AT]spnet.net> Vasanth Manickam <vasanth.manickam[AT]bt.com> Julian Onions <julian.onions[AT]gmail.com> Samuel Thibault <samuel.thibault[AT]ens-lyon.org> -Peter Kovář <peter.kovar[AT]gmail.com> +Peter Kovár <peter.kovar[AT]gmail.com> Paul Ollis <paul.ollis[AT]roke.co.uk> Dominik Kuhlen <dkuhlen[AT]gmx.net> Karl Knoebl <karl.knoebl[AT]siemens.com> @@ -3703,7 +3703,7 @@ Paul Stath <pstath[AT]axxcelera.com> DeCount <aatrade[AT]libero.it> Andras Veres-Szentkiralyi <vsza[AT]vsza.hu> Jakob Hirsch <jh.wireshark-bugzilla[AT]plonk.de> -Роман Донченко <DXDragon[AT]yandex.ru> +Roman Donchenko <DXDragon[AT]yandex.ru> <billyjeans[AT]gmail.com> Evan Huus <eapache[AT]gmail.com> Tom Cook <tcook[AT]ixiacom.com> ++++++ wireshark-1.10.0-enable_lua.patch ++++++ From: prusnak(a)opensuse.org References: [bnc#650434] Upstream: never - fix lua error at startup (enable_lua.patch) [bnc#650434] previously named wireshark-1.2.4-enable_lua.patch --- epan/wslua/template-init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: wireshark-1.10.0rc2/epan/wslua/template-init.lua =================================================================== --- wireshark-1.10.0rc2.orig/epan/wslua/template-init.lua 2013-04-22 19:04:37.000000000 +0100 +++ wireshark-1.10.0rc2/epan/wslua/template-init.lua 2013-05-26 17:43:20.000000000 +0100 @@ -43,7 +43,7 @@ if running_superuser then local disabled_lib = {} setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } ); - dofile = function() error("dofile " .. hint) end +-- dofile = function() error("dofile " .. hint) end loadfile = function() error("loadfile " .. hint) end loadlib = function() error("loadlib " .. hint) end require = function() error("require " .. hint) end ++++++ wireshark-1.2.0-disable-warning-dialog.patch ++++++ Index: ui/gtk/main.c =================================================================== --- ui/gtk/main.c.orig 2012-08-10 01:35:00.000000000 +0100 +++ ui/gtk/main.c 2012-08-15 20:28:59.000000000 +0100 @@ -1399,11 +1399,13 @@ main_colorize_changed(gboolean packet_li static GtkWidget *close_dlg = NULL; +/* static void priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) { recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog); } +*/ #ifdef _WIN32 static void @@ -2081,9 +2083,10 @@ check_and_warn_user_startup(gchar *cf_na #endif { gchar *cur_user, *cur_group; - gpointer priv_warning_dialog; +// gpointer priv_warning_dialog; /* Tell the user not to run as root. */ +/* if (running_with_special_privs() && recent.privs_warn_if_elevated) { cur_user = get_cur_username(); cur_group = get_cur_groupname(); @@ -2098,6 +2101,7 @@ check_and_warn_user_startup(gchar *cf_na simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); } +*/ #ifdef _WIN32 /* Warn the user if npf.sys isn't loaded. */ ++++++ wireshark-1.2.0-geoip.patch ++++++ Index: epan/geoip_db.c =================================================================== --- epan/geoip_db.c.orig 2012-06-05 17:33:40.000000000 +0100 +++ epan/geoip_db.c 2012-06-21 21:55:14.000000000 +0100 @@ -177,6 +177,9 @@ geoip_db_init(void) { geoip_dat_scan_dir(geoip_db_paths[i].path); } } + if (num_geoip_db_paths < 1) { + geoip_dat_scan_dir("/var/lib/GeoIP"); + } /* add fake databases for latitude and longitude (using "City" in reality) */ { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plymouth for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2014-09-28 19:59:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plymouth" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2014-02-15 08:14:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2014-09-28 19:59:04.000000000 +0200 @@ -1,0 +2,165 @@ +Thu Sep 25 13:19:01 UTC 2014 - idonmez(a)suse.com + +- Update 0001-let-it-become-a-real-daemon.patch to call setsid + only from the child process. + +------------------------------------------------------------------- +Fri Sep 12 12:50:06 UTC 2014 - idonmez(a)suse.com + +- Add 0001-let-it-become-a-real-daemon.patch to make plymouth + a real daemon, fixes part of bnc#889757. Patch by Werner. + +------------------------------------------------------------------- +Thu Sep 4 10:34:25 UTC 2014 - idonmez(a)suse.com + +- Add plymouth-boot-vga-framebuffer.patch to fix boot_vga + problem with framebuffer devices. (bnc#886211) + +------------------------------------------------------------------- +Mon Aug 11 14:23:27 UTC 2014 - idonmez(a)suse.com + +- Modify plymouth-ignore-cirrusdrm.patch to return as + early as possible. Patch by glin(a)suse.com + +------------------------------------------------------------------- +Thu Aug 7 09:24:37 UTC 2014 - idonmez(a)suse.com + +- Invert the logic in plymouth-ignore-cirrusdrm.patch bnc#890516 + +------------------------------------------------------------------- +Mon Jul 28 16:10:49 CEST 2014 - fcrozat(a)suse.com + +- Add + 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch: + fix incorrect UTF-8 code used for square [bnc#886148]. + +------------------------------------------------------------------- +Fri Jul 25 14:32:38 CEST 2014 - fcrozat(a)suse.com + +- Add plymouth-ignore-cirrusdrm.patch: ignore cirrus drm and use fb + instead [bnc#888590] + +------------------------------------------------------------------- +Thu Jul 24 16:30:43 UTC 2014 - fcrozat(a)suse.com + +- Add + 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch: + Be more forgiving with empty seat. + +------------------------------------------------------------------- +Tue Jul 8 16:04:38 UTC 2014 - fcrozat(a)suse.com + +- Update 0001-Some-greenish-openSUSE-colors.patch to also use SUSE + colors on tribar [bnc#886148] + +------------------------------------------------------------------- +Fri Jun 27 11:27:02 UTC 2014 - fcrozat(a)suse.com + +- Add + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch: + handle new udev behaviour in seqnum removal. + +------------------------------------------------------------------- +Fri Jun 20 14:03:36 UTC 2014 - fcrozat(a)suse.com + +- Add + 0001-splash-do-not-process-display-lists-if-it-is-empty.patch: + fix crash when calling plymouth quit +- Add 0001-seats-guard-against-NULL-terminal.patch: guard against + NULL terminal. +- Update stop-graphical.patch: add RemainAfterExit=true to + plymouth-start.service, ensuring plymouthd is not restarted when + switching between runlevels. + +------------------------------------------------------------------- +Thu Jun 19 14:22:44 UTC 2014 - fcrozat(a)suse.com + +- Add + 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch: + fix crash when pixel_display is removed. +- Add 0001-device-manager-only-call-ply_terminal_free.patch: fix + crash. +- Add use-mkinitrd.patch: call mkinitrd -B, not dracut for now, + otherwise initramfs is being created by plymouth-update-initrd, + not initrd file. +- Ensure we don't rebuild initrd twice when updating plymouth. +- Ensure default theme is SLE/openSUSE (based on %suse_version) + +------------------------------------------------------------------- +Fri Jun 6 16:16:38 UTC 2014 - fcrozat(a)suse.com + +- Release 0.9.0 (3 additional fixes compared to previously packaged + git snapshot): + + Use udev for graphics device enumeration + + Add new text plugin to replace the tribar one + + Add background tiling and watermark support to two-step + + Make various plymouth commands that change state be resilient + to being called multiple times + + Support going back to the initrd at shutdown + + Keyfile parser improvements + + Make plymouthd use better defaults when running on top of X11 + + Fixes for systems using QXL + + minor two-step plugin fixes + + Use /sys/class/tty/console/active instead of parsing + /proc/cmdline for consoles. + + Documentation improvements + + Drop driver specific renderers and use generic driver across the + board. + + Better debug message output + + systemd integration fixes + + upstart integration fixes + + initrd scripts fixes + + Misc fixes + +------------------------------------------------------------------- +Thu Jun 5 07:24:10 UTC 2014 - idonmez(a)suse.com + +- Update fix-serial-consoles.patch to fix a crash in some rare + cases. + +------------------------------------------------------------------- +Wed May 21 12:11:25 UTC 2014 - idonmez(a)suse.com + +- Add fix-serial-consoles.patch to fix binary garbage on serial + consoles. This is bnc#873859 + +------------------------------------------------------------------- +Mon May 5 12:49:49 UTC 2014 - fcrozat(a)suse.com + +- Remove plymouth-restore-suspend.patch: suspend package is being + dropped, no longer needs to provide this old API. +- Remove requires on suspend package. + +------------------------------------------------------------------- +Thu Apr 17 12:56:23 UTC 2014 - idonmez(a)suse.com + +- Update to git snapshot as of 20140327 + * Fixes bnc#872502 and bnc#872428 + +------------------------------------------------------------------- +Wed Apr 16 11:35:30 UTC 2014 - trenn(a)suse.de + +- Kill all mkinitrd stuff + Remove suse-initrd-support +- Tell zypper to regenerate initrd on installation/update via %post and + %posttrans scripts + +------------------------------------------------------------------- +Thu Apr 10 10:55:03 UTC 2014 - idonmez(a)suse.com + +- Add plymouth-manpages.patch to fix manpage installation (bnc#871419) + +------------------------------------------------------------------- +Thu Feb 20 12:47:03 UTC 2014 - fcrozat(a)suse.com + +- Drop plymouth.conf, it is no longer used, plymouthd.conf is + nowadays. + +------------------------------------------------------------------- +Wed Feb 15 10:02:32 UTC 2014 - kigurame(a)opensuse.org +- Updated from git +- carried over patches +- Dropped 0001-Make-plymouthd-real-daemon-and-save-old-log.patch + Because it is really not necesary + +------------------------------------------------------------------- Old: ---- 0001-Make-plymouthd-real-daemon-and-save-old-log.patch plymouth-0.8.8_git201309032142.tar.xz plymouth-restore-suspend.patch suse-initrd-support New: ---- 0001-device-manager-only-call-ply_terminal_free.patch 0001-let-it-become-a-real-daemon.patch 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch 0001-seats-guard-against-NULL-terminal.patch 0001-splash-do-not-process-display-lists-if-it-is-empty.patch 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch fix-serial-consoles.patch plymouth-0.9.0.tar.bz2 plymouth-boot-vga-framebuffer.patch plymouth-ignore-cirrusdrm.patch plymouth-manpages.patch use-mkinitrd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.Fy1NWC/_old 2014-09-28 19:59:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Fy1NWC/_new 2014-09-28 19:59:05.000000000 +0200 @@ -22,32 +22,53 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.8.8_git201309032142 +Version: 0.9.0 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0+ Group: System/Base Url: http://freedesktop.org/software/plymouth/releases -Source0: %{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.bz2 Source1: boot-duration -# PATCH-OPENSUSE -- Support the openSUSE initrd -Patch1: suse-initrd-support # PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes Patch3: plymouth-fix-window-size # PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service Patch4: stop-graphical.patch -# PATCH-OPENSUSE -- Restore suspend / resume state (needed for suspend package) -Patch5: plymouth-restore-suspend.patch # PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin Patch9: plymouth-dracut-path.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch # PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatcoke(a)gmail.com -- make sure the runtime directory is /run and not /var/run Patch16: plymouth-correct-runtime-dir.patch -# PATCH-SUSE -- 0001-Make-plymouthd-real-daemon-and-save-old-log.patch werner(a)suse.de -- All daemons should call setsid(2) to become a real daemons -Patch17: 0001-Make-plymouthd-real-daemon-and-save-old-log.patch +# PATCH-FIX-UPSTREAM plymouth-manpages.patch idoenmez(a)suse.de -- Fix man page installation +Patch17: plymouth-manpages.patch +Patch18: fix-serial-consoles.patch +# PATCH-FIX-UPSTREAM 0001-device-manager-only-call-ply_terminal_free.patch fcrozat(a)suse.com -- Fix crash +Patch19: 0001-device-manager-only-call-ply_terminal_free.patch +# PATCH-FIX-OPENSUSE use-mkinitrd.patch fcrozat(a)suse.com -- call mkinitrd -B for now +Patch20: use-mkinitrd.patch +# PATCH-FIX-UPSTREAM 0001-seats-guard-against-NULL-terminal.patch fcrozat(a)suse.com -- guard against null terminal +Patch21: 0001-seats-guard-against-NULL-terminal.patch +# PATCH-FIX-UPSTREAM 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch fcrozat(a)suse.com -- prevent crash if pixel display is removed +Patch22: 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch +# PATCH-FIX-UPSTREAM 0001-splash-do-not-process-display-lists-if-it-is-empty.patch fcrozat(a)suse.com -- do no crash when removing displays +Patch23: 0001-splash-do-not-process-display-lists-if-it-is-empty.patch +# PATCH-FIX-UPSTREAM 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch fcrozat(a)suse.com -- handle recent udev +Patch24: 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch +# PATCH-FIX-UPSTREAM 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch fcrozat(a)suse.com -- handle empty seat better +Patch25: 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch +# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch fcrozat(a)suse.com -- ignore cirrusdrm, use fb instead +Patch26: plymouth-ignore-cirrusdrm.patch +# PATCH-FIX-UPSTREAM 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch bnc#886148 fcrozat(a)suse.com -- fix UTF-8 code for square +Patch27: 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch +Patch28: plymouth-boot-vga-framebuffer.patch +Patch29: 0001-let-it-become-a-real-daemon.patch + BuildRequires: automake +BuildRequires: docbook-xsl-stylesheets BuildRequires: kernel-headers BuildRequires: libtool +BuildRequires: libudev-devel +BuildRequires: libxslt BuildRequires: module-init-tools BuildRequires: update-desktop-files BuildRequires: xz @@ -55,12 +76,9 @@ BuildRequires: pkgconfig(systemd) >= 186 Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts -%ifarch %ix86 x86_64 ppc ppc64 ppc64le -Requires: suspend >= 0.80.20100129.1 -%endif Requires: systemd >= 186 Requires(post): plymouth-scripts = %{version} -Requires(post): mkinitrd +BuildRequires: suse-module-tools Suggests: plymouth-plugin-label Provides: bootsplash = 3.4 Obsoletes: bootsplash <= 3.4 @@ -156,7 +174,6 @@ Requires: cpio Requires: findutils Requires: pigz -Requires(post): mkinitrd %description scripts This package contains scripts that help integrate Plymouth with @@ -239,6 +256,19 @@ language that simplifies the process of designing custom boot splash themes. +%package plugin-tribar +Summary: Plymouth "script" plugin +Group: System/Base +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} + +%description plugin-tribar +This package contains the "tribar" boot splash plugin for +Plymouth. It features an extensible, scriptable boot splash +language that simplifies the process of designing custom +boot splash themes. + %package theme-fade-in Summary: Plymouth "Fade-In" theme Group: System/Base @@ -287,6 +317,17 @@ This package contains the "Solar" boot splash theme for Plymouth. It features a blue flamed sun with animated solar flares. +%package theme-tribar +Summary: Plymouth "Tribar" theme +Group: System/Base +Requires: %{name}-plugin-tribar = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-tribar +This package contains the "Tribar" boot splash theme for +Plymouth + %package theme-script Summary: Plymouth "Script" plugin Group: System/Base @@ -301,21 +342,35 @@ %prep %setup -q -%patch1 -p1 %patch3 -p1 %patch4 -p1 -%ifarch %ix86 x86_64 ppc ppc64 ppc64le -%patch5 -p1 -%endif %patch9 -p0 %patch10 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 + # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c # Change the default theme -sed -i -e 's/fade-in/openSUSE/g' src/plymouthd.defaults + +%if %{suse_version} == 1315 +sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults +%else +sed -i -e 's/spinner/openSUSE/g' src/plymouthd.defaults +%endif %build autoreconf -fiv @@ -330,11 +385,10 @@ --with-log-viewer \ --without-rhgb-compat-link \ --with-boot-tty=/dev/tty7 \ - --with-shutdown-tty=/dev/tty7 \ + --with-shutdown-tty=/dev/tty1 \ --without-gdm-autostart-file \ --with-release-file=/etc/os-release -make clean make %{?_smp_mflags} V=1 %install @@ -361,12 +415,12 @@ touch %{buildroot}%{_localstatedir}/spool/plymouth/boot.log cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth -cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf +cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf %post +%{?regenerate_initrd_post} if [ ! -e /.buildenv ]; then [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration - %{_libexecdir}/plymouth/plymouth-update-initrd fi [ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : @@ -377,6 +431,9 @@ [ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi +%posttrans +%{?regenerate_initrd_posttrans} + %post -n libply-boot-client2 -p /sbin/ldconfig %postun -n libply-boot-client2 -p /sbin/ldconfig @@ -471,7 +528,6 @@ %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%config(noreplace) %{_sysconfdir}/plymouth/plymouth.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth @@ -491,6 +547,7 @@ %{_unitdir}/* %ghost %{_localstatedir}/log/boot.log %ghost %{_localstatedir}/spool/plymouth/boot.log + %files dracut %defattr(-, root, root) %{_libexecdir}/plymouth/plymouth-populate-initrd @@ -583,10 +640,19 @@ %{_datadir}/plymouth/themes/solar/*.png %{_datadir}/plymouth/themes/solar/solar.plymouth +%files theme-tribar +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/tribar +%{_datadir}/plymouth/themes/tribar/*.* + %files plugin-two-step %defattr(-, root, root) %{_libdir}/plymouth/two-step.so +%files plugin-tribar +%defattr(-, root, root) +%{_libdir}/plymouth/tribar.so + %files plugin-script %defattr(-, root, root) %{_libdir}/plymouth/script.so ++++++ 0001-Some-greenish-openSUSE-colors.patch ++++++ --- /var/tmp/diff_new_pack.Fy1NWC/_old 2014-09-28 19:59:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Fy1NWC/_new 2014-09-28 19:59:05.000000000 +0200 @@ -7,11 +7,32 @@ src/plugins/splash/text/plugin.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c -index 50059be..d9235c5 100644 ---- a/src/plugins/splash/text/plugin.c -+++ b/src/plugins/splash/text/plugin.c -@@ -180,13 +180,13 @@ view_start_animation (view_t *view) +Index: plymouth-0.9.0/src/plugins/splash/text/plugin.c +=================================================================== +--- plymouth-0.9.0.orig/src/plugins/splash/text/plugin.c ++++ plymouth-0.9.0/src/plugins/splash/text/plugin.c +@@ -174,13 +174,13 @@ view_start_animation (view_t *view) + 0x000000); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_WHITE, +- 0xffffff); ++ 0x40ff00); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_BLUE, +- 0x3465a4); ++ 0x20a000); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_BROWN, +- 0x979a9b); ++ 0x106000); + + ply_text_display_set_background_color (view->display, + PLY_TERMINAL_COLOR_BLACK); +Index: plymouth-0.9.0/src/plugins/splash/tribar/plugin.c +=================================================================== +--- plymouth-0.9.0.orig/src/plugins/splash/tribar/plugin.c ++++ plymouth-0.9.0/src/plugins/splash/tribar/plugin.c +@@ -177,13 +177,13 @@ view_start_animation (view_t *view) 0x000000); ply_terminal_set_color_hex_value (terminal, PLY_TERMINAL_COLOR_WHITE, @@ -28,6 +49,3 @@ ply_text_display_set_background_color (view->display, PLY_TERMINAL_COLOR_BLACK); --- -1.7.7 - ++++++ 0001-device-manager-only-call-ply_terminal_free.patch ++++++ >From 54951cef0e5ea3caeae1eb0ec33db7ed37d0d4b3 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Thu, 12 Jun 2014 13:50:51 +0200 Subject: [PATCH] device-manager: only call ply_terminal_free ply_terminal_free will call ply_terminal_close anyway and is guarded against NULL terminal (ply_terminal_close is not). --- src/libply-splash-core/ply-device-manager.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c index dbc203d..aa4d15c 100644 --- a/src/libply-splash-core/ply-device-manager.c +++ b/src/libply-splash-core/ply-device-manager.c @@ -442,7 +442,6 @@ free_terminal (char *device, { ply_hashtable_remove (manager->terminals, device); - ply_terminal_close (terminal); ply_terminal_free (terminal); } -- 1.8.4.5 ++++++ 0001-let-it-become-a-real-daemon.patch ++++++ Related to bnc#892526 -- let plymouthd become a real daemon that is it should use its own session with the help of the system call setsid(2). Also avoid an EBUSY on ioctl TIOCCONS if a former plymouthd had failed. And a crash or termination may restore not only the current virtual console but also any serial console as well restore the system console. --- plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c | 9 ++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h | 1 plymouth-0.9.0/src/libply/ply-terminal-session.c | 7 ++ plymouth-0.9.0/src/libply/ply-utils.c | 2 plymouth-0.9.0/src/main.c | 42 +++++++------ 5 files changed, 43 insertions(+), 18 deletions(-) Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c =================================================================== --- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c +++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c @@ -933,3 +933,12 @@ ply_device_manager_deactivate_keyboards node = next_node; } } + +void +ply_close_all_terminals (ply_device_manager_t *manager) +{ + ply_hashtable_foreach (manager->terminals, + (ply_hashtable_foreach_func_t *) + ply_terminal_close, + manager); +} Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h =================================================================== --- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.h +++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h @@ -49,6 +49,7 @@ void ply_device_manager_deactivate_keybo void ply_device_manager_activate_renderers (ply_device_manager_t *manager); void ply_device_manager_deactivate_renderers (ply_device_manager_t *manager); ply_terminal_t *ply_device_manager_get_default_terminal (ply_device_manager_t *manager); +void ply_close_all_terminals (ply_device_manager_t *manager); #endif Index: plymouth-0.9.0/src/libply/ply-utils.c =================================================================== --- plymouth-0.9.0.orig/src/libply/ply-utils.c +++ plymouth-0.9.0/src/libply/ply-utils.c @@ -77,6 +77,7 @@ static int errno_stack[PLY_ERRNO_STACK_SIZE]; static int errno_stack_position = 0; +static bool inChild = false; bool ply_open_unidirectional_pipe (int *sender_fd, @@ -797,6 +798,7 @@ ply_create_daemon (void) { int read_error = errno; int status; + inChild = true; if (waitpid (pid, &status, WNOHANG) <= 0) { @@ -843,6 +845,9 @@ ply_detach_daemon (ply_daemon_handle_t * close (sender_fd); free (handle); + if (inChild) + setsid(); + return true; } Index: plymouth-0.9.0/src/libply/ply-terminal-session.c =================================================================== --- plymouth-0.9.0.orig/src/libply/ply-terminal-session.c +++ plymouth-0.9.0/src/libply/ply-terminal-session.c @@ -187,6 +187,13 @@ ply_terminal_session_redirect_console (p assert (terminal_name != NULL); + fd = open ("/dev/console", O_RDWR | O_NOCTTY); + if (fd >= 0) + { + ioctl (fd, TIOCCONS); /* Undo any current map if any */ + close (fd); + } + fd = open (terminal_name, O_RDWR | O_NOCTTY); if (fd < 0) Index: plymouth-0.9.0/src/main.c =================================================================== --- plymouth-0.9.0.orig/src/main.c +++ plymouth-0.9.0/src/main.c @@ -1042,6 +1042,7 @@ on_seat_added (state_t *state, } +static ply_device_manager_t *manager; static void load_devices (state_t *state, ply_device_manager_flags_t flags) @@ -1049,6 +1050,8 @@ load_devices (state_t state->device_manager = ply_device_manager_new (state->default_tty, flags); state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager); + manager = state->device_manager; + ply_device_manager_watch_seats (state->device_manager, (ply_seat_added_handler_t) on_seat_added, @@ -1077,6 +1080,7 @@ quit_splash (state_t *state) ply_trace ("Not retaining splash, so deallocating VT"); ply_terminal_deactivate_vt (state->local_console_terminal); ply_terminal_close (state->local_console_terminal); + ply_close_all_terminals (state->device_manager); } } @@ -2075,25 +2079,22 @@ dump_debug_buffer_to_file (void) #include <termios.h> #include <unistd.h> static void -on_crash (int signum) +dosigaction (int signum) { - struct termios term_attributes; int fd; - fd = open ("/dev/tty1", O_RDWR | O_NOCTTY); - if (fd < 0) fd = open ("/dev/hvc0", O_RDWR | O_NOCTTY); - - ioctl (fd, KDSETMODE, KD_TEXT); - - tcgetattr (fd, &term_attributes); - - term_attributes.c_iflag |= BRKINT | IGNPAR | ICRNL | IXON; - term_attributes.c_oflag |= OPOST; - term_attributes.c_lflag |= ECHO | ICANON | ISIG | IEXTEN; - - tcsetattr (fd, TCSAFLUSH, &term_attributes); + if (manager) + { + ply_device_manager_deactivate_keyboards (manager); + ply_close_all_terminals (manager); + } - close (fd); + fd = open ("/dev/console", O_RDWR | O_NOCTTY); + if (fd >= 0) + { + ioctl (fd, TIOCCONS); /* Undo any current map if any */ + close (fd); + } if (debug_buffer != NULL) { @@ -2108,7 +2109,6 @@ on_crash (int signum) pid_file = NULL; } - signal (signum, SIG_DFL); raise(signum); } @@ -2145,6 +2145,7 @@ main (int argc, char *kernel_command_line = NULL; char *tty = NULL; ply_device_manager_flags_t device_manager_flags = PLY_DEVICE_MANAGER_FLAGS_NONE; + struct sigaction sa; state.start_time = ply_get_timestamp (); state.command_parser = ply_command_parser_new ("plymouthd", "Splash server"); @@ -2256,8 +2257,13 @@ main (int argc, if (debug) debug_buffer = ply_buffer_new (); - signal (SIGABRT, on_crash); - signal (SIGSEGV, on_crash); + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESETHAND; + sa.sa_handler = dosigaction; + sigaction (SIGHUP, &sa, NULL); + sigaction (SIGTERM, &sa, NULL); + sigaction (SIGABRT, &sa, NULL); + sigaction (SIGSEGV, &sa, NULL); /* before do anything we need to make sure we have a working * environment. ++++++ 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch ++++++ >From 920009efa99204de172332486de5ccff6a3332d5 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Thu, 19 Jun 2014 17:58:50 +0200 Subject: [PATCH] libply-splash-core: also monitor for file removal in udev directory --- src/libply-splash-core/ply-device-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c index aa4d15c..06d751c 100644 --- a/src/libply-splash-core/ply-device-manager.c +++ b/src/libply-splash-core/ply-device-manager.c @@ -761,7 +761,7 @@ watch_for_coldplug_completion (ply_device_manager_t *manager) } fd = inotify_init1 (IN_CLOEXEC); - result = inotify_add_watch (fd, "/run/udev", IN_MOVED_TO); + result = inotify_add_watch (fd, "/run/udev", IN_MOVED_TO | IN_DELETE); if (result < 0) { -- 1.8.4.5 ++++++ 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch ++++++ >From 84eb4381db85877a9a56b35994e6c10d43e46ebe Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode(a)redhat.com> Date: Mon, 14 Jul 2014 08:04:54 -0400 Subject: [PATCH] seat: be a little more forgiving in the case there's no open terminal We can end up in a situation where a seat object doesn't have a terminal associated with it. In that case we shouldn't crash, but continue on with no input available for that seat. https://bugs.freedesktop.org/show_bug.cgi?id=80553 --- src/libply-splash-core/ply-seat.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) Index: plymouth-0.9.0/src/libply-splash-core/ply-seat.c =================================================================== --- plymouth-0.9.0.orig/src/libply-splash-core/ply-seat.c +++ plymouth-0.9.0/src/libply-splash-core/ply-seat.c @@ -154,14 +154,23 @@ ply_seat_open (ply_seat_t *seat add_pixel_displays (seat); } - else + else if (seat->terminal != NULL) { seat->keyboard = ply_keyboard_new_for_terminal (seat->terminal); } - add_text_displays (seat); - ply_keyboard_watch_for_input (seat->keyboard); - seat->keyboard_active = true; + if (seat->terminal != NULL) { + add_text_displays (seat); + } else { + ply_trace ("not adding text display for seat, since seat has no associated terminal"); + } + + if (seat->keyboard != NULL) { + ply_keyboard_watch_for_input (seat->keyboard); + seat->keyboard_active = true; + } else { + ply_trace ("not watching seat for input"); + } return true; } ++++++ 0001-seats-guard-against-NULL-terminal.patch ++++++ >From a6eff09852c2eb4d684526b814d2b2df578938d0 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Thu, 12 Jun 2014 18:51:24 +0200 Subject: [PATCH] seats: guard against NULL terminal --- src/libply-splash-core/ply-keyboard.c | 7 +++++-- src/libply-splash-core/ply-seat.c | 6 +++--- src/libply-splash-core/ply-terminal.c | 11 +++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/libply-splash-core/ply-keyboard.c b/src/libply-splash-core/ply-keyboard.c index 624f906..1bed19f 100644 --- a/src/libply-splash-core/ply-keyboard.c +++ b/src/libply-splash-core/ply-keyboard.c @@ -423,8 +423,11 @@ ply_keyboard_free (ply_keyboard_t *keyboard) } else { - ply_buffer_free (keyboard->provider.if_terminal->key_buffer); - free (keyboard->provider.if_terminal); + if (keyboard->provider.if_terminal) + { + ply_buffer_free (keyboard->provider.if_terminal->key_buffer); + free (keyboard->provider.if_terminal); + } } free (keyboard); diff --git a/src/libply-splash-core/ply-seat.c b/src/libply-splash-core/ply-seat.c index 2ac8bf7..29e2dfa 100644 --- a/src/libply-splash-core/ply-seat.c +++ b/src/libply-splash-core/ply-seat.c @@ -102,12 +102,12 @@ add_text_displays (ply_seat_t *seat) { ply_text_display_t *display; - if (!ply_terminal_is_open (seat->terminal)) + if (!seat->terminal || !ply_terminal_is_open (seat->terminal)) { - if (!ply_terminal_open (seat->terminal)) + if (!seat->terminal || !ply_terminal_open (seat->terminal)) { ply_trace ("could not add terminal %s: %m", - ply_terminal_get_name (seat->terminal)); + seat->terminal ? ply_terminal_get_name (seat->terminal) : "none" ); return; } } diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c index 992dd3f..b52b108 100644 --- a/src/libply-splash-core/ply-terminal.c +++ b/src/libply-splash-core/ply-terminal.c @@ -654,30 +654,33 @@ ply_terminal_open (ply_terminal_t *terminal) int ply_terminal_get_fd (ply_terminal_t *terminal) { - return terminal->fd; + return terminal ? terminal->fd : -1; } bool ply_terminal_is_vt (ply_terminal_t *terminal) { - return terminal->vt_number > 0; + return terminal ? terminal->vt_number > 0 : false; } bool ply_terminal_is_open (ply_terminal_t *terminal) { - return terminal->is_open; + return terminal ? terminal->is_open : false; } bool ply_terminal_is_active (ply_terminal_t *terminal) { - return terminal->is_active; + return terminal ? terminal->is_active : false; } void ply_terminal_close (ply_terminal_t *terminal) { + if (!terminal) + return; + if (!terminal->is_open) { ply_trace ("terminal %s is already closed", terminal->name); -- 1.8.4.5 ++++++ 0001-splash-do-not-process-display-lists-if-it-is-empty.patch ++++++ >From 95b775ea543489c688595e94a96909402b2b56f1 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Fri, 20 Jun 2014 16:01:12 +0200 Subject: [PATCH] splash: do not process display lists if it is empty or NULL --- src/plugins/splash/script/plugin.c | 1 + src/plugins/splash/script/script-lib-sprite.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/plugins/splash/script/plugin.c b/src/plugins/splash/script/plugin.c index 8e37b37..cd9e052 100644 --- a/src/plugins/splash/script/plugin.c +++ b/src/plugins/splash/script/plugin.c @@ -334,6 +334,7 @@ stop_script_animation (ply_boot_splash_plugin_t *plugin) script_state_destroy (plugin->script_state); script_lib_sprite_destroy (plugin->script_sprite_lib); + plugin->script_sprite_lib = NULL; script_lib_image_destroy (plugin->script_image_lib); script_lib_plymouth_destroy (plugin->script_plymouth_lib); script_lib_math_destroy (plugin->script_math_lib); diff --git a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c index 166c7e7..f1cd57f 100644 --- a/src/plugins/splash/script/script-lib-sprite.c +++ b/src/plugins/splash/script/script-lib-sprite.c @@ -704,6 +704,9 @@ void script_lib_sprite_pixel_display_removed (script_lib_sprite_data_t *data, pl ply_list_node_t *next_node; script_lib_display_t* display; + if (!data) + return; + node = ply_list_get_first_node (data->displays); while (node) { @@ -725,6 +728,9 @@ script_lib_sprite_refresh (script_lib_sprite_data_t *data) ply_region_t *region = ply_region_new (); ply_list_t *rectable_list; + if (!data) + return; + ply_list_sort_stable (data->sprite_list, &sprite_compare_z); node = ply_list_get_first_node (data->sprite_list); @@ -848,5 +854,6 @@ void script_lib_sprite_destroy (script_lib_sprite_data_t *data) script_parse_op_free (data->script_main_op); script_obj_native_class_destroy (data->class); free (data); + data = NULL; } -- 1.8.4.5 ++++++ 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch ++++++ >From 61525fba34c724b6e319f6b3b8198c0c0f8aa677 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Thu, 19 Jun 2014 16:18:12 +0200 Subject: [PATCH] splash: remove pixel_pixel in sprite-lib when notified they are gone --- src/plugins/splash/script/plugin.c | 1 + src/plugins/splash/script/script-lib-sprite.c | 28 +++++++++++++++++++++++---- src/plugins/splash/script/script-lib-sprite.h | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/plugins/splash/script/plugin.c b/src/plugins/splash/script/plugin.c index c5c1e16..8e37b37 100644 --- a/src/plugins/splash/script/plugin.c +++ b/src/plugins/splash/script/plugin.c @@ -401,6 +401,7 @@ static void remove_pixel_display (ply_boot_splash_plugin_t *plugin, ply_pixel_display_t *display) { + script_lib_sprite_pixel_display_removed (plugin->script_sprite_lib, display); ply_list_remove_data(plugin->displays, display); } diff --git a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c index e0ced7e..166c7e7 100644 --- a/src/plugins/splash/script/script-lib-sprite.c +++ b/src/plugins/splash/script/script-lib-sprite.c @@ -77,7 +77,7 @@ static script_return_t sprite_get_image (script_state_t *state, { script_lib_sprite_data_t *data = user_data; sprite_t *sprite = script_obj_as_native_of_class (state->this, data->class); - + if (sprite && sprite->image_obj) { script_obj_ref (sprite->image_obj); @@ -481,7 +481,7 @@ static void script_lib_sprite_draw_area (script_lib_display_t *display, } } -static void +static void draw_area (script_lib_sprite_data_t *data, int x, int y, @@ -533,10 +533,10 @@ script_lib_sprite_data_t *script_lib_sprite_setup (script_state_t *state, ply_pixel_display_t *pixel_display = ply_list_node_get_data (node); script_lib_display_t *script_display = malloc (sizeof(script_lib_display_t)); script_display->pixel_display = pixel_display; - + script_display->x = (max_width - ply_pixel_display_get_width (pixel_display)) / 2; script_display->y = (max_height - ply_pixel_display_get_height (pixel_display)) / 2; - + script_display->data = data; ply_pixel_display_set_draw_handler (pixel_display, (ply_pixel_display_draw_handler_t) @@ -698,6 +698,26 @@ region_add_area (ply_region_t *region, ply_region_add_rectangle (region, &rectangle); } +void script_lib_sprite_pixel_display_removed (script_lib_sprite_data_t *data, ply_pixel_display_t *pixel_display) +{ + ply_list_node_t *node; + ply_list_node_t *next_node; + script_lib_display_t* display; + + node = ply_list_get_first_node (data->displays); + while (node) + { + next_node = ply_list_get_next_node (data->displays, node); + display = ply_list_node_get_data (node); + + if (display->pixel_display == pixel_display) + { + ply_list_remove_node (data->displays, node); + } + node = next_node; + } +} + void script_lib_sprite_refresh (script_lib_sprite_data_t *data) { diff --git a/src/plugins/splash/script/script-lib-sprite.h b/src/plugins/splash/script/script-lib-sprite.h index 0cb0681..2404b85 100644 --- a/src/plugins/splash/script/script-lib-sprite.h +++ b/src/plugins/splash/script/script-lib-sprite.h @@ -65,6 +65,7 @@ typedef struct script_lib_sprite_data_t *script_lib_sprite_setup (script_state_t *state, ply_list_t *displays); +void script_lib_sprite_pixel_display_removed (script_lib_sprite_data_t *data, ply_pixel_display_t *pixel_display); void script_lib_sprite_refresh (script_lib_sprite_data_t *data); void script_lib_sprite_destroy (script_lib_sprite_data_t *data); -- 1.8.4.5 ++++++ 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch ++++++ >From 40c2dd36c5da64919f69dd4f37de2ecf19f23058 Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode(a)redhat.com> Date: Mon, 28 Jul 2014 09:58:49 -0400 Subject: [PATCH] =?UTF-8?q?text-step-bar:=20use=20correct=20utf-8=20multib?= =?UTF-8?q?yte=20sequence=20for=20=E2=96=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason in commit 113526408c5706c9efc7f43c3f8258354e762677 I commited the sequence \x25\x96\xa0 in place of the block character that was there before. I don't know where I got \x25 from, but it's not right (and couldn't even be right since the high order bit isn't set which is a requirement for the first byte in multi-byte utf-8 sequences). This commit uses \xe2 instead which I got from doing: $ echo ■ | xxd 0000000: e296 a00a .... --- src/libply-splash-core/ply-text-step-bar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: plymouth-0.9.0/src/libply-splash-core/ply-text-step-bar.c =================================================================== --- plymouth-0.9.0.orig/src/libply-splash-core/ply-text-step-bar.c +++ plymouth-0.9.0/src/libply-splash-core/ply-text-step-bar.c @@ -96,7 +96,7 @@ ply_text_step_bar_draw (ply_text_step_ba } /* U+25A0 BLACK SQUARE */ - ply_text_display_write (step_bar->display, "%s", "\x25\x96\xa0"); + ply_text_display_write (step_bar->display, "%s", "\xe2\x96\xa0"); ply_text_display_write (step_bar->display, "%c", ' '); } ++++++ fix-serial-consoles.patch ++++++ Index: plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.c =================================================================== --- plymouth-0.8.8_git20140327.orig/src/libply-splash-core/ply-device-manager.c +++ plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.c @@ -58,6 +58,8 @@ struct _ply_device_manager int udev_queue_fd; ply_fd_watch_t *udev_queue_fd_watch; struct udev_monitor *udev_monitor; + bool has_serial_consoles; + ply_seat_added_handler_t seat_added_handler; ply_seat_removed_handler_t seat_removed_handler; @@ -501,6 +503,7 @@ ply_device_manager_new (const char manager->loop = NULL; manager->terminals = ply_hashtable_new (ply_hashtable_string_hash, ply_hashtable_string_compare); manager->local_console_terminal = ply_terminal_new (default_tty); + manager->has_serial_consoles = false; ply_hashtable_insert (manager->terminals, (void *) ply_terminal_get_name (manager->local_console_terminal), manager->local_console_terminal); @@ -670,21 +673,19 @@ create_seat_for_terminal (const char static bool create_seats_from_terminals (ply_device_manager_t *manager) { - bool has_serial_consoles; - ply_trace ("checking for consoles"); if (manager->flags & PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES) { - has_serial_consoles = false; + manager->has_serial_consoles = false; ply_trace ("ignoring all consoles but default console because explicitly told to."); } else { - has_serial_consoles = add_consoles_from_file (manager, "/sys/class/tty/console/active"); + manager->has_serial_consoles = add_consoles_from_file (manager, "/sys/class/tty/console/active"); } - if (has_serial_consoles) + if (manager->has_serial_consoles) { ply_trace ("serial consoles detected, managing them with details forced"); ply_hashtable_foreach (manager->terminals, @@ -838,6 +839,15 @@ ply_device_manager_has_open_seats (ply_d return false; } +bool +ply_device_manager_has_serial_consoles (ply_device_manager_t *manager) +{ + if (manager) + return manager->has_serial_consoles; + else + return false; +} + ply_list_t * ply_device_manager_get_seats (ply_device_manager_t *manager) { Index: plymouth-0.8.8_git20140327/src/main.c =================================================================== --- plymouth-0.8.8_git20140327.orig/src/main.c +++ plymouth-0.8.8_git20140327/src/main.c @@ -848,7 +848,7 @@ plymouth_should_show_default_splash (sta }; int i; - if (state->should_force_details) + if (ply_device_manager_has_serial_consoles(state->device_manager) || state->should_force_details) return false; for (i = 0; strings[i] != NULL; i++) Index: plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.h =================================================================== --- plymouth-0.8.8_git20140327.orig/src/libply-splash-core/ply-device-manager.h +++ plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.h @@ -42,6 +42,7 @@ void ply_device_manager_watch_seats (ply ply_seat_removed_handler_t seat_removed_handler, void *data); bool ply_device_manager_has_open_seats (ply_device_manager_t *manager); +bool ply_device_manager_has_serial_consoles (ply_device_manager_t *manager); ply_list_t *ply_device_manager_get_seats (ply_device_manager_t *manager); void ply_device_manager_free (ply_device_manager_t *manager); void ply_device_manager_activate_keyboards (ply_device_manager_t *manager); ++++++ plymouth-0.8.8_git201309032142.tar.xz -> plymouth-0.9.0.tar.bz2 ++++++ ++++ 76815 lines of diff (skipped) ++++++ plymouth-boot-vga-framebuffer.patch ++++++ Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c =================================================================== --- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c +++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c @@ -101,12 +101,13 @@ device_is_for_local_console (ply_device_ * card the kernel is using for its console. */ device_path = udev_device_get_syspath (device); asprintf (&bus_device_path, "%s/device", device_path); + ply_trace ("Testing device path %s\n", bus_device_path); bus_device = udev_device_new_from_syspath (manager->udev_context, bus_device_path); boot_vga = udev_device_get_sysattr_value (bus_device, "boot_vga"); free (bus_device_path); - if (boot_vga != NULL && strcmp (boot_vga, "1") == 0) + if (boot_vga == NULL /* framebuffer case */ || strcmp (boot_vga, "1") == 0) for_local_console = true; else for_local_console = false; ++++++ plymouth-dracut-path.patch ++++++ --- /var/tmp/diff_new_pack.Fy1NWC/_old 2014-09-28 19:59:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Fy1NWC/_new 2014-09-28 19:59:05.000000000 +0200 @@ -4,8 +4,8 @@ [ -z "$INITRDDIR" ] && usage error mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes --inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd --inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth +-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR +-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR +inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd +inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR ++++++ plymouth-ignore-cirrusdrm.patch ++++++ diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c index a5aa59d..0be2117 100644 --- a/src/libply-splash-core/ply-device-manager.c +++ b/src/libply-splash-core/ply-device-manager.c @@ -125,6 +125,10 @@ fb_device_has_drm_device (ply_device_manager_t *manager, const char *id_path; bool has_drm_device = false; + const char *card_name = udev_device_get_sysattr_value (fb_device, "name"); + if (card_name && strcmp ("cirrusdrmfb", card_name) == 0) + return false; + /* We want to see if the framebuffer is associated with a DRM-capable * graphics card, if it is, we'll use the DRM device */ card_matches = udev_enumerate_new (manager->udev_context); ++++++ plymouth-manpages.patch ++++++ Index: plymouth-0.8.8_git20140207/docs/Makefile.am =================================================================== --- plymouth-0.8.8_git20140207.orig/docs/Makefile.am +++ plymouth-0.8.8_git20140207/docs/Makefile.am @@ -16,12 +16,14 @@ plymouth.1: plymouth1.xml %.1: %.xml $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -man_MANS = \ +man1_MANS = \ plymouth.1 \ - plymouth.8 \ - plymouthd.8 \ plymouth-set-default-theme.1 +man8_MANS = \ + plymouth.8 \ + plymouthd.8 + EXTRA_DIST = \ plymouth.xml \ plymouth1.xml \ ++++++ stop-graphical.patch ++++++ --- /var/tmp/diff_new_pack.Fy1NWC/_old 2014-09-28 19:59:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Fy1NWC/_new 2014-09-28 19:59:06.000000000 +0200 @@ -1,7 +1,7 @@ -Index: plymouth-0.8.6.1/systemd-units/plymouth-quit-wait.service.in +Index: plymouth-0.9.0/systemd-units/plymouth-quit-wait.service.in =================================================================== ---- plymouth-0.8.6.1.orig/systemd-units/plymouth-quit-wait.service.in -+++ plymouth-0.8.6.1/systemd-units/plymouth-quit-wait.service.in +--- plymouth-0.9.0.orig/systemd-units/plymouth-quit-wait.service.in ++++ plymouth-0.9.0/systemd-units/plymouth-quit-wait.service.in @@ -1,6 +1,7 @@ [Unit] Description=Wait for Plymouth Boot Screen to Quit @@ -10,10 +10,10 @@ [Service] ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait -Index: plymouth-0.8.6.1/systemd-units/plymouth-quit.service.in +Index: plymouth-0.9.0/systemd-units/plymouth-quit.service.in =================================================================== ---- plymouth-0.8.6.1.orig/systemd-units/plymouth-quit.service.in -+++ plymouth-0.8.6.1/systemd-units/plymouth-quit.service.in +--- plymouth-0.9.0.orig/systemd-units/plymouth-quit.service.in ++++ plymouth-0.9.0/systemd-units/plymouth-quit.service.in @@ -1,6 +1,7 @@ [Unit] Description=Terminate Plymouth Boot Screen ++++++ use-mkinitrd.patch ++++++ Index: plymouth-0.9.0/scripts/plymouth-update-initrd =================================================================== --- plymouth-0.9.0.orig/scripts/plymouth-update-initrd +++ plymouth-0.9.0/scripts/plymouth-update-initrd @@ -1,2 +1,2 @@ #!/bin/bash -dracut -f +mkinitrd -B -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0